ember-cli 4.0.0-beta.4 → 4.1.0

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();

package/lib/utilities/get-lang-arg.js

@@ -1,6 +1,6 @@
-/* 
+/*
 
-This utility processes the argument passed with the `lang` option 
+This utility processes the argument passed with the `lang` option
 in ember-cli, i.e. `ember (new||init||addon) app-name --lang=langArg`
 
 Execution Context (usage, input, output, error handling, etc.):
@@ -35,11 +35,11 @@ Warning Messages (if necessary):
 
 'use strict';
 
-const getLangCodeInfo = require('is-language-code');
+const { isLangCode } = require('is-language-code');
 
 // Primary language code validation function (boolean)
 function isValidLangCode(langArg) {
-  return getLangCodeInfo(langArg).res;
+  return isLangCode(langArg).res;
 }
 
 // Generates the result to pass back to `init`
@@ -48,29 +48,29 @@ function getResult(langArg) {
 }
 
 /*
-Misuse case: attempt to set application programming language via `lang` 
+Misuse case: attempt to set application programming language via `lang`
 AND
 Edge case: valid language code AND a common programming language abbreviation
 -------------------------------------------------------------------------------
-It is possible that a user might mis-interpret the type of `language` that is 
-specified by the `--lang` flag. One notable potential `misuse case` is one in 
-which the user thinks `--lang` specifies the application's programming 
-language. For example, the user might call `ember new my-app --lang=typescript` 
-expecting to achieve an effect similar to the one provided by the 
+It is possible that a user might mis-interpret the type of `language` that is
+specified by the `--lang` flag. One notable potential `misuse case` is one in
+which the user thinks `--lang` specifies the application's programming
+language. For example, the user might call `ember new my-app --lang=typescript`
+expecting to achieve an effect similar to the one provided by the
 `ember-cli-typescript` addon.
 
-This misuse case is handled by checking the input `langArg` against an Array 
-containing notable programming language-related values: language names 
-(e.g. `JavaScript`), abbreviations (e.g. `js`), file extensions (e.g. `.js`), 
-or versions (e.g. `ES6`), etc. Specifically, if `langArg` is found within this 
-reference list, a WARNING message that describes correct `--lang` usage will 
-be emitted. The `lang` attribute will not be assigned in `index.html`, and the 
+This misuse case is handled by checking the input `langArg` against an Array
+containing notable programming language-related values: language names
+(e.g. `JavaScript`), abbreviations (e.g. `js`), file extensions (e.g. `.js`),
+or versions (e.g. `ES6`), etc. Specifically, if `langArg` is found within this
+reference list, a WARNING message that describes correct `--lang` usage will
+be emitted. The `lang` attribute will not be assigned in `index.html`, and the
 user will be notified with a corresponding STATUS message.
 
 There are several edge cases (marked) where `langArg` is both a commonly-used
-abbreviation for a programming language AND a valid language code. The behavior 
-for these cases is to assume the user has used `--lang` correctly and set the 
-`lang` attribute to the valid code in `index.html`. To cover for potential 
+abbreviation for a programming language AND a valid language code. The behavior
+for these cases is to assume the user has used `--lang` correctly and set the
+`lang` attribute to the valid code in `index.html`. To cover for potential
 misuage, several helpful messages will also be emitted:
 - `ts` is a valid language code AND a common programming language abbreviation
 - the `lang` attribute will be set to `ts` in the application
@@ -141,44 +141,44 @@ function isValidCodeAndProg(langArg) {
   return isValidLangCode(langArg) && isProgLang(langArg);
 }
 
-/* 
+/*
 Misuse case: `--lang` called without `langArg` (NB: parser bug workaround)
 -------------------------------------------------------------------------------
-This is a workaround for handling an existing bug in the ember-cli parser  
-where the `--lang` option is specified in the command without a corresponding 
-value for `langArg`. 
+This is a workaround for handling an existing bug in the ember-cli parser
+where the `--lang` option is specified in the command without a corresponding
+value for `langArg`.
 
-As examples, the parser behavior would likely affect the following usages: 
+As examples, the parser behavior would likely affect the following usages:
   1. `ember new app-name --lang --skip-npm
   2. `ember new app-name --lang`
 
-In this context, the unintended parser behavior is that `langArg` will be 
-assingned to the String that immediately follows `--lang` in the command. If 
-`--lang` is the last explicitly defined part of the command (as in the second 
-example above), the first of any any `hidden` options pushed onto the command 
-after the initial parse (e.g. `--disable-analytics`, `--no-watcher`) will be 
-used when assigning `langArg`. 
+In this context, the unintended parser behavior is that `langArg` will be
+assingned to the String that immediately follows `--lang` in the command. If
+`--lang` is the last explicitly defined part of the command (as in the second
+example above), the first of any any `hidden` options pushed onto the command
+after the initial parse (e.g. `--disable-analytics`, `--no-watcher`) will be
+used when assigning `langArg`.
 
 In the above examples, `langArg` would likely be assigned as follows:
   1. `ember new app-name --lang --skip-npm => `langArg='--skip-npm'`
   2. `ember new app-name --lang` => `langArg='--disable-analytics'`
 
-The workaround impelemented herein is to check whether or not the value of 
-`langArg` starts with a hyphen. The rationale for this approach is based on 
+The workaround impelemented herein is to check whether or not the value of
+`langArg` starts with a hyphen. The rationale for this approach is based on
 the following underlying assumptions:
   - ALL CLI options start with (at least one) hyphen
   - NO valid language codes start with a hyphen
 
-If the leading hyphen is detected, the current behavior is to assume `--lang` 
-was declared without a corresponding specification. A WARNING message that 
-describes correct `--lang` usage will be emitted. The `lang` attribute will not 
-be assigned in `index.html`, and the user will be notified with a corresponding 
+If the leading hyphen is detected, the current behavior is to assume `--lang`
+was declared without a corresponding specification. A WARNING message that
+describes correct `--lang` usage will be emitted. The `lang` attribute will not
+be assigned in `index.html`, and the user will be notified with a corresponding
 STATUS message. Execution will not be halted.
 
-Other complications related to this parser behavior are considered out-of-scope 
-and not handled here. In the first example above, this workaround would ensure 
-that `lang` is not assigned to `--skip-npm`, but it would not guarantee that 
-`--skip-npm` is correctly processed as a command option. That is, `npm` may or 
+Other complications related to this parser behavior are considered out-of-scope
+and not handled here. In the first example above, this workaround would ensure
+that `lang` is not assigned to `--skip-npm`, but it would not guarantee that
+`--skip-npm` is correctly processed as a command option. That is, `npm` may or
 may not get skipped during execution.
 */
 
