diff --git a/package.json b/package.json
index f11b1c49086..a43dd423cf4 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,17 @@
       "broccoli-merge-trees": "^4.2.0",
       "ember-cli-babel": "^7.26.11",
       "ember-cli-htmlbars": "^6.2.0"
+    },
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "rsvp",
+        "webpack",
+        "ember-auto-import"
+      ],
+      "allowAny": [
+        "ember-source",
+        "typescript"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
index 439d7198924..c1e8a4cdeb8 100644
--- a/packages/-ember-data/package.json
+++ b/packages/-ember-data/package.json
@@ -77,6 +77,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
+    "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "ember-source": "~5.1.2"
diff --git a/packages/unpublished-test-infra/package.json b/packages/unpublished-test-infra/package.json
index b8c7e978c53..e11552a584f 100644
--- a/packages/unpublished-test-infra/package.json
+++ b/packages/unpublished-test-infra/package.json
@@ -45,6 +45,7 @@
     "@babel/runtime": "^7.22.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^3.2.0",
+    "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@types/ember__owner": "^4.0.4",
diff --git a/packages/unpublished-test-infra/tests/dummy/config/environment.js b/packages/unpublished-test-infra/tests/dummy/config/environment.js
index 50a22cd35b0..13f83df1e75 100644
--- a/packages/unpublished-test-infra/tests/dummy/config/environment.js
+++ b/packages/unpublished-test-infra/tests/dummy/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 96c30ae1fb4..9011d6f3761 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -171,10 +171,10 @@ importers:
     dependencies:
       '@ember-data/adapter':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/adapter(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2)
+        version: file:packages/adapter(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)
       '@ember-data/debug':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/debug
+        version: file:packages/debug(@ember/string@3.1.1)
       '@ember-data/graph':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/graph(@ember-data/store@5.3.0-alpha.8)
@@ -186,7 +186,7 @@ importers:
         version: file:packages/legacy-compat(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)
       '@ember-data/model':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(ember-inflector@4.0.2)(ember-source@5.1.2)
+        version: file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2)
       '@ember-data/private-build-infra':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/private-build-infra
@@ -195,10 +195,10 @@ importers:
         version: file:packages/request
       '@ember-data/serializer':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/serializer(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2)
+        version: file:packages/serializer(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)
       '@ember-data/store':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+        version: file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember-data/tracking':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/tracking
@@ -230,6 +230,9 @@ importers:
       '@babel/core':
         specifier: ^7.22.9
         version: 7.22.9
+      '@ember/string':
+        specifier: ^3.1.1
+        version: 3.1.1
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.22.9)
@@ -1272,6 +1275,9 @@ importers:
       '@ember/optional-features':
         specifier: ^2.0.0
         version: 2.0.0
+      '@ember/string':
+        specifier: ^3.1.1
+        version: 3.1.1
       '@ember/test-helpers':
         specifier: ^3.2.0
         version: 3.2.0(ember-source@5.1.2)(webpack@5.88.2)
@@ -1316,7 +1322,7 @@ importers:
         version: 7.0.0(@ember/test-helpers@3.2.0)(ember-source@5.1.2)(qunit@2.19.4)(webpack@5.88.2)
       ember-resolver:
         specifier: ^10.1.1
-        version: 10.1.1(ember-source@5.1.2)
+        version: 10.1.1(@ember/string@3.1.1)(ember-source@5.1.2)
       ember-source:
         specifier: ~5.1.2
         version: 5.1.2(@babel/core@7.22.9)(@glimmer/component@1.1.2)(webpack@5.88.2)
@@ -1458,27 +1464,51 @@ importers:
 
   tests/blueprints:
     devDependencies:
+      '@babel/core':
+        specifier: ^7.22.9
+        version: 7.22.9
       '@ember-data/adapter':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/adapter
+        version: file:packages/adapter(@ember-data/store@packages+store)(@ember/string@3.1.1)(ember-inflector@4.0.2)
+      '@ember-data/legacy-compat':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/legacy-compat
       '@ember-data/model':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/model
+        version: file:packages/model(@babel/core@7.22.9)(@ember-data/legacy-compat@packages+legacy-compat)(@ember-data/store@packages+store)(@ember-data/tracking@packages+tracking)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2)
       '@ember-data/private-build-infra':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/private-build-infra
       '@ember-data/serializer':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/serializer
+        version: file:packages/serializer(@ember-data/store@packages+store)(@ember/string@3.1.1)(ember-inflector@4.0.2)
+      '@ember-data/store':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/store
+      '@ember-data/tracking':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/tracking
       '@ember-data/unpublished-test-infra':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/unpublished-test-infra
+      '@ember/string':
+        specifier: ^3.1.1
+        version: 3.1.1
+      '@glimmer/component':
+        specifier: ^1.1.2
+        version: 1.1.2(@babel/core@7.22.9)
       ember-cli:
         specifier: ~5.1.0
         version: 5.1.0
       ember-cli-blueprint-test-helpers:
         specifier: ^0.19.2
         version: 0.19.2
+      ember-inflector:
+        specifier: ^4.0.2
+        version: 4.0.2
+      ember-source:
+        specifier: ~5.1.2
+        version: 5.1.2(@babel/core@7.22.9)(@glimmer/component@1.1.2)
       mocha:
         specifier: ^10.2.0
         version: 10.2.0
@@ -1508,9 +1538,12 @@ importers:
       '@ember-data/active-record':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/active-record(ember-inflector@4.0.2)
+      '@ember-data/graph':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/graph
       '@ember-data/json-api':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/json-api(ember-inflector@4.0.2)
+        version: file:packages/json-api(@ember-data/graph@packages+graph)(@ember-data/store@packages+store)(ember-inflector@4.0.2)
       '@ember-data/private-build-infra':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/private-build-infra
@@ -1520,6 +1553,9 @@ importers:
       '@ember-data/rest':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/rest(ember-inflector@4.0.2)
+      '@ember-data/store':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/store
       '@ember-data/unpublished-test-infra':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/unpublished-test-infra
@@ -1632,9 +1668,12 @@ importers:
       '@ember-data/adapter':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/adapter(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)
+      '@ember-data/legacy-compat':
+        specifier: workspace:5.3.0-alpha.8
+        version: link:../../packages/legacy-compat
       '@ember-data/model':
         specifier: workspace:5.3.0-alpha.8
-        version: file:packages/model(@babel/core@7.22.9)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2)
+        version: file:packages/model(@babel/core@7.22.9)(@ember-data/legacy-compat@packages+legacy-compat)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2)
       '@ember-data/serializer':
         specifier: workspace:5.3.0-alpha.8
         version: file:packages/serializer(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)
@@ -2778,6 +2817,15 @@ importers:
       '@ember/test-helpers':
         specifier: ^3.2.0
         version: 3.2.0(ember-source@5.1.2)(webpack@5.88.2)
