@ember/app-blueprint 6.9.0-beta.2 → 6.10.0-alpha.2

package/.release-plan.json

@@ -2,9 +2,9 @@
   "solution": {
     "@ember/app-blueprint": {
       "impact": "patch",
-      "oldVersion": "6.9.0-beta.1",
-      "newVersion": "6.9.0-beta.2",
-      "tagName": "beta",
+      "oldVersion": "6.10.0-alpha.1",
+      "newVersion": "6.10.0-alpha.2",
+      "tagName": "alpha",
       "constraints": [
         {
           "impact": "patch",
@@ -18,5 +18,5 @@
       "pkgJSONPath": "./package.json"
     }
   },
-  "description": "## Release (2025-11-06)\n\n* @ember/app-blueprint 6.9.0-beta.2 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#126](https://github.com/ember-cli/ember-app-blueprint/pull/126) [bugfix release] Add eslint parser option `project: true` ([@mkszepp](https://github.com/mkszepp))\n  * [#120](https://github.com/ember-cli/ember-app-blueprint/pull/120) [bugfix release] set node version in engines to >= 20 ([@aklkv](https://github.com/aklkv))\n  * [#116](https://github.com/ember-cli/ember-app-blueprint/pull/116) [bugfix release] update ember-cli version to latest stable ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#122](https://github.com/ember-cli/ember-app-blueprint/pull/122) Merge release into beta ([@mansona](https://github.com/mansona))\n  * [#127](https://github.com/ember-cli/ember-app-blueprint/pull/127) Prepare Stable Release v6.8.3 ([@github-actions[bot]](https://github.com/apps/github-actions))\n  * [#121](https://github.com/ember-cli/ember-app-blueprint/pull/121) Prepare Stable Release v6.8.2 ([@github-actions[bot]](https://github.com/apps/github-actions))\n  * [#117](https://github.com/ember-cli/ember-app-blueprint/pull/117) Prepare Stable Release v6.8.1 ([@github-actions[bot]](https://github.com/apps/github-actions))\n\n#### Committers: 4\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n- [@github-actions[bot]](https://github.com/apps/github-actions)\n"
+  "description": "## Release (2025-11-07)\n\n* @ember/app-blueprint 6.10.0-alpha.2 (patch)\n\n#### :bug: Bug Fix\n* `@ember/app-blueprint`\n  * [#126](https://github.com/ember-cli/ember-app-blueprint/pull/126) [bugfix release] Add eslint parser option `project: true` ([@mkszepp](https://github.com/mkszepp))\n  * [#120](https://github.com/ember-cli/ember-app-blueprint/pull/120) [bugfix release] set node version in engines to >= 20 ([@aklkv](https://github.com/aklkv))\n  * [#116](https://github.com/ember-cli/ember-app-blueprint/pull/116) [bugfix release] update ember-cli version to latest stable ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `@ember/app-blueprint`\n  * [#130](https://github.com/ember-cli/ember-app-blueprint/pull/130) Merge beta into main ([@mansona](https://github.com/mansona))\n  * [#131](https://github.com/ember-cli/ember-app-blueprint/pull/131) fix warpdrive lint tests ([@mansona](https://github.com/mansona))\n  * [#129](https://github.com/ember-cli/ember-app-blueprint/pull/129) Prepare Beta Release v6.9.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))\n  * [#122](https://github.com/ember-cli/ember-app-blueprint/pull/122) Merge release into beta ([@mansona](https://github.com/mansona))\n  * [#127](https://github.com/ember-cli/ember-app-blueprint/pull/127) Prepare Stable Release v6.8.3 ([@github-actions[bot]](https://github.com/apps/github-actions))\n  * [#121](https://github.com/ember-cli/ember-app-blueprint/pull/121) Prepare Stable Release v6.8.2 ([@github-actions[bot]](https://github.com/apps/github-actions))\n  * [#117](https://github.com/ember-cli/ember-app-blueprint/pull/117) Prepare Stable Release v6.8.1 ([@github-actions[bot]](https://github.com/apps/github-actions))\n\n#### Committers: 4\n- Alexey Kulakov ([@aklkv](https://github.com/aklkv))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Markus Sanin ([@mkszepp](https://github.com/mkszepp))\n- [@github-actions[bot]](https://github.com/apps/github-actions)\n"
 }

package/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## Release (2025-11-06)
+## Release (2025-11-07)
 
-* @ember/app-blueprint 6.9.0-beta.2 (patch)
+* @ember/app-blueprint 6.10.0-alpha.2 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
@@ -12,6 +12,9 @@
 
 #### :house: Internal
 * `@ember/app-blueprint`
+  * [#130](https://github.com/ember-cli/ember-app-blueprint/pull/130) Merge beta into main ([@mansona](https://github.com/mansona))
+  * [#131](https://github.com/ember-cli/ember-app-blueprint/pull/131) fix warpdrive lint tests ([@mansona](https://github.com/mansona))
+  * [#129](https://github.com/ember-cli/ember-app-blueprint/pull/129) Prepare Beta Release v6.9.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
   * [#122](https://github.com/ember-cli/ember-app-blueprint/pull/122) Merge release into beta ([@mansona](https://github.com/mansona))
   * [#127](https://github.com/ember-cli/ember-app-blueprint/pull/127) Prepare Stable Release v6.8.3 ([@github-actions[bot]](https://github.com/apps/github-actions))
   * [#121](https://github.com/ember-cli/ember-app-blueprint/pull/121) Prepare Stable Release v6.8.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
@@ -23,95 +26,102 @@
 - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
 - [@github-actions[bot]](https://github.com/apps/github-actions)
 
-## Release (2025-11-02)
+## Release (2025-10-31)
 
-* @ember/app-blueprint 6.8.3 (patch)
+* @ember/app-blueprint 6.10.0-alpha.1 (minor)
 
-#### :bug: Bug Fix
+#### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#126](https://github.com/ember-cli/ember-app-blueprint/pull/126) [bugfix release] Add eslint parser option `project: true` ([@mkszepp](https://github.com/mkszepp))
-
-#### Committers: 1
-- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
-
-## Release (2025-10-24)
-
-* @ember/app-blueprint 6.8.2 (patch)
+  * [#125](https://github.com/ember-cli/ember-app-blueprint/pull/125) Glint 2 (for `--typescript` projects) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#124](https://github.com/ember-cli/ember-app-blueprint/pull/124) Use modern EmberData/WarpDrive ([@runspired](https://github.com/runspired))
+  * [#113](https://github.com/ember-cli/ember-app-blueprint/pull/113) Prepare 6.10 alpha ([@mansona](https://github.com/mansona))
 
-#### :bug: Bug Fix
+#### :memo: Documentation
 * `@ember/app-blueprint`
-  * [#120](https://github.com/ember-cli/ember-app-blueprint/pull/120) [bugfix release] set node version in engines to >= 20 ([@aklkv](https://github.com/aklkv))
-
-#### Committers: 1
-- Alexey Kulakov ([@aklkv](https://github.com/aklkv))
-
-## Release (2025-10-17)
+  * [#114](https://github.com/ember-cli/ember-app-blueprint/pull/114) update RELEASE.md with notes for after ember-cli release ([@mansona](https://github.com/mansona))
 
-* @ember/app-blueprint 6.8.1 (patch)
-
-#### :bug: Bug Fix
-* `@ember/app-blueprint`
-  * [#116](https://github.com/ember-cli/ember-app-blueprint/pull/116) [bugfix release] update ember-cli version to latest stable ([@mansona](https://github.com/mansona))
-
-#### Committers: 1
+#### Committers: 3
 - Chris Manson ([@mansona](https://github.com/mansona))
+- Chris Thoburn ([@runspired](https://github.com/runspired))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 
 ## Release (2025-10-14)
 
-* @ember/app-blueprint 6.9.0-beta.1 (minor)
+* @ember/app-blueprint 6.9.0-alpha.2 (minor)
 
 #### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#111](https://github.com/ember-cli/ember-app-blueprint/pull/111) Prepare 6.9 Beta ([@mansona](https://github.com/mansona))
-  * [#109](https://github.com/ember-cli/ember-app-blueprint/pull/109) Release 6.8 ([@mansona](https://github.com/mansona))
-  * [#76](https://github.com/ember-cli/ember-app-blueprint/pull/76) Prepare 6.9-alpha ([@mansona](https://github.com/mansona))
+  * [#103](https://github.com/ember-cli/ember-app-blueprint/pull/103) [beta] update Vite to latest (v7) ([@mansona](https://github.com/mansona))
+  * [#98](https://github.com/ember-cli/ember-app-blueprint/pull/98) Update deps ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#95](https://github.com/ember-cli/ember-app-blueprint/pull/95) [Beta] add services directory ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#91](https://github.com/ember-cli/ember-app-blueprint/pull/91) [bugfix beta] add legacy inspector support ([@mansona](https://github.com/mansona))
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
+  * [#100](https://github.com/ember-cli/ember-app-blueprint/pull/100) [beta] swap to the Vitest beta to fix CI ([@mansona](https://github.com/mansona))
+  * [#88](https://github.com/ember-cli/ember-app-blueprint/pull/88) [bugfix beta] fix the use of ember test in the new blueprint ([@mansona](https://github.com/mansona))
+  * [#86](https://github.com/ember-cli/ember-app-blueprint/pull/86) [bugfix beta] update ember-cli to beta ([@mansona](https://github.com/mansona))
+  * [#82](https://github.com/ember-cli/ember-app-blueprint/pull/82) Use TypeScript way of accessing potentially undefined `podModulePrefix` ([@pichfl](https://github.com/pichfl))
   * [#78](https://github.com/ember-cli/ember-app-blueprint/pull/78) Use strict mode for all CJS files ([@simonihmig](https://github.com/simonihmig))
 
 #### :memo: Documentation
 * `@ember/app-blueprint`
+  * [#97](https://github.com/ember-cli/ember-app-blueprint/pull/97) [documentation beta] update readme for Vite ([@mansona](https://github.com/mansona))
   * [#64](https://github.com/ember-cli/ember-app-blueprint/pull/64) Update the release document to match the ember-cli process ([@mansona](https://github.com/mansona))
   * [#81](https://github.com/ember-cli/ember-app-blueprint/pull/81) Correct example usage command in README ([@abeforgit](https://github.com/abeforgit))
   * [#80](https://github.com/ember-cli/ember-app-blueprint/pull/80) Fix formatting of README file ([@bertdeblock](https://github.com/bertdeblock))
 
 #### :house: Internal
 * `@ember/app-blueprint`
-  * [#110](https://github.com/ember-cli/ember-app-blueprint/pull/110) Prepare Stable Release v6.8.0 ([@github-actions[bot]](https://github.com/apps/github-actions))
-  * [#107](https://github.com/ember-cli/ember-app-blueprint/pull/107) Prepare Alpha Release v6.9.0-alpha.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
   * [#108](https://github.com/ember-cli/ember-app-blueprint/pull/108) update release-plan ([@mansona](https://github.com/mansona))
   * [#106](https://github.com/ember-cli/ember-app-blueprint/pull/106) Merge beta into main ([@mansona](https://github.com/mansona))
-  * [#77](https://github.com/ember-cli/ember-app-blueprint/pull/77) Prepare Alpha Release v6.9.0-alpha.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
-
-#### Committers: 5
+  * [#105](https://github.com/ember-cli/ember-app-blueprint/pull/105) Prepare Beta Release v6.8.0-beta.8 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#104](https://github.com/ember-cli/ember-app-blueprint/pull/104) Merge release into beta ([@mansona](https://github.com/mansona))
+  * [#102](https://github.com/ember-cli/ember-app-blueprint/pull/102) Prepare Beta Release v6.8.0-beta.7 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#101](https://github.com/ember-cli/ember-app-blueprint/pull/101) [beta] update node version used in CI ([@mansona](https://github.com/mansona))
+  * [#96](https://github.com/ember-cli/ember-app-blueprint/pull/96) Prepare Beta Release v6.8.0-beta.6 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#93](https://github.com/ember-cli/ember-app-blueprint/pull/93) Add Windows tests ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+  * [#92](https://github.com/ember-cli/ember-app-blueprint/pull/92) Prepare Beta Release v6.8.0-beta.5 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#89](https://github.com/ember-cli/ember-app-blueprint/pull/89) Prepare Beta Release v6.8.0-beta.4 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#87](https://github.com/ember-cli/ember-app-blueprint/pull/87) Prepare Beta Release v6.8.0-beta.3 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#85](https://github.com/ember-cli/ember-app-blueprint/pull/85) Prepare Stable Release v6.7.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#84](https://github.com/ember-cli/ember-app-blueprint/pull/84) Prepare Beta Release v6.8.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#83](https://github.com/ember-cli/ember-app-blueprint/pull/83) update ember source to latest beta ([@mansona](https://github.com/mansona))
+
+#### Committers: 7
 - Arne Bertrand ([@abeforgit](https://github.com/abeforgit))
 - Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
 - Chris Manson ([@mansona](https://github.com/mansona))
+- Florian Pichler ([@pichfl](https://github.com/pichfl))
 - Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 - [@github-actions[bot]](https://github.com/apps/github-actions)
 
-## Release (2025-10-14)
+## Release (2025-09-05)
 
-* @ember/app-blueprint 6.8.0 (minor)
+* @ember/app-blueprint 6.9.0-alpha.1 (minor)
 
 #### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#109](https://github.com/ember-cli/ember-app-blueprint/pull/109) Release 6.8 ([@mansona](https://github.com/mansona))
+  * [#76](https://github.com/ember-cli/ember-app-blueprint/pull/76) Prepare 6.9-alpha ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
 
-## Release (2025-10-02)
+## Release (2025-09-05)
 
-* @ember/app-blueprint 6.7.2 (patch)
+* @ember/app-blueprint 6.8.0-beta.1 (minor)
 
-#### :bug: Bug Fix
+#### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#82](https://github.com/ember-cli/ember-app-blueprint/pull/82) Use TypeScript way of accessing potentially undefined `podModulePrefix` ([@pichfl](https://github.com/pichfl))
+  * [#73](https://github.com/ember-cli/ember-app-blueprint/pull/73) Prepare 6.8 beta ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `@ember/app-blueprint`
+  * [#75](https://github.com/ember-cli/ember-app-blueprint/pull/75) update the beta version ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
-- Florian Pichler ([@pichfl](https://github.com/pichfl))
+- Chris Manson ([@mansona](https://github.com/mansona))
 
 ## Release (2025-09-04)
 

package/RELEASE.md

@@ -120,6 +120,13 @@ You can use [this saved search](https://github.com/ember-cli/ember-app-blueprint
 - Check the `Release Alpha` GitHub action to make sure the release succeeded
 
 
+### Release ember-cli and update ember-cli versions
+
+After doing all this release process you can go and release ember-cli. Once ember-cli has been updated you will need to come back here and update the ember-cli reference to be the release (and not the pre-release) for each of the branches.
+
+This is necessary because we're not in the same repository and can't make release `ember-cli` and `@ember/app-blueprint` atomically.
+
+
 ## Changelog updates
 
 `release-plan` is designed to automatically generate a Changelog that includes the titles of every PR that was merged since the last release. As we would like to make use of this auto-generated Changelog we need to make sure that PRs are named correctly and the Changelog included in the "Prepare Release" PRs are what we were expecting.

package/eslint.config.mjs

@@ -25,6 +25,11 @@ export default [
   pluginJs.configs.recommended,
   eslintConfigPrettier,
   {
-    ignores: ['tests/fixtures/*', 'files/ember-cli-build.js'],
+    ignores: [
+      'tests/fixtures/*',
+      'files/ember-cli-build.js',
+      'files/_js_*',
+      'files/_ts_*',
+    ],
   },
 ];

package/files/_js_eslint.config.mjs

@@ -16,6 +16,7 @@ import globals from 'globals';
 import js from '@eslint/js';
 
 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';
@@ -32,6 +33,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/files/_ts_eslint.config.mjs

@@ -18,6 +18,7 @@ import js from '@eslint/js';
 import ts from 'typescript-eslint';
 
 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';
@@ -44,6 +45,7 @@ export default ts.config(
   ember.configs.base,
   ember.configs.gjs,
   ember.configs.gts,
+  <% if (warpDrive) { %>...WarpDrive,<% } %>
   eslintConfigPrettier,
   /**
    * Ignores must be in their own object

package/files/app/app.ts

@@ -1,3 +1,4 @@
+<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
 import Application from '@ember/application';
 import compatModules from '@embroider/virtual/compat-modules';
 import Resolver from 'ember-resolver';

package/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: true,
+  cache: JSONAPICache,
+  handlers: [
+    // -- your handlers here
+  ],
+  schemas: [
+    // -- your schemas here
+  ],
+});
+
+type Store = InstanceType<typeof Store>;
+
+export default Store;

package/files/ember-cli-build.js

@@ -4,19 +4,22 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const { compatBuild } = require('@embroider/compat');
 
 module.exports = async function (defaults) {
-  const { buildOnce } = await import('@embroider/vite');
+  <% if (warpDrive) {%>const { setConfig } = await import('@warp-drive/core/build-config');
+  <% } %>const { buildOnce } = await import('@embroider/vite');
+
   let 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,
-      },
+    // 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
     },
-    <% } %>// Add options here
   });
-
+<% } %>
   return compatBuild(app, buildOnce);
 };

package/files/package.json

@@ -22,7 +22,7 @@
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix<% if (typescript) { %>",
-    "lint:types": "glint<% } %>",
+    "lint:types": "ember-tsc --noEmit<% } %>",
     "start": "vite",
     "test": "vite build --mode development && ember test --path dist"
   },
@@ -35,16 +35,7 @@
     "@babel/runtime": "^7.28.4",
     "@babel/plugin-transform-runtime": "^7.28.3<% if (typescript) { %>",
     "@babel/plugin-transform-typescript": "^7.28.0<% } %>",
-    "@babel/eslint-parser": "^7.28.4<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.6.0",
-    "@ember-data/graph": "~5.6.0",
-    "@ember-data/json-api": "~5.6.0",
-    "@ember-data/legacy-compat": "~5.6.0",
-    "@ember-data/model": "~5.6.0",
-    "@ember-data/request": "~5.6.0",
-    "@ember-data/request-utils": "~5.6.0",
-    "@ember-data/serializer": "~5.6.0",
-    "@ember-data/store": "~5.6.0<% } %><% if (typescript) { %>",
+    "@babel/eslint-parser": "^7.28.4<% if (typescript) { %>",
     "@ember/app-tsconfig": "^1.0.3<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/string": "^4.0.1",
@@ -59,36 +50,38 @@
     "@embroider/legacy-inspector-support": "^0.1.3",
     "@eslint/js": "^9.37.0",
     "@glimmer/component": "^2.0.0<% if (typescript) { %>",
-    "@glint/core": "^1.5.2",
-    "@glint/environment-ember-loose": "^1.5.2",
-    "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.6.1<% } %>",
+    "@glint/ember-tsc": "^1.0.4",
+    "@glint/template": "^1.6.2",
+    "@glint/tsserver-plugin": "^2.0.4<% } %>",
     "@rollup/plugin-babel": "^6.0.4<% if (typescript) { %>",
     "@types/qunit": "^2.19.13",
-    "@types/rsvp": "^4.0.9<% if (emberData) {%>",
-    "@warp-drive/core-types": "~5.6.0<% }} %><% if (emberData) { %>",
-    "@warp-drive/ember": "~5.6.0<% } %>",
+    "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
+    "@warp-drive/core": "5.8.0",
+    "@warp-drive/ember": "5.8.0",
+    "@warp-drive/json-api": "5.8.0",
+    "@warp-drive/legacy": "5.8.0",
+    "@warp-drive/utilities": "5.8.0<% } %>",
     "babel-plugin-ember-template-compilation": "^2.4.1",
     "concurrently": "^9.2.1",
     "decorator-transforms": "^2.3.0",
     "ember-auto-import": "^2.11.1",
     "ember-cli": "~6.9.0-alpha.1",
     "ember-cli-babel": "^8.2.0",
-    "ember-cli-deprecation-workflow": "^3.4.0<% if (emberData) { %>",
-    "ember-data": "~5.6.0<% } %>",
+    "ember-cli-deprecation-workflow": "^3.4.0",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.9.0-beta.1",
+    "ember-source": "~6.10.0-alpha.1",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ember": "^12.7.4",
     "eslint-plugin-n": "^17.23.1",
-    "eslint-plugin-qunit": "^8.2.5",
+    "eslint-plugin-qunit": "^8.2.5<% if (warpDrive) { %>",
+    "eslint-plugin-warp-drive": "5.8.0<% } %>",
     "globals": "^16.4.0",
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",

package/files/tests/test-helper.ts

@@ -1,3 +1,4 @@
+<% if (warpDrive) { %>import '@warp-drive/ember/install';<% } %>
 import Application from '<%= modulePrefix %>/app';
 import config from '<%= modulePrefix %>/config/environment';
 import * as QUnit from 'qunit';

package/files/tsconfig.json

@@ -1,9 +1,6 @@
 {
   "extends": "@ember/app-tsconfig",
   "include": ["app", "tests", "types"],
-  "glint": {
-    "environment": ["ember-loose", "ember-template-imports"]
-  },
   "compilerOptions": {
     "allowJs": true,
     "paths": {
@@ -11,6 +8,11 @@
       "<%= name %>/*": ["./app/*"],
       "*": ["./types/*"]
     },
-    "types": ["ember-source/types", "@embroider/core/virtual", "vite/client"]
+    "types": [
+      "ember-source/types",
+      "@embroider/core/virtual",
+      "vite/client",
+      "@glint/ember-tsc/types"
+    ]
   }
 }

package/index.js

@@ -40,6 +40,7 @@ module.exports = {
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
           !options.emberData && `"--no-ember-data"`,
+          !options.warpDrive && `"--no-warp-drive"`,
         ]
           .filter(Boolean)
           .join(',\n            ') +
@@ -75,7 +76,7 @@ module.exports = {
       blueprint: 'app',
       blueprintOptions,
       lang: options.lang,
-      emberData: options.emberData,
+      warpDrive: options.warpDrive ?? options.emberData,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       packageManager: options.packageManager ?? 'npm',
@@ -101,9 +102,11 @@ module.exports = {
       );
     }
 
-    if (!options.emberData) {
-      files = files.filter((file) => !file.includes('models/'));
-      files = files.filter((file) => !file.includes('ember-data/'));
+    const warpDrive = options.warpDrive || options.emberData;
+    if (!warpDrive) {
+      files = files.filter((file) => !file.includes('services/store.ts'));
+    } else {
+      files = files.filter((file) => !file.includes('services/.gitkeep'));
     }
 
     this._files = files;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.9.0-beta.2",
+  "version": "6.10.0-alpha.2",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
@@ -17,8 +17,8 @@
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "beta",
-    "publishTag": "beta"
+    "semverIncrementTag": "alpha",
+    "publishTag": "alpha"
   },
   "dependencies": {
     "chalk": "^4.1.2",

package/tests/arguments.test.mjs

@@ -108,15 +108,31 @@ describe('Blueprint Arguments', function () {
     it('installs ember-data by default', async function () {
       const { files } = await generateApp();
 
-      expect(parse(files['package.json']).devDependencies['ember-data']).to.not
-        .be.undefined;
+      expect(parse(files['package.json']).devDependencies['@warp-drive/core'])
+        .to.not.be.undefined;
     });
 
     it('does not add ember-data if you pass --no-ember-data', async function () {
       const { files } = await generateApp({ flags: ['--no-ember-data'] });
 
-      expect(parse(files['package.json']).devDependencies['ember-data']).to.be
-        .undefined;
+      expect(parse(files['package.json']).devDependencies['@warp-drive/core'])
+        .to.be.undefined;
+    });
+  });
+
+  describe('--no-warp-drive', async function () {
+    it('installs warp-drive by default', async function () {
+      const { files } = await generateApp();
+
+      expect(parse(files['package.json']).devDependencies['@warp-drive/core'])
+        .to.not.be.undefined;
+    });
+
+    it('does not add warp-drive if you pass --no-warp-drive', async function () {
+      const { files } = await generateApp({ flags: ['--no-warp-drive'] });
+
+      expect(parse(files['package.json']).devDependencies['@warp-drive/core'])
+        .to.be.undefined;
     });
   });
 

package/tests/fixtures/warpdrive-js/app/routes/application.js

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
+
+export default class ApplicationRoute extends Route {
+  @service store;
+
+  model() {
+    return {
+      person: this.store.request({
+        url: 'https://swapi.dev/api/people/1',
+      }),
+    };
+  }
+}

package/tests/fixtures/warpdrive-js/app/services/store.js

@@ -0,0 +1,30 @@
+import { useLegacyStore } from '@warp-drive/legacy';
+import { JSONAPICache } from '@warp-drive/json-api';
+import { withDefaults } from '@warp-drive/legacy/model/migration-support';
+
+const Store = useLegacyStore({
+  linksMode: true,
+  cache: JSONAPICache,
+  handlers: [
+    {
+      request() {
+        return Promise.resolve({
+          data: {
+            type: 'person',
+            id: '1',
+            attributes: { name: 'Luke Skywalker' },
+          },
+        });
+      },
+    },
+  ],
+  schemas: [
+    // -- your schemas here
+    withDefaults({
+      type: 'person',
+      fields: [{ kind: 'field', name: 'name' }],
+    }),
+  ],
+});
+
+export default Store;

package/tests/fixtures/warpdrive-js/app/templates/application.gjs

@@ -0,0 +1,22 @@
+import { pageTitle } from 'ember-page-title';
+import { Request } from '@warp-drive/ember';
+
+<template>
+  {{pageTitle "MyTestApp"}}
+
+  {{outlet}}
+
+  {{! The following component displays Ember's default welcome message. }}
+  <Request @request={{@model.person}}>
+    <:loading>
+      <p>Loading person...</p>
+    </:loading>
+    <:error as |error|>
+      <p>Error loading person: {{error.message}}</p>
+    </:error>
+    <:content as |result|>
+      <h1>Welcome {{result.data.name}}</h1>
+    </:content>
+  </Request>
+  {{! Feel free to remove this! }}
+</template>

package/tests/fixtures/warpdrive-js/tests/application/index-test.js

@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { visit } from '@ember/test-helpers';
+
+module('Application | index', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting / shows welcome message', async function (assert) {
+    await visit('/');
+
+    assert.dom('h1').hasText('Welcome Luke Skywalker');
+  });
+});

package/tests/fixtures/warpdrive-ts/app/routes/application.ts

@@ -0,0 +1,26 @@
+import Route from '@ember/routing/route';
+import { service } from '@ember/service';
+import { withReactiveResponse } from '@warp-drive/core/request';
+import type { Type } from '@warp-drive/core/types/symbols';
+import type Store from 'test-app/services/store';
+
+export interface Person {
+  id: string;
+  $type: 'person';
+  name: string;
+  [Type]: 'person';
+}
+
+export default class ApplicationRoute extends Route {
+  @service declare store: Store;
+
+  model() {
+    return {
+      person: this.store.request(
+        withReactiveResponse<Person>({
+          url: 'https://swapi.dev/api/people/1',
+        }),
+      ),
+    };
+  }
+}

package/tests/fixtures/warpdrive-ts/app/services/store.ts

@@ -0,0 +1,32 @@
+import { useLegacyStore } from '@warp-drive/legacy';
+import { JSONAPICache } from '@warp-drive/json-api';
+import { withDefaults } from '@warp-drive/legacy/model/migration-support';
+
+const Store = useLegacyStore({
+  linksMode: true,
+  cache: JSONAPICache,
+  handlers: [
+    {
+      request<T>(): Promise<T> {
+        return Promise.resolve({
+          data: {
+            type: 'person',
+            id: '1',
+            attributes: { name: 'Luke Skywalker' }
+          },
+        } as T);
+      }
+    }
+  ],
+  schemas: [
+    // -- your schemas here
+    withDefaults({
+      type: 'person',
+      fields: [{ kind: 'field', name: 'name' }],
+    }),
+  ],
+});
+
+type Store = InstanceType<typeof Store>;
+
+export default Store;

package/tests/fixtures/warpdrive-ts/app/templates/application.gts

@@ -0,0 +1,32 @@
+import { pageTitle } from 'ember-page-title';
+import { Request } from '@warp-drive/ember';
+import type { TOC } from '@ember/component/template-only';
+import type { Future } from '@warp-drive/core/request';
+import type { ReactiveDataDocument } from '@warp-drive/core/reactive';
+import type { Person } from 'test-app/routes/application';
+
+const Route: TOC<{ Args: {
+  model: {
+    person: Future<ReactiveDataDocument<Person>>
+  }
+} }> = <template>
+  {{pageTitle "MyTestApp"}}
+
+  {{outlet}}
+
+  {{! The following component displays Ember's default welcome message. }}
+  <Request @request={{@model.person}}>
+    <:loading>
+      <p>Loading person...</p>
+    </:loading>
+    <:error as |error|>
+      <p>Error loading person: {{error.message}}</p>
+    </:error>
+    <:content as |result|>
+      <h1>Welcome {{result.data.name}}</h1>
+    </:content>
+  </Request>
+  {{! Feel free to remove this! }}
+</template>
+
+export default Route;

package/tests/fixtures/warpdrive-ts/tests/application/index-test.ts

@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { visit } from '@ember/test-helpers';
+
+module('Application | index', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting / shows welcome message', async function (assert) {
+    await visit('/');
+
+    assert.dom('h1').hasText('Welcome Luke Skywalker');
+  });
+});

package/tests/lint.test.mjs

@@ -56,7 +56,7 @@ describe('linting & formatting', function () {
     it('glint passes', async function () {
       expect(
         JSON.parse(app.files['package.json']).scripts['lint:types'],
-      ).to.equal('glint');
+      ).to.equal('ember-tsc --noEmit');
 
       let { exitCode, stdout } = await app.execa('pnpm', ['lint:types']);
 

package/tests/warpdrive.test.mjs

@@ -0,0 +1,137 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import fixturify from 'fixturify';
+
+import { generateApp } from './helpers.mjs';
+
+it('Slow(JavaScript): Runs tests', async function () {
+  let app = await generateApp({
+    flags: ['--pnpm', '--typescript'],
+    skipNpm: false,
+  });
+
+  fixturify.writeSync(
+    app.dir,
+    fixturify.readSync('./tests/fixtures/warpdrive-js'),
+  );
+
+  let { stdout: stdout2, exitCode: exitCode2 } = await app.execa('pnpm', [
+    'test',
+  ]);
+
+  if (!process.env.CI) {
+    console.log(stdout2);
+  }
+
+  expect(stdout2).to.match(/ok .* Application \| index/);
+  expect(stdout2).to.match(/ok .* Ember.onerror/);
+
+  expect(stdout2).to.contain('# tests 2');
+  expect(stdout2).to.contain('# pass  2');
+  expect(stdout2).to.contain('# skip  0');
+  expect(stdout2).to.contain('# todo  0');
+  expect(stdout2).to.contain('# ok');
+
+  expect(exitCode2).to.equal(0);
+});
+
+it('Slow(TypeScript): Runs tests', async function () {
+  let app = await generateApp({
+    flags: ['--pnpm', '--typescript'],
+    skipNpm: false,
+  });
+
+  fixturify.writeSync(
+    app.dir,
+    fixturify.readSync('./tests/fixtures/warpdrive-ts'),
+  );
+
+  let { stdout: stdout2, exitCode: exitCode2 } = await app.execa('pnpm', [
+    'test',
+  ]);
+
+  if (!process.env.CI) {
+    console.log(stdout2);
+  }
+
+  expect(stdout2).to.match(/ok .* Application \| index/);
+  expect(stdout2).to.match(/ok .* Ember.onerror/);
+
+  expect(stdout2).to.contain('# tests 2');
+  expect(stdout2).to.contain('# pass  2');
+  expect(stdout2).to.contain('# skip  0');
+  expect(stdout2).to.contain('# todo  0');
+  expect(stdout2).to.contain('# ok');
+  expect(exitCode2).to.equal(0);
+});
+
+describe('linting & formatting', function () {
+  describe('JavaScript', function () {
+    let app;
+
+    beforeAll(async function () {
+      /**
+       * We are passing --pnpm here because it's just faster to run in CI and realistically
+       * we don't need to worry about the differences between pnpm and npm at this level
+       */
+      app = await generateApp({ flags: ['--pnpm'], skipNpm: false });
+      fixturify.writeSync(
+        app.dir,
+        fixturify.readSync('./tests/fixtures/warpdrive-js'),
+      );
+    });
+
+    it('yields output without errors', async function (context) {
+      // Lint errors on windows machines - probably because of line-endings.
+      // TODO fix the config so that a newly generated app doens't fail lint on windows
+      if (process.platform === 'win32') {
+        context.skip();
+      }
+
+      let { exitCode } = await app.execa('pnpm', ['lint']);
+
+      expect(exitCode).to.equal(0);
+    });
+  });
+
+  describe('TypeScript', function () {
+    let app;
+
+    beforeAll(async function () {
+      /**
+       * We are passing --pnpm here because it's just faster to run in CI and realistically
+       * we don't need to worry about the differences between pnpm and npm at this level
+       */
+      app = await generateApp({
+        flags: ['--typescript', '--pnpm'],
+        skipNpm: false,
+      });
+      fixturify.writeSync(
+        app.dir,
+        fixturify.readSync('./tests/fixtures/warpdrive-js'),
+      );
+    });
+
+    it('yields output without errors', async function (context) {
+      // Lint errors on windows machines - probably because of line-endings.
+      // TODO fix the config so that a newly generated app doens't fail lint on windows
+      if (process.platform === 'win32') {
+        context.skip();
+      }
+
+      let { exitCode } = await app.execa('pnpm', ['lint']);
+
+      expect(exitCode).to.equal(0);
+    });
+
+    it('glint passes', async function () {
+      expect(
+        JSON.parse(app.files['package.json']).scripts['lint:types'],
+      ).to.equal('ember-tsc --noEmit');
+
+      let { exitCode, stdout } = await app.execa('pnpm', ['lint:types']);
+
+      console.log(stdout);
+      expect(exitCode).to.equal(0);
+    });
+  });
+});