Repository: ember-cli/ember-cli
Pull request #10702 (2025-05-21 16:02:40)

[Bugfix]: Update ember-data and unify the versions between @ and non-@



3 commands needed to update / rebase:
```bash
WRITE_FIXTURES=true pnpm test ./tests/acceptance/new-test.js
EMBER_CLI_ENABLE_ALL_EXPERIMENTS=true WRITE_FIXTURES=true pnpm test ./tests/acceptance/new-test.js
EMBER_CLI_EMBROIDER=true WRITE_FIXTURES=true pnpm test ./tests/acceptance/new-test.js
```


Patch:
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index e775a5377..73c3e1b99 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -31,16 +31,16 @@
     "@babel/core": "^7.27.1",
     "@babel/eslint-parser": "^7.27.1",
     "@babel/plugin-proposal-decorators": "^7.27.1<% if (typescript && emberData) { %>",
-    "@ember-data/adapter": "~5.3.13",
-    "@ember-data/graph": "~5.3.13",
-    "@ember-data/json-api": "~5.3.13",
-    "@ember-data/legacy-compat": "~5.3.13",
-    "@ember-data/model": "~5.3.13",
-    "@ember-data/request": "~5.3.13",
-    "@ember-data/request-utils": "~5.3.13",
-    "@ember-data/serializer": "~5.3.13",
-    "@ember-data/store": "~5.3.13",
-    "@ember-data/tracking": "~5.3.13<% } %>",
+    "@ember-data/adapter": "~5.5.0",
+    "@ember-data/graph": "~5.5.0",
+    "@ember-data/json-api": "~5.5.0",
+    "@ember-data/legacy-compat": "~5.5.0",
+    "@ember-data/model": "~5.5.0",
+    "@ember-data/request": "~5.5.0",
+    "@ember-data/request-utils": "~5.5.0",
+    "@ember-data/serializer": "~5.5.0",
+    "@ember-data/store": "~5.5.0",
+    "@warp-drive/ember": "~5.5.0<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.2.1<% if (embroider) { %>",
     "@embroider/compat": "^3.9.0",
@@ -70,7 +70,7 @@
     "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.4.1-beta.1<% } %>",
+    "ember-data": "~5.5.0<% } %>",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/blueprints/app/files/tsconfig.json b/blueprints/app/files/tsconfig.json
index 0f72c901e..22672dbbe 100644
--- a/blueprints/app/files/tsconfig.json
+++ b/blueprints/app/files/tsconfig.json
@@ -25,7 +25,7 @@
       "@ember-data/request-utils/unstable-preview-types",
       "@ember-data/model/unstable-preview-types",
       "@ember-data/serializer/unstable-preview-types",
-      "@ember-data/tracking/unstable-preview-types",
+      "@warp-drive/ember/unstable-preview-types",
       "@warp-drive/core-types/unstable-preview-types<% } %>"
     ]
   }


Test patch:
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index 83224181c..256aa9c4e 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -49,7 +49,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index 6354f43ca..3ae067bc3 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/tests/fixtures/app/embroider-no-welcome/package.json
@@ -50,7 +50,7 @@
     "ember-cli-deprecation-workflow": "^3.3.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json
index a31267b04..7ddb37ff8 100644
--- a/tests/fixtures/app/embroider-pnpm/package.json
+++ b/tests/fixtures/app/embroider-pnpm/package.json
@@ -50,7 +50,7 @@
     "ember-cli-deprecation-workflow": "^3.3.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json
index ac172ac5e..0f4bdeffe 100644
--- a/tests/fixtures/app/embroider-yarn/package.json
+++ b/tests/fixtures/app/embroider-yarn/package.json
@@ -50,7 +50,7 @@
     "ember-cli-deprecation-workflow": "^3.3.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index 2527072cb..a2880307b 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/tests/fixtures/app/embroider/package.json
@@ -50,7 +50,7 @@
     "ember-cli-deprecation-workflow": "^3.3.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index 78274b834..530df5874 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -49,7 +49,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json
index ae8c1fefa..dd1123ea3 100644
--- a/tests/fixtures/app/pnpm/package.json
+++ b/tests/fixtures/app/pnpm/package.json
@@ -49,7 +49,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json
index 568fdcd55..1e01dd4fe 100644
--- a/tests/fixtures/app/typescript-embroider/package.json
+++ b/tests/fixtures/app/typescript-embroider/package.json
@@ -31,16 +31,16 @@
     "@babel/core": "^7.27.1",
     "@babel/eslint-parser": "^7.27.1",
     "@babel/plugin-proposal-decorators": "^7.27.1",
