ember-resolver
Advanced tools
Comparing version
@@ -9,2 +9,3 @@ /* globals requirejs, require */ | ||
import classFactory from '../../utils/class-factory'; | ||
import makeDictionary from '../../utils/make-dictionary'; | ||
@@ -136,5 +137,5 @@ if (typeof requirejs.entries === 'undefined') { | ||
this._normalizeCache = Object.create(null); | ||
this._normalizeCache = makeDictionary(); | ||
this.pluralizedTypes = this.pluralizedTypes || Object.create(null); | ||
this.pluralizedTypes = this.pluralizedTypes || makeDictionary(); | ||
@@ -412,3 +413,3 @@ if (!this.pluralizedTypes.config) { | ||
let items = Object.create(null); | ||
let items = makeDictionary(); | ||
for (let index = 0, length = moduleKeys.length; index < length; index++) { | ||
@@ -415,0 +416,0 @@ let moduleName = moduleKeys[index]; |
@@ -1,24 +0,1 @@ | ||
## v6.0.1 (2019-12-18) | ||
#### :boom: Breaking Change | ||
* [#452](https://github.com/ember-cli/ember-resolver/pull/452) Remove dead module unification code ([@stefanpenner](https://github.com/stefanpenner)) | ||
#### :rocket: Enhancement | ||
* [#450](https://github.com/ember-cli/ember-resolver/pull/450) remove now defunct v8 optimization ([@stefanpenner](https://github.com/stefanpenner)) | ||
#### :bug: Bug Fix | ||
* [#475](https://github.com/ember-cli/ember-resolver/pull/475) Fix babel-plugin-debug-macros warning ([@hjdivad](https://github.com/hjdivad)) | ||
#### Committers: 2 | ||
- David J. Hamilton ([@hjdivad](https://github.com/hjdivad)) | ||
- Stefan Penner ([@stefanpenner](https://github.com/stefanpenner)) | ||
## v6.0.0 (2019-11-19) | ||
#### :boom: Breaking Change | ||
* [#449](https://github.com/ember-cli/ember-resolver/pull/449) Upgrade deps and drop node 6 support ([@stefanpenner](https://github.com/stefanpenner)) | ||
#### Committers: 1 | ||
- Stefan Penner ([@stefanpenner](https://github.com/stefanpenner)) | ||
## v5.2.1 (2019-08-09) | ||
@@ -25,0 +2,0 @@ |
89
index.js
'use strict'; | ||
const VersionChecker = require('ember-cli-version-checker'); | ||
var VersionChecker = require('ember-cli-version-checker'); | ||
var path = require('path'); | ||
var isModuleUnification; | ||
@@ -9,3 +11,3 @@ module.exports = { | ||
emberResolverFeatureFlags() { | ||
const resolverConfig = {}; //TODO: load from ember-cli-build.js | ||
var resolverConfig = {}; //TODO: load from ember-cli-build.js | ||
@@ -17,7 +19,78 @@ return Object.assign({ | ||
included() { | ||
init: function() { | ||
this._super.init.apply(this, arguments); | ||
this.options = this.options || {}; | ||
if (process.env.EMBER_CLI_MODULE_UNIFICATION) { | ||
this.project.isModuleUnification = function () { | ||
return true; | ||
} | ||
} | ||
this._emberResolverFeatureFlags = this.emberResolverFeatureFlags(); | ||
isModuleUnification = !!this.project.isModuleUnification && this.project.isModuleUnification(); | ||
this.options.babel = { | ||
loose: true, | ||
plugins: [ | ||
[require.resolve('babel-plugin-debug-macros'), { | ||
debugTools: { | ||
source: 'this-is-dumb-it-should-not-be-required-i-blame-rwjblue' | ||
}, | ||
envFlags: { | ||
source: 'ember-resolver-env-flags', | ||
flags: { DEBUG: process.env.EMBER_ENV != 'production' } | ||
}, | ||
features: { | ||
name: 'ember-resolver', | ||
source: 'ember-resolver/features', | ||
flags: this._emberResolverFeatureFlags | ||
} | ||
}] | ||
] | ||
}; | ||
}, | ||
treeForAddon: function() { | ||
var MergeTrees = require('broccoli-merge-trees'); | ||
let addonTrees = [].concat( | ||
this._super.treeForAddon.apply(this, arguments), | ||
isModuleUnification && this._moduleUnificationTrees() | ||
).filter(Boolean); | ||
return new MergeTrees(addonTrees); | ||
}, | ||
_moduleUnificationTrees() { | ||
var resolve = require('resolve'); | ||
var Funnel = require('broccoli-funnel'); | ||
let featureTreePath = path.join(this.root, 'mu-trees/addon'); | ||
var featureTree = new Funnel(featureTreePath, { | ||
destDir: 'ember-resolver' | ||
}); | ||
var glimmerResolverSrc = require.resolve('@glimmer/resolver/package'); | ||
var glimmerResolverPath = path.dirname(glimmerResolverSrc); | ||
var glimmerResolverTree = new Funnel(glimmerResolverPath, { | ||
srcDir: 'dist/modules/es2017', | ||
destDir: '@glimmer/resolver' | ||
}); | ||
var glimmerDISrc = resolve.sync('@glimmer/di', { basedir: glimmerResolverPath }); | ||
var glimmerDITree = new Funnel(path.join(glimmerDISrc, '../../../..'), { | ||
srcDir: 'dist/modules/es2017', | ||
destDir: '@glimmer/di' | ||
}); | ||
return [ | ||
this.preprocessJs(featureTree, { registry: this.registry }), | ||
this.preprocessJs(glimmerResolverTree, { registry: this.registry }), | ||
this.preprocessJs(glimmerDITree, { registry: this.registry }), | ||
]; | ||
}, | ||
included: function() { | ||
this._super.included.apply(this, arguments); | ||
let checker = new VersionChecker(this); | ||
let dep = checker.for('ember-cli', 'npm'); | ||
var checker = new VersionChecker(this); | ||
var dep = checker.for('ember-cli', 'npm'); | ||
@@ -29,5 +102,5 @@ if (dep.lt('2.0.0')) { | ||
monkeyPatchVendorFiles() { | ||
let filesToAppend = this.app.legacyFilesToAppend; | ||
let legacyResolverIndex = filesToAppend.indexOf(this.app.bowerDirectory + '/ember-resolver/dist/modules/ember-resolver.js'); | ||
monkeyPatchVendorFiles: function() { | ||
var filesToAppend = this.app.legacyFilesToAppend; | ||
var legacyResolverIndex = filesToAppend.indexOf(this.app.bowerDirectory + '/ember-resolver/dist/modules/ember-resolver.js'); | ||
@@ -34,0 +107,0 @@ if (legacyResolverIndex > -1) { |
{ | ||
"name": "ember-resolver", | ||
"version": "6.0.1", | ||
"version": "6.0.2", | ||
"description": "The default modules based resolver for Ember CLI.", | ||
@@ -8,13 +8,4 @@ "keywords": [ | ||
], | ||
"homepage": "https://github.com/ember-cli/ember-resolver#readme", | ||
"bugs": { | ||
"url": "https://github.com/ember-cli/ember-resolver/issues" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/ember-cli/ember-resolver.git" | ||
}, | ||
"license": "MIT", | ||
"author": "Robert Jackson <me@rwjblue.com>", | ||
"main": "index.js", | ||
"directories": { | ||
@@ -24,2 +15,6 @@ "doc": "doc", | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/ember-cli/ember-resolver.git" | ||
}, | ||
"scripts": { | ||
@@ -34,11 +29,12 @@ "build": "ember build", | ||
"dependencies": { | ||
"@glimmer/resolver": "^0.4.1", | ||
"babel-plugin-debug-macros": "^0.3.3", | ||
"broccoli-funnel": "^2.0.2", | ||
"broccoli-merge-trees": "^3.0.0", | ||
"ember-cli-babel": "^7.13.2", | ||
"ember-cli-babel": "^7.13.0", | ||
"ember-cli-version-checker": "^3.1.3", | ||
"resolve": "^1.13.1" | ||
"resolve": "^1.12.0" | ||
}, | ||
"devDependencies": { | ||
"@ember/optional-features": "^1.2.0", | ||
"@ember/optional-features": "^1.0.0", | ||
"babel-eslint": "^10.0.3", | ||
@@ -48,3 +44,3 @@ "broccoli-asset-rev": "^3.0.0", | ||
"ember-cli-dependency-checker": "^3.2.0", | ||
"ember-cli-htmlbars": "^4.2.0", | ||
"ember-cli-htmlbars": "^4.0.8", | ||
"ember-cli-inject-live-reload": "^2.0.2", | ||
@@ -55,39 +51,26 @@ "ember-cli-qunit": "^4.1.1", | ||
"ember-qunit-assert-helpers": "^0.2.2", | ||
"ember-source": "~3.14.3", | ||
"ember-source": "~3.14.0", | ||
"ember-source-channel-url": "^2.0.1", | ||
"ember-try": "^1.4.0", | ||
"eslint": "^6.7.2", | ||
"eslint-plugin-ember": "^7.7.2", | ||
"ember-try": "^1.3.0", | ||
"eslint": "^6.6.0", | ||
"eslint-plugin-ember": "^7.1.0", | ||
"eslint-plugin-node": "^10.0.0", | ||
"lerna-changelog": "^0.8.3", | ||
"loader.js": "^4.7.0", | ||
"qunit-dom": "^0.9.0", | ||
"release-it": "^12.2.1", | ||
"release-it-lerna-changelog": "^1.0.3" | ||
"qunit-dom": "^0.9.0" | ||
}, | ||
"resolutions": { | ||
"**/engine.io": "3.3.1" | ||
}, | ||
"engines": { | ||
"node": "8.* || >= 10.*" | ||
}, | ||
"publishConfig": { | ||
"registry": "https://registry.npmjs.org" | ||
}, | ||
"ember-addon": { | ||
"configPath": "tests/dummy/config" | ||
}, | ||
"release-it": { | ||
"plugins": { | ||
"release-it-lerna-changelog": { | ||
"infile": "CHANGELOG.md" | ||
} | ||
}, | ||
"git": { | ||
"tagName": "v${version}" | ||
}, | ||
"github": { | ||
"release": true | ||
} | ||
"main": "index.js", | ||
"bugs": { | ||
"url": "https://github.com/ember-cli/ember-resolver/issues" | ||
}, | ||
"homepage": "https://github.com/ember-cli/ember-resolver#readme", | ||
"resolutions": { | ||
"**/engine.io": "3.3.1" | ||
} | ||
} |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
Environment variable access
Supply chain riskPackage accesses environment variables, which may be a sign of credential stuffing or data theft.
Found 2 instances in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
111544
63.35%20
-9.09%28
47.37%2105
307.16%7
16.67%5
150%+ Added
+ Added
+ Added
Updated
Updated