@ember-tooling/classic-build-app-blueprint 6.12.0-alpha.3 → 6.12.0-beta.1

package/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/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/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/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/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/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, {

package/files/package.json

@@ -31,60 +31,64 @@
     "@babel/core": "^7.29.0",
     "@babel/eslint-parser": "^7.28.6",
     "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.7.0",
-    "@ember-data/graph": "~5.7.0",
-    "@ember-data/json-api": "~5.7.0",
-    "@ember-data/legacy-compat": "~5.7.0",
-    "@ember-data/model": "~5.7.0",
-    "@ember-data/request": "~5.7.0",
-    "@ember-data/request-utils": "~5.7.0",
-    "@ember-data/serializer": "~5.7.0",
-    "@ember-data/store": "~5.7.0",
-    "@warp-drive/ember": "~5.7.0<% } %>",
+    "@ember-data/adapter": "~5.8.1",
+    "@ember-data/graph": "~5.8.1",
+    "@ember-data/json-api": "~5.8.1",
+    "@ember-data/legacy-compat": "~5.8.1",
+    "@ember-data/model": "~5.8.1",
+    "@ember-data/request": "~5.8.1",
+    "@ember-data/request-utils": "~5.8.1",
+    "@ember-data/serializer": "~5.8.1",
+    "@ember-data/store": "~5.8.1",
+    "@warp-drive/ember": "~5.8.1<% } %>",
     "@ember/optional-features": "^2.3.0",
     "@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
     "@embroider/compat": "^3.9.3",
     "@embroider/core": "^3.5.9<% } %>",
-    "@embroider/macros": "^1.19.7<% if (embroider) { %>",
+    "@embroider/macros": "^1.20.2<% if (embroider) { %>",
     "@embroider/webpack": "^4.1.2<% } %>",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^9.39.4",
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.7.4",
+    "@glint/template": "^1.7.7",
     "@tsconfig/ember": "^3.0.12",
     "@types/qunit": "^2.19.13",
-    "@types/rsvp": "^4.0.9<% if (emberData) {%>",
-    "@warp-drive/core-types": "~5.7.0<% }} %>",
+    "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
+    "@warp-drive/core": "~5.8.1",
+    "@warp-drive/json-api": "~5.8.1",
+    "@warp-drive/legacy": "~5.8.1",
+    "@warp-drive/utilities": "~5.8.1<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
-    "ember-auto-import": "^2.12.0",
-    "ember-cli": "~6.12.0-alpha.4",
+    "ember-auto-import": "^2.13.1",
+    "ember-cli": "~6.12.0-beta.1",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-clean-css": "^3.0.0",
-    "ember-cli-dependency-checker": "^3.3.3",
+    "ember-cli-dependency-checker": "^3.4.0",
     "ember-cli-deprecation-workflow": "^3.4.0",
-    "ember-cli-htmlbars": "^6.3.0",
+    "ember-cli-htmlbars": "^7.0.1",
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>",
-    "ember-data": "~5.7.0<% } %>",
+    "ember-data": "~5.8.1<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.3.0",
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
-    "ember-resolver": "^13.1.1",
-    "ember-source": "~6.12.0-alpha.3",
+    "ember-resolver": "^13.2.0",
+    "ember-source": "~6.12.0",
     "ember-template-imports": "^4.4.0",
     "ember-template-lint": "^6.1.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^9.1.2",
     "eslint-plugin-ember": "^12.7.5",
-    "eslint-plugin-n": "^17.23.2",
-    "eslint-plugin-qunit": "^8.2.6",
+    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
+    "eslint-plugin-warp-drive": "^5.8.1<% } %>",
     "globals": "^15.15.0",
     "loader.js": "^4.7.0",
     "prettier": "^3.8.1",
@@ -94,8 +98,8 @@
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^36.0.1<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0<% } %>",
-    "webpack": "^5.105.0"
+    "typescript-eslint": "^8.58.0<% } %>",
+    "webpack": "^5.105.4"
   },
   "engines": {
     "node": ">= 20.19"

package/files/tests/test-helper.ts

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

package/index.js

@@ -80,6 +80,7 @@ module.exports = {
       embroider,
       lang: options.lang,
       emberData: options.emberData,
+      warpDrive: options.warpDrive ?? options.emberData ?? false,
       ciProvider: options.ciProvider,
       typescript: options.typescript,
       strict: options.strict,
@@ -109,6 +110,10 @@ module.exports = {
       files = files.filter((file) => !file.includes('ember-data/'));
     }
 
+    if (!options.warpDrive && !options.emberData) {
+      files = files.filter((file) => !file.includes('services/store.ts'));
+    }
+
     if (options.strict) {
       files = files.filter((file) => !file.endsWith('.hbs'));
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "6.12.0-alpha.3",
+  "version": "6.12.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",
@@ -11,16 +11,16 @@
     "ember-blueprint"
   ],
   "dependencies": {
+    "@ember-tooling/blueprint-model": "^0.5.0",
     "chalk": "^5.6.2",
-    "ember-cli-string-utils": "^1.1.0",
-    "@ember-tooling/blueprint-model": "0.6.2"
+    "ember-cli-string-utils": "^1.1.0"
   },
   "release-plan": {
     "semverIncrementAs": {
       "minor": "prerelease",
       "patch": "prerelease"
     },
-    "semverIncrementTag": "alpha",
-    "publishTag": "alpha"
+    "semverIncrementTag": "beta",
+    "publishTag": "beta"
   }
 }