-    "@ember-data/adapter": "~5.3.13",
-    "@ember-data/graph": "~5.3.13",
-    "@ember-data/json-api": "~5.3.13",
-    "@ember-data/legacy-compat": "~5.3.13",
-    "@ember-data/model": "~5.3.13",
-    "@ember-data/request": "~5.3.13",
-    "@ember-data/request-utils": "~5.3.13",
-    "@ember-data/serializer": "~5.3.13",
-    "@ember-data/store": "~5.3.13",
-    "@ember-data/tracking": "~5.3.13",
+    "@ember-data/adapter": "~5.5.0",
+    "@ember-data/graph": "~5.5.0",
+    "@ember-data/json-api": "~5.5.0",
+    "@ember-data/legacy-compat": "~5.5.0",
+    "@ember-data/model": "~5.5.0",
+    "@ember-data/request": "~5.5.0",
+    "@ember-data/request-utils": "~5.5.0",
+    "@ember-data/serializer": "~5.5.0",
+    "@ember-data/store": "~5.5.0",
+    "@warp-drive/ember": "~5.5.0",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.2.1",
     "@embroider/compat": "^3.9.0",
@@ -68,7 +68,7 @@
     "ember-cli-deprecation-workflow": "^3.3.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/typescript-embroider/tsconfig.json b/tests/fixtures/app/typescript-embroider/tsconfig.json
index 9a63aa24c..96e957dcd 100644
--- a/tests/fixtures/app/typescript-embroider/tsconfig.json
+++ b/tests/fixtures/app/typescript-embroider/tsconfig.json
@@ -25,7 +25,7 @@
       "@ember-data/request-utils/unstable-preview-types",
       "@ember-data/model/unstable-preview-types",
       "@ember-data/serializer/unstable-preview-types",
-      "@ember-data/tracking/unstable-preview-types",
+      "@warp-drive/ember/unstable-preview-types",
       "@warp-drive/core-types/unstable-preview-types"
     ]
   }
diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json
index 2074568f8..e739508ba 100644
--- a/tests/fixtures/app/typescript/package.json
+++ b/tests/fixtures/app/typescript/package.json
@@ -31,16 +31,16 @@
     "@babel/core": "^7.27.1",
     "@babel/eslint-parser": "^7.27.1",
     "@babel/plugin-proposal-decorators": "^7.27.1",
-    "@ember-data/adapter": "~5.3.13",
-    "@ember-data/graph": "~5.3.13",
-    "@ember-data/json-api": "~5.3.13",
-    "@ember-data/legacy-compat": "~5.3.13",
-    "@ember-data/model": "~5.3.13",
-    "@ember-data/request": "~5.3.13",
-    "@ember-data/request-utils": "~5.3.13",
-    "@ember-data/serializer": "~5.3.13",
-    "@ember-data/store": "~5.3.13",
-    "@ember-data/tracking": "~5.3.13",
+    "@ember-data/adapter": "~5.5.0",
+    "@ember-data/graph": "~5.5.0",
+    "@ember-data/json-api": "~5.5.0",
+    "@ember-data/legacy-compat": "~5.5.0",
+    "@ember-data/model": "~5.5.0",
+    "@ember-data/request": "~5.5.0",
+    "@ember-data/request-utils": "~5.5.0",
+    "@ember-data/serializer": "~5.5.0",
+    "@ember-data/store": "~5.5.0",
+    "@warp-drive/ember": "~5.5.0",
     "@ember/optional-features": "^2.2.0",
     "@ember/test-helpers": "^5.2.1",
     "@embroider/macros": "^1.17.2",
@@ -67,7 +67,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",
diff --git a/tests/fixtures/app/typescript/tsconfig.json b/tests/fixtures/app/typescript/tsconfig.json
index 9a63aa24c..96e957dcd 100644
--- a/tests/fixtures/app/typescript/tsconfig.json
+++ b/tests/fixtures/app/typescript/tsconfig.json
@@ -25,7 +25,7 @@
       "@ember-data/request-utils/unstable-preview-types",
       "@ember-data/model/unstable-preview-types",
       "@ember-data/serializer/unstable-preview-types",
-      "@ember-data/tracking/unstable-preview-types",
+      "@warp-drive/ember/unstable-preview-types",
       "@warp-drive/core-types/unstable-preview-types"
     ]
   }
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index 9683bdff4..2912c53ac 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -49,7 +49,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.4.1-beta.1",
+    "ember-data": "~5.5.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.0",