ember-cli 4.7.0 → 4.8.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # ember-cli Changelog
 
+## v4.8.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.7.0...v4.8.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.7.0...v4.8.0-beta.0)
+
+#### Changelog
+
+- [#9920](https://github.com/ember-cli/ember-cli/pull/9920) [BUGFIX] Make sure a blueprint’s options object and project instance are always available for all public hooks [@bertdeblock](https://github.com/bertdeblock)
+- [#9945](https://github.com/ember-cli/ember-cli/pull/9945) [ENHANCEMENT/BREAKING] Add Node v18 to `engines` in `app` and `addon` blueprint (removes support for Node v17) [@bertdeblock](https://github.com/bertdeblock)
+- [#9946](https://github.com/ember-cli/ember-cli/pull/9946) [INTERNAL] Unskip `package-info-cache` tests [@bertdeblock](https://github.com/bertdeblock)
+- [#9951](https://github.com/ember-cli/ember-cli/pull/9951) Update `js-yaml` to v4 [@bertdeblock](https://github.com/bertdeblock)
+- [#9952](https://github.com/ember-cli/ember-cli/pull/9952) Update `walk-sync` to v3 [@bertdeblock](https://github.com/bertdeblock)
+- [#9971](https://github.com/ember-cli/ember-cli/pull/9971) Add Ember 4.4 LTS to addon blueprint, remove 3.24 [@simonihmig](https://github.com/simonihmig)
+- [#9975](https://github.com/ember-cli/ember-cli/pull/9975) [ENHANCEMENT] Fix `prefer-const` lint violations in `app` and `addon` blueprints [@bmish](https://github.com/bmish)
+- [#9987](https://github.com/ember-cli/ember-cli/pull/9987) [BUGFIX] Handle rebuild failures without exiting [@bendemboski](https://github.com/bendemboski)
+- [#9988](https://github.com/ember-cli/ember-cli/pull/9988) [BUGFIX] - Address npm-run-all and Yarn 3 conflict & Removed warning [@christianarty](https://github.com/christianarty)
+
+Thank you to all who took the time to contribute!
+
 ## v4.7.0
 
 #### Blueprint Changes

package/blueprints/addon/files/.github/workflows/ci.yml

@@ -57,8 +57,8 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.24
           - ember-lts-3.28
+          - ember-lts-4.4
           - ember-release
           - ember-beta
           - ember-canary

package/blueprints/addon/files/.travis.yml

@@ -51,8 +51,8 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.24
     - env: EMBER_TRY_SCENARIO=ember-lts-3.28
+    - env: EMBER_TRY_SCENARIO=ember-lts-4.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

package/blueprints/addon/files/README.md

@@ -5,8 +5,8 @@
 
 ## Compatibility
 
-* Ember.js v3.24 or above
-* Ember CLI v3.24 or above
+* Ember.js v3.28 or above
+* Ember CLI v3.28 or above
 * Node.js v14 or above
 
 

package/blueprints/addon/files/addon-config/ember-try.js

@@ -8,18 +8,18 @@ module.exports = async function () {
     <% if (yarn) { %>useYarn: true,
     <% } %>scenarios: [
       {
-        name: 'ember-lts-3.24',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.3',
+            'ember-source': '~3.28.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.28',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.4.0',
           },
         },
       },

package/blueprints/addon/files/ember-cli-build.js

@@ -3,7 +3,7 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     // Add options here
   });
 

package/blueprints/app/files/config/environment.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function (environment) {
-  let ENV = {
+  const ENV = {
     modulePrefix: '<%= modulePrefix %>',
     environment,
     rootURL: '/',

package/blueprints/app/files/ember-cli-build.js

@@ -3,7 +3,7 @@
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function (defaults) {
-  let app = new EmberApp(defaults, {
+  const app = new EmberApp(defaults, {
     // Add options here
   });
 

package/blueprints/app/files/package.json

@@ -12,14 +12,14 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test"
   },
   "devDependencies": {
@@ -41,13 +41,13 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.7.1",
+    "ember-data": "~4.8.0-beta.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.7.0",
+    "ember-source": "~4.8.0-beta.1",
     "ember-template-lint": "^4.14.0<% if (welcome) { %>",
     "ember-welcome-page": "^6.2.0<% } %>",
     "eslint": "^7.32.0",
@@ -64,7 +64,7 @@
     "webpack": "^5.74.0"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "4.7.0-release-6277227f89"
+        "version": "4.8.0-beta.0-beta-2b7d76957a"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -623,6 +623,12 @@
                     "description": "",
                     "type": "String",
                     "optional": true
+                },
+                {
+                    "name": "blueprintOptions",
+                    "description": "",
+                    "type": "Object",
+                    "optional": true
                 }
             ]
         },
@@ -3655,7 +3661,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 200,
+            "line": 201,
             "description": "Indicates whether or not a blueprint is a candidate for automatic transpilation from TS to JS.\nThis property could be false in the case that the blueprint is written in JS and is not intended\nto work with TS at all, OR in the case that the blueprint is written in TS and the author does\nnot intend to support transpilation to JS.",
             "access": "public",
             "tagname": "",
@@ -3667,7 +3673,25 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 219,
+            "line": 222,
+            "description": "Process the options object coming from either\nthe `init`, `install` or `uninstall` hook.",
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "_processOptions",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "",
+                    "type": "Object"
+                }
+            ],
+            "class": "Blueprint",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/models/blueprint.js",
+            "line": 238,
             "description": "Hook to specify the path to the blueprint's files. By default this is\n`path.join(this.path, 'files)`.\n\nThis can be used to customize which set of files to install based on options\nor environmental variables. It defaults to the `files` directory within the\nblueprint's folder.",
             "access": "public",
             "tagname": "",
@@ -3689,12 +3713,19 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 236,
+            "line": 255,
             "description": "Used to retrieve files for blueprint.",
             "access": "public",
             "tagname": "",
             "itemtype": "method",
             "name": "files",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "",
+                    "type": "Object"
+                }
+            ],
             "return": {
                 "description": "Contents of the blueprint's files directory",
                 "type": "Array"
@@ -3704,7 +3735,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 258,
+            "line": 278,
             "itemtype": "method",
             "name": "srcPath",
             "params": [
@@ -3723,7 +3754,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 267,
+            "line": 287,
             "description": "Hook for normalizing entity name\n\nUse the `normalizeEntityName` hook to add custom normalization and\nvalidation of the provided entity name. The default hook does not\nmake any changes to the entity name, but makes sure an entity name\nis present and that it doesn't have a trailing slash.\n\nThis hook receives the entity name as its first argument. The string\nreturned by this hook will be used as the new entity name.",
             "access": "public",
             "tagname": "",
@@ -3745,7 +3776,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 287,
+            "line": 307,
             "description": "Write a status and message to the UI",
             "access": "private",
             "tagname": "",
@@ -3773,7 +3804,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 301,
+            "line": 321,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3794,7 +3825,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 313,
+            "line": 333,
             "description": "Actions lookup",
             "access": "private",
             "tagname": "",
@@ -3806,7 +3837,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 351,
+            "line": 371,
             "description": "Calls an action.",
             "access": "private",
             "tagname": "",
@@ -3832,7 +3863,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 369,
+            "line": 389,
             "description": "Prints warning for pod unsupported.",
             "access": "private",
             "tagname": "",
@@ -3843,7 +3874,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 386,
+            "line": 406,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3860,7 +3891,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 397,
+            "line": 417,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3877,7 +3908,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 426,
+            "line": 446,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3909,7 +3940,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 452,
+            "line": 472,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3935,7 +3966,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 506,
+            "line": 526,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3956,7 +3987,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 525,
+            "line": 545,
             "itemtype": "method",
             "name": "install",
             "params": [
@@ -3975,7 +4006,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 555,
+            "line": 572,
             "itemtype": "method",
             "name": "uninstall",
             "params": [
@@ -3994,7 +4025,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 580,
+            "line": 594,
             "description": "Hook for running operations before install.",
             "itemtype": "method",
             "name": "beforeInstall",
@@ -4007,7 +4038,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 587,
+            "line": 601,
             "description": "Hook for running operations after install.",
             "itemtype": "method",
             "name": "afterInstall",
@@ -4020,7 +4051,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 594,
+            "line": 608,
             "description": "Hook for running operations before uninstall.",
             "itemtype": "method",
             "name": "beforeUninstall",
@@ -4033,7 +4064,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 601,
+            "line": 615,
             "description": "Hook for running operations after uninstall.",
             "itemtype": "method",
             "name": "afterUninstall",
@@ -4046,7 +4077,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 610,
+            "line": 624,
             "description": "Hook for adding custom template variables.\n\nWhen the following is called on the command line:\n\n```sh\nember generate controller foo --type=array --dry-run isAdmin:true\n```\n\nThe object passed to `locals` looks like this:\n\n```js\n{\n  entity: {\n    name: 'foo',\n    options: {\n      isAdmin: true\n    }\n  },\n  dryRun: true\n  type: \"array\"\n  // more keys\n}\n```\n\nThis hook must return an object or a Promise which resolves to an object.\nThe resolved object will be merged with the aforementioned default locals.",
             "access": "public",
             "tagname": "",
@@ -4068,7 +4099,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 645,
+            "line": 659,
             "description": "Hook to add additional or override existing fileMap tokens.\n\nUse `fileMapTokens` to add custom fileMap tokens for use\nin the `mapFile` method. The hook must return an object in the\nfollowing pattern:\n\n```js\n{\n  __token__(options){\n    // logic to determine value goes here\n    return 'value';\n  }\n}\n```\n\nIt will be merged with the default `fileMapTokens`, and can be used\nto override any of the default tokens.\n\nTokens are used in the files folder (see `files`), and get replaced with\nvalues when the `mapFile` method is called.",
             "access": "public",
             "tagname": "",
@@ -4083,7 +4114,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 673,
+            "line": 687,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4104,7 +4135,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 729,
+            "line": 743,
             "description": "Used to generate fileMap tokens for mapFile.",
             "itemtype": "method",
             "name": "generateFileMap",
@@ -4124,7 +4155,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 744,
+            "line": 758,
             "itemtype": "method",
             "name": "buildFileInfo",
             "params": [
@@ -4153,7 +4184,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 765,
+            "line": 779,
             "itemtype": "method",
             "name": "isUpdate",
             "return": {
@@ -4165,7 +4196,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 775,
+            "line": 789,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4196,7 +4227,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 787,
+            "line": 801,
             "description": "Add update files to ignored files or reset them",
             "access": "private",
             "tagname": "",
@@ -4207,7 +4238,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 800,
+            "line": 814,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4228,7 +4259,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 813,
+            "line": 827,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4250,7 +4281,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 827,
+            "line": 841,
             "itemtype": "method",
             "name": "processFiles",
             "params": [
@@ -4274,7 +4305,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 860,
+            "line": 874,
             "itemtype": "method",
             "name": "processFilesForUninstall",
             "params": [
@@ -4294,7 +4325,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 911,
+            "line": 925,
             "itemtype": "method",
             "name": "mapFile",
             "params": [
@@ -4317,7 +4348,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 928,
+            "line": 942,
             "description": "Looks for a __root__ token in the files folder. Must be present for\nthe blueprint to support addon tokens. The `server`, `blueprints`, and `test`",
             "access": "private",
             "tagname": "",
@@ -4332,7 +4363,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 940,
+            "line": 954,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4362,7 +4393,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 970,
+            "line": 984,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4383,7 +4414,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1003,
+            "line": 1017,
             "description": "Used to add a package to the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addPackageToProject",
@@ -4408,7 +4439,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1025,
+            "line": 1039,
             "description": "Used to add multiple packages to the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\nExpects each array item to be an object with a `name`.  Each object\nmay optionally have a `target` to specify a specific version.",
             "itemtype": "method",
             "name": "addPackagesToProject",
@@ -4431,7 +4462,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1074,
+            "line": 1088,
             "description": "Used to remove a package from the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that any package conflicts can be resolved before the\naddon is used.",
             "itemtype": "method",
             "name": "removePackageFromProject",
@@ -4451,7 +4482,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1091,
+            "line": 1105,
             "description": "Used to remove multiple packages from the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that any package conflicts can be resolved before the\naddon is used.\n\nExpects each array item to be an object with a `name` property.",
             "itemtype": "method",
             "name": "removePackagesFromProject",
@@ -4471,8 +4502,8 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1132,
-            "description": "Used to add a Bower package to the projects `bower.json`.\n\nBower is a package manager that is no longer recommended \nfor new projects, but you may find this hook used in older\naddons.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\n`localPackageName` and `target` may be thought of as equivalent\nto the key-value pairs in the `dependency` or `devDepencency`\nobjects contained within a bower.json file.",
+            "line": 1146,
+            "description": "Used to add a Bower package to the projects `bower.json`.\n\nBower is a package manager that is no longer recommended\nfor new projects, but you may find this hook used in older\naddons.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\n`localPackageName` and `target` may be thought of as equivalent\nto the key-value pairs in the `dependency` or `devDepencency`\nobjects contained within a bower.json file.",
             "itemtype": "method",
             "name": "addBowerPackageToProject",
             "params": [
@@ -4504,8 +4535,8 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1185,
-            "description": "Used to add an array of packages to the projects `bower.json`.\n\nBower is a package manager that is no longer recommended \nfor new projects, but you may find this hook used in older\naddons.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\nExpects each array item to be an object with a `name`.  Each object\nmay optionally have a `target` to specify a specific version, or a\n`source` to specify a non-local name to be resolved.",
+            "line": 1199,
+            "description": "Used to add an array of packages to the projects `bower.json`.\n\nBower is a package manager that is no longer recommended\nfor new projects, but you may find this hook used in older\naddons.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\nExpects each array item to be an object with a `name`.  Each object\nmay optionally have a `target` to specify a specific version, or a\n`source` to specify a non-local name to be resolved.",
             "itemtype": "method",
             "name": "addBowerPackagesToProject",
             "params": [
@@ -4529,7 +4560,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1245,
+            "line": 1259,
             "description": "Used to add an addon to the project's `package.json` and run it's\n`defaultBlueprint` if it provides one.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addAddonToProject",
@@ -4549,7 +4580,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1265,
+            "line": 1279,
             "description": "Used to add multiple addons to the project's `package.json` and run their\n`defaultBlueprint` if they provide one.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addAddonsToProject",
@@ -4569,7 +4600,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1311,
+            "line": 1325,
             "description": "Used to retrieve a task with the given name. Passes the new task\nthe standard information available (like `ui`, `analytics`, `project`, etc).",
             "itemtype": "method",
             "name": "taskFor",
@@ -4586,7 +4617,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1329,
+            "line": 1343,
             "description": "Inserts the given content into a file. If the `contentsToInsert` string is already\npresent in the current contents, the file will not be changed unless `force` option\nis passed.\n\nIf `options.before` is specified, `contentsToInsert` will be inserted before\nthe first instance of that string.  If `options.after` is specified, the\ncontents will be inserted after the first instance of that string.\nIf the string specified by options.before or options.after is not in the file,\nno change will be made.\n\nIf neither `options.before` nor `options.after` are present, `contentsToInsert`\nwill be inserted at the end of the file.\n\nExample:\n```\n// app/router.js\nRouter.map(function () {\n});\n```\n\n```\ninsertIntoFile('app/router.js', '  this.route(\"admin\");', {\n  after: 'Router.map(function () {' + EOL\n}).then(function() {\n  // file has been inserted into!\n});\n\n\n```\n\n```\n// app/router.js\nRouter.map(function () {\n  this.route(\"admin\");\n});\n```",
             "itemtype": "method",
             "name": "insertIntoFile",
@@ -4616,7 +4647,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1433,
+            "line": 1447,
             "description": "Used to retrieve a blueprint with the given name.",
             "itemtype": "method",
             "name": "lookupBlueprint",
@@ -4638,7 +4669,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1450,
+            "line": 1464,
             "static": 1,
             "itemtype": "method",
             "name": "lookup",
@@ -4665,6 +4696,12 @@
                             "description": "Throw a `SilentError` if a\n  matching Blueprint could not be found",
                             "type": "Boolean",
                             "optional": true
+                        },
+                        {
+                            "name": "blueprintOptions",
+                            "description": "Options object that will be passed\n  along to the Blueprint instance on creation.",
+                            "type": "Object",
+                            "optional": true
                         }
                     ]
                 }
@@ -4679,7 +4716,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1497,
+            "line": 1513,
             "description": "Loads a blueprint from given path.",
             "static": 1,
             "itemtype": "method",
@@ -4689,6 +4726,12 @@
                     "name": "blueprintPath",
                     "description": "",
                     "type": "String"
+                },
+                {
+                    "name": "blueprintOptions",
+                    "description": "",
+                    "type": "Object",
+                    "optional": true
                 }
             ],
             "return": {
@@ -4701,7 +4744,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1524,
+            "line": 1541,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4731,7 +4774,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1573,
+            "line": 1590,
             "description": "Files that are renamed when installed into the target directory.\nThis allows including files in the blueprint that would have an effect\non another process, such as a file named `.gitignore`.\n\nThe keys are the filenames used in the files folder.\nThe values are the filenames used in the target directory.",
             "static": 1,
             "itemtype": "property",
@@ -4742,7 +4785,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1588,
+            "line": 1605,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4752,7 +4795,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1594,
+            "line": 1611,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4762,7 +4805,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1600,
+            "line": 1617,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4772,7 +4815,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1608,
+            "line": 1625,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4794,7 +4837,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1621,
+            "line": 1638,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4812,7 +4855,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1632,
+            "line": 1649,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4830,7 +4873,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1641,
+            "line": 1658,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4857,7 +4900,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1655,
+            "line": 1672,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4879,7 +4922,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1667,
+            "line": 1684,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4902,7 +4945,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1682,
+            "line": 1699,
             "description": "Looks for a __path__ token in the files folder. Must be present for\nthe blueprint to support pod tokens.",
             "access": "private",
             "tagname": "",
@@ -4925,7 +4968,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1721,
+            "line": 1738,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4947,7 +4990,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1735,
+            "line": 1752,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4969,7 +5012,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1745,
+            "line": 1762,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4984,7 +5027,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1758,
+            "line": 1775,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -6379,7 +6422,7 @@
         },
         {
             "file": "lib/tasks/npm-task.js",
-            "line": 147,
+            "line": 151,
             "description": "This method will determine what package manager (npm or yarn) should be\nused to install the npm dependencies.\n\nSetting `this.useYarn` to `true` or `false` will force the use of yarn\nor npm respectively.\n\nIf `this.useYarn` is not set we check if `yarn.lock` exists and if\n`yarn` is available and in that case set `useYarn` to `true`.",
             "access": "private",
             "tagname": "",

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/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-beta.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",