ember-cli 4.11.0 → 4.12.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # ember-cli Changelog
 
+## v4.12.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.11.0...v4.12.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.11.0...v4.12.0-beta.0)
+
+#### Changelog
+
+- [#10039](https://github.com/ember-cli/ember-cli/pull/10039) [CLEANUP] Remove unused test fixtures [@bertdeblock](https://github.com/bertdeblock)
+- [#10040](https://github.com/ember-cli/ember-cli/pull/10040) [CLEANUP] Remove MU-related debug code [@bertdeblock](https://github.com/bertdeblock)
+- [#10091](https://github.com/ember-cli/ember-cli/pull/10091) [BUGFIX] Fix looking up the default blueprint for scoped addons [@GendelfLugansk](https://github.com/GendelfLugansk)
+- [#10107](https://github.com/ember-cli/ember-cli/pull/10107) [INTERNAL] Remove old `uninstall:npm` command [@bertdeblock](https://github.com/bertdeblock)
+- [#10122](https://github.com/ember-cli/ember-cli/pull/10122) [ENHANCEMENT] Add Stylelint setup to `app` and `addon` blueprints [RFC 814] [@bmish](https://github.com/bmish)
+- [#10142](https://github.com/ember-cli/ember-cli/pull/10142) [ENHANCEMENT] Update ESLint to v8 in `app` and `addon` blueprints [@bertdeblock](https://github.com/bertdeblock)
+- [#10157](https://github.com/ember-cli/ember-cli/pull/10157) [ENHANCEMENT] Exclude `ember-cli-terser` when generating apps using the `--embroider` option [@bertdeblock](https://github.com/bertdeblock)
+- [#10159](https://github.com/ember-cli/ember-cli/pull/10159) [ENHANCEMENT] Exclude `ember-cli-sri` when generating apps using the `--embroider` option [@bertdeblock](https://github.com/bertdeblock)
+- [#10161](https://github.com/ember-cli/ember-cli/pull/10161) [ENHANCEMENT] Remove NPM version checking [@bertdeblock](https://github.com/bertdeblock)
+- [#10166](https://github.com/ember-cli/ember-cli/pull/10166) [INTERNAL] Remove unused dependencies [@bertdeblock](https://github.com/bertdeblock)
+- [#10169](https://github.com/ember-cli/ember-cli/pull/10169) [ENHANCEMENT] Remove `app.import` comment in `app` blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#10172](https://github.com/ember-cli/ember-cli/pull/10172) [PERFORMANCE] Lazy require heavier packages [@bertdeblock](https://github.com/bertdeblock)
+- [#10173](https://github.com/ember-cli/ember-cli/pull/10173) [ENHANCEMENT] Don't delete the newly-generated app directory when an error occurs [@ef4](https://github.com/ef4)
+- [#10174](https://github.com/ember-cli/ember-cli/pull/10174) [INTERNAL] Clean up removal of `bower.json` and `package.json` files in `addon` blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#10180](https://github.com/ember-cli/ember-cli/pull/10180) [ENHANCEMENT] Update `ember-welcome-page` to v7 in `app` blueprint [@ijlee2](https://github.com/ijlee2)
+- [#10188](https://github.com/ember-cli/ember-cli/pull/10188) [ENHANCEMENT] Update ESLint parser `ecmaVersion` to `latest` in `app` blueprint [@elwayman02](https://github.com/elwayman02)
+- [#10189](https://github.com/ember-cli/ember-cli/pull/10189) [ENHANCEMENT] Add v4.8 LTS to `addon` blueprint - Remove v3.28 LTS and `ember-classic` scenario [@bertdeblock](https://github.com/bertdeblock)
+- [#10192](https://github.com/ember-cli/ember-cli/pull/10192) [BUGFIX] The `addon` command should throw when no addon name is provided [@bertdeblock](https://github.com/bertdeblock)
+- [#10198](https://github.com/ember-cli/ember-cli/pull/10198) [INTERNAL] Output TypeScript apps and addons for StackBlitz [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+Thank you to all who took the time to contribute!
+
 ## v4.11.0
 
 #### Blueprint Changes

package/blueprints/addon/additional-package.json

@@ -11,7 +11,7 @@
     "ember-try": "^2.0.0"
   },
   "peerDependencies": {
-    "ember-source": "^3.28.0 || ^4.0.0"
+    "ember-source": "^4.0.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

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

@@ -57,12 +57,11 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.28
           - ember-lts-4.4
+          - ember-lts-4.8
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-classic
           - embroider-safe
           - embroider-optimized
 

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

@@ -51,12 +51,11 @@ 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.28
     - env: EMBER_TRY_SCENARIO=ember-lts-4.4
+    - env: EMBER_TRY_SCENARIO=ember-lts-4.8
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
-    - env: EMBER_TRY_SCENARIO=ember-classic
     - env: EMBER_TRY_SCENARIO=embroider-safe
     - env: EMBER_TRY_SCENARIO=embroider-optimized
 <% if (yarn) { %>

package/blueprints/addon/files/README.md

@@ -5,8 +5,8 @@
 
 ## Compatibility
 
-* Ember.js v3.28 or above
-* Ember CLI v3.28 or above
+* Ember.js v4.4 or above
+* Ember CLI v4.4 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.28',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.4.0',
           },
         },
       },
       {
-        name: 'ember-lts-4.4',
+        name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
-            'ember-source': '~4.4.0',
+            'ember-source': '~4.8.0',
           },
         },
       },
@@ -47,24 +47,6 @@ module.exports = async function () {
           },
         },
       },
-      {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.28.0',
-          },
-          ember: {
-            edition: 'classic',
-          },
-        },
-      },
       embroiderSafe(),
       embroiderOptimized(),
     ],

package/blueprints/addon/files/npmignore

@@ -18,6 +18,8 @@
 /.gitignore
 /.prettierignore
 /.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig

package/blueprints/addon/index.js

@@ -111,13 +111,6 @@ module.exports = {
   },
 
   async afterInstall(options) {
-    let packagePath = path.join(this.path, 'files', 'package.json');
-    let bowerPath = path.join(this.path, 'files', 'bower.json');
-
-    [packagePath, bowerPath].forEach((filePath) => {
-      fs.removeSync(filePath);
-    });
-
     if (options.typescript) {
       await this.addAddonToProject({
         name: 'ember-cli-typescript',

package/blueprints/app/files/.eslintrc.js

@@ -2,12 +2,15 @@
 
 module.exports = {
   root: true,
-  parser: '<%= typescript ? '@typescript-eslint/parser' : 'babel-eslint' %>',
+  parser: '<%= typescript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
   parserOptions: {
-    ecmaVersion: 2018,<% if (!typescript) { %>
+    ecmaVersion: 'latest',<% if (!typescript) { %>
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
     },<% } %>
   },
   plugins: ['ember'<% if (typescript) { %>, '@typescript-eslint'<% } %>],
@@ -35,6 +38,7 @@ module.exports = {
       files: [
         './.eslintrc.js',
         './.prettierrc.js',
+        './.stylelintrc.js',
         './.template-lintrc.js',
         './ember-cli-build.js',<% if (blueprint !== 'app') { %>
         './index.js',<% } %>

package/blueprints/app/files/.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

package/blueprints/app/files/.stylelintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+};

package/blueprints/app/files/app/styles/app.css

@@ -0,0 +1 @@
+/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */

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

@@ -7,19 +7,6 @@ module.exports = function (defaults) {
     // Add options here
   });
 
-  // Use `app.import` to add additional libraries to the generated
-  // output files.
-  //
-  // If you need to use different assets in different
-  // environments, specify an object as the first parameter. That
-  // object's keys should be the environment name and the values
-  // should be the asset to use in that environment.
-  //
-  // If the library that you are including contains AMD or ES6
-  // modules that you would like to import into your application
-  // please specify an object with the list of modules as keys
-  // along with the exports of each module as its value.
-
   <% if (embroider) { %>const { Webpack } = require('@embroider/webpack');
   return require('@embroider/compat').compatBuild(app, Webpack, {
     skipBabel: [

package/blueprints/app/files/package.json

@@ -13,6 +13,8 @@
   "scripts": {
     "build": "ember build --environment=production",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\"",
+    "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
     "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
@@ -24,7 +26,9 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@ember/optional-features": "^2.0.0",
+    "<% if (!typescript) { %>@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "<% } %>@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3<% if (embroider) { %>",
     "@embroider/compat": "^2.1.1",
@@ -32,9 +36,8 @@
     "@embroider/webpack": "^2.1.1<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0<% } else { %>",
-    "babel-eslint": "^10.1.0<% } %>",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^7.6.0",
     "ember-auto-import": "^2.6.1",
@@ -43,9 +46,9 @@
     "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.2.0",
-    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.2",
+    "ember-cli-terser": "^4.0.2<% } %>",
     "ember-data": "~4.11.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
@@ -53,11 +56,11 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.11.0",
+    "ember-source": "~4.12.0-beta.2",
     "ember-template-lint": "^5.6.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.1<% } %>",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-ember": "^11.4.7",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
@@ -66,6 +69,10 @@
     "prettier": "^2.8.4",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
+    "stylelint": "^15.2.0",
+    "stylelint-config-prettier": "^9.0.5",
+    "stylelint-config-standard": "^30.0.1",
+    "stylelint-prettier": "^3.0.0",
     "tracked-built-ins": "^3.1.1",
     "webpack": "^5.75.0"
   },

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.11.0-release-9b26c614f0"
+        "version": "4.12.0-beta.0-beta-3c14502fb3"
     },
     "files": {
         "lib\\broccoli\\default-packager.js": {
@@ -613,7 +613,7 @@
             "module": "ember-cli",
             "namespace": "Blueprint",
             "file": "lib\\models\\blueprint.js",
-            "line": 32,
+            "line": 31,
             "description": "A blueprint is a bundle of template files with optional install\nlogic.\n\nBlueprints follow a simple structure. Let's take the built-in\n`controller` blueprint as an example:\n\n```\nblueprints/controller\n├── files\n│   ├── app\n│   │   └── __path__\n│   │       └── __name__.js\n└── index.js\n\nblueprints/controller-test\n├── files\n│   └── tests\n│       └── unit\n│           └── controllers\n│               └── __test__.js\n└── index.js\n```\n\n## Files\n\n`files` contains templates for the all the files to be\ninstalled into the target directory.\n\nThe `__name__` token is subtituted with the dasherized\nentity name at install time. For example, when the user\ninvokes `ember generate controller foo` then `__name__` becomes\n`foo`. When the `--pod` flag is used, for example `ember\ngenerate controller foo --pod` then `__name__` becomes\n`controller`.\n\nThe `__path__` token is substituted with the blueprint\nname at install time. For example, when the user invokes\n`ember generate controller foo` then `__path__` becomes\n`controller`. When the `--pod` flag is used, for example\n`ember generate controller foo --pod` then `__path__`\nbecomes `foo` (or `<podModulePrefix>/foo` if the\npodModulePrefix is defined). This token is primarily for\npod support, and is only necessary if the blueprint can be\nused in pod structure. If the blueprint does not require pod\nsupport, simply use the blueprint name instead of the\n`__path__` token.\n\nThe `__test__` token is substituted with the dasherized\nentity name and appended with `-test` at install time.\nThis token is primarily for pod support and only necessary\nif the blueprint requires support for a pod structure. If\nthe blueprint does not require pod support, simply use the\n`__name__` token instead.\n\n## Template Variables (AKA Locals)\n\nVariables can be inserted into templates with\n`<%= someVariableName %>`.\n\nFor example, the built-in `util` blueprint\n`files/app/utils/__name__.js` looks like this:\n\n```js\nexport default function <%= camelizedModuleName %>() {\n  return true;\n}\n```\n\n`<%= camelizedModuleName %>` is replaced with the real\nvalue at install time.\n\nThe following template variables are provided by default:\n\n- `dasherizedPackageName`\n- `classifiedPackageName`\n- `dasherizedModuleName`\n- `classifiedModuleName`\n- `camelizedModuleName`\n\n`packageName` is the project name as found in the project's\n`package.json`.\n\n`moduleName` is the name of the entity being generated.\n\nThe mechanism for providing custom template variables is\ndescribed below.\n\n## Index.js\n\nCustom installation and uninstallation behavior can be added\nby overriding the hooks documented below. `index.js` should\nexport a plain object, which will extend the prototype of the\n`Blueprint` class. If needed, the original `Blueprint` prototype\ncan be accessed through the `_super` property.\n\n```js\nmodule.exports = {\n  locals(options) {\n    // Return custom template variables here.\n    return {};\n  },\n\n  normalizeEntityName(entityName) {\n    // Normalize and validate entity name here.\n    return entityName;\n  },\n\n  fileMapTokens(options) {\n    // Return custom tokens to be replaced in your files\n    return {\n      __token__(options){\n        // logic to determine value goes here\n        return 'value';\n      }\n    }\n  },\n\n  filesPath(options) {\n    return path.join(this.path, 'files');\n  },\n\n  beforeInstall(options) {},\n  afterInstall(options) {},\n  beforeUninstall(options) {},\n  afterUninstall(options) {}\n\n};\n```\n\n## Blueprint Hooks\n\n### beforeInstall & beforeUninstall\n\nCalled before any of the template files are processed and receives\nthe `options` and `locals` hashes as parameters. Typically used for\nvalidating any additional command line options or for any asynchronous\nsetup that is needed.   As an example, the `controller` blueprint validates\nits `--type` option in this hook.  If you need to run any asynchronous code,\nwrap it in a promise and return that promise from these hooks.  This will\nensure that your code is executed correctly.\n\n### afterInstall & afterUninstall\n\nThe `afterInstall` and `afterUninstall` hooks receives the same\narguments as `locals`. Use it to perform any custom work after the\nfiles are processed. For example, the built-in `route` blueprint\nuses these hooks to add and remove relevant route declarations in\n`app/router.js`.\n\n### Overriding Install\n\nIf you don't want your blueprint to install the contents of\n`files` you can override the `install` method. It receives the\nsame `options` object described above and must return a promise.\nSee the built-in `resource` blueprint for an example of this.",
             "is_constructor": 1,
             "extends": "CoreObject",
@@ -797,7 +797,7 @@
             "module": "ember-cli",
             "namespace": "",
             "file": "lib\\tasks\\transforms\\amd\\index.js",
-            "line": 6,
+            "line": 4,
             "description": "This addon is used to register a custom AMD transform for app and addons to use.",
             "is_constructor": 1
         },
@@ -3661,7 +3661,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 201,
+            "line": 200,
             "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": "",
@@ -3673,7 +3673,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 222,
+            "line": 221,
             "description": "Process the options object coming from either\nthe `init`, `install` or `uninstall` hook.",
             "access": "private",
             "tagname": "",
@@ -3691,7 +3691,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 238,
+            "line": 237,
             "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": "",
@@ -3713,7 +3713,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 255,
+            "line": 254,
             "description": "Used to retrieve files for blueprint.",
             "access": "public",
             "tagname": "",
@@ -3735,7 +3735,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 278,
+            "line": 277,
             "itemtype": "method",
             "name": "srcPath",
             "params": [
@@ -3754,7 +3754,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 287,
+            "line": 286,
             "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": "",
@@ -3776,7 +3776,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 307,
+            "line": 306,
             "description": "Write a status and message to the UI",
             "access": "private",
             "tagname": "",
@@ -3804,7 +3804,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 321,
+            "line": 320,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3825,7 +3825,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 333,
+            "line": 332,
             "description": "Actions lookup",
             "access": "private",
             "tagname": "",
@@ -3837,7 +3837,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 371,
+            "line": 370,
             "description": "Calls an action.",
             "access": "private",
             "tagname": "",
@@ -3863,7 +3863,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 389,
+            "line": 388,
             "description": "Prints warning for pod unsupported.",
             "access": "private",
             "tagname": "",
@@ -3874,7 +3874,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 406,
+            "line": 405,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3891,7 +3891,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 417,
+            "line": 416,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3908,7 +3908,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 446,
+            "line": 445,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3940,7 +3940,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 472,
+            "line": 471,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -3966,7 +3966,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 526,
+            "line": 525,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4716,7 +4716,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1544,
+            "line": 1536,
             "description": "Loads a blueprint from given path.",
             "static": 1,
             "itemtype": "method",
@@ -4744,7 +4744,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1572,
+            "line": 1564,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4774,7 +4774,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1621,
+            "line": 1613,
             "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",
@@ -4785,7 +4785,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1636,
+            "line": 1628,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4795,7 +4795,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1642,
+            "line": 1634,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4805,7 +4805,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1648,
+            "line": 1640,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4815,7 +4815,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1656,
+            "line": 1648,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4837,7 +4837,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1669,
+            "line": 1661,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4855,7 +4855,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1680,
+            "line": 1672,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4873,7 +4873,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1689,
+            "line": 1681,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4900,7 +4900,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1703,
+            "line": 1695,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4922,7 +4922,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1715,
+            "line": 1707,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4945,7 +4945,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1730,
+            "line": 1722,
             "description": "Looks for a __path__ token in the files folder. Must be present for\nthe blueprint to support pod tokens.",
             "access": "private",
             "tagname": "",
@@ -4968,7 +4968,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1769,
+            "line": 1761,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4990,7 +4990,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1783,
+            "line": 1775,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5012,7 +5012,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1793,
+            "line": 1785,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5027,7 +5027,7 @@
         },
         {
             "file": "lib\\models\\blueprint.js",
-            "line": 1806,
+            "line": 1798,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -6422,7 +6422,7 @@
         },
         {
             "file": "lib\\tasks\\npm-task.js",
-            "line": 151,
+            "line": 131,
             "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/broccoli/default-packager.js

@@ -557,10 +557,7 @@ module.exports = class DefaultPackager {
       };
 
       let stylesAndVendor = callAddonsPreprocessTreeHook(this.project, 'css', tree);
-      stylesAndVendor = this._debugTree(stylesAndVendor, 'mu-layout:addonsPreprocessTree:css');
-
       let preprocessedStyles = preprocessCss(stylesAndVendor, '/app/styles', '/assets', options);
-      preprocessedStyles = this._debugTree(preprocessedStyles, 'mu-layout:preprocess:css');
 
       let vendorStyles = [];
       for (let outputFile in this.styleOutputFiles) {

package/lib/commands/addon.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const SilentError = require('silent-error');
 const NewCommand = require('./new');
 
 module.exports = NewCommand.extend({
@@ -30,4 +31,16 @@ module.exports = NewCommand.extend({
   ],
 
   anonymousOptions: ['<addon-name>'],
+
+  run(commandOptions, commandArguments) {
+    let addonName = commandArguments[0];
+
+    if (addonName) {
+      return this._super(commandOptions, commandArguments);
+    }
+
+    return Promise.reject(
+      new SilentError('The `ember addon` command requires a name to be specified. For more details, run `ember help`.')
+    );
+  },
 });

package/lib/commands/new.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const fs = require('fs-extra');
 const chalk = require('chalk');
 const Command = require('../models/command');
 const Project = require('../models/project');
@@ -115,7 +114,7 @@ module.exports = Command.extend({
       project: Project.nullProject(this.ui, this.cli),
     });
 
-    let opts = await this.runTask('CreateAndStepIntoDirectory', {
+    await this.runTask('CreateAndStepIntoDirectory', {
       projectName,
       directoryName: commandOptions.directory,
       dryRun: commandOptions.dryRun,
@@ -123,17 +122,6 @@ module.exports = Command.extend({
 
     initCommand.project.root = process.cwd();
 
-    try {
-      let response = await initCommand.run(commandOptions, rawArgs);
-      return response;
-    } catch (err) {
-      let { initialDirectory, projectDirectory } = opts;
-
-      process.chdir(initialDirectory);
-      await fs.remove(projectDirectory);
-
-      console.log(chalk.red(`Error creating new application. Removing generated directory \`./${projectDirectory}\``));
-      throw err;
-    }
+    return await initCommand.run(commandOptions, rawArgs);
   },
 });

package/lib/commands/test.js

@@ -10,8 +10,6 @@ const fs = require('fs');
 const temp = require('temp');
 temp.track();
 
-require('express').static.mime.define({ 'application/wasm': ['wasm'] });
-
 let defaultPort = 7357;
 
 module.exports = Command.extend({
@@ -81,6 +79,9 @@ module.exports = Command.extend({
   init() {
     this._super.apply(this, arguments);
 
+    // Make sure Testem supports the Wasm MIME type:
+    require('express').static.mime.define({ 'application/wasm': ['wasm'] });
+
     this.Builder = this.Builder || Builder;
     this.Watcher = this.Watcher || Watcher;
 

package/lib/models/blueprint.js

@@ -23,7 +23,6 @@ const EOL = require('os').EOL;
 const bowEpParser = require('bower-endpoint-parser');
 const logger = require('heimdalljs-logger')('ember-cli:blueprint');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const { removeTypes } = require('remove-types');
 const isAddon = require('../utilities/is-addon');
 const { deprecate } = require('../debug');
 
@@ -532,6 +531,7 @@ let Blueprint = CoreObject.extend({
   async convertToJS(fileInfo) {
     let rendered = await fileInfo.render();
 
+    const { removeTypes } = require('remove-types');
     const transformed = await removeTypes(rendered);
 
     fileInfo.rendered = transformed;
@@ -1508,23 +1508,6 @@ let Blueprint = CoreObject.extend({
 Blueprint.lookup = function (name, options) {
   options = options || {};
 
-  if (name.includes(path.sep)) {
-    let blueprintPath = path.resolve(name);
-    let isNameAPath = Boolean(blueprintPath);
-
-    if (isNameAPath) {
-      if (Blueprint._existsSync(blueprintPath)) {
-        return Blueprint.load(blueprintPath, options.blueprintOptions);
-      }
-
-      if (!options.ignoreMissing) {
-        throw new SilentError(`Unknown blueprint: ${name}`);
-      }
-
-      return;
-    }
-  }
-
   let lookupPaths = generateLookupPaths(options.paths);
 
   let lookupPath;
@@ -1536,6 +1519,15 @@ Blueprint.lookup = function (name, options) {
     }
   }
 
+  // Check if `name` itself is a path to a blueprint:
+  if (name.includes(path.sep)) {
+    let blueprintPath = path.resolve(name);
+
+    if (Blueprint._existsSync(blueprintPath)) {
+      return Blueprint.load(blueprintPath, options.blueprintOptions);
+    }
+  }
+
   if (!options.ignoreMissing) {
     throw new SilentError(`Unknown blueprint: ${name}`);
   }

package/lib/tasks/interactive-new.js

@@ -1,9 +1,5 @@
 'use strict';
 
-const inquirer = require('inquirer');
-const { isLangCode } = require('is-language-code');
-const osLocale = require('os-locale');
-
 const Task = require('../models/task');
 const isValidProjectName = require('../utilities/valid-project-name');
 
@@ -11,6 +7,8 @@ const DEFAULT_LOCALE = 'en-US';
 
 class InteractiveNewTask extends Task {
   async run(newCommandOptions, _testAnswers) {
+    const inquirer = require('inquirer');
+
     let prompt = inquirer.createPromptModule();
     let questions = await this.getQuestions(newCommandOptions);
     let answers = await prompt(questions, _testAnswers);
@@ -24,6 +22,8 @@ class InteractiveNewTask extends Task {
   }
 
   async getQuestions(newCommandOptions = {}) {
+    const { isLangCode } = require('is-language-code');
+
     return [
       {
         name: 'blueprint',
@@ -145,6 +145,8 @@ class InteractiveNewTask extends Task {
   }
 
   getUserLocale() {
+    const osLocale = require('os-locale');
+
     return osLocale();
   }
 }

package/lib/tasks/npm-task.js

@@ -25,8 +25,6 @@ class NpmTask extends Task {
 
     // The command to run: can be 'install' or 'uninstall'
     this.command = '';
-
-    this.versionConstraints = '3 || 4 || 5 || 6 || 7 || 8';
   }
 
   get packageManagerOutputName() {
@@ -115,24 +113,6 @@ class NpmTask extends Task {
       let version = result.stdout;
       logger.info('npm --version: %s', version);
 
-      let ok = semver.satisfies(version, this.versionConstraints);
-      if (!ok) {
-        logger.warn('npm --version is outside of version constraint: %s', this.versionConstraints);
-
-        let below = semver.ltr(version, this.versionConstraints);
-        if (below) {
-          throw new SilentError(
-            'Ember CLI is now using the global npm, but your npm version is outdated.\n' +
-              'Please update your global npm version by running: npm install -g npm'
-          );
-        }
-
-        this.ui.writeWarnLine(
-          'Ember CLI is using the global npm, but your npm version has not yet been ' +
-            'verified to work with the current Ember CLI release.'
-        );
-      }
-
       return { name: 'npm', version };
     } catch (error) {
       logger.error('npm --version failed: %s', error);

package/lib/tasks/transforms/amd/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const shimAmd = require('./amd-shim');
-
 class AmdTransformAddon {
   /**
    * This addon is used to register a custom AMD transform for app and addons to use.
@@ -15,6 +13,8 @@ class AmdTransformAddon {
   }
 
   importTransforms() {
+    const shimAmd = require('./amd-shim');
+
     return {
       amd: {
         transform: (tree, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.11.0",
+  "version": "4.12.0-beta.0",
   "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.20.12",
-    "@babel/plugin-transform-modules-amd": "^7.19.6",
+    "@babel/core": "^7.21.0",
+    "@babel/plugin-transform-modules-amd": "^7.20.11",
     "amd-name-resolver": "^1.3.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "bower-config": "^1.4.3",
@@ -74,7 +74,6 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^3.3.0",
     "ember-cli-string-utils": "^1.1.0",
-    "ember-source-channel-url": "^3.0.0",
     "ensure-posix-path": "^1.1.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
@@ -83,11 +82,11 @@
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^8.0.3",
+    "glob": "^8.1.0",
     "heimdalljs": "^0.2.6",
     "heimdalljs-fs-monitor": "^1.1.1",
     "heimdalljs-graph": "^1.0.0",
@@ -103,7 +102,7 @@
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^5.1.0",
+    "minimatch": "^7.4.1",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
     "npm-package-arg": "^10.1.0",
@@ -116,7 +115,7 @@
     "remove-types": "^1.0.0",
     "resolve": "^1.22.1",
     "resolve-package-path": "^4.0.3",
-    "safe-stable-stringify": "^2.3.1",
+    "safe-stable-stringify": "^2.4.2",
     "sane": "^5.0.1",
     "semver": "^7.3.5",
     "silent-error": "^1.1.1",
@@ -126,15 +125,14 @@
     "testem": "^3.10.1",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "walk-sync": "^3.0.0",
     "watch-detector": "^1.0.2",
-    "workerpool": "^6.3.1",
+    "workerpool": "^6.4.0",
     "yam": "^1.0.0"
   },
   "devDependencies": {
-    "@ember/edition-utils": "^1.2.0",
-    "@octokit/rest": "^19.0.5",
+    "@octokit/rest": "^19.0.7",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.7",
@@ -143,14 +141,14 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-n": "^15.3.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "fixturify": "^2.1.0",
-    "jsdom": "^20.0.3",
+    "fixturify": "^3.0.0",
+    "jsdom": "^21.1.0",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
     "nock": "^13.2.9",
@@ -163,7 +161,7 @@
     "testdouble": "^3.16.6",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",
-    "which": "2.0.2",
+    "which": "3.0.0",
     "yuidoc-ember-cli-theme": "^1.0.4",
     "yuidocjs": "0.10.2"
   },
@@ -186,5 +184,9 @@
       "tokenRef": "GITHUB_AUTH"
     }
   },
-  "trackingCode": "UA-49225444-1"
+  "trackingCode": "UA-49225444-1",
+  "volta": {
+    "node": "14.21.3",
+    "yarn": "1.22.19"
+  }
 }

package/tests/helpers/assert-version-lock.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line n/no-unpublished-require
-const expect = require('chai').expect;
+const { expect } = require('chai');
 const semver = require('semver');
 
 module.exports = function assertVersionLock(_deps) {

package/lib/commands/uninstall-npm.js

@@ -1,19 +0,0 @@
-'use strict';
-
-const Command = require('../models/command');
-const SilentError = require('silent-error');
-
-module.exports = Command.extend({
-  name: 'uninstall:npm',
-  description: 'Npm package uninstall are now managed by the user.',
-  works: 'insideProject',
-  skipHelp: true,
-
-  anonymousOptions: ['<package-names...>'],
-
-  run() {
-    let err = 'This command has been removed. Please use `npm uninstall ';
-    err += '<packageName> --save-dev` instead.';
-    return Promise.reject(new SilentError(err));
-  },
-});