ember-cli 4.7.0 → 4.8.0

package/lib/models/blueprint.js

@@ -190,6 +190,7 @@ const initialIgnoredFiles = ['.DS_Store'];
   @constructor
   @extends CoreObject
   @param {String} [blueprintPath]
+  @param {Object} [blueprintOptions]
 */
 let Blueprint = CoreObject.extend({
   availableOptions: [],
@@ -209,11 +210,29 @@ let Blueprint = CoreObject.extend({
   */
   shouldTransformTypeScript: false,
 
-  init(blueprintPath) {
+  init(blueprintPath, blueprintOptions) {
     this._super();
 
     this.path = blueprintPath;
     this.name = path.basename(blueprintPath);
+
+    this._processOptions(blueprintOptions);
+  },
+
+  /**
+    Process the options object coming from either
+    the `init`, `install` or `uninstall` hook.
+
+    @private
+    @method _processOptions
+    @param {Object} options
+  */
+  _processOptions(options = {}) {
+    this.options = options;
+    this.dryRun = options.dryRun;
+    this.pod = options.pod;
+    this.project = options.project;
+    this.ui = options.ui;
   },
 
   /**
@@ -238,9 +257,10 @@ let Blueprint = CoreObject.extend({
 
     @public
     @method files
+    @param {Object} options
     @return {Array} Contents of the blueprint's files directory
   */
-  files() {
+  files(/* options */) {
     if (this._files) {
       return this._files;
     }
@@ -528,17 +548,14 @@ let Blueprint = CoreObject.extend({
     @return {Promise}
   */
   install(options) {
-    let ui = (this.ui = options.ui);
-    let dryRun = (this.dryRun = options.dryRun);
-    this.project = options.project;
-    this.pod = options.pod;
-    this.options = options;
+    this._processOptions(options);
+
     this.hasPathToken = hasPathToken(this.files(this.options));
 
-    ui.writeLine(`installing ${this.name}`);
+    this.ui.writeLine(`installing ${this.name}`);
 
-    if (dryRun) {
-      ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' + ' changes will be written.'));
+    if (this.dryRun) {
+      this.ui.writeLine(chalk.yellow('You specified the `dry-run` flag, so no changes will be written.'));
     }
 
     this._normalizeEntityName(options.entity);
@@ -558,17 +575,14 @@ let Blueprint = CoreObject.extend({
     @return {Promise}
   */
   uninstall(options) {
-    let ui = (this.ui = options.ui);
-    let dryRun = (this.dryRun = options.dryRun);
-    this.project = options.project;
-    this.pod = options.pod;
-    this.options = options;
+    this._processOptions(options);
+
     this.hasPathToken = hasPathToken(this.files(this.options));
 
-    ui.writeLine(`uninstalling ${this.name}`);
+    this.ui.writeLine(`uninstalling ${this.name}`);
 
-    if (dryRun) {
-      ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' + ' files will be deleted.'));
+    if (this.dryRun) {
+      this.ui.writeLine(chalk.yellow('You specified the `dry-run` flag, so no files will be deleted.'));
     }
 
     this._normalizeEntityName(options.entity);
@@ -934,7 +948,7 @@ let Blueprint = CoreObject.extend({
     @return {Boolean}
   */
   supportsAddon() {
-    return /__root__/.test(this.files().join());
+    return /__root__/.test(this.files(this.options).join());
   },
 
   /**
@@ -1131,8 +1145,8 @@ let Blueprint = CoreObject.extend({
 
   /**
     Used to add a Bower package to the projects `bower.json`.
-    
-    Bower is a package manager that is no longer recommended 
+
+    Bower is a package manager that is no longer recommended
     for new projects, but you may find this hook used in older
     addons.
 
@@ -1184,8 +1198,8 @@ let Blueprint = CoreObject.extend({
 
   /**
     Used to add an array of packages to the projects `bower.json`.
-    
-    Bower is a package manager that is no longer recommended 
+
+    Bower is a package manager that is no longer recommended
     for new projects, but you may find this hook used in older
     addons.
 
@@ -1456,6 +1470,8 @@ let Blueprint = CoreObject.extend({
   @param {Array} [options.paths] Extra paths to search for blueprints
   @param {Boolean} [options.ignoreMissing] Throw a `SilentError` if a
     matching Blueprint could not be found
+  @param {Object} [options.blueprintOptions] Options object that will be passed
+    along to the Blueprint instance on creation.
   @return {Blueprint}
 */
 Blueprint.lookup = function (name, options) {
@@ -1467,7 +1483,7 @@ Blueprint.lookup = function (name, options) {
 
     if (isNameAPath) {
       if (Blueprint._existsSync(blueprintPath)) {
-        return Blueprint.load(blueprintPath);
+        return Blueprint.load(blueprintPath, options.blueprintOptions);
       }
 
       if (!options.ignoreMissing) {
@@ -1485,7 +1501,7 @@ Blueprint.lookup = function (name, options) {
     let blueprintPath = path.resolve(lookupPath, name);
 
     if (Blueprint._existsSync(blueprintPath)) {
-      return Blueprint.load(blueprintPath);
+      return Blueprint.load(blueprintPath, options.blueprintOptions);
     }
   }
 
@@ -1500,9 +1516,10 @@ Blueprint.lookup = function (name, options) {
   @method load
   @namespace Blueprint
   @param {String} blueprintPath
+  @param {Object} [blueprintOptions]
   @return {Blueprint} blueprint instance
 */
-Blueprint.load = function (blueprintPath) {
+Blueprint.load = function (blueprintPath, blueprintOptions) {
   if (fs.lstatSync(blueprintPath).isDirectory()) {
     let Constructor = Blueprint;
 
@@ -1517,7 +1534,7 @@ Blueprint.load = function (blueprintPath) {
       }
     }
 
-    return new Constructor(blueprintPath);
+    return new Constructor(blueprintPath, blueprintOptions);
   }
 };
 

package/lib/models/project.js

@@ -658,6 +658,7 @@ class Project {
   reloadAddons() {
     this.reloadPkg();
     this._addonsInitialized = false;
+    this._didDiscoverAddons = false;
     return this.initializeAddons();
   }
 

package/lib/tasks/generate-from-blueprint.js

@@ -3,7 +3,6 @@
 const Blueprint = require('../models/blueprint');
 const Task = require('../models/task');
 const parseOptions = require('../utilities/parse-options');
-const { merge } = require('ember-cli-lodash-subset');
 const logger = require('heimdalljs-logger')('ember-cli:generate-from-blueprint');
 const lintFix = require('../utilities/lint-fix');
 
@@ -29,18 +28,51 @@ class GenerateTask extends Task {
     let name = options.args[0];
     let noAddonBlueprint = ['mixin', 'blueprint-test'];
 
-    let mainBlueprint = this.lookupBlueprint(name, options.ignoreMissingMain);
-    let testBlueprint = this.lookupBlueprint(`${name}-test`, true);
+    let entity = {
+      name: options.args[1],
+      options: parseOptions(options.args.slice(2)),
+    };
 
-    // lookup custom addon blueprint
-    let addonBlueprint = this.lookupBlueprint(`${name}-addon`, true);
+    let baseBlueprintOptions = {
+      target: this.project.root,
+      entity,
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project,
+      settings: this.settings,
+      testing: this.testing,
+      taskOptions: options,
+      originBlueprintName: name,
+    };
+
+    let mainBlueprintOptions = { ...baseBlueprintOptions, ...options };
+    let testBlueprintOptions = { ...mainBlueprintOptions, installingTest: true };
+    let addonBlueprintOptions = { ...mainBlueprintOptions, installingAddon: true };
+
+    let mainBlueprint = this.lookupBlueprint(name, {
+      blueprintOptions: mainBlueprintOptions,
+      ignoreMissing: options.ignoreMissingMain,
+    });
+
+    let testBlueprint = this.lookupBlueprint(`${name}-test`, {
+      blueprintOptions: testBlueprintOptions,
+      ignoreMissing: true,
+    });
+
+    let addonBlueprint = this.lookupBlueprint(`${name}-addon`, {
+      blueprintOptions: addonBlueprintOptions,
+      ignoreMissing: true,
+    });
 
     // otherwise, use default addon-import
     if (noAddonBlueprint.indexOf(name) < 0 && !addonBlueprint && options.args[1]) {
       let mainBlueprintSupportsAddon = mainBlueprint && mainBlueprint.supportsAddon();
 
       if (mainBlueprintSupportsAddon) {
-        addonBlueprint = this.lookupBlueprint('addon-import', true);
+        addonBlueprint = this.lookupBlueprint('addon-import', {
+          blueprintOptions: addonBlueprintOptions,
+          ignoreMissing: true,
+        });
       }
     }
 
@@ -56,26 +88,7 @@ class GenerateTask extends Task {
       }
     }
 
-    let entity = {
-      name: options.args[1],
-      options: parseOptions(options.args.slice(2)),
-    };
-
-    let blueprintOptions = {
-      target: this.project.root,
-      entity,
-      ui: this.ui,
-      analytics: this.analytics,
-      project: this.project,
-      settings: this.settings,
-      testing: this.testing,
-      taskOptions: options,
-      originBlueprintName: name,
-    };
-
-    blueprintOptions = merge(blueprintOptions, options || {});
-
-    await mainBlueprint[this.blueprintFunction](blueprintOptions);
+    await mainBlueprint[this.blueprintFunction](mainBlueprintOptions);
     if (testBlueprint) {
       if (testBlueprint.locals === Blueprint.prototype.locals) {
         testBlueprint.locals = function (options) {
@@ -83,14 +96,13 @@ class GenerateTask extends Task {
         };
       }
 
-      let testBlueprintOptions = merge({}, blueprintOptions, { installingTest: true });
       await testBlueprint[this.blueprintFunction](testBlueprintOptions);
     }
 
     if (!addonBlueprint || name.match(/-addon/)) {
       return;
     }
-    if (!this.project.isEmberCLIAddon() && blueprintOptions.inRepoAddon === null) {
+    if (!this.project.isEmberCLIAddon() && mainBlueprintOptions.inRepoAddon === null) {
       return;
     }
 
@@ -100,15 +112,14 @@ class GenerateTask extends Task {
       };
     }
 
-    let addonBlueprintOptions = merge({}, blueprintOptions, { installingAddon: true });
-
     return addonBlueprint[this.blueprintFunction](addonBlueprintOptions);
   }
 
-  lookupBlueprint(name, ignoreMissing) {
+  lookupBlueprint(name, { blueprintOptions, ignoreMissing }) {
     return Blueprint.lookup(name, {
-      paths: this.project.blueprintLookupPaths(),
+      blueprintOptions,
       ignoreMissing,
+      paths: this.project.blueprintLookupPaths(),
     });
   }
 }

package/lib/tasks/npm-task.js

@@ -63,7 +63,11 @@ class NpmTask extends Task {
 
       if (semver.gte(version, '2.0.0')) {
         logger.warn('yarn --version: %s', version);
-        this.ui.writeWarnLine(`Yarn v2 is not fully supported. Proceeding with yarn: ${version}`);
+        let yarnConfig = await this.yarn(['config', 'get', 'nodeLinker']);
+        let nodeLinker = yarnConfig.stdout.trim();
+        if (nodeLinker !== 'node-modules') {
+          this.ui.writeWarnLine(`Yarn v2 is not fully supported. Proceeding with yarn: ${version}`);
+        }
       } else {
         logger.info('yarn --version: %s', version);
       }

package/lib/utilities/load-config.js

@@ -6,8 +6,8 @@ const path = require('path');
 const yaml = require('js-yaml');
 
 let parsers = {
-  '.yml': yaml.safeLoad,
-  '.yaml': yaml.safeLoad,
+  '.yml': yaml.load,
+  '.yaml': yaml.load,
   '.json': JSON.parse,
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,7 +37,7 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.18.6",
+    "@babel/core": "^7.18.13",
     "@babel/plugin-transform-modules-amd": "^7.18.6",
     "amd-name-resolver": "^1.3.1",
     "babel-plugin-module-resolver": "^4.1.0",
@@ -61,7 +61,7 @@
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.2",
-    "ci-info": "^3.3.1",
+    "ci-info": "^3.3.2",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -97,7 +97,7 @@
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
     "isbinaryfile": "^5.0.0",
-    "js-yaml": "^3.14.0",
+    "js-yaml": "^4.1.0",
     "leek": "0.0.24",
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
@@ -105,9 +105,9 @@
     "minimatch": "^5.1.0",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^9.0.2",
+    "npm-package-arg": "^9.1.0",
     "p-defer": "^3.0.0",
-    "portfinder": "^1.0.28",
+    "portfinder": "^1.0.29",
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.8",
@@ -121,18 +121,18 @@
     "sort-package-json": "^1.57.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.7.0",
+    "testem": "^3.8.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "uuid": "^8.3.2",
-    "walk-sync": "^2.2.0",
-    "watch-detector": "^1.0.1",
+    "walk-sync": "^3.0.0",
+    "watch-detector": "^1.0.2",
     "workerpool": "^6.2.1",
     "yam": "^1.0.0"
   },
   "devDependencies": {
     "@ember/edition-utils": "^1.2.0",
-    "@octokit/rest": "^18.12.0",
+    "@octokit/rest": "^19.0.4",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.6",
@@ -141,24 +141,24 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.10.0",
+    "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-chai-expect": "^3.0.0",
-    "eslint-plugin-mocha": "^10.0.5",
+    "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "fixturify": "^2.1.0",
     "jsdom": "^20.0.0",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
-    "nock": "^13.2.8",
+    "nock": "^13.2.9",
     "nyc": "^15.1.0",
-    "prettier": "2.6.2",
-    "release-it": "^15.1.1",
+    "prettier": "2.7.1",
+    "release-it": "^15.4.1",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
-    "supertest": "^6.2.3",
-    "testdouble": "^3.16.5",
+    "supertest": "^6.2.4",
+    "testdouble": "^3.16.6",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",
     "which": "2.0.2",