ember-cli 4.5.0 → 4.6.0-beta.1

package/.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
         os: [ubuntu, windows]
 
     steps:
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # ember-cli Changelog
 
+## v4.6.0-beta.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.5.0...v4.6.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.5.0...v4.6.0-beta.1)
+
+#### Changelog
+
+- [#9890](https://github.com/ember-cli/ember-cli/pull/9890) Make sure addons are discovered only once [@wagenet](https://github.com/wagenet)
+- [#9770](https://github.com/ember-cli/ember-cli/pull/9770) Include the addon’s name in the warning when a core command is overridden [@davecombs](https://github.com/davecombs)
+- [#9863](https://github.com/ember-cli/ember-cli/pull/9863) [INTERNAL] Add `.prettierignore` file to Ember CLI repo [@bertdeblock](https://github.com/bertdeblock)
+- [#9872](https://github.com/ember-cli/ember-cli/pull/9872) [INTERNAL] Use native classes for tasks in test suite [@bertdeblock](https://github.com/bertdeblock)
+- [#9885](https://github.com/ember-cli/ember-cli/pull/9885) [CLEANUP] Remove `ie 11` from default targets [@bertdeblock](https://github.com/bertdeblock)
+- [#9898](https://github.com/ember-cli/ember-cli/pull/9898) Remove deprecated `addonJsFiles` method on `addon` model [@bertdeblock](https://github.com/bertdeblock)
+- [#9899](https://github.com/ember-cli/ember-cli/pull/9899) Remove deprecated internal `silent` error [@bertdeblock](https://github.com/bertdeblock)
+- [#9900](https://github.com/ember-cli/ember-cli/pull/9900) Remove unused CLI error class [@bertdeblock](https://github.com/bertdeblock)
+- [#9902](https://github.com/ember-cli/ember-cli/pull/9902) Remove support for `ember-cli-inject-live-reload` < v1.10.0 [@bertdeblock](https://github.com/bertdeblock)
+- [#9903](https://github.com/ember-cli/ember-cli/pull/9903) Deprecate `vendor-shim` blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#9904](https://github.com/ember-cli/ember-cli/pull/9904) Update Node compatibility warning [@bertdeblock](https://github.com/bertdeblock)
+- [#9906](https://github.com/ember-cli/ember-cli/pull/9906) Drop support for Node v12 [@bertdeblock](https://github.com/bertdeblock)
+- [#9907](https://github.com/ember-cli/ember-cli/pull/9907) Remove ESLint config file from `server` blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#9908](https://github.com/ember-cli/ember-cli/pull/9908) Remove support for finding an addon by its unscoped name [@bertdeblock](https://github.com/bertdeblock)
+- [#9909](https://github.com/ember-cli/ember-cli/pull/9909) Deprecate support for `ember-cli-jshint` [@bertdeblock](https://github.com/bertdeblock)
+- [#9917](https://github.com/ember-cli/ember-cli/pull/9917) update beta deps [@kellyselden](https://github.com/kellyselden)
+- [#9919](https://github.com/ember-cli/ember-cli/pull/9919) Clean up `ember-addon` object in package file when destroying an in-repo addon [@bertdeblock](https://github.com/bertdeblock)
+- [#9935](https://github.com/ember-cli/ember-cli/pull/9935) Update dev changelog script [@kellyselden](https://github.com/kellyselden)
+- [#9938](https://github.com/ember-cli/ember-cli/pull/9938) [INTERNAL] Fix internal `sequence` util [@bertdeblock](https://github.com/bertdeblock)
+- [#9939](https://github.com/ember-cli/ember-cli/pull/9939) Update `fs-extra` to v10 [@bertdeblock](https://github.com/bertdeblock)
+- [#9937](https://github.com/ember-cli/ember-cli/pull/9937) [INTERNAL] Remove old `deprecate` utility [@bertdeblock](https://github.com/bertdeblock)
+- [#9941](https://github.com/ember-cli/ember-cli/pull/9941) Update `filesize` to v9 [@bertdeblock](https://github.com/bertdeblock)
+- [#9942](https://github.com/ember-cli/ember-cli/pull/9942) Update `isbinaryfile` to v5 [@bertdeblock](https://github.com/bertdeblock)
+- [#9944](https://github.com/ember-cli/ember-cli/pull/9944) Add support for Node v18 [@ddzz](https://github.com/ddzz)
+- [#9947](https://github.com/ember-cli/ember-cli/pull/9947) [DOC] Update EOL date for Node v16 in `Node Support` doc [@bertdeblock](https://github.com/bertdeblock)
+- [#9953](https://github.com/ember-cli/ember-cli/pull/9953) Update `resolve-package-path` to v4 [@bertdeblock](https://github.com/bertdeblock)
+- [#9954](https://github.com/ember-cli/ember-cli/pull/9954) Update `jsdom` to v20 [@bertdeblock](https://github.com/bertdeblock)
+- [#9969](https://github.com/ember-cli/ember-cli/pull/9969) update ember source beta [@kellyselden](https://github.com/kellyselden)
+
+Thank you to all who took the time to contribute!
+
 ## v4.5.0
 
 #### Blueprint Changes

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

@@ -22,7 +22,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %>
@@ -71,7 +71,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>

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

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "12"
+  - "14"
 
 dist: xenial
 

package/blueprints/addon/files/README.md

@@ -7,7 +7,7 @@
 
 * Ember.js v3.24 or above
 * Ember CLI v3.24 or above
-* Node.js v12 or above
+* Node.js v14 or above
 
 
 ## Installation

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

@@ -22,7 +22,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
@@ -39,7 +39,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
         run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>

package/blueprints/app/files/.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "12"
+  - "14"
 
 dist: xenial
 

package/blueprints/app/files/package.json

@@ -47,7 +47,7 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.5.0",
+    "ember-source": "~4.6.0-beta.2",
     "ember-template-lint": "^4.10.0<% if (welcome) { %>",
     "ember-welcome-page": "^6.2.0<% } %>",
     "eslint": "^7.32.0",
@@ -64,7 +64,7 @@
     "webpack": "^5.73.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

package/blueprints/blueprint/index.js

@@ -2,20 +2,4 @@
 
 module.exports = {
   description: 'Generates a blueprint and definition.',
-
-  files() {
-    let files = this._super.files.apply(this, arguments);
-
-    if (!this.hasJSHint()) {
-      files = files.filter((file) => file !== 'blueprints/.jshintrc');
-    }
-
-    return files;
-  },
-
-  hasJSHint() {
-    if (this.project) {
-      return 'ember-cli-jshint' in this.project.dependencies();
-    }
-  },
 };

package/blueprints/in-repo-addon/index.js

@@ -69,9 +69,12 @@ module.exports = {
       let newPathIndex = paths.indexOf(newPath);
       if (newPathIndex > -1) {
         paths.splice(newPathIndex, 1);
-        if (paths.length === 0) {
-          delete contents['ember-addon']['paths'];
-        }
+      }
+      if (paths.length === 0) {
+        delete contents['ember-addon']['paths'];
+      }
+      if (Object.keys(contents['ember-addon']).length === 0) {
+        delete contents['ember-addon'];
       }
     }
 

package/blueprints/server/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const isPackageMissing = require('ember-cli-is-package-missing');
+const { deprecate } = require('../../lib/debug');
 
 module.exports = {
   description: 'Generates a server directory for mocks and proxies.',
@@ -28,12 +29,28 @@ module.exports = {
   },
 
   files() {
-    return ['server/index.js', this.hasJSHint() ? 'server/.jshintrc' : 'server/.eslintrc.js'];
+    let files = ['server/index.js'];
+
+    if (this.hasJSHint()) {
+      files.push('server/.jshintrc');
+    }
+
+    return files;
   },
 
   hasJSHint() {
-    if (this.project) {
-      return 'ember-cli-jshint' in this.project.dependencies();
-    }
+    let hasJSHint = Boolean(this.project) && 'ember-cli-jshint' in this.project.dependencies();
+
+    deprecate('Support for `ember-cli-jshint` is deprecated. We recommend using `eslint` instead.', !hasJSHint, {
+      for: 'ember-cli',
+      id: 'ember-cli.ember-cli-jshint-support',
+      since: {
+        available: '4.6.0',
+        enabled: '4.6.0',
+      },
+      until: '5.0.0',
+    });
+
+    return hasJSHint;
   },
 };

package/blueprints/vendor-shim/index.js

@@ -1,10 +1,23 @@
 'use strict';
 
 const stringUtil = require('ember-cli-string-utils');
+const { deprecate } = require('../../lib/debug');
 
 module.exports = {
   description: 'Generates an ES6 module shim for global libraries.',
 
+  beforeInstall() {
+    deprecate('The `vendor-shim` blueprint is deprecated. Please use `ember-auto-import` instead.', false, {
+      for: 'ember-cli',
+      id: 'ember-cli.vendor-shim-blueprint',
+      since: {
+        available: '4.6.0',
+        enabled: '4.6.0',
+      },
+      until: '5.0.0',
+    });
+  },
+
   locals(options) {
     let entity = options.entity;
     let rawName = entity.name;

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.5.0-release-d5a4e0b0c2"
+        "version": "4.6.0-beta.1-beta-79f8547eb8"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -1554,7 +1554,7 @@
         },
         {
             "file": "lib/cli/cli.js",
-            "line": 262,
+            "line": 264,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -1574,7 +1574,7 @@
         },
         {
             "file": "lib/cli/cli.js",
-            "line": 303,
+            "line": 305,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3213,22 +3213,6 @@
         {
             "file": "lib/models/addon.js",
             "line": 1272,
-            "description": "Returns a tree containing the addon's js files",
-            "access": "private",
-            "tagname": "",
-            "deprecated": true,
-            "itemtype": "method",
-            "name": "addonJsFiles",
-            "return": {
-                "description": "The filtered addon js files",
-                "type": "Tree"
-            },
-            "class": "Addon",
-            "module": "ember-cli"
-        },
-        {
-            "file": "lib/models/addon.js",
-            "line": 1289,
             "description": "Preprocesses a javascript tree.",
             "access": "private",
             "tagname": "",
@@ -3243,7 +3227,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1300,
+            "line": 1283,
             "description": "Returns a tree with all javascript for this addon.",
             "access": "private",
             "tagname": "",
@@ -3265,7 +3249,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1336,
+            "line": 1319,
             "description": "Returns the module name for this addon.",
             "access": "public",
             "tagname": "",
@@ -3280,7 +3264,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1351,
+            "line": 1334,
             "description": "Returns the path for addon blueprints.",
             "access": "public",
             "tagname": "",
@@ -3298,7 +3282,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1369,
+            "line": 1352,
             "description": "Augments the application's configuration settings.\n\nObject returned from this hook is merged with the application's configuration object.\n\nApplication's configuration always take precedence.\n\n#### Uses:\n\n- Modifying configuration options (see list of defaults [here](https://github.com/ember-cli/ember-cli/blob/v2.4.3/lib/broccoli/ember-app.js#L163))\n  - For example\n    - `minifyJS`\n    - `storeConfigInMeta`\n    - et, al",
             "access": "public",
             "tagname": "",
@@ -3328,7 +3312,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1409,
+            "line": 1392,
             "access": "public",
             "tagname": "",
             "itemtype": "method",
@@ -3342,7 +3326,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1419,
+            "line": 1402,
             "access": "public",
             "tagname": "",
             "itemtype": "method",
@@ -3356,7 +3340,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1428,
+            "line": 1411,
             "description": "Can be used to exclude addons from being added as a child addon.\n\n#### Uses:\n\n- Abstract away multiple addons while only including one into the built assets",
             "access": "public",
             "tagname": "",
@@ -3381,7 +3365,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1460,
+            "line": 1443,
             "description": "Allows the specification of custom addon commands.\nExpects you to return an object whose key is the name of the command and value is the command instance..\n\nThis function is not implemented by default\n\n#### Uses:\n\n- Include custom commands into consuming application",
             "access": "public",
             "tagname": "",
@@ -3399,7 +3383,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1484,
+            "line": 1467,
             "description": "Allows addons to define a custom transform function that other addons and app can use when using `app.import`.\n\nThis function is not implemented by default\n\n#### Uses:\n\n- An app or addons want to transform a dependency that is being imported using `app.import`.",
             "access": "public",
             "tagname": "",
@@ -3418,7 +3402,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1528,
+            "line": 1511,
             "description": "Pre-process a tree\n\n#### Uses:\n\n- removing / adding files from the build.",
             "access": "public",
             "tagname": "",
@@ -3445,7 +3429,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1542,
+            "line": 1525,
             "description": "Post-process a tree",
             "access": "public",
             "tagname": "",
@@ -3475,7 +3459,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1555,
+            "line": 1538,
             "description": "This hook allows you to make changes to the express server run by ember-cli.\n\nIt's passed a `startOptions` object which contains:\n- `app` Express server instance\n- `options` A hash with:\n  - `project` Current {{#crossLink \"Project\"}}project{{/crossLink}}\n  - `watcher`\n  - `environment`\n\nThis function is not implemented by default\n\n#### Uses:\n\n- Tacking on headers to each request\n- Modifying the request object\n\n*Note:* that this should only be used in development, and if you need the same behavior in production you'll\nneed to configure your server.",
             "access": "public",
             "tagname": "",
@@ -3496,7 +3480,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1594,
+            "line": 1577,
             "description": "This hook allows you to make changes to the express server run by testem.\n\nThis function is not implemented by default\n\n#### Uses:\n\n- Adding custom test-specific endpoints\n- Manipulating HTTP requests in tests",
             "access": "public",
             "tagname": "",
@@ -3514,7 +3498,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1609,
+            "line": 1592,
             "description": "This hook is called before a build takes place.",
             "access": "public",
             "tagname": "",
@@ -3532,7 +3516,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1617,
+            "line": 1600,
             "description": "This hook is called after a build is complete.\n\nIt's passed a `result` object which contains:\n- `directory` Path to build output\n\n#### Uses:\n\n- Slow tree listing\n- May be used to manipulate your project after build has happened",
             "access": "public",
             "tagname": "",
@@ -3550,7 +3534,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1633,
+            "line": 1616,
             "description": "This hook is called after the build has been processed and the build files have been copied to the output directory\n\nIt's passed a `result` object which contains:\n- `directory` Path to build output",
             "access": "public",
             "tagname": "",
@@ -3571,7 +3555,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1650,
+            "line": 1633,
             "description": "This hook is called when an error occurs during the preBuild, postBuild or outputReady hooks\nfor addons, or when the build fails\n\n#### Uses:\n\n- Custom error handling during build process",
             "access": "public",
             "tagname": "",
@@ -3592,7 +3576,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1666,
+            "line": 1649,
             "description": "Used to add preprocessors to the preprocessor registry. This is often used by addons like [ember-cli-htmlbars](https://github.com/ember-cli/ember-cli-htmlbars)\nand [ember-cli-coffeescript](https://github.com/kimroen/ember-cli-coffeescript) to add a `template` or `js` preprocessor to the registry.\n\n**Uses:**\n\n- Adding preprocessors to the registry.",
             "access": "public",
             "tagname": "",
@@ -3617,7 +3601,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1708,
+            "line": 1691,
             "description": "Return value is merged into the **tests** tree. This lets you inject\nlinter output as test results.\n\n**Uses:**\n\n- JSHint\n- any other form of automated test generation that turns code into tests",
             "access": "public",
             "tagname": "",
@@ -3643,7 +3627,7 @@
         },
         {
             "file": "lib/models/addon.js",
-            "line": 1727,
+            "line": 1710,
             "description": "Allow addons to implement contentFor method to add string output into the associated `{{content-for 'foo'}}` section in `index.html`\n\n**Uses:**\n\n- For instance, to inject analytics code into `index.html`",
             "access": "public",
             "tagname": "",

package/lib/cli/cli.js

@@ -151,20 +151,22 @@ class CLI {
 
       let platformCheckerToken = heimdall.start('platform-checker');
 
+      const emberCLIVersion = require('../../package.json').version;
       const PlatformChecker = require('../utilities/platform-checker');
       let platform = new PlatformChecker(process.version);
       let recommendation =
-        ' We recommend that you use the most-recent "Active LTS" version of Node.js.' +
-        ' See https://github.com/ember-cli/ember-cli/blob/master/docs/node-support.md for details.';
+        ' See "https://github.com/ember-cli/ember-cli/blob/master/docs/node-support.md" to find out which version of Node is best to use.';
 
       if (!this.testing) {
         if (platform.isDeprecated) {
-          this.ui.writeDeprecateLine(`Node ${process.version} is no longer supported by Ember CLI.${recommendation}`);
+          this.ui.writeDeprecateLine(
+            `Node ${process.version} is no longer supported by Ember CLI v${emberCLIVersion}.${recommendation}`
+          );
         }
 
         if (!platform.isTested) {
           this.ui.writeWarnLine(
-            `Node ${process.version} is not tested against Ember CLI on your platform.${recommendation}`
+            `Ember CLI v${emberCLIVersion} is not tested against Node ${process.version}.${recommendation}`
           );
         }
       }

package/lib/cli/lookup-command.js

@@ -27,11 +27,15 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
   // Attempt to find command in ember-cli core commands
   let command = findCommand(commands, commandName);
 
+  let addonWithCommand;
   let addonCommand;
   // Attempt to find command within addons
   if (project && project.eachAddonCommand) {
     project.eachAddonCommand((addonName, commands) => {
       addonCommand = findCommand(commands, commandName);
+      if (addonCommand) {
+        addonWithCommand = addonName;
+      }
       return !addonCommand;
     });
   }
@@ -39,7 +43,7 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
   if (command && addonCommand) {
     if (addonCommand.overrideCore) {
       ui.writeWarnLine(
-        `An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
+        `An ember-addon (${addonWithCommand}) has attempted to override the core command "${command.prototype.name}". ` +
           `The addon command will be used as the overridding was explicit.`
       );
 
@@ -47,7 +51,7 @@ module.exports = function (commands, commandName, commandArgs, optionHash) {
     }
 
     ui.writeWarnLine(
-      `An ember-addon has attempted to override the core command "${command.prototype.name}". ` +
+      `An ember-addon (${addonWithCommand}) has attempted to override the core command "${command.prototype.name}". ` +
         `The core command will be used.`
     );
     return command;

package/lib/models/addon.js

@@ -1269,23 +1269,6 @@ let addonProto = {
     });
   },
 
-  /**
-    Returns a tree containing the addon's js files
-
-    @private
-    @deprecated
-    @method addonJsFiles
-    @return {Tree} The filtered addon js files
-  */
-  addonJsFiles(tree) {
-    this._warn(`Addon.prototype.addonJsFiles is deprecated`);
-
-    return new Funnel(tree, {
-      destDir: this.moduleName(),
-      annotation: 'Funnel: Addon JS',
-    });
-  },
-
   /**
     Preprocesses a javascript tree.
 

package/lib/models/project.js

@@ -311,7 +311,7 @@ class Project {
     if (fs.existsSync(`${targetsPath}.js`)) {
       this._targets = this.require(targetsPath);
     } else {
-      this._targets = require('../utilities/default-targets');
+      this._targets = require('../../blueprints/app/files/config/targets');
     }
     return this._targets;
   }
@@ -474,9 +474,9 @@ class Project {
    */
   discoverAddons() {
     if (this._didDiscoverAddons) {
-      this._didDiscoverAddons = true;
       return;
     }
+    this._didDiscoverAddons = true;
 
     let addonPackageList = this._packageInfo.discoverProjectAddons();
     this.addonPackages = this._packageInfo.generateAddonPackages(addonPackageList);

package/lib/utilities/find-addon-by-name.js

@@ -1,34 +1,14 @@
 'use strict';
 
-function unscope(name) {
-  if (name[0] !== '@') {
-    return name;
-  }
-
-  return name.slice(name.indexOf('/') + 1);
-}
-
 let HAS_FOUND_ADDON_BY_NAME = Object.create(null);
-let HAS_FOUND_ADDON_BY_UNSCOPED_NAME = Object.create(null);
-/*
-  Finds an addon given a specific name. Due to older versions of ember-cli
-  not properly supporting scoped packages it was (at one point) common practice
-  to have `package.json` include a scoped name but `index.js` having an unscoped
-  name.
-
-  Changes to the blueprints and addon model (in ~ 3.4+) have made it much clearer
-  that both `package.json` and `index.js` `name`'s should match. At some point
-  this will be "forced" and no longer optional.
 
-  This function is attempting to prioritize matching across all of the combinations
-  (in this priority order):
+/*
+  Finds an addon given a specific name.
 
-  - package.json name matches requested name exactly
-  - index.js name matches requested name exactly
-  - unscoped (leaf portion) index.js name matches unscoped requested name
+  The `name` value in an addon's `package.json` file takes priority over the
+  `name` value in an addon's `index.js` file.
 */
 module.exports = function findAddonByName(addons, name) {
-  let unscopedName = unscope(name);
   let exactMatchFromPkg = addons.find((addon) => addon.pkg && addon.pkg.name === name);
 
   if (exactMatchFromPkg) {
@@ -51,22 +31,9 @@ module.exports = function findAddonByName(addons, name) {
     return exactMatchFromIndex;
   }
 
-  let unscopedMatchFromIndex = addons.find((addon) => addon.name && unscope(addon.name) === unscopedName);
-  if (unscopedMatchFromIndex) {
-    if (HAS_FOUND_ADDON_BY_UNSCOPED_NAME[name] !== true) {
-      HAS_FOUND_ADDON_BY_UNSCOPED_NAME[name] = true;
-      console.trace(
-        `Finding a scoped addon via its unscoped name is deprecated. You searched for \`${name}\` which we found as \`${unscopedMatchFromIndex.name}\` in '${unscopedMatchFromIndex.root}'`
-      );
-    }
-
-    return unscopedMatchFromIndex;
-  }
-
   return null;
 };
 
 module.exports._clearCaches = function () {
   HAS_FOUND_ADDON_BY_NAME = Object.create(null);
-  HAS_FOUND_ADDON_BY_UNSCOPED_NAME = Object.create(null);
 };

package/lib/utilities/is-live-reload-request.js

@@ -1,17 +1,7 @@
 'use strict';
 
 const cleanBaseUrl = require('clean-base-url');
-const deprecate = require('./deprecate');
 
 module.exports = function isLiveReloadRequest(url, liveReloadPrefix) {
-  let regex = /\/livereload$/gi;
-  if (url === `${cleanBaseUrl(liveReloadPrefix)}livereload`) {
-    return true;
-  } else if (regex.test(url)) {
-    //version needs to be updated according to the this PR (https://github.com/ember-cli/ember-cli-inject-live-reload/pull/55)
-    //in master of ember-cli-inject-live-reload.
-    deprecate(`Upgrade ember-cli-inject-live-reload version to 1.10.0 or above`, true);
-    return true;
-  }
-  return false;
+  return url === `${cleanBaseUrl(liveReloadPrefix)}livereload`;
 };

package/lib/utilities/sequence.js

@@ -27,14 +27,16 @@
  * @return Promise<Array>
  *
  */
-module.exports = function sequence(tasks) {
+module.exports = async function sequence(tasks) {
   let length = tasks.length;
-  let current = Promise.resolve();
-  let results = new Array(length);
+  let results = [];
 
   for (let i = 0; i < length; ++i) {
-    current = results[i] = current.then(tasks[i]);
+    let task = tasks[i];
+    let prevResult = results[i - 1];
+
+    results.push(typeof task === 'function' ? await task(prevResult) : await task);
   }
 
-  return Promise.all(results);
+  return results;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.5.0",
+  "version": "4.6.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,8 +37,8 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/plugin-transform-modules-amd": "^7.16.7",
+    "@babel/core": "^7.18.6",
+    "@babel/plugin-transform-modules-amd": "^7.18.6",
     "amd-name-resolver": "^1.3.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "bower-config": "^1.4.3",
@@ -61,14 +61,14 @@
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.2",
-    "ci-info": "^3.3.0",
+    "ci-info": "^3.3.1",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
     "console-ui": "^3.1.2",
     "core-object": "^3.1.5",
     "dag-map": "^2.0.2",
-    "diff": "^5.0.0",
+    "diff": "^5.1.0",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-lodash-subset": "^2.0.1",
     "ember-cli-normalize-entity-name": "^1.0.0",
@@ -79,11 +79,11 @@
     "execa": "^5.1.1",
     "exit": "^0.1.2",
     "express": "^4.18.1",
-    "filesize": "^8.0.6",
+    "filesize": "^9.0.11",
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.1.0",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
@@ -96,13 +96,13 @@
     "inflection": "^1.13.1",
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
-    "isbinaryfile": "^4.0.8",
+    "isbinaryfile": "^5.0.0",
     "js-yaml": "^3.14.0",
     "leek": "0.0.24",
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-terminal": "0.2.1",
-    "minimatch": "^5.0.1",
+    "minimatch": "^5.1.0",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
     "npm-package-arg": "^9.0.2",
@@ -112,22 +112,22 @@
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.8",
     "remove-types": "^1.0.0",
-    "resolve": "^1.20.0",
-    "resolve-package-path": "^3.1.0",
+    "resolve": "^1.22.1",
+    "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.3.1",
     "sane": "^5.0.1",
     "semver": "^7.3.5",
     "silent-error": "^1.1.1",
-    "sort-package-json": "^1.55.0",
+    "sort-package-json": "^1.57.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.6.0",
+    "testem": "^3.7.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",
-    "workerpool": "^6.2.0",
+    "workerpool": "^6.2.1",
     "yam": "^1.0.0"
   },
   "devDependencies": {
@@ -144,21 +144,21 @@
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-chai-expect": "^3.0.0",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-mocha": "^10.0.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "fixturify": "^2.1.0",
-    "jsdom": "^19.0.0",
+    "jsdom": "^20.0.0",
     "latest-version": "^5.1.0",
-    "mocha": "^9.2.2",
-    "nock": "^13.2.2",
+    "mocha": "^10.0.0",
+    "nock": "^13.2.8",
     "nyc": "^15.1.0",
     "prettier": "2.6.2",
-    "release-it": "^14.14.0",
+    "release-it": "^15.1.1",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
-    "supertest": "^6.1.6",
-    "testdouble": "^3.16.4",
+    "supertest": "^6.2.3",
+    "testdouble": "^3.16.5",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",
     "which": "2.0.2",
@@ -166,7 +166,7 @@
     "yuidocjs": "0.10.2"
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 14"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/tests/helpers/copy-fixture-files.js

@@ -6,5 +6,8 @@ const path = require('path');
 let rootPath = process.cwd();
 
 module.exports = function copyFixtureFiles(sourceDir) {
-  return fs.copy(path.join(rootPath, 'tests', 'fixtures', sourceDir), '.', { overwrite: true });
+  return fs.copy(path.join(rootPath, 'tests', 'fixtures', sourceDir), '.', {
+    dereference: true,
+    overwrite: true,
+  });
 };

package/blueprints/server/files/server/.eslintrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  env: {
-    node: true
-  }
-};

package/lib/errors/cli.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = class BuildError extends Error {};

package/lib/errors/silent.js

@@ -1,19 +0,0 @@
-'use strict';
-
-const SilentError = require('silent-error');
-const deprecate = require('../utilities/deprecate');
-
-Object.defineProperty(module, 'exports', {
-  get() {
-    // Get the call stack so we can let the user know what module is using the deprecated function.
-    let stack = new Error().stack;
-    stack = stack.split('\n')[5];
-    stack = stack.replace('    at ', '  ');
-
-    deprecate(
-      `\`ember-cli/lib/errors/silent.js\` is deprecated, use \`silent-error\` instead. Required here: \n${stack.toString()}`,
-      true
-    );
-    return SilentError;
-  },
-});

package/lib/utilities/default-targets.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  browsers: ['ie 11', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
-};

package/lib/utilities/deprecate.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-
-module.exports = function (message, test) {
-  if (test) {
-    console.log(chalk.yellow(`DEPRECATION: ${message}`));
-  }
-};