ember-cli 6.2.0-beta.0 → 6.3.0-beta.0

package/CHANGELOG.md

@@ -1,11 +1,43 @@
 # ember-cli Changelog
 
-## v6.2.0-beta.0
+## v6.3.0-beta.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.1.0...v6.2.0-beta.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.1.0...v6.2.0-beta.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.2.0...v6.3.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.2.0...v6.3.0-beta.0)
+
+#### Changelog
+
+- [#10534](https://github.com/ember-cli/ember-cli/pull/10534) [CLEANUP] Clean up `outputPaths` deprecation [@bertdeblock](https://github.com/bertdeblock)
+- [#10538](https://github.com/ember-cli/ember-cli/pull/10538) [CLEANUP] Clean up Travis CI deprecation [@bertdeblock](https://github.com/bertdeblock)
+- [#10586](https://github.com/ember-cli/ember-cli/pull/10586) [INTERNAL] Add tests to ensure no linting errors post generating a new app or addon [@bertdeblock](https://github.com/bertdeblock)
+- [#10587](https://github.com/ember-cli/ember-cli/pull/10587) [BUGFIX] Fix including `ember-source` types for v1 addons [@bertdeblock](https://github.com/bertdeblock)
+- [#10589](https://github.com/ember-cli/ember-cli/pull/10589) [ENHANCEMENT] Deprecate v1 addon `contentFor` types [RFC 1044] [@bertdeblock](https://github.com/bertdeblock)
+- [#10592](https://github.com/ember-cli/ember-cli/pull/10592) [BUGFIX] Fix ESLint config for v1 addons [@bertdeblock](https://github.com/bertdeblock)
+- [#10593](https://github.com/ember-cli/ember-cli/pull/10593) [CLEANUP] Clean up old `broccoli-builder` fallback [@bertdeblock](https://github.com/bertdeblock)
+- [#10594](https://github.com/ember-cli/ember-cli/pull/10594) [CLEANUP] Clean up old `heimdalljs` deprecation [@bertdeblock](https://github.com/bertdeblock)
+- [#10595](https://github.com/ember-cli/ember-cli/pull/10595) [ENHANCEMENT] Update `@glimmer/component` to v2 in blueprints [@bertdeblock](https://github.com/bertdeblock)
+- [#10596](https://github.com/ember-cli/ember-cli/pull/10596) [ENHANCEMENT] Vanilla Prettier setup in blueprints [RFC 1055] [@bertdeblock](https://github.com/bertdeblock)
+- [#10597](https://github.com/ember-cli/ember-cli/pull/10597) [CLEANUP] Clean up remaining Travis fixtures [@bertdeblock](https://github.com/bertdeblock)
+- [#10599](https://github.com/ember-cli/ember-cli/pull/10599) [INTERNAL] Bump `content-tag` to v3 [@SergeAstapov](https://github.com/SergeAstapov)
+- [#10612](https://github.com/ember-cli/ember-cli/pull/10612) [BUGFIX release]: tsconfig.json referenced paths to types instead of imports [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10613](https://github.com/ember-cli/ember-cli/pull/10613) [ENHANCEMENT] Support `--ember-data` / `--no-ember-data` flags when creating a new app [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10615](https://github.com/ember-cli/ember-cli/pull/10615) [ENHANCEMENT] Simplify Prettier config in blueprints [@bendemboski](https://github.com/bendemboski)
+- [#10616](https://github.com/ember-cli/ember-cli/pull/10616) [INTERNAL] Add test to ensure all package files are parseable [@bertdeblock](https://github.com/bertdeblock)
+- [#10617](https://github.com/ember-cli/ember-cli/pull/10617) [ENHANCEMENT] Use `staticInvokables` in the `app` blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#10618](https://github.com/ember-cli/ember-cli/pull/10618) [INTERNAL] Avoid output for `deprecate` tests [@bertdeblock](https://github.com/bertdeblock)
+- [#10619](https://github.com/ember-cli/ember-cli/pull/10619) [BUGFIX] Only remove type imports when removing the types from `.gts` files in blueprints [@Windvis](https://github.com/Windvis)
+- [#10621](https://github.com/ember-cli/ember-cli/pull/10621) [ENHANCEMENT] Bump `@ember/test-helpers` to v5.1.0 in blueprints [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+Thank you to all who took the time to contribute!
+
+## v6.2.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v6.1.0...v6.2.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v6.1.0...v6.2.0)
 
 #### Changelog
 

package/blueprints/addon/files/npmignore

@@ -15,7 +15,6 @@
 /.stylelintignore
 /.stylelintrc.js
 /.template-lintrc.js
-/.travis.yml
 /.watchmanconfig
 /CONTRIBUTING.md
 /ember-cli-build.js

package/blueprints/addon/files/tsconfig.json

@@ -16,9 +16,7 @@
       "<%= addonName %>/test-support": ["addon-test-support"],
       "<%= addonName %>/test-support/*": ["addon-test-support/*"],
       "*": ["types/*"]
-    }
-  },
-  "types": [
-    "ember-source/types"
-  ]
+    },
+    "types": ["ember-source/types"]
+  }
 }

package/blueprints/addon/index.js

@@ -242,6 +242,7 @@ module.exports = {
       blueprintOptions,
       embroider: false,
       lang: options.lang,
+      emberData: options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
@@ -252,9 +253,7 @@ module.exports = {
     let appFiles = this.lookupBlueprint(this.appBlueprintName).files(options);
     let addonFilesPath = this.filesPath(this.options);
     let ignore = [];
-    if (this.options.ciProvider !== 'travis') {
-      ignore.push('.travis.yml');
-    }
+
     if (this.options.ciProvider !== 'github') {
       ignore.push('.github');
     }

package/blueprints/app/files/.prettierignore

@@ -8,6 +8,9 @@
 /coverage/
 !.*
 .*/
+/pnpm-lock.yaml
+ember-cli-update.json
+*.html
 
 # ember-try
 /.node_modules.ember-try/

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

@@ -5,12 +5,6 @@ module.exports = {
   overrides: [
     {
       files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
-      options: {
-        singleQuote: true,
-      },
-    },
-    {
-      files: '*.{gjs,gts}',
       options: {
         singleQuote: true,
         templateSingleQuote: false,

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

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

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

@@ -16,7 +16,7 @@ import globals from 'globals';
 import js from '@eslint/js';
 
 import ember from 'eslint-plugin-ember/recommended';
-import prettier from 'eslint-plugin-prettier/recommended';
+import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
 
@@ -35,7 +35,7 @@ const esmParserOptions = {
 
 export default [
   js.configs.recommended,
-  prettier,
+  eslintConfigPrettier,
   ember.configs.base,
   ember.configs.gjs,
   /**
@@ -81,8 +81,10 @@ export default [
     files: [
       '**/*.cjs',
       'config/**/*.js',
+      'tests/dummy/config/**/*.js',
       'testem.js',
       'testem*.js',
+      'index.js',
       '.prettierrc.js',
       '.stylelintrc.js',
       '.template-lintrc.js',

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

@@ -19,7 +19,7 @@ import ts from 'typescript-eslint';
 
 import ember from 'eslint-plugin-ember/recommended';
 
-import prettier from 'eslint-plugin-prettier/recommended';
+import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
 
@@ -52,7 +52,7 @@ export default ts.config(
   ember.configs.base,
   ember.configs.gjs,
   ember.configs.gts,
-  prettier,
+  eslintConfigPrettier,
   /**
    * Ignores must be in their own object
    * https://eslint.org/docs/latest/use/configure/ignore
@@ -104,8 +104,10 @@ export default ts.config(
     files: [
       '**/*.cjs',
       'config/**/*.js',
+      'tests/dummy/config/**/*.js',
       'testem.js',
       'testem*.js',
+      'index.js',
       '.prettierrc.js',
       '.stylelintrc.js',
       '.template-lintrc.js',

package/blueprints/app/files/app/app.ts

@@ -2,6 +2,11 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from '<%= modulePrefix %>/config/environment';
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

package/blueprints/app/files/app/deprecation-workflow.ts

@@ -0,0 +1,24 @@
+import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
+
+/**
+ * Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
+ */
+setupDeprecationWorkflow({
+  /**
+    false by default, but if a developer / team wants to be more aggressive about being proactive with
+    handling their deprecations, this should be set to "true"
+  */
+  throwOnUnhandled: false,
+  workflow: [
+    /* ... handlers ... */
+    /* to generate this list, run your app for a while (or run the test suite),
+     * and then run in the browser console:
+     *
+     *    deprecationWorkflow.flushDeprecations()
+     *
+     * And copy the handlers here
+     */
+    /* example: */
+    /* { handler: 'silence', matchId: 'template-action' }, */
+  ],
+});

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

@@ -13,10 +13,8 @@ module.exports = function (defaults) {
   return require('@embroider/compat').compatBuild(app, Webpack, {
     staticAddonTestSupportTrees: true,
     staticAddonTrees: true,
-    staticHelpers: true,
-    staticModifiers: true,
-    staticComponents: true,
     staticEmberSource: true,
+    staticInvokables: true,
     skipBabel: [
       {
         package: 'qunit',

package/blueprints/app/files/package.json

@@ -12,10 +12,12 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
+    "format": "prettier . --cache --write",
     "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:\" --prefixColors auto",
+    "lint:fix": "concurrently \"<%= packageManager %>:lint:*:fix\" --names \"fix:\" --prefixColors auto && <%= invokeScriptPrefix %> format",
+    "lint:format": "prettier . --cache --check",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
@@ -26,76 +28,76 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@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<% } %>",
+    "@babel/core": "^7.26.7<% if (!typescript) { %>",
+    "@babel/eslint-parser": "^7.26.5",
+    "@babel/plugin-proposal-decorators": "^7.25.9<% } %><% if (typescript && emberData) { %>",
+    "@ember-data/adapter": "~5.4.0-beta.14",
+    "@ember-data/graph": "~5.4.0-beta.14",
+    "@ember-data/json-api": "~5.4.0-beta.14",
+    "@ember-data/legacy-compat": "~5.4.0-beta.14",
+    "@ember-data/model": "~5.4.0-beta.14",
+    "@ember-data/request": "~5.4.0-beta.14",
+    "@ember-data/request-utils": "~5.4.0-beta.14",
+    "@ember-data/serializer": "~5.4.0-beta.14",
+    "@ember-data/store": "~5.4.0-beta.14",
+    "@ember-data/tracking": "~5.4.0-beta.14<% } %>",
     "@ember/optional-features": "^2.2.0",
-    "@ember/test-helpers": "^4.0.4<% if (embroider) { %>",
-    "@embroider/compat": "^3.7.1",
-    "@embroider/core": "^3.4.20",
+    "@ember/test-helpers": "^5.1.0<% if (embroider) { %>",
+    "@embroider/compat": "^3.8.0",
+    "@embroider/core": "^3.5.0<% } %>",
+    "@embroider/macros": "^1.16.10<% if (embroider) { %>",
     "@embroider/webpack": "^4.0.9<% } %>",
-    "@eslint/js": "^9.17.0",
-    "@glimmer/component": "^1.1.2",
+    "@eslint/js": "^9.19.0",
+    "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
-    "@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",
+    "@glint/environment-ember-loose": "^1.5.2",
+    "@glint/environment-ember-template-imports": "^1.5.2",
+    "@glint/template": "^1.5.2",
+    "@tsconfig/ember": "^3.0.9",
     "@types/eslint__js": "^8.42.3",
     "@types/qunit": "^2.19.12",
     "@types/rsvp": "^4.0.9",
-    "@warp-drive/core-types": "~0.0.0-beta.12<% } %>",
+    "@warp-drive/core-types": "~0.0.0<% } %>",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^9.1.0",
+    "concurrently": "^9.1.2",
     "ember-auto-import": "^2.10.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.3",
+    "ember-cli-deprecation-workflow": "^3.1.0",
     "ember-cli-htmlbars": "^6.3.0",
     "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.12",
+    "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
+    "ember-data": "~5.4.0-beta.14<% } %>",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
     "ember-page-title": "^8.2.3",
     "ember-qunit": "^9.0.1",
     "ember-resolver": "^13.1.0",
-    "ember-source": "~6.2.0-beta.1",
-    "ember-template-imports": "^4.2.0",
-    "ember-template-lint": "^6.0.0<% if (welcome) { %>",
+    "ember-source": "~6.3.0-beta.1",
+    "ember-template-imports": "^4.3.0",
+    "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.17.0",
+    "eslint": "^9.19.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-ember": "^12.3.3",
+    "eslint-plugin-ember": "^12.5.0",
     "eslint-plugin-n": "^17.15.1",
-    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-qunit": "^8.1.2",
     "globals": "^15.14.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.4.2",
     "prettier-plugin-ember-template-tag": "^2.0.4",
-    "qunit": "^2.23.1",
+    "qunit": "^2.24.1",
     "qunit-dom": "^3.4.0",
-    "stylelint": "^16.12.0",
+    "stylelint": "^16.14.1",
     "stylelint-config-standard": "^36.0.1",
-    "stylelint-prettier": "^5.0.2",
     "tracked-built-ins": "^3.4.0<% if (typescript) { %>",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.18.2<% } %>",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.23.0<% } %>",
     "webpack": "^5.97.1"
   },
   "engines": {

package/blueprints/app/files/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/ember/tsconfig.json",
+  "extends": "@tsconfig/ember",
   "glint": {
     "environment": ["ember-loose", "ember-template-imports"]
   },
@@ -14,19 +14,19 @@
       "*": ["types/*"]
     },
     "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",
-      "./node_modules/@ember-data/graph/unstable-preview-types",
-      "./node_modules/@ember-data/json-api/unstable-preview-types",
-      "./node_modules/@ember-data/legacy-compat/unstable-preview-types",
-      "./node_modules/@ember-data/request/unstable-preview-types",
-      "./node_modules/@ember-data/request-utils/unstable-preview-types",
-      "./node_modules/@ember-data/model/unstable-preview-types",
-      "./node_modules/@ember-data/serializer/unstable-preview-types",
-      "./node_modules/@ember-data/tracking/unstable-preview-types",
-      "./node_modules/@warp-drive/core-types/unstable-preview-types"
+      "ember-source/types<% if (emberData) { %>",
+      "ember-data/unstable-preview-types",
+      "@ember-data/store/unstable-preview-types",
+      "@ember-data/adapter/unstable-preview-types",
+      "@ember-data/graph/unstable-preview-types",
+      "@ember-data/json-api/unstable-preview-types",
+      "@ember-data/legacy-compat/unstable-preview-types",
+      "@ember-data/request/unstable-preview-types",
+      "@ember-data/request-utils/unstable-preview-types",
+      "@ember-data/model/unstable-preview-types",
+      "@ember-data/serializer/unstable-preview-types",
+      "@ember-data/tracking/unstable-preview-types",
+      "@warp-drive/core-types/unstable-preview-types<% } %>"
     ]
   }
 }

package/blueprints/app/index.js

@@ -76,6 +76,7 @@ module.exports = {
       blueprintOptions,
       embroider,
       lang: options.lang,
+      emberData: options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
@@ -88,9 +89,6 @@ module.exports = {
     }
 
     let files = this._super();
-    if (options.ciProvider !== 'travis') {
-      files = files.filter((file) => file !== '.travis.yml');
-    }
 
     if (options.ciProvider !== 'github') {
       files = files.filter((file) => file.indexOf('.github') < 0);
@@ -102,6 +100,11 @@ module.exports = {
       );
     }
 
+    if (!options.emberData) {
+      files = files.filter((file) => !file.includes('models/'));
+      files = files.filter((file) => !file.includes('ember-data/'));
+    }
+
     this._files = files;
 
     return this._files;

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, DEPRECATIONS } = require('../debug');
+const { assert } = require('../debug');
 const Project = require('../models/project');
 
 const concat = require('broccoli-concat');
@@ -29,25 +29,6 @@ const DefaultPackager = require('./default-packager');
 let DEFAULT_CONFIG = {
   storeConfigInMeta: true,
   autoRun: true,
-  outputPaths: {
-    app: {
-      html: 'index.html',
-    },
-    tests: {
-      js: '/assets/tests.js',
-    },
-    vendor: {
-      css: '/assets/vendor.css',
-      js: '/assets/vendor.js',
-    },
-    testSupport: {
-      css: '/assets/test-support.css',
-      js: {
-        testSupport: '/assets/test-support.js',
-        testLoader: '/assets/test-loader.js',
-      },
-    },
-  },
   minifyCSS: {
     options: { relativeTo: 'assets' },
   },
@@ -65,7 +46,6 @@ class EmberApp {
    Available init options:
    - storeConfigInMeta, defaults to `true`
    - autoRun, defaults to `true`
-   - outputPaths, defaults to `{}`
    - minifyCSS, defaults to `{enabled: !!isProduction,options: { relativeTo: 'assets' }}
    - sourcemaps, defaults to `{}`
    - trees, defaults to `{}`
@@ -223,12 +203,6 @@ class EmberApp {
     @param {Object} options
   */
   _initOptions(options) {
-    deprecate(
-      'Using the `outputPaths` build option is deprecated, as output paths will no longer be predetermined under Embroider.',
-      typeof options.outputPaths === 'undefined',
-      DEPRECATIONS.DEPRECATE_OUTPUT_PATHS.options
-    );
-
     let resolvePathFor = (defaultPath, specified) => {
       let path = defaultPath;
       if (specified && typeof specified === 'string') {
@@ -280,14 +254,6 @@ class EmberApp {
         enabled: this.isProduction,
         options: { processImport: false },
       },
-      outputPaths: {
-        app: {
-          css: {
-            app: `/assets/${this.name}.css`,
-          },
-          js: `/assets/${this.name}.js`,
-        },
-      },
       sourcemaps: {
         enabled: !this.isProduction,
         extensions: ['js'],
@@ -310,6 +276,32 @@ class EmberApp {
 
     this.options = defaultsDeep(options, detectedDefaultOptions, DEFAULT_CONFIG);
 
+    // Keep `outputPaths` on `this.options` for now, because ember-auto-import reads it here:
+    // https://github.com/embroider-build/ember-auto-import/blob/ce42c052151ca39e74955212a963fcf3091d7c90/packages/ember-auto-import/ts/auto-import.ts#L84
+    this.options.outputPaths = {
+      app: {
+        css: {
+          app: `/assets/${this.name}.css`,
+        },
+        html: 'index.html',
+        js: `/assets/${this.name}.js`,
+      },
+      tests: {
+        js: '/assets/tests.js',
+      },
+      vendor: {
+        css: '/assets/vendor.css',
+        js: '/assets/vendor.js',
+      },
+      testSupport: {
+        css: '/assets/test-support.css',
+        js: {
+          testSupport: '/assets/test-support.js',
+          testLoader: '/assets/test-loader.js',
+        },
+      },
+    };
+
     // For now we must disable Babel sourcemaps due to unforeseen
     // performance regressions.
     if (!('sourceMaps' in this.options.babel)) {

package/lib/commands/addon.js

@@ -24,11 +24,12 @@ module.exports = NewCommand.extend({
       type: String,
       description: "Sets the base human language of the addon's own test application via index.html",
     },
+    { name: 'lint-fix', type: Boolean, default: true },
     {
       name: 'ci-provider',
-      type: ['travis', 'github', 'none'],
+      type: ['github', 'none'],
       default: 'github',
-      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
+      description: 'Installs the optional default CI blueprint. Only Github Actions is supported at the moment.',
     },
     { name: 'typescript', type: Boolean, default: false, description: 'Set up the addon to use TypeScript' },
   ],

package/lib/commands/init.js

@@ -9,7 +9,6 @@ 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, DEPRECATIONS } = require('../debug');
 
 module.exports = Command.extend({
   name: 'init',
@@ -42,9 +41,15 @@ module.exports = Command.extend({
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
     {
       name: 'ci-provider',
-      type: ['travis', 'github', 'none'],
+      type: ['github', 'none'],
       default: 'github',
-      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
+      description: 'Installs the optional default CI blueprint. Only Github Actions is supported at the moment.',
+    },
+    {
+      name: 'ember-data',
+      type: Boolean,
+      default: true,
+      description: 'Include ember-data dependencies and configuration',
     },
     { name: 'typescript', type: Boolean, default: false, description: 'Set up the app to use TypeScript' },
   ],
@@ -117,19 +122,10 @@ module.exports = Command.extend({
     if (commandOptions.skipGit === false) {
       await this.runTask('GitInit', commandOptions, rawArgs);
     }
+
     const projectName = this.project.name();
     const prependEmoji = require('../../lib/utilities/prepend-emoji');
 
-    if (ciProvider === 'travis') {
-      this.ui.writeLine('');
-
-      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,
-        DEPRECATIONS.DEPRECATE_TRAVIS_CI_SUPPORT.options
-      );
-    }
-
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('🎉', `Successfully created project ${chalk.yellow(projectName)}.`));
     this.ui.writeLine(prependEmoji('👉', 'Get started by typing:'));

package/lib/commands/new.js

@@ -36,11 +36,18 @@ module.exports = Command.extend({
       type: String,
       description: 'Sets the base human language of the application via index.html',
     },
+    { name: 'lint-fix', type: Boolean, default: true },
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
     {
       name: 'ci-provider',
-      type: ['travis', 'github', 'none'],
-      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
+      type: ['github', 'none'],
+      description: 'Installs the optional default CI blueprint. Only Github Actions is supported at the moment.',
+    },
+    {
+      name: 'ember-data',
+      type: Boolean,
+      default: true,
+      description: 'Include ember-data dependencies and configuration',
     },
     {
       name: 'interactive',
@@ -72,6 +79,10 @@ module.exports = Command.extend({
         commandOptions.name = answers.name;
       }
 
+      if (answers.emberData) {
+        commandOptions.emberData = answers.emberData;
+      }
+
       if (answers.lang) {
         commandOptions.lang = answers.lang;
       }

package/lib/debug/deprecate.js

@@ -80,13 +80,7 @@ function deprecate(description, condition, options) {
 
   let message = formatMessage(description, options);
 
-  warn(message);
-  warn('');
-  warn(getStackTrace());
-
-  // Return the message for testing purposes.
-  // This can be removed once we can register deprecation handlers.
-  return message;
+  warn(`${message}\n\n${getStackTrace()}`);
 }
 
 function isSemVer(version) {

package/lib/debug/deprecations.js

@@ -2,6 +2,7 @@
 
 const { _isDeprecationRemoved } = require('./deprecate');
 
+// eslint-disable-next-line no-unused-vars
 function deprecation(options) {
   return {
     options,
@@ -10,24 +11,17 @@ function deprecation(options) {
 }
 
 const DEPRECATIONS = {
-  DEPRECATE_OUTPUT_PATHS: deprecation({
+  V1_ADDON_CONTENT_FOR_TYPES: deprecation({
     for: 'ember-cli',
-    id: 'ember-cli.outputPaths-build-option',
+    id: 'ember-cli.v1-addon-content-for-types',
     since: {
-      available: '5.3.0',
-      enabled: '5.3.0',
+      available: '6.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: '7.0.0',
+    url: 'https://deprecations.emberjs.com/id/v1-addon-content-for-types',
+    meta: {
+      types: ['app-prefix', 'app-suffix', 'tests-prefix', 'tests-suffix', 'vendor-prefix', 'vendor-suffix'],
     },
-    until: '6.0.0',
-    url: 'https://deprecations.emberjs.com/id/travis-ci-support',
   }),
 };
 

package/lib/models/builder.js

@@ -24,9 +24,6 @@ class Builder extends CoreObject {
   constructor(options) {
     super(options);
 
-    // Use Broccoli 2.0 by default, if this fails due to .read/.rebuild API, fallback to broccoli-builder
-    this.broccoliBuilderFallback = false;
-
     this._instantiationStack = new Error().stack.replace(/[^\n]*\n/, '');
     this._cleanup = this.cleanup.bind(this);
 
@@ -67,31 +64,8 @@ class Builder extends CoreObject {
 
     this.tree = await this.readBuildFile(this.project.root);
 
-    let broccoli = require('broccoli');
-
-    try {
-      this.builder = new broccoli.Builder(this.tree);
-      return;
-    } catch (e) {
-      // Catch here to trap InvalidNodeError. If this is thrown, it's because the node provided is not valid
-      // and likely uses the old .read/.rebuild API, so fallback to broccoli-builder that supports that API
-      if (
-        !(e instanceof broccoli.Builder.InvalidNodeError) ||
-        e.message.indexOf('The .read/.rebuild API is no longer supported as of Broccoli 1.0') === -1
-      ) {
-        throw e;
-      }
-
-      // Fallback to broccoli-builder
-      let error = `Invalid Broccoli2 node detected, falling back to broccoli-builder. Broccoli error:\n`;
-      error += `---------------\n`;
-      error += e.message;
-      error += `---------------\n`;
-      this.ui.writeWarnLine(error);
-    }
+    const broccoli = require('broccoli');
 
-    broccoli = require('broccoli-builder');
-    this.broccoliBuilderFallback = true;
     this.builder = new broccoli.Builder(this.tree);
   }
 
@@ -179,7 +153,7 @@ class Builder extends CoreObject {
     try {
       this.project._instrumentation.start('build');
 
-      if (addWatchDirCallback && !this.broccoliBuilderFallback) {
+      if (addWatchDirCallback) {
         for (let path of this.builder.watchedPaths) {
           addWatchDirCallback(path);
         }
@@ -193,24 +167,16 @@ class Builder extends CoreObject {
 
       await this.processAddonBuildSteps('preBuild');
 
-      if (this.broccoliBuilderFallback) {
-        try {
-          buildResults = await this.builder.build(addWatchDirCallback);
-        } catch (error) {
-          this.throwFormattedBroccoliError(error);
-        }
-      } else {
-        try {
-          await this.builder.build();
-
-          // build legacy style results object (this is passed to various addon APIs)
-          buildResults = {
-            directory: this.builder.outputPath,
-            graph: this.builder.outputNodeWrapper,
-          };
-        } catch (error) {
-          this.throwFormattedBroccoliError(error);
-        }
+      try {
+        await this.builder.build();
+
+        // build legacy style results object (this is passed to various addon APIs)
+        buildResults = {
+          directory: this.builder.outputPath,
+          graph: this.builder.outputNodeWrapper,
+        };
+      } catch (error) {
+        this.throwFormattedBroccoliError(error);
       }
 
       await this.processAddonBuildSteps('postBuild', buildResults);
@@ -222,8 +188,6 @@ class Builder extends CoreObject {
         Object.assign({}, buildResults, { outputChanges, directory: this.outputPath })
       );
 
-      this.checkForPostBuildEnvironmentIssues();
-
       return buildResults;
     } catch (error) {
       await this.processAddonBuildSteps('buildError', error);
@@ -273,26 +237,6 @@ class Builder extends CoreObject {
     }
   }
 
-  /**
-   * Checks for issues in the environment that can't easily be detected until
-   * after a build and issues any necessary deprecation warnings.
-   *
-   * - check for old (pre 0.1.4) versions of heimdalljs
-   *
-   * @private
-   * @method checkForPostBuildEnvironmentIssues
-   */
-  checkForPostBuildEnvironmentIssues(value) {
-    // 0.1.3 and prior used a global heimdall instance to share sessions
-    // newer versions keep the session itself on process
-    this.project.ui.writeDeprecateLine(
-      'Heimdalljs < 0.1.4 found.  Please remove old versions of heimdalljs and reinstall (you can find them with `npm ls heimdalljs` as long as you have nothing `npm link`d).  Performance instrumentation data will be incomplete until then.',
-      !process._heimdall
-    );
-
-    return value;
-  }
-
   throwFormattedBroccoliError(err) {
     // TODO fix ember-cli/console-ui to handle current broccoli broccoliPayload
     let broccoliPayload = err && err.broccoliPayload;
@@ -316,12 +260,8 @@ class Builder extends CoreObject {
         };
       }
       if (!broccoliPayload.versions) {
-        let builderVersion = this.broccoliBuilderFallback
-          ? require('broccoli-builder/package').version
-          : require('broccoli/package').version;
-
         broccoliPayload.versions = {
-          'broccoli-builder': builderVersion,
+          broccoli: require('broccoli/package').version,
           node: process.version,
         };
       }

package/lib/tasks/interactive-new.js

@@ -111,10 +111,6 @@ class InteractiveNewTask extends Task {
             name: 'GitHub Actions',
             value: 'github',
           },
-          {
-            name: 'Travis CI',
-            value: 'travis',
-          },
           {
             name: 'None',
             value: 'none',
@@ -125,6 +121,22 @@ class InteractiveNewTask extends Task {
           },
         ],
       },
+      {
+        name: 'emberData',
+        type: 'confirm',
+        message: 'Do you want to include ember-data?',
+        when: undefined === newCommandOptions.emberData,
+        choices: [
+          {
+            name: 'Include ember-data',
+            value: true,
+          },
+          {
+            name: 'Do not include ember-data',
+            value: false,
+          },
+        ],
+      },
     ];
   }
 

package/lib/utilities/ember-app-utils.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const cleanBaseURL = require('clean-base-url');
+const { deprecate, DEPRECATIONS } = require('../debug');
 
 /**
  * Returns a normalized url given a string.
@@ -124,6 +125,14 @@ document.addEventListener('DOMContentLoaded', function() {
   content = options.addons.reduce((content, addon) => {
     let addonContent = addon.contentFor ? addon.contentFor(type, config, content) : null;
     if (addonContent) {
+      for (const deprecatedType of DEPRECATIONS.V1_ADDON_CONTENT_FOR_TYPES.options.meta.types) {
+        deprecate(
+          `Addon \`${addon.name}\` is using the deprecated \`${deprecatedType}\` type in its \`contentFor\` method. Please see the deprecation guide for the correct path forward.`,
+          type !== deprecatedType,
+          DEPRECATIONS.V1_ADDON_CONTENT_FOR_TYPES.options
+        );
+      }
+
       return content.concat(addonContent);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.2.0-beta.0",
+  "version": "6.3.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -39,9 +39,8 @@
   },
   "dependencies": {
     "@pnpm/find-workspace-dir": "^7.0.2",
-    "babel-remove-types": "^1.0.0",
+    "babel-remove-types": "^1.0.1",
     "broccoli": "^3.5.2",
-    "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^4.2.5",
     "broccoli-config-loader": "^1.0.1",
     "broccoli-config-replace": "^1.1.2",
@@ -61,10 +60,10 @@
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
     "console-ui": "^3.1.2",
-    "content-tag": "^2.0.1",
+    "content-tag": "^3.1.0",
     "core-object": "^3.1.5",
     "dag-map": "^2.0.2",
-    "diff": "^5.1.0",
+    "diff": "^7.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-lodash-subset": "^2.0.1",
     "ember-cli-normalize-entity-name": "^1.0.0",
@@ -78,7 +77,7 @@
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.3.0",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
@@ -94,7 +93,7 @@
     "is-language-code": "^3.1.0",
     "isbinaryfile": "^5.0.4",
     "lodash": "^4.17.21",
-    "markdown-it": "^13.0.1",
+    "markdown-it": "^14.1.0",
     "markdown-it-terminal": "^0.4.0",
     "minimatch": "^7.4.3",
     "morgan": "^1.10.0",
@@ -110,7 +109,7 @@
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.4.3",
     "sane": "^5.0.1",
-    "semver": "^7.3.5",
+    "semver": "^7.7.0",
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.12.0",
     "symlink-or-copy": "^1.3.1",
@@ -142,7 +141,7 @@
     "fixturify": "^3.0.0",
     "jsdom": "^21.1.1",
     "latest-version": "^5.1.0",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.1",
     "nock": "^13.5.5",
     "nyc": "^15.1.0",
     "prettier": "2.8.7",

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

@@ -1,78 +0,0 @@
-# DEPRECATION:
-#
-# Support for generating a Travis CI config file is deprecated.
-# You can keep using Travis CI, or you could also consider switching to GitHub Actions instead.
-#
-# Feel free to remove this comment block if you want to continue using Travis CI.
-#
-# ID     travis-ci-support
-# UNTIL  6.0.0
-# URL    https://deprecations.emberjs.com/id/travis-ci-support
-
----
-language: node_js
-node_js:
-  # we recommend testing addons with the same minimum supported node version as Ember CLI
-  # so that your addon works for all apps
-  - "18"
-
-dist: xenial
-
-addons:
-  chrome: stable
-<% if (yarn) { %>
-cache:
-  yarn: true
-<% } else { %>
-cache:
-  directories:
-    - $HOME/.npm
-<% } %>
-env:
-  global:
-    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md for details.
-    - JOBS=1
-
-branches:
-  only:
-    - master
-    # npm version tags
-    - /^v\d+\.\d+\.\d+/
-
-jobs:
-  fast_finish: false
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
-
-  include:
-    # runs linting and tests with current locked deps
-    - stage: "Tests"
-      name: "Tests"
-      script:
-        - <% if (yarn) { %>yarn<% } else { %>npm run<% } %> lint
-        - <% if (yarn) { %>yarn<% } else { %>npm run<% } %> test:ember
-
-    - stage: "Additional Tests"
-      name: "Floating Dependencies"
-      install:<% if (yarn) { %>
-        - yarn install --no-lockfile --non-interactive<% } else { %>
-        - npm install --no-package-lock<% } %>
-      script:
-        - <% if (yarn) { %>yarn<% } else { %>npm run<% } %> test:ember
-
-    # 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-4.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-5.4
-    - env: EMBER_TRY_SCENARIO=ember-release
-    - env: EMBER_TRY_SCENARIO=ember-beta
-    - env: EMBER_TRY_SCENARIO=ember-canary
-    - env: EMBER_TRY_SCENARIO=embroider-safe
-    - env: EMBER_TRY_SCENARIO=embroider-optimized
-<% if (yarn) { %>
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-<% } %>
-script:
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

package/blueprints/app/files/.travis.yml

@@ -1,43 +0,0 @@
-# DEPRECATION:
-#
-# Support for generating a Travis CI config file is deprecated.
-# You can keep using Travis CI, or you could also consider switching to GitHub Actions instead.
-#
-# Feel free to remove this comment block if you want to continue using Travis CI.
-#
-# ID     travis-ci-support
-# UNTIL  6.0.0
-# URL    https://deprecations.emberjs.com/id/travis-ci-support
-
----
-language: node_js
-node_js:
-  - "18"
-
-dist: xenial
-
-addons:
-  chrome: stable
-<% if (yarn) { %>
-cache:
-  yarn: true
-<% } else { %>
-cache:
-  directories:
-    - $HOME/.npm
-<% } %>
-env:
-  global:
-    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md for details.
-    - JOBS=1
-
-branches:
-  only:
-    - master
-<% if (yarn) { %>
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-<% } %>
-script:
-  - <% if (yarn) { %>yarn<% } else { %>npm<% } %> test