ember-resolver
Advanced tools
Comparing version
@@ -21,3 +21,3 @@ /*globals require */ | ||
let { | ||
const { | ||
underscore, | ||
@@ -27,3 +27,3 @@ classify, | ||
} = Ember.String; | ||
let { | ||
const { | ||
get, | ||
@@ -38,4 +38,4 @@ DefaultResolver | ||
var prefix, type, name; | ||
var fullNameParts = fullName.split('@'); | ||
let prefix, type, name; | ||
let fullNameParts = fullName.split('@'); | ||
@@ -47,3 +47,3 @@ // HTMLBars uses helper:@content-helper which collides | ||
fullNameParts.length === 2) { | ||
var prefixParts = fullNameParts[0].split(':'); | ||
let prefixParts = fullNameParts[0].split(':'); | ||
@@ -55,3 +55,3 @@ if (prefixParts.length === 2) { | ||
} else { | ||
var nameParts = fullNameParts[1].split(':'); | ||
let nameParts = fullNameParts[1].split(':'); | ||
@@ -68,5 +68,5 @@ prefix = fullNameParts[0]; | ||
var fullNameWithoutType = name; | ||
var namespace = get(this, 'namespace'); | ||
var root = namespace; | ||
let fullNameWithoutType = name; | ||
let namespace = get(this, 'namespace'); | ||
let root = namespace; | ||
@@ -90,9 +90,9 @@ return { | ||
var normalizedModuleName = this.findModuleName(parsedName); | ||
let normalizedModuleName = this.findModuleName(parsedName); | ||
if (normalizedModuleName) { | ||
var defaultExport = this._extractDefaultExport(normalizedModuleName, parsedName); | ||
let defaultExport = this._extractDefaultExport(normalizedModuleName, parsedName); | ||
if (defaultExport === undefined) { | ||
throw new Error(" Expected to find: '" + parsedName.fullName + "' within '" + normalizedModuleName + "' but got 'undefined'. Did you forget to `export default` within '" + normalizedModuleName + "'?"); | ||
throw new Error(` Expected to find: '${parsedName.fullName}' within '${normalizedModuleName}' but got 'undefined'. Did you forget to 'export default' within '${normalizedModuleName}'?`); | ||
} | ||
@@ -112,3 +112,3 @@ | ||
// https://github.com/emberjs/ember.js/blob/master/packages/ember-application/lib/system/resolver.js | ||
var Resolver = DefaultResolver.extend({ | ||
const Resolver = DefaultResolver.extend({ | ||
resolveOther, | ||
@@ -120,11 +120,11 @@ parseName, | ||
makeToString: function(factory, fullName) { | ||
makeToString(factory, fullName) { | ||
return '' + this.namespace.modulePrefix + '@' + fullName + ':'; | ||
}, | ||
shouldWrapInClassFactory: function(/* module, parsedName */){ | ||
shouldWrapInClassFactory(/* module, parsedName */){ | ||
return false; | ||
}, | ||
init: function() { | ||
init() { | ||
this._super(); | ||
@@ -147,7 +147,7 @@ this.moduleBasedResolver = true; | ||
normalize: function(fullName) { | ||
normalize(fullName) { | ||
return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName)); | ||
}, | ||
_normalize: function(fullName) { | ||
_normalize(fullName) { | ||
// A) Convert underscores to dashes | ||
@@ -160,3 +160,3 @@ // B) Convert camelCase to dash-case, except for helpers where we want to avoid shadowing camelCase expressions | ||
var split = fullName.split(':'); | ||
let split = fullName.split(':'); | ||
if (split.length > 1) { | ||
@@ -173,8 +173,8 @@ if (split[0] === 'helper') { | ||
pluralize: function(type) { | ||
pluralize(type) { | ||
return this.pluralizedTypes[type] || (this.pluralizedTypes[type] = type + 's'); | ||
}, | ||
podBasedLookupWithPrefix: function(podPrefix, parsedName) { | ||
var fullNameWithoutType = parsedName.fullNameWithoutType; | ||
podBasedLookupWithPrefix(podPrefix, parsedName) { | ||
let fullNameWithoutType = parsedName.fullNameWithoutType; | ||
@@ -188,4 +188,4 @@ if (parsedName.type === 'template') { | ||
podBasedModuleName: function(parsedName) { | ||
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
podBasedModuleName(parsedName) { | ||
let podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
@@ -195,4 +195,4 @@ return this.podBasedLookupWithPrefix(podPrefix, parsedName); | ||
podBasedComponentsInSubdir: function(parsedName) { | ||
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
podBasedComponentsInSubdir(parsedName) { | ||
let podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix; | ||
podPrefix = podPrefix + '/components'; | ||
@@ -227,5 +227,5 @@ | ||
mainModuleName: function(parsedName) { | ||
mainModuleName(parsedName) { | ||
// if router:main or adapter:main look for a module with just the type first | ||
var tmpModuleName = parsedName.prefix + '/' + parsedName.type; | ||
let tmpModuleName = parsedName.prefix + '/' + parsedName.type; | ||
@@ -237,8 +237,8 @@ if (parsedName.fullNameWithoutType === 'main') { | ||
defaultModuleName: function(parsedName) { | ||
defaultModuleName(parsedName) { | ||
return parsedName.prefix + '/' + this.pluralize(parsedName.type) + '/' + parsedName.fullNameWithoutType; | ||
}, | ||
prefix: function(parsedName) { | ||
var tmpPrefix = this.namespace.modulePrefix; | ||
prefix(parsedName) { | ||
let tmpPrefix = this.namespace.modulePrefix; | ||
@@ -268,7 +268,7 @@ if (this.namespace[parsedName.type + 'Prefix']) { | ||
]; | ||
}), | ||
}).readOnly(), | ||
findModuleName: function(parsedName, loggingDisabled){ | ||
var moduleNameLookupPatterns = this.get('moduleNameLookupPatterns'); | ||
var moduleName; | ||
findModuleName(parsedName, loggingDisabled){ | ||
let moduleNameLookupPatterns = this.get('moduleNameLookupPatterns'); | ||
let moduleName; | ||
@@ -278,3 +278,3 @@ for (let index = 0, length = moduleNameLookupPatterns.length; index < length; index++) { | ||
var tmpModuleName = item.call(this, parsedName); | ||
let tmpModuleName = item.call(this, parsedName); | ||
@@ -301,7 +301,7 @@ // allow treat all dashed and all underscored as the same thing | ||
chooseModuleName: function(moduleName, parsedName) { | ||
var underscoredModuleName = underscore(moduleName); | ||
chooseModuleName(moduleName, parsedName) { | ||
let underscoredModuleName = underscore(moduleName); | ||
if (moduleName !== underscoredModuleName && this._moduleRegistry.has(moduleName) && this._moduleRegistry.has(underscoredModuleName)) { | ||
throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`"); | ||
throw new TypeError(`Ambiguous module names: '${ moduleName}' and '${underscoredModuleName }'`); | ||
} | ||
@@ -316,3 +316,3 @@ | ||
// something/something/-something => something/something/_something | ||
var partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1'); | ||
let partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1'); | ||
@@ -329,6 +329,6 @@ if (this._moduleRegistry.has(partializedModuleName)) { | ||
Ember.runInDebug(() => { | ||
var isCamelCaseHelper = parsedName.type === 'helper' && !!moduleName.match(/[a-z]+[A-Z]+/); | ||
let isCamelCaseHelper = parsedName.type === 'helper' && !!moduleName.match(/[a-z]+[A-Z]+/); | ||
if (isCamelCaseHelper) { | ||
this._camelCaseHelperWarnedNames = this._camelCaseHelperWarnedNames || []; | ||
var alreadyWarned = this._camelCaseHelperWarnedNames.indexOf(parsedName.fullName) > -1; | ||
let alreadyWarned = this._camelCaseHelperWarnedNames.indexOf(parsedName.fullName) > -1; | ||
if (!alreadyWarned && this._moduleRegistry.has(dasherize(moduleName))) { | ||
@@ -350,6 +350,6 @@ this._camelCaseHelperWarnedNames.push(parsedName.fullName); | ||
// used by Ember.DefaultResolver.prototype._logLookup | ||
lookupDescription: function(fullName) { | ||
var parsedName = this.parseName(fullName); | ||
lookupDescription(fullName) { | ||
let parsedName = this.parseName(fullName); | ||
var moduleName = this.findModuleName(parsedName, true); | ||
let moduleName = this.findModuleName(parsedName, true); | ||
@@ -360,3 +360,3 @@ return moduleName; | ||
// only needed until 1.6.0-beta.2 can be required | ||
_logLookup: function(found, parsedName, description) { | ||
_logLookup(found, parsedName, description) { | ||
if (!Ember.ENV.LOG_MODULE_RESOLVER && !parsedName.root.LOG_RESOLVER) { | ||
@@ -366,3 +366,3 @@ return; | ||
var symbol, padding; | ||
let symbol, padding; | ||
@@ -385,9 +385,9 @@ if (found) { symbol = '[✓]'; } | ||
knownForType: function(type) { | ||
var moduleKeys = this._moduleRegistry.moduleNames(); | ||
knownForType(type) { | ||
let moduleKeys = this._moduleRegistry.moduleNames(); | ||
var items = makeDictionary(); | ||
for (var index = 0, length = moduleKeys.length; index < length; index++) { | ||
var moduleName = moduleKeys[index]; | ||
var fullname = this.translateToContainerFullname(type, moduleName); | ||
let items = makeDictionary(); | ||
for (let index = 0, length = moduleKeys.length; index < length; index++) { | ||
let moduleName = moduleKeys[index]; | ||
let fullname = this.translateToContainerFullname(type, moduleName); | ||
@@ -402,4 +402,4 @@ if (fullname) { | ||
translateToContainerFullname: function(type, moduleName) { | ||
var prefix = this.prefix({ type: type }); | ||
translateToContainerFullname(type, moduleName) { | ||
let prefix = this.prefix({ type }); | ||
@@ -409,6 +409,6 @@ // Note: using string manipulation here rather than regexes for better performance. | ||
// '^' + prefix + '/(.+)/' + type + '$' | ||
var podPrefix = prefix + '/'; | ||
var podSuffix = '/' + type; | ||
var start = moduleName.indexOf(podPrefix); | ||
var end = moduleName.indexOf(podSuffix); | ||
let podPrefix = prefix + '/'; | ||
let podSuffix = '/' + type; | ||
let start = moduleName.indexOf(podPrefix); | ||
let end = moduleName.indexOf(podSuffix); | ||
@@ -422,4 +422,4 @@ if (start === 0 && end === (moduleName.length - podSuffix.length) && | ||
// '^' + prefix + '/' + pluralizedType + '/(.+)$' | ||
var pluralizedType = this.pluralize(type); | ||
var nonPodPrefix = prefix + '/' + pluralizedType + '/'; | ||
let pluralizedType = this.pluralize(type); | ||
let nonPodPrefix = prefix + '/' + pluralizedType + '/'; | ||
@@ -431,4 +431,4 @@ if (moduleName.indexOf(nonPodPrefix) === 0 && moduleName.length > nonPodPrefix.length) { | ||
_extractDefaultExport: function(normalizedModuleName) { | ||
var module = require(normalizedModuleName, null, null, true /* force sync */); | ||
_extractDefaultExport(normalizedModuleName) { | ||
let module = require(normalizedModuleName, null, null, true /* force sync */); | ||
@@ -435,0 +435,0 @@ if (module && module['default']) { |
export default function classFactory(klass) { | ||
return { | ||
create: function (injections) { | ||
create(injections) { | ||
if (typeof klass.extend === 'function') { | ||
@@ -5,0 +5,0 @@ return klass.extend(injections); |
import Ember from 'ember'; | ||
let create = (Object.create || Ember.create); | ||
const create = (Object.create || Ember.create); | ||
if (!(create && !create(null).hasOwnProperty)) { | ||
@@ -5,0 +5,0 @@ throw new Error("This browser does not support Object.create(null), please polyfil with es5-sham: http://git.io/yBU2rg"); |
import create from './create'; | ||
export default function makeDictionary() { | ||
var cache = create(null); | ||
let cache = create(null); | ||
cache['_dict'] = null; | ||
@@ -6,0 +6,0 @@ delete cache['_dict']; |
{ | ||
"name": "ember-resolver", | ||
"version": "2.1.1", | ||
"version": "3.0.0", | ||
"description": "The default modules based resolver for Ember CLI.", | ||
@@ -24,4 +24,4 @@ "directories": { | ||
"broccoli-asset-rev": "^2.4.2", | ||
"ember-cli": "2.8.0", | ||
"ember-cli-app-version": "^1.0.0", | ||
"ember-cli": "2.11.1", | ||
"ember-cli-app-version": "^2.0.1", | ||
"ember-cli-dependency-checker": "^1.2.0", | ||
@@ -32,5 +32,3 @@ "ember-cli-htmlbars": "^1.0.3", | ||
"ember-cli-jshint": "^1.0.0", | ||
"ember-cli-qunit": "^2.1.0", | ||
"ember-cli-release": "^0.2.9", | ||
"ember-cli-sri": "^2.1.0", | ||
"ember-cli-qunit": "^3.1.1", | ||
"ember-cli-test-loader": "^1.1.0", | ||
@@ -40,3 +38,3 @@ "ember-cli-uglify": "^1.2.0", | ||
"ember-export-application-global": "^1.0.5", | ||
"ember-load-initializers": "^0.5.1", | ||
"ember-load-initializers": "^0.6.3", | ||
"loader.js": "^4.0.1" | ||
@@ -43,0 +41,0 @@ }, |
@@ -58,2 +58,2 @@ # Ember Resolver [](https://travis-ci.org/ember-cli/ember-resolver) | ||
... you probably need to update your application accordingly. See aptible/dashboard.aptible.com#423 as an example of how to update. | ||
... you probably need to update your application accordingly. See [aptible/dashboard.aptible.com#423](https://github.com/aptible/dashboard.aptible.com/pull/423/files) as an example of how to update. |
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
208389
353.15%15
-11.76%19
-5%422
-18.53%2
100%