ember-cli 4.4.0 → 4.6.0-beta.1

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/markdown-color.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 
 const chalk = require('chalk');
 const SilentError = require('silent-error');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 
 let colors = ['red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'black', 'white', 'grey', 'gray'];
 let backgroundColors = ['bgRed', 'bgGreen', 'bgBlue', 'bgCyan', 'bgMagenta', 'bgYellow', 'bgWhite', 'bgBlack'];

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.4.0",
+  "version": "4.6.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,15 +37,15 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.17.9",
-    "@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",
     "bower-endpoint-parser": "0.2.2",
     "broccoli": "^3.5.2",
     "broccoli-amd-funnel": "^2.0.1",
-    "broccoli-babel-transpiler": "^7.8.0",
+    "broccoli-babel-transpiler": "^7.8.1",
     "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^4.2.5",
     "broccoli-config-loader": "^1.0.1",
@@ -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",
@@ -78,12 +78,12 @@
     "ensure-posix-path": "^1.1.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
-    "express": "^4.17.2",
-    "filesize": "^8.0.6",
+    "express": "^4.18.1",
+    "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,38 +96,38 @@
     "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": "^12.2.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": "^8.1.5",
+    "npm-package-arg": "^9.0.2",
     "p-defer": "^3.0.0",
     "portfinder": "^1.0.28",
     "promise-map-series": "^0.3.0",
     "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": {
@@ -142,23 +142,23 @@
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
     "eslint": "^8.10.0",
-    "eslint-config-prettier": "^7.2.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/tests/helpers/default-packager.js

@@ -132,7 +132,6 @@ const DEFAULT_SOURCE = {
       'ember-cli-sri': '^2.1.0',
       'ember-cli-uglify': '^2.0.0',
       'ember-data': '~3.0.0-beta.1',
-      'ember-export-application-global': '^2.0.0',
       'ember-load-initializers': '^1.0.0',
       'ember-qunit': '^3.4.1',
       'ember-resolver': '^4.0.0',

package/tests/helpers/fixturify-project.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const merge = require('ember-cli-lodash-subset').merge;
+const { merge } = require('ember-cli-lodash-subset');
 const FixturifyProject = require('fixturify-project');
 const Project = require('../../lib/models/project');
 const MockCLI = require('./mock-cli');

package/tests/helpers/run-command.js

@@ -2,7 +2,7 @@
 
 const chalk = require('chalk');
 const spawn = require('child_process').spawn;
-const defaults = require('ember-cli-lodash-subset').defaults;
+const { defaults } = require('ember-cli-lodash-subset');
 const killCliProcess = require('./kill-cli-process');
 const logOnFailure = require('./log-on-failure');
 let debug = require('heimdalljs-logger')('run-command');

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}`));
-  }
-};