+      '@embroider/compat':
+        specifier: ^3.2.0
+        version: 3.2.0(@embroider/core@3.2.0)
+      '@embroider/core':
+        specifier: ^3.2.0
+        version: 3.2.0
+      '@embroider/webpack':
+        specifier: ^3.1.4
+        version: 3.1.4(@embroider/core@3.2.0)(webpack@5.88.2)
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.22.9)
@@ -4654,7 +4702,7 @@ packages:
     resolution: {integrity: sha512-3yWpPsK5O77tUdCwW3HayrAcdlRitIRYMvLIG69Pkal1JMIGdNYVTvJ2R1lenhQh2syd/WFmGM07vQuDAtotQw==}
     engines: {node: 16.* || >= 18}
     peerDependencies:
-      ember-source: ^4.0.0 || ^5.0.0
+      ember-source: '*'
     dependencies:
       '@ember/test-waiters': 3.0.2
       '@embroider/macros': 1.12.2
@@ -4718,6 +4766,20 @@ packages:
       - webpack
     dev: true
 
+  /@embroider/babel-loader-8@3.0.0(@embroider/core@3.2.0)(supports-color@8.1.1)(webpack@5.88.2):
+    resolution: {integrity: sha512-NIaHmX/FmxKdyB82J0jHTZWk9OyBEfFm0981pTWgnKCnREhaLSvlEtIlf5iEEU4RPCBIunZZqiy2W/QI3fLaxg==}
+    engines: {node: 12.* || 14.* || >= 16}
+    peerDependencies:
+      '@embroider/core': ^3.0.0
+    dependencies:
+      '@babel/core': 7.22.9(supports-color@8.1.1)
+      '@embroider/core': 3.2.0
+      babel-loader: 8.3.0(@babel/core@7.22.9)(webpack@5.88.2)
+    transitivePeerDependencies:
+      - supports-color
+      - webpack
+    dev: true
+
   /@embroider/compat@3.1.5(@embroider/core@3.1.3):
     resolution: {integrity: sha512-SXFv83kXbiNggIsP/JwhcjXeux5MCphUGxK7VKFqq+IVOFGxr7TnIJOBLyWTAYgh3MtB+rOQiiqmqGdLhszVXg==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -4775,6 +4837,63 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@embroider/compat@3.2.0(@embroider/core@3.2.0):
+    resolution: {integrity: sha512-hHlF0vOcmUHZFJKj07QEetbQSbY44nsDFS9nShlPeUOLlKdl02Wik3vR0AcBKGXMZyu9m5kbhmTM6T8aSquIww==}
+    engines: {node: 12.* || 14.* || >= 16}
+    hasBin: true
+    peerDependencies:
+      '@embroider/core': ^3.2.0
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@babel/core': 7.22.9
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-transform-runtime': 7.22.9(@babel/core@7.22.9)
+      '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
+      '@babel/runtime': 7.22.6
+      '@babel/traverse': 7.22.8
+      '@embroider/core': 3.2.0
+      '@embroider/macros': 1.12.2
+      '@types/babel__code-frame': 7.0.3
+      '@types/yargs': 17.0.24
+      assert-never: 1.2.1
+      babel-import-util: 2.0.0
+      babel-plugin-ember-template-compilation: 2.1.1
+      babel-plugin-syntax-dynamic-import: 6.18.0
+      babylon: 6.18.0
+      bind-decorator: 1.0.11
+      broccoli: 3.5.2
+      broccoli-concat: 4.2.5
+      broccoli-file-creator: 2.1.1
+      broccoli-funnel: 3.0.8
+      broccoli-merge-trees: 4.2.0
+      broccoli-persistent-filter: 3.1.3
+      broccoli-plugin: 4.0.7
+      broccoli-source: 3.0.1
+      chalk: 4.1.2
+      debug: 4.3.4
+      escape-string-regexp: 4.0.0
+      fast-sourcemap-concat: 1.4.0
+      fs-extra: 9.1.0
+      fs-tree-diff: 2.0.1
+      jsdom: 16.7.0
+      lodash: 4.17.21
+      pkg-up: 3.1.0
+      resolve: 1.22.2
+      resolve-package-path: 4.0.3
+      semver: 7.5.4
+      symlink-or-copy: 1.3.1
+      tree-sync: 2.1.0
+      typescript-memoize: 1.1.1
+      walk-sync: 3.0.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@glint/template'
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /@embroider/core@3.1.3:
     resolution: {integrity: sha512-fDznlVajVYDXvpRjXUiu60+x95sid5alktQZBLwdsPGLMhghf0f7WyAacDweWE+ajULps1TuToYm0lagY/sYJw==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -4811,17 +4930,70 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@embroider/core@3.2.0:
+    resolution: {integrity: sha512-IHuSKiPumf0RQMiiawLyIxOHgjw2pAKU3kuL7xc3Zy48sXyTAixxJcv/e7g5HKUIhBkYiBpXFC4lFkE2dbWgKA==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/parser': 7.22.7
+      '@babel/traverse': 7.22.8
+      '@embroider/macros': 1.12.2
+      '@embroider/shared-internals': 2.3.0
+      assert-never: 1.2.1
+      babel-plugin-ember-template-compilation: 2.1.1
+      broccoli-node-api: 1.7.0
+      broccoli-persistent-filter: 3.1.3
+      broccoli-plugin: 4.0.7
+      broccoli-source: 3.0.1
+      debug: 4.3.4
+      fast-sourcemap-concat: 1.4.0
+      filesize: 10.0.7
+      fs-extra: 9.1.0
+      fs-tree-diff: 2.0.1
+      handlebars: 4.7.7
+      js-string-escape: 1.0.1
+      jsdom: 16.7.0
+      lodash: 4.17.21
+      resolve: 1.22.2
+      resolve-package-path: 4.0.3
+      typescript-memoize: 1.1.1
+      walk-sync: 3.0.0
+    transitivePeerDependencies:
+      - '@glint/template'
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /@embroider/hbs-loader@3.0.1(@embroider/core@3.1.3)(webpack@5.88.2):
     resolution: {integrity: sha512-suX65PCsEbt1GW6gEbd31wuw0X8vHWvBiAGNm4bjLCwNSZCR8SIqvAs32+F8k738ArgRsRU4zgaOFuHug8XrRw==}
     engines: {node: 12.* || 14.* || >= 16}
     peerDependencies:
       '@embroider/core': ^3.1.3
       webpack: ^5
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       '@embroider/core': 3.1.3
       webpack: 5.88.2
     dev: true
 
+  /@embroider/hbs-loader@3.0.2(@embroider/core@3.2.0)(webpack@5.88.2):
+    resolution: {integrity: sha512-uN0w4rbes0xJUvC8YrhkwoTEbMD5wIMPMWF8+3BnLmHcATSFZ34hEmOGorgBB1lLAkv5Vo7xhBulWGwigEvBUg==}
+    engines: {node: 12.* || 14.* || >= 16}
+    peerDependencies:
+      '@embroider/core': ^3.2.0
+      webpack: ^5
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      '@embroider/core': 3.2.0
+      webpack: 5.88.2
+    dev: true
+
   /@embroider/macros@1.12.2:
     resolution: {integrity: sha512-3AY1iWq9ctQESgTeKk6Hdw/E5ypAx793bK5WZHHYcmjJAIVfR6lHa6SBoNjDNuYRduabd2lN0VJq7StwL62ETg==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -4869,12 +5041,49 @@ packages:
       typescript-memoize: 1.1.1
     dev: true
 
+  /@embroider/shared-internals@2.3.0:
+    resolution: {integrity: sha512-5h7hUcci10ixXecJj/peqNQJO8kWe4b4tRx7mZjf7I6+P6zDcdVk3QxQZ+/gwrG6cbEfpLzEGKIEiLjZvPtqIA==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      babel-import-util: 2.0.0
+      debug: 4.3.4
+      ember-rfc176-data: 0.3.18
+      fs-extra: 9.1.0
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      resolve-package-path: 4.0.3
+      semver: 7.5.4
+      typescript-memoize: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@embroider/shared-internals@2.3.0(supports-color@8.1.1):
+    resolution: {integrity: sha512-5h7hUcci10ixXecJj/peqNQJO8kWe4b4tRx7mZjf7I6+P6zDcdVk3QxQZ+/gwrG6cbEfpLzEGKIEiLjZvPtqIA==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      babel-import-util: 2.0.0
+      debug: 4.3.4(supports-color@8.1.1)
+      ember-rfc176-data: 0.3.18
+      fs-extra: 9.1.0
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      resolve-package-path: 4.0.3
+      semver: 7.5.4
+      typescript-memoize: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@embroider/webpack@3.1.3(@embroider/core@3.1.3)(webpack@5.88.2):
     resolution: {integrity: sha512-6WWznSExOVJZb8Ks8E9mFJm5ZlqREEvJxRKWebwiMkXJvbNPpHDKARkbDuqME+fwdIAQFGlxqllqJ5mwZ3J1eg==}
     engines: {node: 12.* || 14.* || >= 16}
     peerDependencies:
       '@embroider/core': ^3.1.3
       webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       '@babel/core': 7.22.9(supports-color@8.1.1)
       '@embroider/babel-loader-8': 3.0.0(@embroider/core@3.1.3)(supports-color@8.1.1)(webpack@5.88.2)
@@ -4906,6 +5115,46 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@embroider/webpack@3.1.4(@embroider/core@3.2.0)(webpack@5.88.2):
+    resolution: {integrity: sha512-i56CNcIzYnlLpT3y2Q/Apmq2YkUQm9RGTEFixor1oFE2x1f+cVNt7yvBj01dN4cYbRnAkfE1y/1RXt907GMYkQ==}
+    engines: {node: 12.* || 14.* || >= 16}
+    peerDependencies:
+      '@embroider/core': ^3.2.0
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      '@babel/core': 7.22.9(supports-color@8.1.1)
+      '@embroider/babel-loader-8': 3.0.0(@embroider/core@3.2.0)(supports-color@8.1.1)(webpack@5.88.2)
+      '@embroider/core': 3.2.0
+      '@embroider/hbs-loader': 3.0.2(@embroider/core@3.2.0)(webpack@5.88.2)
+      '@embroider/shared-internals': 2.3.0(supports-color@8.1.1)
+      '@types/supports-color': 8.1.1
+      assert-never: 1.2.1
+      babel-loader: 8.3.0(@babel/core@7.22.9)(webpack@5.88.2)
+      babel-preset-env: 1.7.0(supports-color@8.1.1)
+      css-loader: 5.2.7(webpack@5.88.2)
+      csso: 4.2.0
+      debug: 4.3.4(supports-color@8.1.1)
+      escape-string-regexp: 4.0.0
+      fs-extra: 9.1.0
+      jsdom: 16.7.0(supports-color@8.1.1)
+      lodash: 4.17.21
+      mini-css-extract-plugin: 2.7.6(webpack@5.88.2)
+      semver: 7.5.4
+      source-map-url: 0.4.1
+      style-loader: 2.0.0(webpack@5.88.2)
+      supports-color: 8.1.1
+      terser: 5.18.2
+      thread-loader: 3.0.4(webpack@5.88.2)
+      webpack: 5.88.2
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - utf-8-validate
+    dev: true
+
   /@eslint-community/eslint-utils@4.4.0(eslint@8.45.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6615,12 +6864,37 @@ packages:
     resolution: {integrity: sha512-TNdiTQdPhXlx02pzG//UyVPSKE7SNWjY0n4So/ZnjQpWwaM5LvWBLkWa1JKll5u06HNscHD91XZPuwrMg1kadQ==}
     engines: {node: '>= 12.*'}
 
+  /babel-import-util@2.0.0:
+    resolution: {integrity: sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==}
+    engines: {node: '>= 12.*'}
+    dev: true
+
+  /babel-loader@8.3.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==}
+    engines: {node: '>= 8.9'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+      webpack: '>=2'
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      '@babel/core': 7.22.9
+      find-cache-dir: 3.3.2
+      loader-utils: 2.0.4
+      make-dir: 3.1.0
+      schema-utils: 2.7.1
+    dev: true
+
   /babel-loader@8.3.0(@babel/core@7.22.9)(webpack@5.88.2):
     resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==}
     engines: {node: '>= 8.9'}
     peerDependencies:
       '@babel/core': ^7.0.0
       webpack: '>=2'
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       '@babel/core': 7.22.9
       find-cache-dir: 3.3.2
@@ -6641,15 +6915,6 @@ packages:
       babel-runtime: 6.26.0
     dev: true
 
-  /babel-plugin-debug-macros@0.2.0:
-    resolution: {integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-beta.42
-    dependencies:
-      semver: 5.7.1
-    dev: true
-
   /babel-plugin-debug-macros@0.2.0(@babel/core@7.22.9):
     resolution: {integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==}
     engines: {node: '>=4'}
@@ -6688,6 +6953,14 @@ packages:
       '@glimmer/syntax': 0.84.3
       babel-import-util: 1.4.1
 
+  /babel-plugin-ember-template-compilation@2.1.1:
+    resolution: {integrity: sha512-vwEUw7qfwAgwUokQc5xMxrcJMhCu2dVvDDMIXFyOpXwxt+kqZ2FKvXFV+rJjYchIgHH5rBduEtt4Qk1qeZ6RDA==}
+    engines: {node: '>= 12.*'}
+    dependencies:
+      '@glimmer/syntax': 0.84.3
+      babel-import-util: 2.0.0
+    dev: true
+
   /babel-plugin-filter-imports@4.0.0:
     resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==}
     engines: {node: '>=8'}
@@ -8585,11 +8858,14 @@ packages:
     resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
     engines: {node: '>=8'}
 
-  /css-loader@5.2.7(webpack@5.88.2):
+  /css-loader@5.2.7:
     resolution: {integrity: sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
       webpack: ^4.27.0 || ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.25)
       loader-utils: 2.0.4
@@ -8601,7 +8877,28 @@ packages:
       postcss-value-parser: 4.2.0
       schema-utils: 3.3.0
       semver: 7.5.4
-      webpack: 5.88.2
+    dev: true
+
+  /css-loader@5.2.7(webpack@5.88.2):
+    resolution: {integrity: sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      webpack: ^4.27.0 || ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      icss-utils: 5.1.0(postcss@8.4.25)
+      loader-utils: 2.0.4
+      postcss: 8.4.25
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.25)
+      postcss-modules-local-by-default: 4.0.3(postcss@8.4.25)
+      postcss-modules-scope: 3.0.0(postcss@8.4.25)
+      postcss-modules-values: 4.0.0(postcss@8.4.25)
+      postcss-value-parser: 4.2.0
+      schema-utils: 3.3.0
+      semver: 7.5.4
+      webpack: 5.88.2
 
   /css-tree@1.1.3:
     resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
@@ -8969,6 +9266,47 @@ packages:
   /electron-to-chromium@1.4.454:
     resolution: {integrity: sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==}
 
+  /ember-auto-import@2.6.3:
+    resolution: {integrity: sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-proposal-decorators': 7.22.7(@babel/core@7.22.9)
+      '@babel/preset-env': 7.22.7(@babel/core@7.22.9)
+      '@embroider/macros': 1.12.2
+      '@embroider/shared-internals': 2.2.2
+      babel-loader: 8.3.0(@babel/core@7.22.9)
+      babel-plugin-ember-modules-api-polyfill: 3.5.0
+      babel-plugin-ember-template-compilation: 2.1.0
+      babel-plugin-htmlbars-inline-precompile: 5.3.1
+      babel-plugin-syntax-dynamic-import: 6.18.0
+      broccoli-debug: 0.6.5
+      broccoli-funnel: 3.0.8
+      broccoli-merge-trees: 4.2.0
+      broccoli-plugin: 4.0.7
+      broccoli-source: 3.0.1
+      css-loader: 5.2.7
+      debug: 4.3.4
+      fs-extra: 10.1.0
+      fs-tree-diff: 2.0.1
+      handlebars: 4.7.7
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      mini-css-extract-plugin: 2.7.6
+      parse5: 6.0.1
+      resolve: 1.22.2
+      resolve-package-path: 4.0.3
+      semver: 7.5.4
+      style-loader: 2.0.0
+      typescript-memoize: 1.1.1
+      walk-sync: 3.0.0
+    transitivePeerDependencies:
+      - '@glint/template'
+      - supports-color
+      - webpack
+    dev: true
+
   /ember-auto-import@2.6.3(webpack@5.88.2):
     resolution: {integrity: sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -9009,19 +9347,6 @@ packages:
       - supports-color
       - webpack
 
-  /ember-cache-primitive-polyfill@1.0.1:
-    resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==}
-    engines: {node: 10.* || >= 12}
-    dependencies:
-      ember-cli-babel: 7.26.11
-      ember-cli-version-checker: 5.1.2
-      ember-compatibility-helpers: 1.2.6
-      silent-error: 1.1.1
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-    dev: true
-
   /ember-cache-primitive-polyfill@1.0.1(@babel/core@7.22.9):
     resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==}
     engines: {node: 10.* || >= 12}
@@ -9034,29 +9359,11 @@ packages:
       - '@babel/core'
       - supports-color
 
-  /ember-cached-decorator-polyfill@1.0.1:
-    resolution: {integrity: sha512-VDgrpIJ6rDDHIfkYrsFR1BM3fpcC0+zFWIOsX0qY44zPrIXjhQWVXs2iVXLIPHprSgf+tFQ3ESxwDscpeRe/0A==}
-    engines: {node: 14.* || >= 16}
-    peerDependencies:
-      ember-source: ^3.13.0 || ^4.0.0
-    dependencies:
-      '@embroider/macros': 1.12.2
-      '@glimmer/tracking': 1.1.2
-      babel-import-util: 1.3.0
-      ember-cache-primitive-polyfill: 1.0.1
-      ember-cli-babel: 7.26.11
-      ember-cli-babel-plugin-helpers: 1.1.1
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@glint/template'
-      - supports-color
-    dev: true
-
   /ember-cached-decorator-polyfill@1.0.1(@babel/core@7.22.9)(ember-source@5.1.2):
     resolution: {integrity: sha512-VDgrpIJ6rDDHIfkYrsFR1BM3fpcC0+zFWIOsX0qY44zPrIXjhQWVXs2iVXLIPHprSgf+tFQ3ESxwDscpeRe/0A==}
     engines: {node: 14.* || >= 16}
     peerDependencies:
-      ember-source: ^3.13.0 || ^4.0.0
+      ember-source: '*'
     dependencies:
       '@embroider/macros': 1.12.2
       '@glimmer/tracking': 1.1.2
@@ -9145,7 +9452,7 @@ packages:
     resolution: {integrity: sha512-nevPv77Wjk0Mslb0AF0wgHfbjki6Fi3/dapTrFz17WLX6n5maLr/MTL1hZcZdbT+69DHdgckCza8Z1WyxiUbBA==}
     engines: {node: 12.* || 14.* || 16.* || >= 18}
     peerDependencies:
-      ember-source: ^3.28.0 || ^4.0.0 || ^5.0.0
+      ember-source: '*'
     dependencies:
       body-parser: 1.20.2
       ember-auto-import: 2.6.3(webpack@5.88.2)
@@ -9690,20 +9997,6 @@ packages:
       - whiskers
     dev: true
 
-  /ember-compatibility-helpers@1.2.6:
-    resolution: {integrity: sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==}
-    engines: {node: 10.* || >= 12.*}
-    dependencies:
-      babel-plugin-debug-macros: 0.2.0
-      ember-cli-version-checker: 5.1.2
-      find-up: 5.0.0
-      fs-extra: 9.1.0
-      semver: 5.7.1
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
-    dev: true
-
   /ember-compatibility-helpers@1.2.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==}
     engines: {node: 10.* || >= 12.*}
@@ -9778,7 +10071,7 @@ packages:
     engines: {node: 16.* || >= 18}
     peerDependencies:
       '@ember/test-helpers': '>=3.0.3'
-      ember-source: '>=4.0.0'
+      ember-source: '*'
       qunit: ^2.13.0
     dependencies:
       '@ember/test-helpers': 3.2.0(ember-source@5.1.2)(webpack@5.88.2)
@@ -9803,7 +10096,7 @@ packages:
     engines: {node: 14.* || 16.* || >= 18}
     peerDependencies:
       '@ember/string': ^3.0.1
-      ember-source: ^4.8.3 || >= 5.0.0
+      ember-source: '*'
     peerDependenciesMeta:
       ember-source:
         optional: true
@@ -9814,22 +10107,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /ember-resolver@10.1.1(ember-source@5.1.2):
-    resolution: {integrity: sha512-y1zzn6C4YGJui+tJzcCKlsf1oSOSVAkRrvmg8OwqVIKnALKKb9ihx2qLCslHg8x0wJvJgMtDMXgrczvQrZW0Lw==}
-    engines: {node: 14.* || 16.* || >= 18}
-    peerDependencies:
-      '@ember/string': ^3.0.1
-      ember-source: ^4.8.3 || >= 5.0.0
-    peerDependenciesMeta:
-      ember-source:
-        optional: true
-    dependencies:
-      ember-cli-babel: 7.26.11
-      ember-source: 5.1.2(@babel/core@7.22.9)(@glimmer/component@1.1.2)(webpack@5.88.2)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /ember-rfc176-data@0.3.18:
     resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==}
 
@@ -9865,6 +10142,65 @@ packages:
       - encoding
     dev: true
 
+  /ember-source@5.1.2(@babel/core@7.22.9)(@glimmer/component@1.1.2):
+    resolution: {integrity: sha512-HTh8CANROxGuBIy/x3c42v4u4255IA55E40KXI3YABww/tV9N1vBRiXolkPcR8aSRDdl32UxL3wBV6/v8npxDQ==}
+    engines: {node: '>= 16.*'}
+    peerDependencies:
+      '@glimmer/component': ^1.1.2
+    dependencies:
+      '@babel/helper-module-imports': 7.22.5
+      '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.22.9)
+      '@ember/edition-utils': 1.2.0
+      '@glimmer/compiler': 0.84.2
+      '@glimmer/component': 1.1.2(@babel/core@7.22.9)
+      '@glimmer/destroyable': 0.84.2
+      '@glimmer/env': 0.1.7
+      '@glimmer/global-context': 0.84.3
+      '@glimmer/interfaces': 0.84.2
+      '@glimmer/manager': 0.84.2
+      '@glimmer/node': 0.84.2
+      '@glimmer/opcode-compiler': 0.84.2
+      '@glimmer/owner': 0.84.2
+      '@glimmer/program': 0.84.2
+      '@glimmer/reference': 0.84.2
+      '@glimmer/runtime': 0.84.2
+      '@glimmer/syntax': 0.84.2
+      '@glimmer/validator': 0.84.2
+      '@glimmer/vm-babel-plugins': 0.84.2(@babel/core@7.22.9)
+      '@simple-dom/interface': 1.4.0
+      babel-plugin-debug-macros: 0.3.4(@babel/core@7.22.9)
+      babel-plugin-filter-imports: 4.0.0
+      backburner.js: 2.7.0
+      broccoli-concat: 4.2.5
+      broccoli-debug: 0.6.5
+      broccoli-file-creator: 2.1.1
+      broccoli-funnel: 3.0.8
+      broccoli-merge-trees: 4.2.0
+      chalk: 4.1.2
+      ember-auto-import: 2.6.3
+      ember-cli-babel: 7.26.11
+      ember-cli-get-component-path-option: 1.0.0
+      ember-cli-is-package-missing: 1.0.0
+      ember-cli-normalize-entity-name: 1.0.0
+      ember-cli-path-utils: 1.0.0
+      ember-cli-string-utils: 1.1.0
+      ember-cli-typescript-blueprint-polyfill: 0.1.0
+      ember-cli-version-checker: 5.1.2
+      ember-router-generator: 2.0.0
+      inflection: 1.13.4
+      resolve: 1.22.2
+      route-recognizer: 0.3.4
+      router_js: 8.0.3(route-recognizer@0.3.4)
+      semver: 7.5.4
+      silent-error: 1.1.1
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@glint/template'
+      - rsvp
+      - supports-color
+      - webpack
+    dev: true
+
   /ember-source@5.1.2(@babel/core@7.22.9)(@glimmer/component@1.1.2)(webpack@5.88.2):
     resolution: {integrity: sha512-HTh8CANROxGuBIy/x3c42v4u4255IA55E40KXI3YABww/tV9N1vBRiXolkPcR8aSRDdl32UxL3wBV6/v8npxDQ==}
     engines: {node: '>= 16.*'}
@@ -13227,11 +13563,26 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /mini-css-extract-plugin@2.7.6:
+    resolution: {integrity: sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==}
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      schema-utils: 4.2.0
+    dev: true
+
   /mini-css-extract-plugin@2.7.6(webpack@5.88.2):
     resolution: {integrity: sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==}
     engines: {node: '>= 12.13.0'}
     peerDependencies:
       webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       schema-utils: 4.2.0
       webpack: 5.88.2
@@ -14725,6 +15076,9 @@ packages:
     peerDependencies:
       route-recognizer: ^0.3.4
       rsvp: ^4.8.5
+    peerDependenciesMeta:
+      rsvp:
+        optional: true
     dependencies:
       '@glimmer/env': 0.1.7
       route-recognizer: 0.3.4
@@ -15379,11 +15733,27 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /style-loader@2.0.0:
+    resolution: {integrity: sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      webpack: ^4.0.0 || ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+    dependencies:
+      loader-utils: 2.0.4
+      schema-utils: 3.3.0
+    dev: true
+
   /style-loader@2.0.0(webpack@5.88.2):
     resolution: {integrity: sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
       webpack: ^4.0.0 || ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
@@ -15508,6 +15878,8 @@ packages:
         optional: true
       uglify-js:
         optional: true
+      webpack:
+        optional: true
     dependencies:
       '@jridgewell/trace-mapping': 0.3.18
       jest-worker: 27.5.1
@@ -15749,6 +16121,9 @@ packages:
     engines: {node: '>= 10.13.0'}
     peerDependencies:
       webpack: ^4.27.0 || ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
     dependencies:
       json-parse-better-errors: 1.0.2
       loader-runner: 4.3.0
@@ -15942,7 +16317,7 @@ packages:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+      typescript: '*'
     dependencies:
       tslib: 1.14.1
       typescript: 5.1.6
@@ -16744,24 +17119,6 @@ packages:
       - supports-color
     dev: true
 
-  file:packages/adapter:
-    resolution: {directory: packages/adapter, type: directory}
-    name: '@ember-data/adapter'
-    engines: {node: 16.* || >= 18.*}
-    peerDependencies:
-      '@ember-data/store': workspace:5.3.0-alpha.8
-      '@ember/string': ^3.1.1
-      ember-inflector: ^4.0.2
-    dependencies:
-      '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@embroider/macros': 1.12.2
-      ember-cli-babel: 7.26.11
-      ember-cli-test-info: 1.0.0
-    transitivePeerDependencies:
-      - '@glint/template'
-      - supports-color
-    dev: true
-
   file:packages/adapter(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2):
     resolution: {directory: packages/adapter, type: directory}
     id: file:packages/adapter
@@ -16783,7 +17140,7 @@ packages:
       - '@glint/template'
       - supports-color
 
-  file:packages/adapter(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2):
+  file:packages/adapter(@ember-data/store@packages+store)(@ember/string@3.1.1)(ember-inflector@4.0.2):
     resolution: {directory: packages/adapter, type: directory}
     id: file:packages/adapter
     name: '@ember-data/adapter'
@@ -16794,7 +17151,8 @@ packages:
       ember-inflector: ^4.0.2
     dependencies:
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+      '@ember-data/store': link:packages/store
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.12.2
       ember-cli-babel: 7.26.11
       ember-cli-test-info: 1.0.0
@@ -16802,29 +17160,7 @@ packages:
     transitivePeerDependencies:
       - '@glint/template'
       - supports-color
-    dev: false
-
-  file:packages/debug:
-    resolution: {directory: packages/debug, type: directory}
-    name: '@ember-data/debug'
-    engines: {node: 16.* || >= 18.*}
-    peerDependencies:
-      '@ember/string': ^3.1.1
-    dependencies:
-      '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.12.2
-      ember-auto-import: 2.6.3(webpack@5.88.2)
-      ember-cli-babel: 7.26.11
-      webpack: 5.88.2
-    transitivePeerDependencies:
-      - '@glint/template'
-      - '@swc/core'
-      - esbuild
-      - supports-color
-      - uglify-js
-      - webpack-cli
-    dev: false
+    dev: true
 
   file:packages/debug(@ember/string@3.1.1):
     resolution: {directory: packages/debug, type: directory}
@@ -16858,7 +17194,7 @@ packages:
       '@ember-data/store': workspace:5.3.0-alpha.8
     dependencies:
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember/edition-utils': 1.2.0
       '@embroider/macros': 1.12.2
       ember-cli-babel: 7.26.11
@@ -16878,7 +17214,7 @@ packages:
     dependencies:
       '@ember-data/graph': file:packages/graph(@ember-data/store@5.3.0-alpha.8)
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember/edition-utils': 1.2.0
       '@embroider/macros': 1.12.2
       ember-cli-babel: 7.26.11
@@ -16887,7 +17223,7 @@ packages:
       - '@glint/template'
       - supports-color
 
-  file:packages/json-api(ember-inflector@4.0.2):
+  file:packages/json-api(@ember-data/graph@packages+graph)(@ember-data/store@packages+store)(ember-inflector@4.0.2):
     resolution: {directory: packages/json-api, type: directory}
     id: file:packages/json-api
     name: '@ember-data/json-api'
@@ -16897,7 +17233,9 @@ packages:
       '@ember-data/store': workspace:5.3.0-alpha.8
       ember-inflector: ^4.0.2
     dependencies:
+      '@ember-data/graph': link:packages/graph
       '@ember-data/private-build-infra': file:packages/private-build-infra
+      '@ember-data/store': link:packages/store
       '@ember/edition-utils': 1.2.0
       '@embroider/macros': 1.12.2
       ember-cli-babel: 7.26.11
@@ -16951,42 +17289,6 @@ packages:
       - '@glint/template'
       - supports-color
 
-  file:packages/model:
-    resolution: {directory: packages/model, type: directory}
-    name: '@ember-data/model'
-    engines: {node: 16.* || >= 18.*}
-    peerDependencies:
-      '@ember-data/debug': workspace:5.3.0-alpha.8
-      '@ember-data/graph': workspace:5.3.0-alpha.8
-      '@ember-data/json-api': workspace:5.3.0-alpha.8
-      '@ember-data/legacy-compat': workspace:5.3.0-alpha.8
-      '@ember-data/store': workspace:5.3.0-alpha.8
-      '@ember-data/tracking': workspace:5.3.0-alpha.8
-      '@ember/string': ^3.1.1
-      ember-inflector: ^4.0.2
-    peerDependenciesMeta:
-      '@ember-data/debug':
-        optional: true
-      '@ember-data/graph':
-        optional: true
-      '@ember-data/json-api':
-        optional: true
-    dependencies:
-      '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.12.2
-      ember-cached-decorator-polyfill: 1.0.1
-      ember-cli-babel: 7.26.11
-      ember-cli-string-utils: 1.1.0
-      ember-cli-test-info: 1.0.0
-      inflection: 2.0.1
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@glint/template'
-      - ember-source
-      - supports-color
-    dev: true
-
   file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
     resolution: {directory: packages/model, type: directory}
     id: file:packages/model
@@ -17031,7 +17333,7 @@ packages:
       - ember-source
       - supports-color
 
-  file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(ember-inflector@4.0.2)(ember-source@5.1.2):
+  file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
     resolution: {directory: packages/model, type: directory}
     id: file:packages/model
     name: '@ember-data/model'
@@ -17053,14 +17355,13 @@ packages:
       '@ember-data/json-api':
         optional: true
     dependencies:
-      '@ember-data/debug': file:packages/debug
-      '@ember-data/graph': file:packages/graph(@ember-data/store@5.3.0-alpha.8)
-      '@ember-data/json-api': file:packages/json-api(@ember-data/graph@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2)
-      '@ember-data/legacy-compat': file:packages/legacy-compat(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)
+      '@ember-data/debug': file:packages/debug(@ember/string@3.1.1)
+      '@ember-data/legacy-compat': file:packages/legacy-compat
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember-data/tracking': file:packages/tracking
       '@ember/edition-utils': 1.2.0
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.12.2
       ember-cached-decorator-polyfill: 1.0.1(@babel/core@7.22.9)(ember-source@5.1.2)
       ember-cli-babel: 7.26.11
@@ -17073,9 +17374,9 @@ packages:
       - '@glint/template'
       - ember-source
       - supports-color
-    dev: false
+    dev: true
 
-  file:packages/model(@babel/core@7.22.9)(@ember-data/debug@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
+  file:packages/model(@babel/core@7.22.9)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
     resolution: {directory: packages/model, type: directory}
     id: file:packages/model
     name: '@ember-data/model'
@@ -17097,8 +17398,9 @@ packages:
       '@ember-data/json-api':
         optional: true
     dependencies:
-      '@ember-data/debug': file:packages/debug(@ember/string@3.1.1)
-      '@ember-data/legacy-compat': file:packages/legacy-compat
+      '@ember-data/graph': file:packages/graph(@ember-data/store@5.3.0-alpha.8)
+      '@ember-data/json-api': file:packages/json-api(@ember-data/graph@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2)
+      '@ember-data/legacy-compat': file:packages/legacy-compat(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)
       '@ember-data/private-build-infra': file:packages/private-build-infra
       '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember-data/tracking': file:packages/tracking
@@ -17118,7 +17420,7 @@ packages:
       - supports-color
     dev: true
 
-  file:packages/model(@babel/core@7.22.9)(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)(@ember-data/legacy-compat@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
+  file:packages/model(@babel/core@7.22.9)(@ember-data/legacy-compat@packages+legacy-compat)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
     resolution: {directory: packages/model, type: directory}
     id: file:packages/model
     name: '@ember-data/model'
@@ -17140,9 +17442,7 @@ packages:
       '@ember-data/json-api':
         optional: true
     dependencies:
-      '@ember-data/graph': file:packages/graph(@ember-data/store@5.3.0-alpha.8)
-      '@ember-data/json-api': file:packages/json-api(@ember-data/graph@5.3.0-alpha.8)(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2)
-      '@ember-data/legacy-compat': file:packages/legacy-compat(@ember-data/graph@5.3.0-alpha.8)(@ember-data/json-api@5.3.0-alpha.8)
+      '@ember-data/legacy-compat': link:packages/legacy-compat
       '@ember-data/private-build-infra': file:packages/private-build-infra
       '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
       '@ember-data/tracking': file:packages/tracking
@@ -17162,7 +17462,7 @@ packages:
       - supports-color
     dev: true
 
-  file:packages/model(@babel/core@7.22.9)(@ember-data/store@5.3.0-alpha.8)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
+  file:packages/model(@babel/core@7.22.9)(@ember-data/legacy-compat@packages+legacy-compat)(@ember-data/store@packages+store)(@ember-data/tracking@packages+tracking)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2):
     resolution: {directory: packages/model, type: directory}
     id: file:packages/model
     name: '@ember-data/model'
@@ -17184,9 +17484,10 @@ packages:
       '@ember-data/json-api':
         optional: true
     dependencies:
+      '@ember-data/legacy-compat': link:packages/legacy-compat
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
-      '@ember-data/tracking': file:packages/tracking
+      '@ember-data/store': link:packages/store
+      '@ember-data/tracking': link:packages/tracking
       '@ember/edition-utils': 1.2.0
       '@ember/string': 3.1.1
       '@embroider/macros': 1.12.2
@@ -17276,24 +17577,6 @@ packages:
       - supports-color
     dev: true
 
-  file:packages/serializer:
-    resolution: {directory: packages/serializer, type: directory}
-    name: '@ember-data/serializer'
-    engines: {node: 16.* || >= 18.*}
-    peerDependencies:
-      '@ember-data/store': workspace:5.3.0-alpha.8
-      '@ember/string': ^3.1.1
-      ember-inflector: ^4.0.2
-    dependencies:
-      '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@embroider/macros': 1.12.2
-      ember-cli-babel: 7.26.11
-      ember-cli-test-info: 1.0.0
-    transitivePeerDependencies:
-      - '@glint/template'
-      - supports-color
-    dev: true
-
   file:packages/serializer(@ember-data/store@5.3.0-alpha.8)(@ember/string@3.1.1)(ember-inflector@4.0.2):
     resolution: {directory: packages/serializer, type: directory}
     id: file:packages/serializer
@@ -17315,7 +17598,7 @@ packages:
       - '@glint/template'
       - supports-color
 
-  file:packages/serializer(@ember-data/store@5.3.0-alpha.8)(ember-inflector@4.0.2):
+  file:packages/serializer(@ember-data/store@packages+store)(@ember/string@3.1.1)(ember-inflector@4.0.2):
     resolution: {directory: packages/serializer, type: directory}
     id: file:packages/serializer
     name: '@ember-data/serializer'
@@ -17326,7 +17609,8 @@ packages:
       ember-inflector: ^4.0.2
     dependencies:
       '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/store': file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2)
+      '@ember-data/store': link:packages/store
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.12.2
       ember-cli-babel: 7.26.11
       ember-cli-test-info: 1.0.0
@@ -17334,7 +17618,7 @@ packages:
     transitivePeerDependencies:
       - '@glint/template'
       - supports-color
-    dev: false
+    dev: true
 
   file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2):
     resolution: {directory: packages/store, type: directory}
@@ -17359,28 +17643,6 @@ packages:
       - ember-source
       - supports-color
 
-  file:packages/store(@babel/core@7.22.9)(@ember-data/tracking@5.3.0-alpha.8)(@glimmer/tracking@1.1.2)(ember-source@5.1.2):
-    resolution: {directory: packages/store, type: directory}
-    id: file:packages/store
-    name: '@ember-data/store'
-    engines: {node: 16.* || >= 18.*}
-    peerDependencies:
-      '@ember-data/tracking': workspace:5.3.0-alpha.8
-      '@ember/string': ^3.1.1
-      '@glimmer/tracking': ^1.1.2
-    dependencies:
-      '@ember-data/private-build-infra': file:packages/private-build-infra
-      '@ember-data/tracking': file:packages/tracking
-      '@embroider/macros': 1.12.2
-      '@glimmer/tracking': 1.1.2
-      ember-cached-decorator-polyfill: 1.0.1(@babel/core@7.22.9)(ember-source@5.1.2)
-      ember-cli-babel: 7.26.11
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@glint/template'
-      - ember-source
-      - supports-color
-
   file:packages/tracking:
     resolution: {directory: packages/tracking, type: directory}
     name: '@ember-data/tracking'
diff --git a/tests/adapter-encapsulation/config/environment.js b/tests/adapter-encapsulation/config/environment.js
index 589ffba0e1d..1f345a934b9 100644
--- a/tests/adapter-encapsulation/config/environment.js
+++ b/tests/adapter-encapsulation/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'adapter-encapsulation-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/blueprints/package.json b/tests/blueprints/package.json
index 7e63f198c62..65ae6c82c29 100644
--- a/tests/blueprints/package.json
+++ b/tests/blueprints/package.json
@@ -31,13 +31,21 @@
     }
   },
   "devDependencies": {
+    "@babel/core": "^7.22.9",
     "@ember-data/adapter": "workspace:5.3.0-alpha.8",
+    "@ember-data/legacy-compat": "workspace:5.3.0-alpha.8",
     "@ember-data/model": "workspace:5.3.0-alpha.8",
     "@ember-data/private-build-infra": "workspace:5.3.0-alpha.8",
     "@ember-data/serializer": "workspace:5.3.0-alpha.8",
+    "@ember-data/store": "workspace:5.3.0-alpha.8",
+    "@ember-data/tracking": "workspace:5.3.0-alpha.8",
     "@ember-data/unpublished-test-infra": "workspace:5.3.0-alpha.8",
+    "@ember/string": "^3.1.1",
+    "@glimmer/component": "^1.1.2",
     "ember-cli": "~5.1.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
+    "ember-inflector": "^4.0.2",
+    "ember-source": "~5.1.2",
     "mocha": "^10.2.0",
     "silent-error": "^1.1.1"
   },
diff --git a/tests/builders/config/environment.js b/tests/builders/config/environment.js
index c6baedb2b72..265be9f8b5e 100644
--- a/tests/builders/config/environment.js
+++ b/tests/builders/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'builders-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/builders/package.json b/tests/builders/package.json
index 7d5e7f5703f..c62913778ee 100644
--- a/tests/builders/package.json
+++ b/tests/builders/package.json
@@ -43,6 +43,8 @@
     "@babel/runtime": "^7.22.6",
     "@ember-data/active-record": "workspace:5.3.0-alpha.8",
     "@ember-data/json-api": "workspace:5.3.0-alpha.8",
+    "@ember-data/graph": "workspace:5.3.0-alpha.8",
+    "@ember-data/store": "workspace:5.3.0-alpha.8",
     "@ember-data/private-build-infra": "workspace:5.3.0-alpha.8",
     "@ember-data/request-utils": "workspace:5.3.0-alpha.8",
     "@ember-data/rest": "workspace:5.3.0-alpha.8",
diff --git a/tests/debug-encapsulation/config/environment.js b/tests/debug-encapsulation/config/environment.js
index c3e2289a507..9f18d4f2f04 100644
--- a/tests/debug-encapsulation/config/environment.js
+++ b/tests/debug-encapsulation/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'debug-encapsulation-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/debug-encapsulation/package.json b/tests/debug-encapsulation/package.json
index f9dcbaf2d9a..8a376458a10 100644
--- a/tests/debug-encapsulation/package.json
+++ b/tests/debug-encapsulation/package.json
@@ -45,6 +45,7 @@
     "@babel/core": "^7.22.9",
     "@babel/runtime": "^7.22.6",
     "@ember-data/adapter": "workspace:5.3.0-alpha.8",
+    "@ember-data/legacy-compat": "workspace:5.3.0-alpha.8",
     "@ember-data/model": "workspace:5.3.0-alpha.8",
     "@ember-data/serializer": "workspace:5.3.0-alpha.8",
     "@ember-data/store": "workspace:5.3.0-alpha.8",
diff --git a/tests/embroider-basic-compat/config/environment.js b/tests/embroider-basic-compat/config/environment.js
index 1639c79a70d..32410cf0b79 100644
--- a/tests/embroider-basic-compat/config/environment.js
+++ b/tests/embroider-basic-compat/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'embroider-basic-compat',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/fastboot/config/environment.js b/tests/fastboot/config/environment.js
index 0bb53e4b82f..b2bf63e45f4 100644
--- a/tests/fastboot/config/environment.js
+++ b/tests/fastboot/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'fastboot-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/full-data-asset-size-app/config/environment.js b/tests/full-data-asset-size-app/config/environment.js
index 2352d0e4bd7..edc2e75993e 100644
--- a/tests/full-data-asset-size-app/config/environment.js
+++ b/tests/full-data-asset-size-app/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'full-data-asset-size-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {},
       EXTEND_PROTOTYPES: {},
diff --git a/tests/graph/config/environment.js b/tests/graph/config/environment.js
index fdfbc8a6fdc..e8b79acbef5 100644
--- a/tests/graph/config/environment.js
+++ b/tests/graph/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'graph-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/json-api-encapsulation/config/environment.js b/tests/json-api-encapsulation/config/environment.js
index 4eb76455ed1..7a35424850c 100644
--- a/tests/json-api-encapsulation/config/environment.js
+++ b/tests/json-api-encapsulation/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'json-api-encapsulation-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/json-api/config/environment.js b/tests/json-api/config/environment.js
index 869bb3bd6b9..dbf5ca63e2e 100644
--- a/tests/json-api/config/environment.js
+++ b/tests/json-api/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'json-api-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/main/config/environment.js b/tests/main/config/environment.js
index 05f515f65f6..24a4a629a80 100644
--- a/tests/main/config/environment.js
+++ b/tests/main/config/environment.js
@@ -6,7 +6,7 @@ module.exports = function (environment) {
     podModulePrefix: 'main-test-app',
     environment: environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       RAISE_ON_DEPRECATION: false,
     },
diff --git a/tests/model-encapsulation/config/environment.js b/tests/model-encapsulation/config/environment.js
index ad6e47878d3..56789684890 100644
--- a/tests/model-encapsulation/config/environment.js
+++ b/tests/model-encapsulation/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'model-encapsulation-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/performance/config/environment.js b/tests/performance/config/environment.js
index 317915898dd..1e6942e6980 100644
--- a/tests/performance/config/environment.js
+++ b/tests/performance/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'performance-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/performance/ember-cli-build.js b/tests/performance/ember-cli-build.js
index 041841ce912..85f34a68459 100644
--- a/tests/performance/ember-cli-build.js
+++ b/tests/performance/ember-cli-build.js
@@ -27,5 +27,20 @@ module.exports = function (defaults) {
   // please specify an object with the list of modules as keys
   // along with the exports of each module as its value.
 
-  return app.toTree();
+  const { Webpack } = require('@embroider/webpack');
+
+  return require('@embroider/compat').compatBuild(app, Webpack, {
+    //
+    // staticAddonTestSupportTrees: true,
+    // staticAddonTrees: true,
+    // staticHelpers: true,
+    // staticModifiers: true,
+    // staticComponents: true,
+    // splitAtRoutes: ['route.name'], // can also be a RegExp
+    // packagerOptions: {
+    //    webpackConfig: { }
+    // }
+    //
+    extraPublicTrees: [],
+  });
 };
diff --git a/tests/performance/package.json b/tests/performance/package.json
index 0bb7c874976..6da1a5fc5a8 100644
--- a/tests/performance/package.json
+++ b/tests/performance/package.json
@@ -34,6 +34,9 @@
     "@babel/runtime": "^7.22.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^3.2.0",
+    "@embroider/compat": "^3.2.0",
+    "@embroider/core": "^3.2.0",
+    "@embroider/webpack": "^3.1.4",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@types/ember__owner": "^4.0.4",
@@ -47,6 +50,7 @@
     "ember-resolver": "^10.1.1",
     "ember-source": "~5.1.2",
     "loader.js": "^4.7.0",
+    "webpack": "^5.88.2",
     "zlib": "1.0.5"
   },
   "ember": {
@@ -59,4 +63,4 @@
     "extends": "../../package.json"
   },
   "packageManager": "pnpm@8.6.9"
-}
\ No newline at end of file
+}
diff --git a/tests/request/config/environment.js b/tests/request/config/environment.js
index 0caf91a5989..a4a2606cb58 100644
--- a/tests/request/config/environment.js
+++ b/tests/request/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'request-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/serializer-encapsulation/config/environment.js b/tests/serializer-encapsulation/config/environment.js
index aa1f5bb9a8e..0b1a0bac9d1 100644
--- a/tests/serializer-encapsulation/config/environment.js
+++ b/tests/serializer-encapsulation/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'serializer-encapsulation-test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build