ember-cli 4.0.0 → 4.2.0-beta.1

package/.github/workflows/ci.yml

@@ -14,6 +14,10 @@ on:
   schedule:
     - cron:  '0 3 * * *' # daily, at 3am
 
+concurrency:
+   group: ci-${{ github.head_ref || github.ref }}
+   cancel-in-progress: true
+
 jobs:
   linting:
     name: Linting
@@ -21,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.5.1
         with:
           node-version: 12.x
           cache: 'yarn'
@@ -39,7 +43,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.5.1
         with:
           node-version: 12.x
           cache: 'yarn'
@@ -61,7 +65,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.5.1
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
@@ -86,7 +90,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.5.1
         with:
           node-version: 12.x
           cache: 'yarn'

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # ember-cli Changelog
 
+## v4.2.0-beta.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.0...v4.2.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.0...v4.2.0-beta.1)
+
+#### Changelog
+
+- [#9681](https://github.com/ember-cli/ember-cli/pull/9681) Update URL to Ember CLI website everywhere [@bertdeblock](https://github.com/bertdeblock)
+- [#9726](https://github.com/ember-cli/ember-cli/pull/9726) Cancel stale workflows when starting a new one. [@rwjblue](https://github.com/rwjblue)
+- [#9731](https://github.com/ember-cli/ember-cli/pull/9731) Add an `assert` and a `deprecate` utility [@bertdeblock](https://github.com/bertdeblock)
+- [#9753](https://github.com/ember-cli/ember-cli/pull/9753) Upgrade to `ember-template-lint` v4 in blueprint [@bmish](https://github.com/bmish)
+
+Thank you to all who took the time to contribute!
+
+## v4.1.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.0.1...v4.1.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.0.1...v4.1.0)
+
+#### Changelog
+
+- [#9700](https://github.com/ember-cli/ember-cli/pull/9700) [Chore] Update  .npmignore to ignore .github and docs folders [@SergeAstapov](https://github.com/SergeAstapov)
+- [#9729](https://github.com/ember-cli/ember-cli/pull/9729) is-language-code@^3.1.0 [@kellyselden](https://github.com/kellyselden)
+
+Thank you to all who took the time to contribute!
+
+## v4.0.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.0.0...v4.0.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.0.0...v4.0.1)
+
+#### Changelog
+
+- [#9675](https://github.com/ember-cli/ember-cli/pull/9675) Fix using `pnpm` install inadvertently [@balinterdi](https://github.com/balinterdi)
+
+Thank you to all who took the time to contribute!
+
 ## v4.0.0
 
 #### Blueprint Changes
@@ -12,13 +55,11 @@
 - [#9679](https://github.com/ember-cli/ember-cli/pull/9679) Bump ember-page-title from v6.2.2 to v7.0.0 [@raido](https://github.com/raido)
 - [#9694](https://github.com/ember-cli/ember-cli/pull/9694) test in node 16 LTS [@kellyselden](https://github.com/kellyselden)
 - [#9696](https://github.com/ember-cli/ember-cli/pull/9696) commands/init: Fix `--yarn` usage [@Turbo87](https://github.com/Turbo87)
-
 - [#9659](https://github.com/ember-cli/ember-cli/pull/9659) Ensure `ember-classic` ember-try scenario uses Ember 3.x [@rwjblue](https://github.com/rwjblue)
 - [#9661](https://github.com/ember-cli/ember-cli/pull/9661) Set default CI config blueprints to run all builds [@elwayman02](https://github.com/elwayman02)
 - [#9666](https://github.com/ember-cli/ember-cli/pull/9666) Remove IE11 comments from `config/target.js` in app blueprint [@bertdeblock](https://github.com/bertdeblock)
 - [#9667](https://github.com/ember-cli/ember-cli/pull/9667) Update eslint-plugin-qunit to v7 in blueprint [@bmish](https://github.com/bmish)
 - [#9670](https://github.com/ember-cli/ember-cli/pull/9670) Don't emit an error when the `lint:fix` script fails post blueprint generation [@bertdeblock](https://github.com/bertdeblock)
-
 - [#9574](https://github.com/ember-cli/ember-cli/pull/9574) Update link to Discord in README.md [@MelSumner](https://github.com/MelSumner)
 - [#9613](https://github.com/ember-cli/ember-cli/pull/9613) Fix test that started failing with v2.17.0 of qunit [@kategengler](https://github.com/kategengler)
 - [#9579](https://github.com/ember-cli/ember-cli/pull/9579) Add `--ci-provider` option to `ember new` and `ember addon` [@snewcomer](https://github.com/snewcomer)

package/README.md

@@ -65,7 +65,7 @@ Community
 
 - Discord: [Get your invite](https://discord.gg/emberjs)
 - Issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
-- Documentation: [ember-cli.com](https://cli.emberjs.com/release/)
+- Documentation: [cli.emberjs.com](https://cli.emberjs.com/release/)
 
 
 

package/blueprints/addon/additional-dev-dependencies.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@embroider/test-setup": "^0.48.1",
+    "@embroider/test-setup": "^0.50.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-try": "^2.0.0",
     "ember-source-channel-url": "^3.0.0"

package/blueprints/addon/files/CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

package/blueprints/app/files/README.md

@@ -10,7 +10,7 @@ You will need the following things properly installed on your computer.
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/)<% if (yarn) { %>
 * [Yarn](https://yarnpkg.com/)<% } else { %> (with npm)<% } %>
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -51,7 +51,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

package/blueprints/app/files/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0<% if (embroider) { %>",
-    "@embroider/compat": "^0.48.1",
-    "@embroider/core": "^0.48.1",
-    "@embroider/webpack": "^0.48.1<% } %>",
+    "@embroider/compat": "^0.50.0",
+    "@embroider/core": "^0.50.0",
+    "@embroider/webpack": "^0.50.0<% } %>",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -35,22 +35,22 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.8",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.0.2",
+    "ember-data": "~4.2.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "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.0.1",
-    "ember-template-lint": "^3.15.0<% if (welcome) { %>",
-    "ember-welcome-page": "^6.0.0<% } %>",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.0<% if (welcome) { %>",
+    "ember-welcome-page": "^6.1.0<% } %>",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

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.0.0-release-b4cbb1029f"
+        "version": "4.2.0-beta.1-beta-1a2aea2e64"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -44,6 +44,20 @@
             "fors": {},
             "namespaces": {}
         },
+        "lib/debug/assert.js": {
+            "name": "lib/debug/assert.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "lib/debug/deprecate.js": {
+            "name": "lib/debug/deprecate.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
         "lib/models/package-info-cache/index.js": {
             "name": "lib/models/package-info-cache/index.js",
             "modules": {},
@@ -1571,6 +1585,53 @@
             "class": "CLI",
             "module": "ember-cli"
         },
+        {
+            "file": "lib/debug/assert.js",
+            "line": 3,
+            "description": "Verify that a certain condition is met, or throw an error if otherwise.\n\nThis is useful for communicating expectations in the code to other human\nreaders as well as catching bugs that accidentally violate these expectations.\n\n```js\nconst { assert } = require('ember-cli/lib/debug');\n\n// Test for truthiness:\nassert('Must pass a string.', typeof str === 'string');\n\n// Fail unconditionally:\nassert('This code path should never run.');\n```",
+            "itemtype": "method",
+            "name": "assert",
+            "params": [
+                {
+                    "name": "description",
+                    "description": "Describes the condition.\nThis will become the message of the error thrown if the assertion fails.",
+                    "type": "String"
+                },
+                {
+                    "name": "condition",
+                    "description": "Must be truthy for the assertion to pass.\nIf falsy, an error will be thrown.",
+                    "type": "Any"
+                }
+            ],
+            "class": "PackageInfoCache",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/debug/deprecate.js",
+            "line": 7,
+            "description": "Display a deprecation message.\n\n```js\nconst { deprecate } = require('ember-cli/lib/debug');\n\ndeprecate('The `foo` method is deprecated.', false, {\n  for: 'ember-cli',\n  id: 'ember-cli.foo-method',\n  since: {\n    available: '4.1.0',\n    enabled: '4.2.0',\n  },\n  until: '5.0.0',\n  url: 'https://example.com',\n});\n```",
+            "itemtype": "method",
+            "name": "deprecate",
+            "params": [
+                {
+                    "name": "description",
+                    "description": "Describes the deprecation.",
+                    "type": "String"
+                },
+                {
+                    "name": "condition",
+                    "description": "If falsy, the deprecation message will be displayed.",
+                    "type": "Any"
+                },
+                {
+                    "name": "options",
+                    "description": "An object including the deprecation's details:\n- `for` The library that the deprecation is for\n- `id` The deprecation's unique id\n- `since.available` A SemVer version indicating when the deprecation was made available\n- `since.enabled` A SemVer version indicating when the deprecation was enabled\n- `until` A SemVer version indicating until when the deprecation will be active\n- `url` A URL that refers to additional information about the deprecation",
+                    "type": "Object"
+                }
+            ],
+            "class": "PackageInfoCache",
+            "module": "ember-cli"
+        },
         {
             "file": "lib/models/package-info-cache/index.js",
             "line": 36,
@@ -2378,7 +2439,7 @@
         },
         {
             "file": "lib/models/per-bundle-addon-cache/index.js",
-            "line": 248,
+            "line": 247,
             "description": "Called from PackageInfo.getAddonInstance(), return an instance of the requested\naddon or a Proxy, based on the type of addon and its bundle host.",
             "itemtype": "method",
             "name": "getAddonInstance",
@@ -5651,7 +5712,7 @@
         },
         {
             "file": "lib/models/host-info-cache.js",
-            "line": 272,
+            "line": 270,
             "description": "This returns the LCA host for a given engine; we use the associated package info\nto compute this (see `getHostAddonInfo` above); this finds the lowest common ancestor\nthat is considered a host amongst _all_ engines by the same name in the project. This\nfunction is intended to replace the original behavior in `ember-engines`.\n\nFor more info, see the original implementation here:\n\nhttps://github.com/ember-engines/ember-engines/blob/master/packages/ember-engines/lib/utils/find-lca-host.js",
             "itemtype": "method",
             "name": "findLCAHost",

package/lib/debug/assert.js

@@ -0,0 +1,37 @@
+'use strict';
+
+/**
+ * Verify that a certain condition is met, or throw an error if otherwise.
+ *
+ * This is useful for communicating expectations in the code to other human
+ * readers as well as catching bugs that accidentally violate these expectations.
+ *
+ * ```js
+ * const { assert } = require('ember-cli/lib/debug');
+ *
+ * // Test for truthiness:
+ * assert('Must pass a string.', typeof str === 'string');
+ *
+ * // Fail unconditionally:
+ * assert('This code path should never run.');
+ * ```
+ *
+ * @method assert
+ * @param {String} description Describes the condition.
+ * This will become the message of the error thrown if the assertion fails.
+ * @param {Any} condition Must be truthy for the assertion to pass.
+ * If falsy, an error will be thrown.
+ */
+function assert(description, condition) {
+  if (!description) {
+    throw new Error('When calling `assert`, you must provide a description as the first argument.');
+  }
+
+  if (condition) {
+    return;
+  }
+
+  throw new Error(`ASSERTION FAILED: ${description}`);
+}
+
+module.exports = assert;

package/lib/debug/deprecate.js

@@ -0,0 +1,111 @@
+'use strict';
+
+const chalk = require('chalk');
+const semver = require('semver');
+const assert = require('./assert');
+
+/**
+ * Display a deprecation message.
+ *
+ * ```js
+ * const { deprecate } = require('ember-cli/lib/debug');
+ *
+ * deprecate('The `foo` method is deprecated.', false, {
+ *   for: 'ember-cli',
+ *   id: 'ember-cli.foo-method',
+ *   since: {
+ *     available: '4.1.0',
+ *     enabled: '4.2.0',
+ *   },
+ *   until: '5.0.0',
+ *   url: 'https://example.com',
+ * });
+ * ```
+ *
+ * @method deprecate
+ * @param {String} description Describes the deprecation.
+ * @param {Any} condition If falsy, the deprecation message will be displayed.
+ * @param {Object} options An object including the deprecation's details:
+ * - `for` The library that the deprecation is for
+ * - `id` The deprecation's unique id
+ * - `since.available` A SemVer version indicating when the deprecation was made available
+ * - `since.enabled` A SemVer version indicating when the deprecation was enabled
+ * - `until` A SemVer version indicating until when the deprecation will be active
+ * - `url` A URL that refers to additional information about the deprecation
+ */
+function deprecate(description, condition, options) {
+  assert('When calling `deprecate`, you must provide a description as the first argument.', description);
+  assert('When calling `deprecate`, you must provide a condition as the second argument.', arguments.length > 1);
+
+  assert(
+    'When calling `deprecate`, you must provide an options object as the third argument. The options object must include the `for`, `id`, `since` and `until` options (`url` is optional).',
+    options
+  );
+
+  assert('When calling `deprecate`, you must provide the `for` option.', options.for);
+  assert('When calling `deprecate`, you must provide the `id` option.', options.id);
+
+  assert(
+    'When calling `deprecate`, you must provide the `since` option. `since` must include the `available` and/or the `enabled` option.',
+    options.since
+  );
+
+  assert(
+    'When calling `deprecate`, you must provide the `since.available` and/or the `since.enabled` option.',
+    options.since.available || options.since.enabled
+  );
+
+  assert(
+    '`since.available` must be a valid SemVer version.',
+    !options.since.available || isSemVer(options.since.available)
+  );
+
+  assert('`since.enabled` must be a valid SemVer version.', !options.since.enabled || isSemVer(options.since.enabled));
+
+  assert(
+    'When calling `deprecate`, you must provide a valid SemVer version for the `until` option.',
+    isSemVer(options.until)
+  );
+
+  if (condition) {
+    return;
+  }
+
+  let message = formatMessage(description, options);
+
+  warn(message);
+  warn(getStackTrace());
+
+  // Return the message for testing purposes.
+  // This can be removed once we can register deprecation handlers.
+  return message;
+}
+
+function isSemVer(version) {
+  return semver.valid(version) !== null;
+}
+
+function formatMessage(description, options) {
+  let message = [`DEPRECATION: ${description}`, `[ID: ${options.id}]`];
+
+  if (options.url) {
+    message.push(`See ${options.url} for more details.`);
+  }
+
+  return message.join(' ');
+}
+
+function getStackTrace() {
+  let error = new Error();
+  let lines = error.stack.split('\n');
+
+  lines.shift(); // Remove the word `Error`.
+
+  return lines.map((line) => line.trim()).join('\n');
+}
+
+function warn(message) {
+  console.warn(chalk.yellow(message));
+}
+
+module.exports = deprecate;

package/lib/debug/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  assert: require('./assert'),
+  deprecate: require('./deprecate'),
+};

package/lib/models/host-info-cache.js

@@ -242,11 +242,9 @@ class HostInfoCache {
         path.push(currentPackageInfo);
 
         queue.push(
-          ...[
-            ...inRepoAddons,
-            ...Object.values(dependencyPackages),
-            ...Object.values(devDependencyPackages),
-          ].map((pkgInfo) => ({ pkgInfo, path: [...path] }))
+          ...[...inRepoAddons, ...Object.values(dependencyPackages), ...Object.values(devDependencyPackages)].map(
+            (pkgInfo) => ({ pkgInfo, path: [...path] })
+          )
         );
       }
     }

package/lib/models/per-bundle-addon-cache/index.js

@@ -234,9 +234,8 @@ class PerBundleAddonCache {
       return bundleHost;
     }
 
-    let { hostPackageInfo, hostAndAncestorBundledPackageInfos } = this.project.hostInfoCache.getHostAddonInfo(
-      bundleHost
-    );
+    let { hostPackageInfo, hostAndAncestorBundledPackageInfos } =
+      this.project.hostInfoCache.getHostAddonInfo(bundleHost);
 
     if (!hostAndAncestorBundledPackageInfos.has(addonPkgInfo)) {
       return bundleHost;

package/lib/tasks/npm-task.js

@@ -187,7 +187,7 @@ class NpmTask extends Task {
       logger.info('yarn.lock not found');
     }
 
-    if (this.hasPNPMLock()) {
+    if (await this.hasPNPMLock()) {
       logger.info('pnpm-lock.yaml found -> trying pnpm');
       try {
         let result = await this.checkPNPM();