@@ -194,12 +194,12 @@ const MSG_HEAD = `An issue with the \`--lang\` flag returned the following messa
 
 // Message context from language code validation (valid: null, invalid: reason)
 function getLangCodeMsg(langArg) {
-  return getLangCodeInfo(langArg).message;
+  return isLangCode(langArg).message;
 }
 
 // Edge case: valid language code AND a common programming language abbreviation
 function getValidAndProgMsg(langArg) {
-  return `The \`--lang\` flag has been used with argument \`${langArg}\`, 
+  return `The \`--lang\` flag has been used with argument \`${langArg}\`,
   which is BOTH a valid language code AND an abbreviation for a programming language.
   ${getProgLangMsg(langArg)}`;
 }
@@ -218,15 +218,15 @@ function getCliMsg() {
 
 // 3. `STATUS` message: report if `lang` will be set in `index.html`
 function getStatusMsg(langArg, willSet) {
-  return `The human language of the application will ${willSet ? `be set to ${langArg}` : `NOT be set`} in 
+  return `The human language of the application will ${willSet ? `be set to ${langArg}` : `NOT be set`} in
   the \`<html>\` element's \`lang\` attribute in \`index.html\`.`;
 }
 
 // 4. `HELP` message: template for all `--lang`-related warnings emitted
-const MSG_HELP = `If this was not your intention, you may edit the \`<html>\` element's 
+const MSG_HELP = `If this was not your intention, you may edit the \`<html>\` element's
   \`lang\` attribute in \`index.html\` manually after the process is complete.
 Information about using the \`--lang\` flag:
-  The \`--lang\` flag sets the base human language of an app or test app: 
+  The \`--lang\` flag sets the base human language of an app or test app:
     - \`app/index.html\` (app)
     - \`tests/dummy/app/index.html\` (addon test app)
   If used, the lang option must specfify a valid language code.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.0.0-beta.4",
+  "version": "4.1.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,13 +37,13 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.13.8",
+    "@babel/core": "^7.16.0",
     "@babel/plugin-transform-modules-amd": "^7.12.1",
     "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.1",
+    "broccoli": "^3.5.2",
     "broccoli-amd-funnel": "^2.0.1",
     "broccoli-babel-transpiler": "^7.8.0",
     "broccoli-builder": "^0.18.14",
@@ -51,17 +51,17 @@
     "broccoli-config-loader": "^1.0.1",
     "broccoli-config-replace": "^1.1.2",
     "broccoli-debug": "^0.6.5",
-    "broccoli-funnel": "^3.0.5",
+    "broccoli-funnel": "^3.0.8",
     "broccoli-funnel-reducer": "^1.0.0",
     "broccoli-merge-trees": "^3.0.2",
     "broccoli-middleware": "^2.1.1",
     "broccoli-slow-trees": "^3.1.0",
-    "broccoli-source": "^3.0.0",
+    "broccoli-source": "^3.0.1",
     "broccoli-stew": "^3.0.0",
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.0",
-    "ci-info": "^2.0.0",
+    "ci-info": "^3.3.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -76,10 +76,10 @@
     "ember-cli-string-utils": "^1.1.0",
     "ember-source-channel-url": "^3.0.0",
     "ensure-posix-path": "^1.1.1",
-    "execa": "^5.0.0",
+    "execa": "^5.1.1",
     "exit": "^0.1.2",
     "express": "^4.17.1",
-    "filesize": "^6.1.0",
+    "filesize": "^8.0.6",
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
@@ -87,16 +87,16 @@
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^7.1.6",
+    "glob": "^7.2.0",
     "heimdalljs": "^0.2.6",
-    "heimdalljs-fs-monitor": "^1.1.0",
+    "heimdalljs-fs-monitor": "^1.1.1",
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
-    "inflection": "^1.12.0",
+    "inflection": "^1.13.1",
     "is-git-url": "^1.0.0",
-    "is-language-code": "^2.0.0",
-    "isbinaryfile": "^4.0.6",
+    "is-language-code": "^3.1.0",
+    "isbinaryfile": "^4.0.8",
     "js-yaml": "^3.14.0",
     "json-stable-stringify": "^1.0.1",
     "leek": "0.0.24",
@@ -106,7 +106,7 @@
     "minimatch": "^3.0.4",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^8.1.1",
+    "npm-package-arg": "^8.1.5",
     "p-defer": "^3.0.0",
     "portfinder": "^1.0.28",
     "promise-map-series": "^0.3.0",
@@ -114,7 +114,7 @@
     "quick-temp": "^0.1.8",
     "resolve": "^1.20.0",
     "resolve-package-path": "^3.1.0",
-    "sane": "^4.1.0",
+    "sane": "^5.0.1",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1",
     "sort-package-json": "^1.49.0",
@@ -131,33 +131,33 @@
   },
   "devDependencies": {
     "@ember/edition-utils": "^1.2.0",
-    "@octokit/rest": "^18.0.15",
+    "@octokit/rest": "^18.12.0",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-files": "^1.4.0",
+    "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
     "eslint": "^7.11.0",
     "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-chai-expect": "^2.2.0",
-    "eslint-plugin-mocha": "^8.1.0",
+    "eslint-plugin-chai-expect": "^3.0.0",
+    "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
     "fixturify": "^2.1.0",
-    "is-language-code": "^2.0.0",
-    "jsdom": "^16.4.0",
+    "jsdom": "^19.0.0",
     "latest-version": "^5.1.0",
     "mocha": "^8.3.2",
-    "nock": "^13.0.5",
+    "nock": "^13.2.1",
     "nyc": "^15.1.0",
-    "prettier": "2.2.1",
-    "release-it": "^14.4.1",
+    "prettier": "2.5.1",
+    "release-it": "^14.11.6",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
-    "supertest": "^6.1.3",
-    "testdouble": "^3.16.1",
+    "supertest": "^6.1.6",
+    "testdouble": "^3.16.3",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",
     "which": "2.0.2",

package/.github/ISSUE_TEMPLATE.md

@@ -1,12 +0,0 @@
-Thank you for taking the time to open an issue!
-
-For bug reports please include the following section in your issue details.
-If you include instructions on how to reproduce the bug or a failing test case
-it will make it easier for us to track down the issue you're having.
-
----
-
-Output from `ember version --verbose && npm --version && yarn --version`:
-```
-[Replace this line with the output.]
-```

package/.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "03:00"
-  open-pull-requests-limit: 10
-  versioning-strategy: increase
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "03:00"
-  open-pull-requests-limit: 10

package/.github/workflows/coverage.yml

@@ -1,31 +0,0 @@
-name: Code Coverage
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  coverage:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v2.1.5
-        with:
-          node-version: 12.x
-
-      - run: yarn install --frozen-lockfile --non-interactive
-
-      - name: Test && Report to Code Climate
-        uses: paambaati/codeclimate-action@v2.7.5
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        with:
-          coverageCommand: yarn test:cover
-          coverageLocations: "coverage/lcov.info:lcov"
-
-      - name: Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

package/docs/analytics.md

@@ -1,44 +0,0 @@
-# Analytics:
-
-Ember-cli tracks (only) the following data points:
-
-* ember-cli version
-* build/rebuild/live-reload times
-* how many errors occurred
-
-** note: no personally identifying information is tracked, if something is
-being leaked please [disclose responsibly](https://emberjs.com/security) **
-
-This information is used to:
-
-* See if there are upgrade blockers (users stuck on old version)
-* Have a broad idea for build performance (to make sure we don't regress, and how to prioritize)
-* See which high-level features are used (serve/test/build/generate etc.)
-* See an increase/decrease in error rates
-
-## Still Not comfortable?
-
-We understand! To permanently disable any analytics gathering you can update your project's `.ember-cli` file (or `$HOME/.ember-cli` for user-wide):
-
-```json
-{
-  "disableAnalytics": true
-}
-```
-
-## Who has access
-
-The ember and ember-cli core teams.
-
-## Links to each code-point where ember-cli emits tracking information
-
-* command name (ember server, ember exam, etc.): to understand what high-level features are used
-  * https://github.com/ember-cli/ember-cli/blob/2da9de596370c0e78ea0c0c3ffcd6a551d2863a9/lib/models/command.js#L277
-* build error: the name of the error
-  * https://github.com/ember-cli/ember-cli/blob/6ec50a1fd21d961f0b0e2ca4daf66a8e7dea6417/lib/models/watcher.js#L32-L34
-* build/rebuild time
-  * https://github.com/ember-cli/ember-cli/blob/503ede1fcb5224d54dc36f82af84550a91d90f26/lib/tasks/build.js#L33
-  * https://github.com/ember-cli/ember-cli/blob/503ede1fcb5224d54dc36f82af84550a91d90f26/lib/tasks/build.js#L44
-* live reload
-  * https://github.com/ember-cli/ember-cli/blob/503ede1fcb5224d54dc36f82af84550a91d90f26/lib/tasks/server/livereload-server.js#L167
-  * https://github.com/ember-cli/ember-cli/blob/503ede1fcb5224d54dc36f82af84550a91d90f26/lib/tasks/server/livereload-server.js#L181