v4-delta as of 05ca736

.github/workflows/compat-tests.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - v4-main
 
 env:
   TURBO_API: http://127.0.0.1:9080

.github/workflows/docs-and-blueprint-tests.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - v4-main
 
 env:
   TURBO_API: http://127.0.0.1:9080

.github/workflows/enforce-pr-labels-canary.yml

@@ -5,6 +5,7 @@ on:
     types: [labeled, unlabeled, opened, reopened]
     branches:
       - main
+      - v4-main
 
 concurrency:
   group: pr-labels-canary-${{ github.head_ref || github.ref_name }}

.vscode/settings.json

@@ -49,5 +49,6 @@
   "typescript.preferences.importModuleSpecifier": "project-relative",
   "bun.debugTerminal.enabled": true,
   "eslint.debug": true,
+  "eslint.runtime": "node",
   "typescript.tsdk": "node_modules/typescript/lib"
 }

config/eslint/typescript.js

@@ -23,6 +23,7 @@ function mergeTsConfigs(configArray) {
 
 export function rules(config = {}) {
   const ourRules = {
+    '@typescript-eslint/no-base-to-string': 'off',
     '@typescript-eslint/no-invalid-void-type': 'off',
     '@typescript-eslint/no-non-null-assertion': 'off',
     '@typescript-eslint/adjacent-overload-signatures': 'error',

config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warp-drive/internal-config",
   "private": true,
-  "version": "5.4.0-alpha.121",
+  "version": "4.12.8",
   "type": "module",
   "dependencies": {
     "@babel/cli": "^7.24.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "5.4.0-alpha.121",
+  "version": "4.12.8",
   "private": true,
   "license": "MIT",
   "repository": {
@@ -27,11 +27,11 @@
     "test": "pnpm run _task:sync-hardlinks; pnpm turbo test --concurrency=1",
     "test:production": "pnpm run _task:sync-hardlinks; pnpm turbo test:production --concurrency=1",
     "test:try-one": "pnpm --filter main-test-app run test:try-one",
-    "test:docs": "FORCE_COLOR=2  pnpm build:docs && pnpm run -r --workspace-concurrency=-1 --if-present test:docs",
+    "test:docs": "FORCE_COLOR=2 pnpm build:docs && pnpm run -r --workspace-concurrency=-1 --if-present --reporter=append-only --reporter-hide-prefix test:docs",
     "test:blueprints": "pnpm run -r --workspace-concurrency=-1 --if-present test:blueprints",
     "test:fastboot": "pnpm run -r --workspace-concurrency=-1 --if-present test:fastboot",
-    "test:vite": "pnpm run -r ---workspace-concurrency=-1 --if-present test:vite",
-    "test:embroider": "pnpm run -r ---workspace-concurrency=-1 --if-present test:embroider"
+    "test:embroider": "pnpm run -r ---workspace-concurrency=-1 --if-present test:embroider",
+    "test:vite": "pnpm run -r ---workspace-concurrency=-1 --if-present test:vite"
   },
   "devDependencies": {
     "@babel/core": "^7.24.5",

packages/-ember-data/app/adapters/-json-api.js

@@ -0,0 +1 @@
+export { default } from '@ember-data/adapter/json-api';

packages/-ember-data/app/initializers/ember-data.js

@@ -1,12 +1,11 @@
-import '@ember-data/request-utils/deprecation-support';
+import 'ember-data';
+
+import setupContainer from 'ember-data/setup-container';
 
 /*
   This code initializes EmberData in an Ember application.
 */
 export default {
   name: 'ember-data',
-  initialize(application) {
-    application.registerOptionsForType('serializer', { singleton: false });
-    application.registerOptionsForType('adapter', { singleton: false });
-  },
+  initialize: setupContainer,
 };

packages/-ember-data/app/instance-initializers/ember-data.js

@@ -0,0 +1,5 @@
+/* exists only for things that historically used "after" or "before" */
+export default {
+  name: 'ember-data',
+  initialize() {},
+};

packages/-ember-data/app/serializers/-default.js

@@ -0,0 +1 @@
+export { default } from '@ember-data/serializer/json';

packages/-ember-data/app/serializers/-json-api.js

@@ -0,0 +1 @@
+export { default } from '@ember-data/serializer/json-api';

packages/-ember-data/app/serializers/-rest.js

@@ -0,0 +1 @@
+export { default } from '@ember-data/serializer/rest';

packages/-ember-data/app/services/store.js

@@ -1,10 +1,11 @@
 import { deprecate } from '@ember/debug';
 
 export { default } from 'ember-data/store';
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
 
 deprecate(
   "You are relying on ember-data auto-magically installing the store service. Use `export { default } from 'ember-data/store';` in app/services/store.js instead",
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/app/transforms/boolean.js

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { BooleanTransform as default } from '@ember-data/serializer/transform';
 
 deprecate(
   "You are relying on ember-data auto-magically installing the BooleanTransform. Use `export { BooleanTransform as default } from '@ember-data/serializer/transform';` in app/transforms/boolean.js instead",
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/app/transforms/date.js

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { DateTransform as default } from '@ember-data/serializer/transform';
 
 deprecate(
   "You are relying on ember-data auto-magically installing the DateTransform. Use `export { DateTransform as default } from '@ember-data/serializer/transform';` in app/transforms/date.js instead",
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/app/transforms/number.js

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { NumberTransform as default } from '@ember-data/serializer/transform';
 
 deprecate(
   "You are relying on ember-data auto-magically installing the NumberTransform. Use `export { NumberTransform as default } from '@ember-data/serializer/transform';` in app/transforms/number.js instead",
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/app/transforms/string.js

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { StringTransform as default } from '@ember-data/serializer/transform';
 
 deprecate(
   "You are relying on ember-data auto-magically installing the StringTransform. Use `export { StringTransform as default } from '@ember-data/serializer/transform';` in app/transforms/string.js instead",
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data",
-  "version": "5.4.0-alpha.121",
+  "version": "4.12.8",
   "description": "The lightweight reactive data library for JavaScript applications",
   "keywords": [
     "ember-addon"
@@ -149,7 +149,7 @@
     "@ember/test-waiters": "^3.1.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@types/qunit": "^2.19.10",
+    "@types/qunit": "2.19.10",
     "@ember/test-helpers": "4.0.4",
     "@warp-drive/internal-config": "workspace:*",
     "ember-source": "~5.12.0",

packages/-ember-data/src/-private/index.ts

@@ -1,19 +1,8 @@
 // public
 import ArrayProxy from '@ember/array/proxy';
-import { deprecate } from '@ember/debug';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ObjectProxy from '@ember/object/proxy';
 
-deprecate('Importing from `ember-data/-private` is deprecated without replacement.', false, {
-  id: 'ember-data:deprecate-legacy-imports',
-  for: 'ember-data',
-  until: '6.0',
-  since: {
-    enabled: '5.2',
-    available: '5.2',
-  },
-});
-
 export { default as Store } from '../store';
 
 export { DS } from './core';

packages/-ember-data/src/adapter.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { default } from '@ember-data/adapter';
-
-deprecate(
-  'Importing from `ember-data/adapter` is deprecated. Please import from `@ember-data/adapter` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/adapters/errors.ts

@@ -1,5 +1,3 @@
-import { deprecate } from '@ember/debug';
-
 export {
   AbortError,
   default as AdapterError,
@@ -10,18 +8,6 @@ export {
   ServerError,
   TimeoutError,
   UnauthorizedError,
+  errorsArrayToHash,
+  errorsHashToArray,
 } from '@ember-data/adapter/error';
-
-deprecate(
-  'Importing from `ember-data/adapters/errors` is deprecated. Please import from `@ember-data/adapter` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/adapters/json-api.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { default } from '@ember-data/adapter/json-api';
-
-deprecate(
-  'Importing from `ember-data/adapters/json-api` is deprecated. Please import from `@ember-data/adapter/json-api` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/adapters/rest.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { default } from '@ember-data/adapter/rest';
-
-deprecate(
-  'Importing from `ember-data/adapters/rest` is deprecated. Please import from `@ember-data/adapter/rest` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/attr.ts

@@ -1,13 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { attr as default } from '@ember-data/model';
-
-deprecate('Importing from `ember-data/attr` is deprecated. Please import from `@ember-data/model` instead.', false, {
-  id: 'ember-data:deprecate-legacy-imports',
-  for: 'ember-data',
-  until: '6.0',
-  since: {
-    enabled: '5.2',
-    available: '5.2',
-  },
-});

packages/-ember-data/src/index.ts

@@ -185,6 +185,7 @@ import Transform, {
   NumberTransform,
   StringTransform,
 } from '@ember-data/serializer/transform';
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
 
 import {
   DS,
@@ -201,14 +202,14 @@ import setupContainer from './setup-container';
 
 deprecate(
   'Importing from `ember-data` is deprecated. Please import from the appropriate `@ember-data/*` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',
     until: '6.0',
     since: {
       enabled: '5.2',
-      available: '5.2',
+      available: '4.13',
     },
   }
 );

packages/-ember-data/src/model.ts

@@ -1,13 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { default } from '@ember-data/model';
-
-deprecate('Importing from `ember-data/model` is deprecated. Please import from `@ember-data/model` instead.', false, {
-  id: 'ember-data:deprecate-legacy-imports',
-  for: 'ember-data',
-  until: '6.0',
-  since: {
-    enabled: '5.2',
-    available: '5.2',
-  },
-});

packages/-ember-data/src/relationships.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { belongsTo, hasMany } from '@ember-data/model';
-
-deprecate(
-  'Importing from `ember-data/relationships` is deprecated. Please import from `@ember-data/model` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/serializer.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { default } from '@ember-data/serializer';
-
-deprecate(
-  'Importing from `ember-data/serializer` is deprecated. Please import from `@ember-data/serializer` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);

packages/-ember-data/src/serializers/embedded-records-mixin.ts

@@ -1,17 +1 @@
-import { deprecate } from '@ember/debug';
-
 export { EmbeddedRecordsMixin as default } from '@ember-data/serializer/rest';
-
-deprecate(
-  'Importing from `ember-data/serializers/embedded-records-mixin` is deprecated. Please import from `@ember-data/serializer/rest` instead.',
-  false,
-  {
-    id: 'ember-data:deprecate-legacy-imports',
-    for: 'ember-data',
-    until: '6.0',
-    since: {
-      enabled: '5.2',
-      available: '5.2',
-    },
-  }
-);