ember-cli 6.12.0-alpha.5 → 6.12.0

package/RELEASE.md

@@ -44,12 +44,17 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - make sure to not update the version in the package.json during this step, this will be release-plan's job
   - make sure to not update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job
   - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
+  - commit the merge `git commit -am "promote beta to release"`
 - Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta.
 
   ```
   node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=<whatever version was in the beta>
   ```
 
+- run `pnpm lint:fix`
+- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@latest`
+- manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json
+- run `pnpm install` to make sure the lock file is up to date
 - commit this update `git commit -am "update blueprint dependencies to latest"`
 - push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release`
 - mark this PR as an `enhancement` if it is a minor release
@@ -59,6 +64,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - Merge the `Prepare Release` branch when you are ready to release
 - Check the `Release Stable` GitHub action to make sure the release succeeded
 
+### Finish the `@ember/app-blueprint` release
+
+- Update the `@ember/app-blueprint` `release` branch to use this new version of ember-cli
+- continue the rest of the [@ember/app-blueprint release process](https://github.com/ember-cli/ember-app-blueprint/blob/main/RELEASE.md#release-ember-cli-and-update-that-dependency) until beta and alpha are released
+
 ### Beta release from the `beta` branch
 
 - fetch latest from origin `git fetch`
@@ -67,17 +77,20 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
   - **make sure to not update any .github/workflows/plan-beta-release.yml file** this should still plan a beta release
   - **make sure to not update any .github/workflows/publish-beta.yml file** this should still publish a beta release
-  - make sure to not update the version in the package.json during this step, that step comes later
+  - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later
   - make sure to not remove the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step.
+  - commit the merge `git commit -am "merge release into beta"`
 - merge master into this new branch too e.g. `git merge origin/master --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
   - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage.
   - make sure not to update the `release-plan` config in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`
+  - make sure not to update the `@ember-tooling/blueprint-blueprint` versions (i.e. not workspace dependencies) in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`
+  - make sure not to add any files from `packages/blueprint-blueprint` or `packages/blueprint-model` in this merge (those files only exist on main)
   - commit the merge `git commit -am "merge master into beta"`
 - update the versions in package.jsons
   - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",`
-  - update the alpha version in `packages/addon-blueprint/package.json` to be a beta
-  - update the alpha version in `packages/app-blueprint/package.json` to be a beta
+  - update the alpha version in `packages/addon-blueprint/package.json` to be the same beta version
+  - update the alpha version in `packages/app-blueprint/package.json` to be the same beta version
   - update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same as the version you just put in the top level package.json
   - commit the version changes `git commit -am "update versions"`
 - Update blueprint dependencies to beta
@@ -86,8 +99,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data=<whatever version was in the alpha>
   ```
 
+- run `pnpm lint:fix`
 - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@beta`
 - manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json
+- run `pnpm install` to make sure the lock file is up to date
 - commit this update `git commit -am "update blueprint dependencies to beta"`
 - push and open a PR targeting `beta` with a PR title like `Prepare 6.5-beta`
 - mark this PR as an `enchancement` if the next beta is a minor release
@@ -104,9 +119,9 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - create a new branch to merge `beta` into `master` e.g. `git checkout --no-track -b merge-beta origin/master`
 - merge beta into this new branch e.g. `git merge origin/beta --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
-  - make sure to not update the version in the package.json during this step, that step comes later
+  - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later
   - make sure to not update the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step.
-  - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies. On master they always use the latest and don't use semver.
+  - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`. On master they always use the latest and don't use semver.
   - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release
   - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
   - **make sure to not update the CHANGELOG.md file** in this step.
@@ -116,7 +131,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - e.g. if the current alpha is `"version": "6.6.0-alpha.3",` update it to be `"version": "6.7.0-alpha.0",`
 - manually update the alpha version in `packages/addon-blueprint/package.json` to be the same alpha
 - manually update the alpha version in `packages/app-blueprint/package.json` to be the same alpha
-- commit this change to the version in package.json: `git commit -am "update to the next alpha version"`
+- update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same alpha
+- commit this change `git commit -am "update to the next alpha version"`
 - Update blueprint dependencies to alpha
 
   ```
@@ -124,8 +140,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   ```
 
 - note: ember-data (aka warp-drive) should only ever be updated on master as a separate PR. It is no longer part of the release process
+- run `pnpm lint:fix`
 - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@alpha`
 - make sure the app-blueprint still has a `~` after the above step
+- run `pnpm install` to make sure the lock file is up to date
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
 - push and open a PR targeting `master` with a PR title like `Prepare 6.6-alpha`
 - mark this PR as an `enchancement` if the next alpha is a minor release

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": "6.12.0-alpha.5-master-14ad69880a"
+        "version": "6.12.0-release-ae160c15f5"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -894,7 +894,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 358,
+            "line": 360,
             "description": "Returns the environment name",
             "access": "public",
             "tagname": "",
@@ -910,7 +910,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 370,
+            "line": 372,
             "description": "Delegates to `broccoli-concat` with the `sourceMapConfig` option set to `options.sourcemaps`.",
             "access": "private",
             "tagname": "",
@@ -934,7 +934,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 385,
+            "line": 387,
             "description": "Checks the result of `addon.isEnabled()` if it exists, defaults to `true` otherwise.",
             "access": "private",
             "tagname": "",
@@ -956,7 +956,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 397,
+            "line": 399,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -977,7 +977,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 408,
+            "line": 410,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -998,7 +998,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 419,
+            "line": 421,
             "description": "Returns whether an addon should be added to the project",
             "access": "private",
             "tagname": "",
@@ -1020,7 +1020,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 435,
+            "line": 437,
             "description": "Calls the included hook on addons.",
             "access": "private",
             "tagname": "",
@@ -1031,7 +1031,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 471,
+            "line": 473,
             "description": "Calls the importTransforms hook on addons.",
             "access": "private",
             "tagname": "",
@@ -1042,7 +1042,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 520,
+            "line": 522,
             "description": "Loads and initializes addons for this project.\nCalls initializeAddons on the Project.",
             "access": "private",
             "tagname": "",
@@ -1053,7 +1053,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 547,
+            "line": 549,
             "description": "Returns a list of trees for a given type, returned by all addons.",
             "access": "private",
             "tagname": "",
@@ -1075,7 +1075,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 559,
+            "line": 561,
             "description": "Runs addon post-processing on a given tree and returns the processed tree.\n\nThis enables addons to do process immediately **after** the preprocessor for a\ngiven type is run, but before concatenation occurs. If an addon wishes to\napply a transform before the preprocessors run, they can instead implement the\npreprocessTree hook.\n\nTo utilize this addons implement `postprocessTree` hook.\n\nAn example, would be to apply some broccoli transform on all JS files, but\nonly after the existing pre-processors have run.\n\n```js\nmodule.exports = {\n  name: 'my-cool-addon',\n  postprocessTree(type, tree) {\n    if (type === 'js') {\n      return someBroccoliTransform(tree);\n    }\n\n    return tree;\n  }\n}\n\n```",
             "access": "private",
             "tagname": "",
@@ -1102,7 +1102,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 596,
+            "line": 598,
             "description": "Runs addon pre-processing on a given tree and returns the processed tree.\n\nThis enables addons to do process immediately **before** the preprocessor for a\ngiven type is run.  If an addon wishes to apply a transform  after the\npreprocessors run, they can instead implement the postprocessTree hook.\n\nTo utilize this addons implement `preprocessTree` hook.\n\nAn example, would be to remove some set of files before the preprocessors run.\n\n```js\nvar stew = require('broccoli-stew');\n\nmodule.exports = {\n  name: 'my-cool-addon',\n  preprocessTree(type, tree) {\n    if (type === 'js' && type === 'template') {\n      return stew.rm(tree, someGlobPattern);\n    }\n\n    return tree;\n  }\n}\n```",
             "access": "private",
             "tagname": "",
@@ -1129,7 +1129,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 632,
+            "line": 634,
             "description": "Runs addon lintTree hooks and returns a single tree containing all\ntheir output.",
             "access": "private",
             "tagname": "",
@@ -1156,7 +1156,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 651,
+            "line": 653,
             "description": "Imports legacy imports in this.vendorFiles",
             "access": "private",
             "tagname": "",
@@ -1167,7 +1167,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 828,
+            "line": 830,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -1181,7 +1181,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1035,
+            "line": 1037,
             "description": "Runs the `app`, `tests` and `templates` trees through the chain of addons that produces lint trees.\n\nThose lint trees are afterwards funneled into the `tests` folder, babel-ified and returned as an array.",
             "access": "private",
             "tagname": "",
@@ -1196,7 +1196,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1075,
+            "line": 1077,
             "access": "public",
             "tagname": "",
             "itemtype": "method",
@@ -1210,7 +1210,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1084,
+            "line": 1086,
             "description": "Imports an asset into the application.",
             "access": "public",
             "tagname": "",
@@ -1268,7 +1268,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1130,
+            "line": 1132,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -1305,7 +1305,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1215,
+            "line": 1217,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -1326,7 +1326,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1256,
+            "line": 1258,
             "description": "Returns an array of trees for this application",
             "access": "private",
             "tagname": "",
@@ -1341,7 +1341,7 @@
         },
         {
             "file": "lib/broccoli/ember-app.js",
-            "line": 1293,
+            "line": 1295,
             "description": "Returns the merged tree for this application",
             "access": "public",
             "tagname": "",

package/lib/broccoli/ember-app.js

@@ -342,13 +342,15 @@ class EmberApp {
 
     this.vendorFiles = omitBy(
       merge(
-        {
-          'ember.js': {
-            development: emberSource.paths.debug,
-            production: emberSource.paths.prod,
-          },
-          'ember-testing.js': [emberSource.paths.testing, { type: 'test' }],
-        },
+        emberSource.paths
+          ? {
+              'ember.js': {
+                development: emberSource.paths.debug,
+                production: emberSource.paths.prod,
+              },
+              'ember-testing.js': [emberSource.paths.testing, { type: 'test' }],
+            }
+          : {},
         this.options.vendorFiles
       ),
       isNull

package/lib/commands/test.js

@@ -4,16 +4,14 @@ const Command = require('../models/command');
 const Watcher = require('../models/watcher');
 const Builder = require('../models/builder');
 const SilentError = require('silent-error');
+const os = require('os');
 const path = require('path');
 const Win = require('../utilities/windows-admin');
 const fs = require('fs');
-const temp = require('temp');
 const util = require('util');
 const PortFinder = require('portfinder');
 let getPort = util.promisify(PortFinder.getPort);
 
-temp.track();
-
 let defaultPort = 7357;
 
 const ClassicOptions = [
@@ -99,7 +97,7 @@ module.exports = Command.extend({
   },
 
   tmp() {
-    return temp.mkdirSync('tests-dist-');
+    return fs.mkdtempSync(path.join(os.tmpdir(), 'tests-dist-'));
   },
 
   _generateCustomConfigs(options) {

package/lib/tasks/install-blueprint.js

@@ -3,8 +3,7 @@
 const fs = require('fs-extra');
 const Blueprint = require('../models/blueprint');
 const Task = require('../models/task');
-const util = require('util');
-const temp = require('temp');
+const os = require('os');
 const path = require('path');
 const merge = require('lodash/merge');
 const { execa } = require('execa');
@@ -17,11 +16,6 @@ const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilitie
 
 const NOT_FOUND_REGEXP = /npm ERR! 404 {2}'(\S+)' is not in the npm registry/;
 
-// Automatically track and cleanup temp files at exit
-temp.track();
-
-let mkdirTemp = util.promisify(temp.mkdir);
-
 class InstallBlueprintTask extends Task {
   async run(options) {
     let cwd = process.cwd();
@@ -115,7 +109,7 @@ class InstallBlueprintTask extends Task {
   }
 
   _createTempFolder() {
-    return mkdirTemp('ember-cli');
+    return fs.mkdtemp(path.join(os.tmpdir(), 'ember-cli-'));
   }
 
   _resolvePackageJSON(directoryPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "6.12.0-alpha.5",
+  "version": "6.12.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -26,16 +26,10 @@
   "bin": {
     "ember": "./bin/ember"
   },
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
-  },
   "dependencies": {
-    "@ember/app-blueprint": "~6.12.0-alpha.1",
+    "@ember-tooling/blueprint-blueprint": "^0.2.1",
+    "@ember-tooling/blueprint-model": "^0.5.0",
+    "@ember/app-blueprint": "~6.12.0",
     "@pnpm/find-workspace-dir": "^1000.1.3",
     "babel-remove-types": "^1.0.2",
     "broccoli": "^4.0.0",
@@ -108,7 +102,6 @@
     "silent-error": "^1.1.1",
     "sort-package-json": "^3.6.0",
     "symlink-or-copy": "^1.3.1",
-    "temp": "0.9.4",
     "testem": "^3.17.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
@@ -116,10 +109,8 @@
     "watch-detector": "^1.0.2",
     "workerpool": "^10.0.1",
     "yam": "^1.0.0",
-    "@ember-tooling/blueprint-blueprint": "0.3.0",
-    "@ember-tooling/blueprint-model": "0.6.2",
-    "@ember-tooling/classic-build-addon-blueprint": "6.12.0-alpha.3",
-    "@ember-tooling/classic-build-app-blueprint": "6.12.0-alpha.3"
+    "@ember-tooling/classic-build-app-blueprint": "6.12.0",
+    "@ember-tooling/classic-build-addon-blueprint": "6.12.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.3",

package/packages/addon-blueprint/files/config/optional-features.json

@@ -2,5 +2,6 @@
   "application-template-wrapper": false,
   "default-async-observers": true,
   "jquery-integration": false,
-  "template-only-glimmer-components": true
+  "template-only-glimmer-components": true,
+  "use-ember-modules": true
 }

package/packages/addon-blueprint/index.js

@@ -244,6 +244,7 @@ module.exports = {
       embroider: false,
       lang: options.lang,
       emberData: options.emberData,
+      warpDrive: options.warpDrive ?? options.emberData ?? false,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       strict: options.strict,

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "6.12.0-alpha.3",
+  "version": "6.12.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,7 +11,7 @@
     "ember-blueprint"
   ],
   "dependencies": {
-    "@ember-tooling/blueprint-model": "workspace:*",
+    "@ember-tooling/blueprint-model": "^0.5.0",
     "chalk": "^5.6.2",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
@@ -20,13 +20,5 @@
     "silent-error": "^1.1.1",
     "sort-package-json": "^2.15.1",
     "walk-sync": "^3.0.0"
-  },
-  "release-plan": {
-    "semverIncrementAs": {
-      "minor": "prerelease",
-      "patch": "prerelease"
-    },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
   }
 }

package/packages/app-blueprint/files/_js_eslint.config.mjs

@@ -15,7 +15,8 @@
 import globals from 'globals';
 import js from '@eslint/js';
 
-import ember from 'eslint-plugin-ember/recommended';
+import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %>
+import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %>
 import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
@@ -38,7 +39,8 @@ export default [
   eslintConfigPrettier,
   ember.configs.base,
   ember.configs.gjs,
-  /**
+  <% if (warpDrive) { %>...WarpDrive,
+  <% } %>/**
    * Ignores must be in their own object
    * https://eslint.org/docs/latest/use/configure/ignore
    */

package/packages/app-blueprint/files/_ts_eslint.config.mjs

@@ -19,7 +19,8 @@ import js from '@eslint/js';
 
 import ts from 'typescript-eslint';
 
-import ember from 'eslint-plugin-ember/recommended';
+import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %>
+import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %>
 
 import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
@@ -54,7 +55,8 @@ export default ts.config(
   ember.configs.base,
   ember.configs.gjs,
   ember.configs.gts,
-  eslintConfigPrettier,
+  <% if (warpDrive) { %>...WarpDrive,
+  <% } %>eslintConfigPrettier,
   /**
    * Ignores must be in their own object
    * https://eslint.org/docs/latest/use/configure/ignore

package/packages/app-blueprint/files/app/app.ts

@@ -1,4 +1,4 @@
-<% if (emberData) { %>import '@warp-drive/ember/install';
+<% if (warpDrive) { %>import '@warp-drive/ember/install';
 <% } %>import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';

package/packages/app-blueprint/files/app/services/store.ts

@@ -0,0 +1,17 @@
+import { useLegacyStore } from '@warp-drive/legacy';
+import { JSONAPICache } from '@warp-drive/json-api';
+
+const Store = useLegacyStore({
+  linksMode: false,
+  cache: JSONAPICache,
+  handlers: [
+    // -- your handlers here
+  ],
+  schemas: [
+    // -- your schemas here
+  ],
+});
+
+type Store = InstanceType<typeof Store>;
+
+export default Store;

package/packages/app-blueprint/files/config/optional-features.json

@@ -3,5 +3,6 @@
   "default-async-observers": true,
   "jquery-integration": false,
   "template-only-glimmer-components": true,
-  "no-implicit-route-model": true
+  "no-implicit-route-model": true,
+  "use-ember-modules": true
 }

package/packages/app-blueprint/files/ember-cli-build.js

@@ -1,22 +1,25 @@
 'use strict';
 
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
+<% if (warpDrive) {%>const { setConfig } = require('@warp-drive/core/build-config');
+<% } %>
 module.exports = function (defaults) {
   const app = new EmberApp(defaults, {
-    <% if (emberData) {%>emberData: {
-      deprecations: {
-        // New projects can safely leave this deprecation disabled.
-        // If upgrading, to opt-into the deprecated behavior, set this to true and then follow:
-        // https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object
-        // before upgrading to Ember Data 6.0
-        DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
-      },
-    },
-    <% } %><% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true },
+    <% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true },
 
     <% } %>// Add options here
   });
+<% if (warpDrive) {%>
+  setConfig(app, __dirname, {
+    // this should be the most recent <major>.<minor> version for
+    // which all deprecations have been fully resolved
+    // and should be updated when that changes
+    compatWith: '5.8',
+    deprecations: {
+      // ... list individual deprecations that have been resolved here
+    },
+  });
+<% } %>
 
   <% if (embroider) { %>const { Webpack } = require('@embroider/webpack');
   return require('@embroider/compat').compatBuild(app, Webpack, {