[NEVER MERGE] v4-main delta comparison

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": {

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"

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

@@ -4,15 +4,21 @@ 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: '4.13',
-  },
-});
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
+deprecate(
+  'Importing from `ember-data/-private` is deprecated without replacement.',
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
+  {
+    id: 'ember-data:deprecate-legacy-imports',
+    for: 'ember-data',
+    until: '6.0',
+    since: {
+      enabled: '5.2',
+      available: '4.13',
+    },
+  }
+);
 
 export { default as Store } from '../store';
 

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { default } from '@ember-data/adapter';
 
 deprecate(
   'Importing from `ember-data/adapter` is deprecated. Please import from `@ember-data/adapter` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,5 +1,7 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export {
   AbortError,
   default as AdapterError,
@@ -10,11 +12,13 @@ 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,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 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,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 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,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,13 +1,19 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 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: '4.13',
-  },
-});
+deprecate(
+  'Importing from `ember-data/attr` is deprecated. Please import from `@ember-data/model` instead.',
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
+  {
+    id: 'ember-data:deprecate-legacy-imports',
+    for: 'ember-data',
+    until: '6.0',
+    since: {
+      enabled: '5.2',
+      available: '4.13',
+    },
+  }
+);

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,7 +202,7 @@ 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',

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

@@ -1,13 +1,19 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 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: '4.13',
-  },
-});
+deprecate(
+  'Importing from `ember-data/model` is deprecated. Please import from `@ember-data/model` instead.',
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
+  {
+    id: 'ember-data:deprecate-legacy-imports',
+    for: 'ember-data',
+    until: '6.0',
+    since: {
+      enabled: '5.2',
+      available: '4.13',
+    },
+  }
+);

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { belongsTo, hasMany } from '@ember-data/model';
 
 deprecate(
   'Importing from `ember-data/relationships` is deprecated. Please import from `@ember-data/model` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { default } from '@ember-data/serializer';
 
 deprecate(
   'Importing from `ember-data/serializer` is deprecated. Please import from `@ember-data/serializer` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 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,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { default } from '@ember-data/serializer/json-api';
 
 deprecate(
   'Importing from `ember-data/serializers/json-api` is deprecated. Please import from `@ember-data/serializer/json-api` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

packages/-ember-data/src/serializers/json.ts

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { default } from '@ember-data/serializer/json';
 
 deprecate(
   'Importing from `ember-data/serializers/json` is deprecated. Please import from `@ember-data/serializer/json` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',

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

@@ -1,10 +1,12 @@
 import { deprecate } from '@ember/debug';
 
+import { DISABLE_6X_DEPRECATIONS } from '@warp-drive/build-config/deprecations';
+
 export { default } from '@ember-data/serializer/rest';
 
 deprecate(
   'Importing from `ember-data/serializers/rest` is deprecated. Please import from `@ember-data/serializer/rest` instead.',
-  false,
+  /* inline-macro-config */ DISABLE_6X_DEPRECATIONS,
   {
     id: 'ember-data:deprecate-legacy-imports',
     for: 'ember-data',