ember-cli 6.0.0-beta.0 → 6.1.0-beta.0

package/CHANGELOG.md

@@ -1,14 +1,37 @@
 # ember-cli Changelog
 
-## v6.0.0-beta.0
+## v6.1.0-beta.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.12.0...v6.0.0-beta.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.12.0...v6.0.0-beta.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.0.0...v6.1.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.0.0...v6.1.0-beta.0)
 
 #### Changelog
 
+- [#10514](https://github.com/ember-cli/ember-cli/pull/10514) [backport release] use fork of remove-types with config: false [@mansona](https://github.com/mansona)
+- [#10515](https://github.com/ember-cli/ember-cli/pull/10515) Use colors for the concurrently prefixes in package.json [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10516](https://github.com/ember-cli/ember-cli/pull/10516) Use ESLint 9 and Flat Config [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10521](https://github.com/ember-cli/ember-cli/pull/10521) Make tests easier to run, closes #10520 [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10525](https://github.com/ember-cli/ember-cli/pull/10525) Upgrade concurrently, closes #10524 [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10526](https://github.com/ember-cli/ember-cli/pull/10526) Update ember-resolver, closes #10523 [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10527](https://github.com/ember-cli/ember-cli/pull/10527) Update @ember/test-helpers, closes #10522 [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10530](https://github.com/ember-cli/ember-cli/pull/10530) Update ember-load-initializers to v3 [@mkszepp](https://github.com/mkszepp)
+- [#10531](https://github.com/ember-cli/ember-cli/pull/10531) Update stylelint and depended package [@mkszepp](https://github.com/mkszepp)
+- [#10535](https://github.com/ember-cli/ember-cli/pull/10535) Upgrade eslint-plugin-ember [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+Thank you to all who took the time to contribute!
+
+## v6.0.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.12.0...v6.0.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.12.0...v6.0.0)
+
+#### Changelog
+
+- [#10559](https://github.com/ember-cli/ember-cli/pull/10559) [ENHANCEMENT] Make deprecations throw when the `until` for `ember-cli` has passed [@kategengler](https://github.com/kategengler)
 - [#10453](https://github.com/ember-cli/ember-cli/pull/10453) [ENHANCEMENT] Allow specifying no CI provider [@deanylev](https://github.com/deanylev)
 - [#10505](https://github.com/ember-cli/ember-cli/pull/10505) use our fork of remove-types with config: false [@mansona](https://github.com/mansona)
 - [#10506](https://github.com/ember-cli/ember-cli/pull/10506) [ENHANCEMENT] Use the official types in the blueprints [@Windvis](https://github.com/Windvis)

package/CONTRIBUTING.md

@@ -37,17 +37,29 @@ for more information.
 ## Run the test suite
 
 ```
-npm test
+pnpm test
 ```
 
 will run ESLint and the "fast" subset of the test suite. Run
-`npm run test:all` for the full test suite which will currently take quite a
+`pnpm run test:all` for the full test suite which will currently take quite a
 few minutes due to heavy IO and network usage.
 
+To run a single test 
+```
+pnpm mocha --fgrep "ember new adds ember-welcome-page by default"
+```
+
+To get help with mocha, run
+```
+pnpm mocha --help
+```
+
 ember-cli is using [Mocha](https://mochajs.org/) for its internal tests. If
 you want to run a specific subset of tests have a look at their
 [documentation](https://mochajs.org/#exclusive-tests).
 
+
+
 ## Update fixtures
 
 ### `ember new`

package/blueprints/addon/files/npmignore

@@ -7,8 +7,6 @@
 /.ember-cli
 /.env*
 /.eslintcache
-/.eslintignore
-/.eslintrc.js
 /.git/
 /.github/
 /.gitignore
@@ -21,6 +19,7 @@
 /.watchmanconfig
 /CONTRIBUTING.md
 /ember-cli-build.js
+/eslint.config.mjs
 /testem.js
 /tests/
 /tsconfig.declarations.json

package/blueprints/addon/files/tsconfig.json

@@ -1,5 +1,8 @@
 {
   "extends": "@tsconfig/ember/tsconfig.json",
+  "glint": {
+    "environment": ["ember-loose", "ember-template-imports"]
+  },
   "compilerOptions": {
     // The combination of `baseUrl` with `paths` allows Ember's classic package
     // layout, which is not resolvable with the Node resolution algorithm, to

package/blueprints/addon/index.js

@@ -68,6 +68,9 @@ module.exports = {
     contents.dependencies['ember-cli-htmlbars'] = contents.devDependencies['ember-cli-htmlbars'];
     delete contents.devDependencies['ember-cli-htmlbars'];
 
+    contents.dependencies['ember-template-imports'] = contents.devDependencies['ember-template-imports'];
+    delete contents.devDependencies['ember-template-imports'];
+
     // 95% of addons don't need ember-data or ember-fetch, make them opt-in instead
     let deps = Object.keys(contents.devDependencies);
     for (let depName of deps) {
@@ -112,7 +115,50 @@ module.exports = {
     return stringifyAndNormalize(sortPackageJson(contents));
   },
 
-  buildFileInfo(intoDir, templateVariables, file) {
+  /**
+   * @override
+   *
+   * This modification of buildFileInfo allows our differing
+   * input files to output to a single file, depending on the options.
+   * For example:
+   *
+   *   for javascript,
+   *     _ts_eslint.config.mjs is deleted
+   *     _js_eslint.config.mjs is renamed to eslint.config.mjs
+   *
+   *   for typescript,
+   *     _js_eslint.config.mjs is deleted
+   *     _ts_eslint.config.mjs is renamed to eslint.config.mjs
+   */
+  buildFileInfo(intoDir, templateVariables, file, commandOptions) {
+    if (file.startsWith('_js_') || file.startsWith('_ts_')) {
+      let fileInfo = this._super.buildFileInfo.apply(this, arguments);
+
+      if (file.includes('_js_')) {
+        if (commandOptions.typescript) {
+          return null;
+        }
+
+        fileInfo.outputBasePath = fileInfo.outputPath.replace('_js_', '');
+        fileInfo.outputPath = fileInfo.outputPath.replace('_js_', '');
+        fileInfo.displayPath = fileInfo.outputPath.replace('_js_', '');
+        return fileInfo;
+      }
+
+      if (file.includes('_ts_')) {
+        if (!commandOptions.typescript) {
+          return null;
+        }
+
+        fileInfo.outputBasePath = fileInfo.outputPath.replace('_ts_', '');
+        fileInfo.outputPath = fileInfo.outputPath.replace('_ts_', '');
+        fileInfo.displayPath = fileInfo.outputPath.replace('_ts_', '');
+        return fileInfo;
+      }
+
+      return fileInfo;
+    }
+
     let mappedPath = this.mapFile(file, templateVariables);
     let options = {
       action: 'write',

package/blueprints/app/files/.prettierrc.js

@@ -1,12 +1,20 @@
 'use strict';
 
 module.exports = {
+  plugins: ['prettier-plugin-ember-template-tag'],
   overrides: [
     {
-      files: '*.{js,ts}',
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
         singleQuote: true,
       },
     },
+    {
+      files: '*.{gjs,gts}',
+      options: {
+        singleQuote: true,
+        templateSingleQuote: false,
+      },
+    },
   ],
 };

package/blueprints/app/files/_js_eslint.config.mjs

@@ -0,0 +1,121 @@
+/**
+ * Debugging:
+ *   https://eslint.org/docs/latest/use/configure/debug
+ *  ----------------------------------------------------
+ *
+ *   Print a file's calculated configuration
+ *
+ *     npx eslint --print-config path/to/file.js
+ *
+ *   Inspecting the config
+ *
+ *     npx eslint --inspect-config
+ *
+ */
+import globals from 'globals';
+import js from '@eslint/js';
+
+import ember from 'eslint-plugin-ember/recommended';
+import prettier from 'eslint-plugin-prettier/recommended';
+import qunit from 'eslint-plugin-qunit';
+import n from 'eslint-plugin-n';
+
+import babelParser from '@babel/eslint-parser';
+
+const esmParserOptions = {
+  ecmaFeatures: { modules: true },
+  ecmaVersion: 'latest',
+  requireConfigFile: false,
+  babelOptions: {
+    plugins: [
+      ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+    ],
+  },
+};
+
+export default [
+  js.configs.recommended,
+  prettier,
+  ember.configs.base,
+  ember.configs.gjs,
+  /**
+   * Ignores must be in their own object
+   * https://eslint.org/docs/latest/use/configure/ignore
+   */
+  {
+    ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
+  },
+  /**
+   * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
+   */
+  {
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      parser: babelParser,
+    },
+  },
+  {
+    files: ['**/*.{js,gjs}'],
+    languageOptions: {
+      parserOptions: esmParserOptions,
+      globals: {
+        ...globals.browser,
+      },
+    },
+  },
+  {
+    files: ['tests/**/*-test.{js,gjs}'],
+    plugins: {
+      qunit,
+    },
+  },
+  /**
+   * CJS node files
+   */
+  {
+    files: [
+      '**/*.cjs',
+      'config/**/*.js',
+      'testem.js',
+      'testem*.js',
+      '.prettierrc.js',
+      '.stylelintrc.js',
+      '.template-lintrc.js',
+      'ember-cli-build.js',
+    ],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'script',
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  /**
+   * ESM node files
+   */
+  {
+    files: ['**/*.mjs'],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      parserOptions: esmParserOptions,
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+];

package/blueprints/app/files/_ts_eslint.config.mjs

@@ -0,0 +1,144 @@
+/**
+ * Debugging:
+ *   https://eslint.org/docs/latest/use/configure/debug
+ *  ----------------------------------------------------
+ *
+ *   Print a file's calculated configuration
+ *
+ *     npx eslint --print-config path/to/file.js
+ *
+ *   Inspecting the config
+ *
+ *     npx eslint --inspect-config
+ *
+ */
+import globals from 'globals';
+import js from '@eslint/js';
+
+import ts from 'typescript-eslint';
+
+import ember from 'eslint-plugin-ember/recommended';
+
+import prettier from 'eslint-plugin-prettier/recommended';
+import qunit from 'eslint-plugin-qunit';
+import n from 'eslint-plugin-n';
+
+import babelParser from '@babel/eslint-parser';
+
+const parserOptions = {
+  esm: {
+    js: {
+      ecmaFeatures: { modules: true },
+      ecmaVersion: 'latest',
+      requireConfigFile: false,
+      babelOptions: {
+        plugins: [
+          [
+            '@babel/plugin-proposal-decorators',
+            { decoratorsBeforeExport: true },
+          ],
+        ],
+      },
+    },
+    ts: {
+      projectService: true,
+      tsconfigRootDir: import.meta.dirname,
+    },
+  },
+};
+
+export default ts.config(
+  js.configs.recommended,
+  ember.configs.base,
+  ember.configs.gjs,
+  ember.configs.gts,
+  prettier,
+  /**
+   * Ignores must be in their own object
+   * https://eslint.org/docs/latest/use/configure/ignore
+   */
+  {
+    ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
+  },
+  /**
+   * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
+   */
+  {
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      parser: babelParser,
+    },
+  },
+  {
+    files: ['**/*.{js,gjs}'],
+    languageOptions: {
+      parserOptions: parserOptions.esm.js,
+      globals: {
+        ...globals.browser,
+      },
+    },
+  },
+  {
+    files: ['**/*.{ts,gts}'],
+    languageOptions: {
+      parser: ember.parser,
+      parserOptions: parserOptions.esm.ts,
+    },
+    extends: [...ts.configs.recommendedTypeChecked, ember.configs.gts],
+  },
+  {
+    files: ['tests/**/*-test.{js,gjs,ts,gts}'],
+    plugins: {
+      qunit,
+    },
+  },
+  /**
+   * CJS node files
+   */
+  {
+    files: [
+      '**/*.cjs',
+      'config/**/*.js',
+      'testem.js',
+      'testem*.js',
+      '.prettierrc.js',
+      '.stylelintrc.js',
+      '.template-lintrc.js',
+      'ember-cli-build.js',
+    ],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'script',
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  /**
+   * ESM node files
+   */
+  {
+    files: ['**/*.mjs'],
+    plugins: {
+      n,
+    },
+
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      parserOptions: parserOptions.esm.js,
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+);

package/blueprints/app/files/package.json

@@ -12,52 +12,55 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "concurrently \"<%= packageManager %>:lint:*(!fix)\" --names \"lint:\"",
+    "lint": "concurrently \"<%= packageManager %>:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
     "lint:css": "stylelint \"**/*.css\"",
     "lint:css:fix": "concurrently \"<%= packageManager %>:lint:css -- --fix\"",
-    "lint:fix": "concurrently \"<%= packageManager %>:lint:*:fix\" --names \"fix:\"",
+    "lint:fix": "concurrently \"<%= packageManager %>:lint:*:fix\" --names \"fix:\" --prefixColors auto",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix<% if (typescript) { %>",
     "lint:types": "tsc --noEmit<% } %>",
     "start": "ember serve",
-    "test": "concurrently \"<%= packageManager %>:lint\" \"<%= packageManager %>:test:*\" --names \"lint,test:\"",
+    "test": "concurrently \"<%= packageManager %>:lint\" \"<%= packageManager %>:test:*\" --names \"lint,test:\" --prefixColors auto",
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2<% if (!typescript) { %>",
-    "@babel/eslint-parser": "^7.25.1",
-    "@babel/plugin-proposal-decorators": "^7.24.7<% } %><% if (typescript) { %>",
-    "@ember-data/adapter": "~5.4.0-beta.11",
-    "@ember-data/graph": "~5.4.0-beta.11",
-    "@ember-data/json-api": "~5.4.0-beta.11",
-    "@ember-data/legacy-compat": "~5.4.0-beta.11",
-    "@ember-data/model": "~5.4.0-beta.11",
-    "@ember-data/request": "~5.4.0-beta.11",
-    "@ember-data/request-utils": "~5.4.0-beta.11",
-    "@ember-data/serializer": "~5.4.0-beta.11",
-    "@ember-data/store": "~5.4.0-beta.11",
-    "@ember-data/tracking": "~5.4.0-beta.11<% } %>",
-    "@ember/optional-features": "^2.1.0",
+    "@babel/core": "^7.26.0<% if (!typescript) { %>",
+    "@babel/eslint-parser": "^7.25.9",
+    "@babel/plugin-proposal-decorators": "^7.25.9<% } %><% if (typescript) { %>",
+    "@ember-data/adapter": "~5.4.0-beta.12",
+    "@ember-data/graph": "~5.4.0-beta.12",
+    "@ember-data/json-api": "~5.4.0-beta.12",
+    "@ember-data/legacy-compat": "~5.4.0-beta.12",
+    "@ember-data/model": "~5.4.0-beta.12",
+    "@ember-data/request": "~5.4.0-beta.12",
+    "@ember-data/request-utils": "~5.4.0-beta.12",
+    "@ember-data/serializer": "~5.4.0-beta.12",
+    "@ember-data/store": "~5.4.0-beta.12",
+    "@ember-data/tracking": "~5.4.0-beta.12<% } %>",
+    "@ember/optional-features": "^2.2.0",
     "@ember/string": "^4.0.0",
-    "@ember/test-helpers": "^3.3.1<% if (embroider) { %>",
-    "@embroider/compat": "^3.6.1",
-    "@embroider/core": "^3.4.16",
-    "@embroider/webpack": "^4.0.5<% } %>",
+    "@ember/test-helpers": "^4.0.4<% if (embroider) { %>",
+    "@embroider/compat": "^3.7.0",
+    "@embroider/core": "^3.4.19",
+    "@embroider/webpack": "^4.0.8<% } %>",
+    "@eslint/js": "^9.14.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
-    "@glint/environment-ember-loose": "^1.4.0",
-    "@glint/template": "^1.4.0",
+    "@glint/environment-ember-loose": "^1.5.0",
+    "@glint/environment-ember-template-imports": "^1.5.0",
+    "@glint/template": "^1.5.0",
     "@tsconfig/ember": "^3.0.8",
-    "@types/qunit": "^2.19.10",
+    "@types/eslint__js": "^8.42.3",
+    "@types/qunit": "^2.19.12",
     "@types/rsvp": "^4.0.9",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "@warp-drive/core-types": "~0.0.0-beta.11<% } %>",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.14.0",
+    "@warp-drive/core-types": "~0.0.0-beta.12<% } %>",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.8.1",
+    "concurrently": "^9.1.0",
+    "ember-auto-import": "^2.10.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
@@ -67,32 +70,36 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %>",
-    "ember-data": "~5.4.0-beta.11",
+    "ember-data": "~5.4.0-beta.12",
     "ember-fetch": "^8.1.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
     "ember-page-title": "^8.2.3",
-    "ember-qunit": "^8.1.0",
-    "ember-resolver": "^12.0.1",
-    "ember-source": "~6.0.0-beta.1",
+    "ember-qunit": "^8.1.1",
+    "ember-resolver": "^13.0.2",
+    "ember-source": "~6.1.0-beta.1",
+    "ember-template-imports": "^4.2.0",
     "ember-template-lint": "^6.0.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^8.57.1",
+    "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-ember": "^12.2.1",
-    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-ember": "^12.3.1",
+    "eslint-plugin-n": "^17.13.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-qunit": "^8.1.2",
+    "globals": "^15.12.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.3.3",
+    "prettier-plugin-ember-template-tag": "^2.0.4",
     "qunit": "^2.22.0",
-    "qunit-dom": "^3.2.1",
-    "stylelint": "^15.11.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.1.0",
+    "qunit-dom": "^3.3.0",
+    "stylelint": "^16.10.0",
+    "stylelint-config-standard": "^36.0.1",
+    "stylelint-prettier": "^5.0.2",
     "tracked-built-ins": "^3.3.0<% if (typescript) { %>",
-    "typescript": "^5.6.2<% } %>",
-    "webpack": "^5.95.0"
+    "typescript": "^5.6.3",
+    "typescript-eslint": "^8.14.0<% } %>",
+    "webpack": "^5.96.1"
   },
   "engines": {
     "node": ">= 18"

package/blueprints/app/files/tsconfig.json

@@ -1,5 +1,8 @@
 {
   "extends": "@tsconfig/ember/tsconfig.json",
+  "glint": {
+    "environment": ["ember-loose", "ember-template-imports"]
+  },
   "compilerOptions": {
     // The combination of `baseUrl` with `paths` allows Ember's classic package
     // layout, which is not resolvable with the Node resolution algorithm, to
@@ -11,7 +14,7 @@
       "*": ["types/*"]
     },
     "types": [
-      "ember-source/types",
+      "./node_modules/ember-source/types/stable",
       "./node_modules/ember-data/unstable-preview-types",
       "./node_modules/@ember-data/store/unstable-preview-types",
       "./node_modules/@ember-data/adapter/unstable-preview-types",

package/blueprints/app/index.js

@@ -115,4 +115,47 @@ module.exports = {
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('✨', `Creating a new Ember app in ${chalk.yellow(process.cwd())}:`));
   },
+
+  /**
+   * @override
+   *
+   * This modification of buildFileInfo allows our differing
+   * input files to output to a single file, depending on the options.
+   * For example:
+   *
+   *   for javascript,
+   *     _ts_eslint.config.mjs is deleted
+   *     _js_eslint.config.mjs is renamed to eslint.config.mjs
+   *
+   *   for typescript,
+   *     _js_eslint.config.mjs is deleted
+   *     _ts_eslint.config.mjs is renamed to eslint.config.mjs
+   */
+  buildFileInfo(intoDir, templateVariables, file, options) {
+    let fileInfo = this._super.buildFileInfo.apply(this, arguments);
+
+    if (file.includes('_js_')) {
+      if (options.typescript) {
+        return null;
+      }
+
+      fileInfo.outputBasePath = fileInfo.outputPath.replace('_js_', '');
+      fileInfo.outputPath = fileInfo.outputPath.replace('_js_', '');
+      fileInfo.displayPath = fileInfo.outputPath.replace('_js_', '');
+      return fileInfo;
+    }
+
+    if (file.includes('_ts_')) {
+      if (!options.typescript) {
+        return null;
+      }
+
+      fileInfo.outputBasePath = fileInfo.outputPath.replace('_ts_', '');
+      fileInfo.outputPath = fileInfo.outputPath.replace('_ts_', '');
+      fileInfo.displayPath = fileInfo.outputPath.replace('_ts_', '');
+      return fileInfo;
+    }
+
+    return fileInfo;
+  },
 };

package/lib/broccoli/ember-app.js

@@ -9,7 +9,7 @@ const p = require('ember-cli-preprocess-registry/preprocessors');
 const chalk = require('chalk');
 const resolve = require('resolve');
 
-const { assert, deprecate } = require('../debug');
+const { assert, deprecate, DEPRECATIONS } = require('../debug');
 const Project = require('../models/project');
 
 const concat = require('broccoli-concat');
@@ -226,15 +226,7 @@ class EmberApp {
     deprecate(
       'Using the `outputPaths` build option is deprecated, as output paths will no longer be predetermined under Embroider.',
       typeof options.outputPaths === 'undefined',
-      {
-        for: 'ember-cli',
-        id: 'ember-cli.outputPaths-build-option',
-        since: {
-          available: '5.3.0',
-          enabled: '5.3.0',
-        },
-        until: '6.0.0',
-      }
+      DEPRECATIONS.DEPRECATE_OUTPUT_PATHS.options
     );
 
     let resolvePathFor = (defaultPath, specified) => {

package/lib/commands/init.js

@@ -9,7 +9,7 @@ const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const getLangArg = require('../../lib/utilities/get-lang-arg');
-const { deprecate } = require('../debug');
+const { deprecate, DEPRECATIONS } = require('../debug');
 
 module.exports = Command.extend({
   name: 'init',
@@ -126,16 +126,7 @@ module.exports = Command.extend({
       deprecate(
         'Support for generating a Travis CI config file is deprecated.\nYou can keep using Travis CI, or you could also consider switching to GitHub Actions instead.',
         false,
-        {
-          for: 'ember-cli',
-          id: 'travis-ci-support',
-          since: {
-            available: '5.5.0',
-            enabled: '5.5.0',
-          },
-          until: '6.0.0',
-          url: 'https://deprecations.emberjs.com/id/travis-ci-support',
-        }
+        DEPRECATIONS.DEPRECATE_TRAVIS_CI_SUPPORT.options
       );
     }
 

package/lib/debug/deprecate.js

@@ -3,6 +3,7 @@
 const chalk = require('chalk');
 const semver = require('semver');
 const assert = require('./assert');
+const emberCLIVersion = require('../../package').version;
 
 /**
  * Display a deprecation message.
@@ -71,6 +72,12 @@ function deprecate(description, condition, options) {
     return;
   }
 
+  if (options.for === 'ember-cli' && isDeprecationRemoved(options.until)) {
+    throw new Error(
+      `The API deprecated by ${options.id} was removed in ember-cli ${options.until}. The message was: ${description}. Please see ${options.url} for more details.`
+    );
+  }
+
   let message = formatMessage(description, options);
 
   warn(message);
@@ -117,4 +124,12 @@ function warn(message) {
   console.warn(chalk.yellow(message));
 }
 
+function isDeprecationRemoved(until) {
+  const currentEmberCLIVersion = parseFloat(process.env.OVERRIDE_DEPRECATION_VERSION ?? emberCLIVersion);
+
+  let significantUntil = until.replace(/(\.0+)/g, '');
+  return currentEmberCLIVersion >= parseFloat(significantUntil);
+}
+
 module.exports = deprecate;
+module.exports._isDeprecationRemoved = isDeprecationRemoved;

package/lib/debug/deprecations.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const { _isDeprecationRemoved } = require('./deprecate');
+
+function deprecation(options) {
+  return {
+    options,
+    isRemoved: _isDeprecationRemoved(options.until),
+  };
+}
+
+const DEPRECATIONS = {
+  DEPRECATE_OUTPUT_PATHS: deprecation({
+    for: 'ember-cli',
+    id: 'ember-cli.outputPaths-build-option',
+    since: {
+      available: '5.3.0',
+      enabled: '5.3.0',
+    },
+    until: '6.0.0',
+  }),
+  DEPRECATE_TRAVIS_CI_SUPPORT: deprecation({
+    for: 'ember-cli',
+    id: 'travis-ci-support',
+    since: {
+      available: '5.5.0',
+      enabled: '5.5.0',
+    },
+    until: '6.0.0',
+    url: 'https://deprecations.emberjs.com/id/travis-ci-support',
+  }),
+};
+
+module.exports = DEPRECATIONS;

package/lib/debug/index.js

@@ -3,4 +3,5 @@
 module.exports = {
   assert: require('./assert'),
   deprecate: require('./deprecate'),
+  DEPRECATIONS: require('./deprecations'),
 };

package/lib/models/blueprint.js

@@ -457,7 +457,7 @@ let Blueprint = CoreObject.extend({
     await beforeHook.call(this, options, locals);
 
     // gather fileInfos to be processed
-    let fileInfos = await process.call(this, intoDir, locals);
+    let fileInfos = await process.call(this, intoDir, locals, options);
 
     // commit changes for each FileInfo (with prompting as needed)
     await Promise.all(fileInfos.map((info) => this._commit(info)));
@@ -781,9 +781,10 @@ let Blueprint = CoreObject.extend({
     @param {Function} destPath
     @param {Object} templateVariables
     @param {String} file
-    @return {FileInfo}
+    @param {Object} options may be used when buildFileInfo is customized in a blueprint
+    @return {FileInfo | null}
   */
-  buildFileInfo(intoDir, templateVariables, file) {
+  buildFileInfo(intoDir, templateVariables, file /*, options */) {
     let mappedPath = this.mapFile(file, templateVariables);
 
     return new FileInfo({
@@ -813,10 +814,13 @@ let Blueprint = CoreObject.extend({
     @param {Array} files
     @param {String} intoDir
     @param {Object} templateVariables
+    @param {Object} options
     @return {Array} file infos
   */
-  _getFileInfos(files, intoDir, templateVariables) {
-    return files.map(this.buildFileInfo.bind(this, intoDir, templateVariables));
+  _getFileInfos(files, intoDir, templateVariables, options) {
+    return files
+      .map((file) => this.buildFileInfo.call(this, intoDir, templateVariables, file, options))
+      .filter(Boolean);
   },
 
   /**
@@ -863,11 +867,12 @@ let Blueprint = CoreObject.extend({
     @method processFiles
     @param {String} intoDir
     @param {Object} templateVariables
+    @param {Object} options
     @return {Promise<FileInfo[]>}
   */
-  processFiles(intoDir, templateVariables) {
+  processFiles(intoDir, templateVariables, options) {
     let files = this._getFilesForInstall(templateVariables.targetFiles);
-    let fileInfos = this._getFileInfos(files, intoDir, templateVariables);
+    let fileInfos = this._getFileInfos(files, intoDir, templateVariables, options);
     this._checkForNoMatch(fileInfos, templateVariables.rawArgs);
 
     this._ignoreUpdateFiles();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.0.0-beta.0",
+  "version": "6.1.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -30,6 +30,7 @@
     "docs": "yuidoc",
     "lint": "eslint . --cache",
     "prepack": "pnpm docs",
+    "mocha": "pnpm exec mocha --require ./tests/bootstrap.js tests/**/*-test.js",
     "test": "node --unhandled-rejections=strict tests/runner",
     "test:all": "node --unhandled-rejections=strict tests/runner all",
     "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all",
@@ -37,7 +38,7 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@pnpm/find-workspace-dir": "^6.0.2",
+    "@pnpm/find-workspace-dir": "^7.0.2",
     "broccoli": "^3.5.2",
     "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^4.2.5",
@@ -54,7 +55,7 @@
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.2",
-    "ci-info": "^3.8.0",
+    "ci-info": "^4.0.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -71,7 +72,7 @@
     "ensure-posix-path": "^1.1.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
-    "express": "^4.18.1",
+    "express": "^4.21.1",
     "filesize": "^10.0.8",
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
@@ -97,7 +98,7 @@
     "minimatch": "^7.4.3",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^10.1.0",
+    "npm-package-arg": "^12.0.0",
     "os-locale": "^5.0.0",
     "p-defer": "^3.0.0",
     "portfinder": "^1.0.32",
@@ -114,7 +115,7 @@
     "sort-package-json": "^1.57.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.15.1",
+    "testem": "^3.15.2",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "walk-sync": "^3.0.0",
@@ -142,7 +143,7 @@
     "jsdom": "^21.1.1",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
-    "nock": "^13.3.0",
+    "nock": "^13.5.5",
     "nyc": "^15.1.0",
     "prettier": "2.8.7",
     "release-it": "^15.10.0",

package/blueprints/app/files/.eslintignore

@@ -1,14 +0,0 @@
-# unconventional js
-/blueprints/*/files/
-
-# compiled output
-/declarations/
-/dist/
-
-# misc
-/coverage/
-!.*
-.*/
-
-# ember-try
-/.node_modules.ember-try/

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

@@ -1,67 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parser: '<%= typescript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
-  parserOptions: {
-    ecmaVersion: 'latest',<% if (!typescript) { %>
-    sourceType: 'module',
-    requireConfigFile: false,
-    babelOptions: {
-      plugins: [
-        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
-      ],
-    },<% } %>
-  },
-  plugins: ['ember'<% if (typescript) { %>, '@typescript-eslint'<% } %>],
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended',
-    'plugin:prettier/recommended',
-  ],
-  env: {
-    browser: true,
-  },
-  rules: {},
-  overrides: [
-<% if (typescript) { %>    // ts files
-    {
-      files: ['**/*.ts'],
-      extends: [
-        'plugin:@typescript-eslint/eslint-recommended',
-        'plugin:@typescript-eslint/recommended',
-      ],
-      rules: {},
-    },
-<% } %>    // node files
-    {
-      files: [
-        './.eslintrc.js',
-        './.prettierrc.js',
-        './.stylelintrc.js',
-        './.template-lintrc.js',
-        './ember-cli-build.js',<% if (blueprint !== 'app') { %>
-        './index.js',<% } %>
-        './testem.js',
-        './blueprints/*/index.js',
-        './config/**/*.js',<% if (blueprint === 'app') { %>
-        './lib/*/index.js',
-        './server/**/*.js',<% } else { %>
-        './tests/dummy/config/**/*.js',<% } %>
-      ],
-<% if (!typescript) { %>      parserOptions: {
-        sourceType: 'script',
-      },
-<% } %>      env: {
-        browser: false,
-        node: true,
-      },
-      extends: ['plugin:n/recommended'],
-    },
-    {
-      // test files
-      files: ['tests/**/*-test.{js,ts}'],
-      extends: ['plugin:qunit/recommended'],
-    },
-  ],
-};