diff --git a/guides/requests/examples/1-auth.md b/guides/requests/examples/1-auth.md
index 1204d3da588..d19d7bece53 100644
--- a/guides/requests/examples/1-auth.md
+++ b/guides/requests/examples/1-auth.md
@@ -76,7 +76,7 @@ Lets imagine we are using [Ember Simple Auth](https://github.com/simplabs/ember-
**app/services/auth-handler.js**
```ts
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import type { NextFn, RequestContext } from '@ember-data/request';
export default class AuthHandler {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 74afe6900d0..e3e9f16960e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3205,40 +3205,40 @@ importers:
version: 7.26.10
'@ember-data/adapter':
specifier: workspace:*
- version: file:packages/adapter(69e6cac629d60cb27e5329b4f9de3a43)
+ version: file:packages/adapter(65216b275277e266899a4839df928e58)
'@ember-data/debug':
specifier: workspace:*
- version: file:packages/debug(cfb627c7838fc2095423bc7c1f084b9d)
+ version: file:packages/debug(3410cd21b55c2a8b1a09fcf68b94f6f2)
'@ember-data/graph':
specifier: workspace:*
- version: file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)
+ version: file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)
'@ember-data/json-api':
specifier: workspace:*
- version: file:packages/json-api(05676ec33b6f3e4f589c1d3a2872f0a0)
+ version: file:packages/json-api(32b3f52911f12801bdd727e95d220732)
'@ember-data/legacy-compat':
specifier: workspace:*
- version: file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)
+ version: file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)
'@ember-data/model':
specifier: workspace:*
- version: file:packages/model(3b1e9f9e630fe03b8eade0af75b22636)
+ version: file:packages/model(490b236d01687caf06cfad4afe0dc969)
'@ember-data/request':
specifier: workspace:*
version: file:packages/request(a616a2f4498bd7bc4cbe317548554807)
'@ember-data/request-utils':
specifier: workspace:*
- version: file:packages/request-utils(27efc869a44f5fafffa358009428a357)
+ version: file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
'@ember-data/serializer':
specifier: workspace:*
- version: file:packages/serializer(69e6cac629d60cb27e5329b4f9de3a43)
+ version: file:packages/serializer(65216b275277e266899a4839df928e58)
'@ember-data/store':
specifier: workspace:*
- version: file:packages/store(b5c06f80147830daf16c42d352e22eff)
+ version: file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
'@ember-data/tracking':
specifier: workspace:*
- version: file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)
+ version: file:packages/tracking(705310b48e66482cebd843ac2ea54e02)
'@ember-data/unpublished-test-infra':
specifier: workspace:*
- version: file:packages/unpublished-test-infra(8665b451ff87cacdfbe98df44bdb7e0d)
+ version: file:packages/unpublished-test-infra(751f09ee2847d078cc905e9ac4ba7bd9)
'@ember/edition-utils':
specifier: ^1.2.0
version: 1.2.0
@@ -3250,7 +3250,7 @@ importers:
version: 4.0.1
'@ember/test-helpers':
specifier: 5.1.0
- version: 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(8cf4fcab81fc3906e6e66c90f19bddef)
+ version: 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(6bdc1548f7ec55b645542e5984f71664)
'@ember/test-waiters':
specifier: ^3.1.0
version: 3.1.0(@babel/core@7.26.9)
@@ -3292,7 +3292,7 @@ importers:
version: file:config(@glint/template@1.5.2)
'@warp-drive/schema-record':
specifier: workspace:*
- version: file:packages/schema-record(1180fba2e999f1c9edce011af67d47b1)
+ version: file:packages/schema-record(4eed1bb7ada307d4903e1ac38a5e65f3)
broccoli-concat:
specifier: ^4.2.5
version: 4.2.5
@@ -3316,7 +3316,7 @@ importers:
version: 2.10.0(@glint/template@1.5.2)
ember-cached-decorator-polyfill:
specifier: ^1.0.2
- version: 1.0.2(8cf4fcab81fc3906e6e66c90f19bddef)
+ version: 1.0.2(6bdc1548f7ec55b645542e5984f71664)
ember-cli:
specifier: ~6.2.2
version: 6.2.2
@@ -3340,7 +3340,7 @@ importers:
version: 3.1.0(@babel/core@7.26.9)
ember-data:
specifier: workspace:*
- version: file:packages/-ember-data(3a60c434391300970a0600e5463be104)
+ version: file:packages/-ember-data(33c23c96805705da3699f473c0b38806)
ember-decorators-polyfill:
specifier: ^1.1.5
version: 1.1.5(@babel/core@7.26.9)
@@ -3349,25 +3349,25 @@ importers:
version: 1.1.3
ember-exam:
specifier: ^9.0.0
- version: 9.0.0(e7b153d02552abd15524b376ba8b55f2)
+ version: 9.0.0(2a2e1d0ba684b2e0f02867435e927e5d)
ember-inflector:
specifier: 5.0.2
version: 5.0.2(@babel/core@7.26.9)
ember-load-initializers:
specifier: ^3.0.1
- version: 3.0.1(c060943494665cf8806af572b33eddfe)
+ version: 3.0.1(99589eb55c421b56135f2773cc4617dc)
ember-maybe-import-regenerator:
specifier: ^1.0.0
version: 1.0.0(@babel/core@7.26.9)
ember-qunit:
specifier: 8.0.2
- version: 8.0.2(74ae58be428444c84c1b0a96d34e4da6)
+ version: 8.0.2(d4125475e230561fc7ca973784afad87)
ember-resolver:
specifier: ^11.0.1
- version: 11.0.1(824ca145128a2e0f190c5305efbce50c)
+ version: 11.0.1(6d69444a73301c587d39565c309a6d5d)
ember-source:
- specifier: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz
- version: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ specifier: ~5.12.0
+ version: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
ember-source-channel-url:
specifier: ^3.0.0
version: 3.0.0
@@ -5508,10 +5508,6 @@ packages:
resolution: {integrity: sha512-xoR8F6fsgFqWbPbCfSgJuJ95vaLnXw0SgDCwyl/KMeeaSxpHwJbr8+BfiUl+7ko2A+HzrY5dPXXnGr4ZM+CUXw==}
engines: {node: '>= 16.0.0'}
- '@glimmer/compiler@0.94.8':
- resolution: {integrity: sha512-mqakVTK+f1QAHcibfL2I4rh9Y7hszOKqaCcgf60NFOPHJTnYNJHtH7TYR6h9Wcr9dRfOgjqxDUVhgrhxp3ojnQ==}
- engines: {node: '>= 18.0.0'}
-
'@glimmer/component@1.1.2':
resolution: {integrity: sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==}
engines: {node: 6.* || 8.* || >= 10.*}
@@ -5522,18 +5518,12 @@ packages:
'@glimmer/destroyable@0.92.3':
resolution: {integrity: sha512-vQ+mzT9Vkf+JueY7L5XbZqK0WyEVTKv0HOLrw/zDw9F5Szn3F/8Ea/qbAClo3QK3oZeg+ulFTa/61rdjSFYHGA==}
- '@glimmer/destroyable@0.94.6':
- resolution: {integrity: sha512-+yihM6wFhtKaSbWlG/DHJELVl/QmMPX8Iuz1SZomlzTaDIDis4+LNZgfdi053OMea0k9QPvzo+nyattxwEHjxA==}
-
'@glimmer/di@0.1.11':
resolution: {integrity: sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==}
'@glimmer/encoder@0.92.3':
resolution: {integrity: sha512-DJ8DB33LxODjzCWRrxozHUaRqVyZj4p8jDLG42aCNmWo3smxrsjshcaVUwDmib24DW+dzR7kMc39ObMqT5zK0w==}
- '@glimmer/encoder@0.93.6':
- resolution: {integrity: sha512-1TH571TwtrDp04HfNzOPxZjoXP5IG2oYzDGymVKcJnvlKlniNXBh2w+tuJoOWmVCpD3Cqdfby/qiKP6u9kmQVA==}
-
'@glimmer/env@0.1.7':
resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==}
@@ -5558,57 +5548,33 @@ packages:
'@glimmer/manager@0.92.4':
resolution: {integrity: sha512-YMoarZT/+Ft2YSd+Wuu5McVsdP9y6jeAdVQGYFpno3NlL3TXYbl7ELtK7OGxFLjzQE01BdiUZZRvcY+a/s9+CQ==}
- '@glimmer/manager@0.94.7':
- resolution: {integrity: sha512-kwpu4kYm23vX7PdeEseIYgIO/yevaxF7u0jKt+9Xi/+gIAJeyPrY0cB24Y4+HLFL5DxfMcrvo/6E5lJ/9LMgMg==}
-
'@glimmer/node@0.92.4':
resolution: {integrity: sha512-a5GME7HQJZFJPQDdSetQI6jjKXXQi0Vdr3WuUrYwhienVTV5LG0uClbFE2yYWC7TX97YDHpRrNk1CC258rujkQ==}
- '@glimmer/node@0.94.7':
- resolution: {integrity: sha512-BVKGYCxRPxCUaZpQpIGIjBZbdlw+ZupgFupf88xs04e+zMBCA4qTccu/bWJ0Y6XQw7uLsh8FgzMKo+xaMzXDjA==}
-
'@glimmer/opcode-compiler@0.92.4':
resolution: {integrity: sha512-WnZSBwxNqW/PPD/zfxEg6BVR5tHwTm8fp76piix8BNCQ6CuzVn6HUJ5SlvBsOwyoRCmzt/pkKmBJn+I675KG4w==}
- '@glimmer/opcode-compiler@0.94.7':
- resolution: {integrity: sha512-0f+mB/XecL0/3r7bnepX/PGCNdrGcFyRofgWRikKxuf38Nu7RX/WjN44f1BgYjUO7FXY0e+ghDcCLhFW+uI8ew==}
-
'@glimmer/owner@0.92.3':
resolution: {integrity: sha512-ZxmXIUCy6DOobhGDhA6kMpaXZS7HAucEgIl/qcjV9crlzGOO8H4j+n2x6nA/8zpuqvO0gYaBzqdNdu+7EgOEmw==}
- '@glimmer/owner@0.93.2':
- resolution: {integrity: sha512-3ySi8qBE8byq3XdsuXAz1HfrgdD2xz4/sfxmpX7kpls8+IGgMMwJ1sgPSTy50MmjsI6zG4vrvfTjhqOy/UqnBg==}
-
'@glimmer/program@0.92.4':
resolution: {integrity: sha512-fkquujQ11lsGCWl/+XpZW2E7bjHj/g6/Ht292A7pSoANBD8Bz/gPYiPM+XuMwes9MApEsTEMjV4EXlyk2/Cirg==}
- '@glimmer/program@0.94.7':
- resolution: {integrity: sha512-cd2Am8llRNaKaGms2TiHPG9D5lFJA8daGX3V4vPfy+lq8+cPYyLA1gLOORD7q9rK8HXsJZneBP6ELpSdpY3iWw==}
-
'@glimmer/reference@0.84.3':
resolution: {integrity: sha512-lV+p/aWPVC8vUjmlvYVU7WQJsLh319SdXuAWoX/SE3pq340BJlAJiEcAc6q52y9JNhT57gMwtjMX96W5Xcx/qw==}
'@glimmer/reference@0.92.3':
resolution: {integrity: sha512-Ud4LE689mEXL6BJnJx0ZPt2dt/A540C+TAnBFXHpcAjROz5gT337RN+tgajwudEUqpufExhcPSMGzs1pvWYCJg==}
- '@glimmer/reference@0.94.6':
- resolution: {integrity: sha512-iNGbiIgVdTyeaUzRiDbCfBDjmq9TMWbZPNmdujKVOC4Zy9dB57OUQYc21mYXxU3SNb8sT8C9oM5lFDy8h5zImQ==}
-
'@glimmer/runtime@0.92.4':
resolution: {integrity: sha512-ISqM/8hVh+fY/gnLAAPKfts4CvnJBOyCYAXgGccIlzzQrSVLaz0NoRiWTLGj5B/3xyPbqLwYPDvlTsOjYtvPoA==}
- '@glimmer/runtime@0.94.7':
- resolution: {integrity: sha512-Q3xZLwVwEg+NHc/pKMdgqeln8D8q7/8HF1CIAcv7fyaTbv3Iz/PUsWG+jq/kJguMtVhwWNiygYxB9vvyzK7RPQ==}
-
'@glimmer/syntax@0.84.3':
resolution: {integrity: sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==}
'@glimmer/syntax@0.92.3':
resolution: {integrity: sha512-7wPKQmULyXCYf0KvbPmfrs/skPISH2QGR9atCnmDWnHyLv5SSZVLm1P0Ctrpta6+Ci3uGQb7hGk0IjsLEavcYQ==}
- '@glimmer/syntax@0.94.7':
- resolution: {integrity: sha512-6L/1Yl6JLbLrY7ywTL5QFNGKAzxtCbC+kXsTExOcukBqsak+nN75vXvBkv+F+NsAZxhoRt72fNBuy9IrP9sghA==}
-
'@glimmer/tracking@1.1.2':
resolution: {integrity: sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==}
@@ -5621,9 +5587,6 @@ packages:
'@glimmer/util@0.92.3':
resolution: {integrity: sha512-K1oH93gGU36slycxJ9CcFpUTsdOc4XQ6RuZFu5oRsxFYtEF5PSu7ik11h58fyeoaWOr1ebfkyAMawbeI2AJ5GA==}
- '@glimmer/util@0.94.6':
- resolution: {integrity: sha512-UDUP4/nHz4/qORWxl9ebc5ZhysKJFhJrY14GAMLBxbXomYtj7liMiht4v5TVW4Law5ziPmpTFQ70RJOOG7ksBg==}
-
'@glimmer/validator@0.94.6':
resolution: {integrity: sha512-s0pzTB+lHXa6eQCSJe57YNNgPsjaY+EmOLH6OsJrWetszltV5fSy2PVjk+2NavsZ6wjaxLKwTd0q3PGPXz/rlQ==}
@@ -5631,22 +5594,12 @@ packages:
resolution: {integrity: sha512-VpkKsHc3oiq9ruiwT7sN4RuOIc5n10PCeWX7tYSNZ85S1bETcAFn0XbyNjI+G3uFshQGEK0T8Fn3+/8VTNIQIg==}
engines: {node: '>=16'}
- '@glimmer/vm-babel-plugins@0.93.3':
- resolution: {integrity: sha512-pBoSPkhOeQrvnV75dWk04aqf4MdTcYIHiXKjijQD2/jEsf3xOml7w2yVIFJy90i09Dhijn2A9VxLvfv1le4YTw==}
- engines: {node: '>=18.18.0'}
-
'@glimmer/vm@0.92.3':
resolution: {integrity: sha512-DNMQz7nn2zRwKO1irVZ4alg1lH+VInwR3vkWVgobUs0yh7OoHVGXKMd5uxzIksqJEUw1XOX9Qgu/GYZB1PiH3w==}
- '@glimmer/vm@0.94.6':
- resolution: {integrity: sha512-RRQtQ1D7K+r0TJCE6+Rn1CgUKQsu0hry+WyQXUW/SETGz3RsL1t9L7Omi8b2HYOS1JA7hkJJ8gHfEY7HCE8hXA==}
-
'@glimmer/wire-format@0.92.3':
resolution: {integrity: sha512-gFz81Q9+V7Xs0X8mSq6y8qacHm0dPaGJo2/Bfcsdow1hLOKNgTCLr4XeDBhRML8f6I6Gk9ugH4QDxyIOXOpC4w==}
- '@glimmer/wire-format@0.94.6':
- resolution: {integrity: sha512-M0ggBTBdeF9AWaq2ZH75fVZ7Y5r/0wqaQ+4tqvEqQJ0kYFwkahnWnFxPYEg2HSRsaNLZjd02sCmh9rwkSANCwg==}
-
'@glint/core@1.5.2':
resolution: {integrity: sha512-kbEt8jBEkH65yDB20tBq/rnZl+iigmAenKQcgu1cqex6/eT6LrQ5E9QxyKtqe9S18qZv0c/LNa0qE7jwbAEKMA==}
hasBin: true
@@ -8464,13 +8417,6 @@ packages:
peerDependencies:
'@glimmer/component': '>= 1.1.2'
- ember-source@https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz:
- resolution: {tarball: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz}
- version: 6.4.0-alpha.1.canary
- engines: {node: '>= 18.*'}
- peerDependencies:
- '@glimmer/component': '>= 1.1.2'
-
ember-strict-resolver@1.3.0:
resolution: {integrity: sha512-GeI1LLLt470sjaq/huKGQTDJPDOH0FlrX8FFVcSZPXO2U9FQH7Kc8BaXb4GpViJbfLLC4d7tIUZI4NBnuXSmKg==}
engines: {node: 10.* || >= 12}
@@ -14194,11 +14140,11 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/adapter@file:packages/adapter(69e6cac629d60cb27e5329b4f9de3a43)':
+ '@ember-data/adapter@file:packages/adapter(65216b275277e266899a4839df928e58)':
dependencies:
- '@ember-data/legacy-compat': file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
+ '@ember-data/legacy-compat': file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
'@ember/edition-utils': 1.2.0
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
@@ -14206,7 +14152,7 @@ snapshots:
ember-cli-path-utils: 1.0.0
ember-cli-string-utils: 1.1.0
ember-cli-test-info: 1.0.0
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -14258,6 +14204,21 @@ snapshots:
- '@glint/template'
- supports-color
+ '@ember-data/debug@file:packages/debug(3410cd21b55c2a8b1a09fcf68b94f6f2)':
+ dependencies:
+ '@ember-data/model': file:packages/model(490b236d01687caf06cfad4afe0dc969)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember/edition-utils': 1.2.0
+ '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
+ transitivePeerDependencies:
+ - '@babel/core'
+ - '@glint/template'
+ - supports-color
+
'@ember-data/debug@file:packages/debug(baf9a16a2d121fc80f78695077c5424c)':
dependencies:
'@ember-data/model': file:packages/model(bf73cc40922ce10283b223b4bd303e92)
@@ -14273,21 +14234,6 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/debug@file:packages/debug(cfb627c7838fc2095423bc7c1f084b9d)':
- dependencies:
- '@ember-data/model': file:packages/model(3b1e9f9e630fe03b8eade0af75b22636)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember/edition-utils': 1.2.0
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
'@ember-data/debug@file:packages/debug(d7096599d210d81d8a800de69d2c7e29)':
dependencies:
'@ember-data/model': file:packages/model(718e0f021980b482b29cbae0e9991b75)
@@ -14318,13 +14264,13 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/graph@file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)':
+ '@ember-data/graph@file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)':
dependencies:
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -14390,19 +14336,6 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/json-api@file:packages/json-api(05676ec33b6f3e4f589c1d3a2872f0a0)':
- dependencies:
- '@ember-data/graph': file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
'@ember-data/json-api@file:packages/json-api(0f2276a6dbdb9198ad4476c7c71ce7f1)':
dependencies:
'@ember-data/graph': file:packages/graph(9667305ad6242729c0c3157e546141d4)
@@ -14429,6 +14362,19 @@ snapshots:
- '@glint/template'
- supports-color
+ '@ember-data/json-api@file:packages/json-api(32b3f52911f12801bdd727e95d220732)':
+ dependencies:
+ '@ember-data/graph': file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
+ transitivePeerDependencies:
+ - '@babel/core'
+ - '@glint/template'
+ - supports-color
+
'@ember-data/json-api@file:packages/json-api(49531e079d90bb9e2041961b9ac72fc1)':
dependencies:
'@ember-data/graph': file:packages/graph(ed6ec32f9bba03dd13f302355a68e97f)
@@ -14468,6 +14414,24 @@ snapshots:
- '@glint/template'
- supports-color
+ '@ember-data/legacy-compat@file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)':
+ dependencies:
+ '@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember/test-waiters': 3.1.0(@babel/core@7.26.9)
+ '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
+ optionalDependencies:
+ '@ember-data/graph': file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)
+ '@ember-data/json-api': file:packages/json-api(32b3f52911f12801bdd727e95d220732)
+ transitivePeerDependencies:
+ - '@babel/core'
+ - '@glint/template'
+ - supports-color
+
'@ember-data/legacy-compat@file:packages/legacy-compat(1db36cd6d2e80677e8b0b148fdb007f3)':
dependencies:
'@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
@@ -14537,24 +14501,6 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/legacy-compat@file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)':
- dependencies:
- '@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember/test-waiters': 3.1.0(@babel/core@7.26.9)
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- optionalDependencies:
- '@ember-data/graph': file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)
- '@ember-data/json-api': file:packages/json-api(05676ec33b6f3e4f589c1d3a2872f0a0)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
'@ember-data/legacy-compat@file:packages/legacy-compat(daba32e862a4fb47f3f63c2e9d823201)':
dependencies:
'@ember-data/request': file:packages/request(56f5eb81dd09f1e4b2f781c4e06ce53c)
@@ -14591,23 +14537,23 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/model@file:packages/model(3b1e9f9e630fe03b8eade0af75b22636)':
+ '@ember-data/model@file:packages/model(490b236d01687caf06cfad4afe0dc969)':
dependencies:
- '@ember-data/legacy-compat': file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember-data/tracking': file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)
+ '@ember-data/legacy-compat': file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember-data/tracking': file:packages/tracking(705310b48e66482cebd843ac2ea54e02)
'@ember/edition-utils': 1.2.0
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
ember-cli-string-utils: 1.1.0
ember-cli-test-info: 1.0.0
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
inflection: 3.0.2
optionalDependencies:
- '@ember-data/graph': file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)
- '@ember-data/json-api': file:packages/json-api(05676ec33b6f3e4f589c1d3a2872f0a0)
+ '@ember-data/graph': file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)
+ '@ember-data/json-api': file:packages/json-api(32b3f52911f12801bdd727e95d220732)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -14742,20 +14688,6 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/request-utils@file:packages/request-utils(27efc869a44f5fafffa358009428a357)':
- dependencies:
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- optionalDependencies:
- '@ember/string': 4.0.1
- ember-inflector: 5.0.2(@babel/core@7.26.9)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
'@ember-data/request-utils@file:packages/request-utils(693bc34f6047e20aab7b4a0b53fc86a3)':
dependencies:
'@embroider/macros': 1.16.11(@babel/core@7.26.9)
@@ -14805,6 +14737,20 @@ snapshots:
- '@glint/template'
- supports-color
+ '@ember-data/request-utils@file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)':
+ dependencies:
+ '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
+ '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
+ optionalDependencies:
+ '@ember/string': 4.0.1
+ ember-inflector: 5.0.2(@babel/core@7.26.9)
+ transitivePeerDependencies:
+ - '@babel/core'
+ - '@glint/template'
+ - supports-color
+
'@ember-data/request-utils@file:packages/request-utils(f76e144d736ddc61b5b3fc94acf05b0c)':
dependencies:
'@embroider/macros': 1.16.11(@babel/core@7.26.9)
@@ -14888,11 +14834,11 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/serializer@file:packages/serializer(69e6cac629d60cb27e5329b4f9de3a43)':
+ '@ember-data/serializer@file:packages/serializer(65216b275277e266899a4839df928e58)':
dependencies:
- '@ember-data/legacy-compat': file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
+ '@ember-data/legacy-compat': file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
'@ember/edition-utils': 1.2.0
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
@@ -14900,7 +14846,7 @@ snapshots:
ember-cli-path-utils: 1.0.0
ember-cli-string-utils: 1.1.0
ember-cli-test-info: 1.0.0
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -14952,20 +14898,6 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/store@file:packages/store(b5c06f80147830daf16c42d352e22eff)':
- dependencies:
- '@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/tracking': file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
- '@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
'@ember-data/store@file:packages/store(d01ec85b299a6605ba4c50037443fea4)':
dependencies:
'@ember-data/request': file:packages/request(56f5eb81dd09f1e4b2f781c4e06ce53c)
@@ -15008,12 +14940,15 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/tracking@file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)':
+ '@ember-data/store@file:packages/store(ff13348e66f438b86ccc4e4d3021637f)':
dependencies:
+ '@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/tracking': file:packages/tracking(705310b48e66482cebd843ac2ea54e02)
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -15137,15 +15072,15 @@ snapshots:
- '@glint/template'
- supports-color
- '@ember-data/unpublished-test-infra@file:packages/unpublished-test-infra(8665b451ff87cacdfbe98df44bdb7e0d)':
+ '@ember-data/unpublished-test-infra@file:packages/unpublished-test-infra(751f09ee2847d078cc905e9ac4ba7bd9)':
dependencies:
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(8cf4fcab81fc3906e6e66c90f19bddef)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(6bdc1548f7ec55b645542e5984f71664)
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
chalk: 4.1.2
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
semver: 7.7.1
optionalDependencies:
qunit: 2.19.4(patch_hash=44177f0047189d474ebdeba20fc8ddc3c8c2a5777d65cbb5f0fac0979bf66301)
@@ -15277,25 +15212,6 @@ snapshots:
- uglify-js
- webpack-cli
- '@ember/test-helpers@5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(8cf4fcab81fc3906e6e66c90f19bddef)':
- dependencies:
- '@ember/test-waiters': 3.1.0(@babel/core@7.26.9)
- '@embroider/addon-shim': 1.9.0
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- '@simple-dom/interface': 1.4.0
- decorator-transforms: 2.3.0(@babel/core@7.26.9)
- dom-element-descriptors: 0.5.1
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- webpack: 5.98.0
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - '@swc/core'
- - esbuild
- - supports-color
- - uglify-js
- - webpack-cli
-
'@ember/test-helpers@5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(b7bd70fa55d8dcc6fec132f7d004fc3f)':
dependencies:
'@ember/test-waiters': 3.1.0(@babel/core@7.26.9)
@@ -16130,13 +16046,6 @@ snapshots:
'@glimmer/vm': 0.92.3
'@glimmer/wire-format': 0.92.3
- '@glimmer/compiler@0.94.8':
- dependencies:
- '@glimmer/interfaces': 0.94.5
- '@glimmer/syntax': 0.94.7
- '@glimmer/util': 0.94.6
- '@glimmer/wire-format': 0.94.6
-
'@glimmer/component@1.1.2(@babel/core@7.26.9)':
dependencies:
'@glimmer/di': 0.1.11
@@ -16170,11 +16079,6 @@ snapshots:
'@glimmer/interfaces': 0.92.3
'@glimmer/util': 0.92.3
- '@glimmer/destroyable@0.94.6':
- dependencies:
- '@glimmer/global-context': 0.93.2
- '@glimmer/interfaces': 0.94.5
-
'@glimmer/di@0.1.11': {}
'@glimmer/encoder@0.92.3':
@@ -16182,11 +16086,6 @@ snapshots:
'@glimmer/interfaces': 0.92.3
'@glimmer/vm': 0.92.3
- '@glimmer/encoder@0.93.6':
- dependencies:
- '@glimmer/interfaces': 0.94.5
- '@glimmer/vm': 0.94.6
-
'@glimmer/env@0.1.7': {}
'@glimmer/global-context@0.84.3':
@@ -16221,16 +16120,6 @@ snapshots:
'@glimmer/validator': 0.94.6
'@glimmer/vm': 0.92.3
- '@glimmer/manager@0.94.7':
- dependencies:
- '@glimmer/destroyable': 0.94.6
- '@glimmer/global-context': 0.93.2
- '@glimmer/interfaces': 0.94.5
- '@glimmer/reference': 0.94.6
- '@glimmer/util': 0.94.6
- '@glimmer/validator': 0.94.6
- '@glimmer/vm': 0.94.6
-
'@glimmer/node@0.92.4':
dependencies:
'@glimmer/interfaces': 0.92.3
@@ -16238,13 +16127,6 @@ snapshots:
'@glimmer/util': 0.92.3
'@simple-dom/document': 1.4.0
- '@glimmer/node@0.94.7':
- dependencies:
- '@glimmer/interfaces': 0.94.5
- '@glimmer/runtime': 0.94.7
- '@glimmer/util': 0.94.6
- '@simple-dom/document': 1.4.0
-
'@glimmer/opcode-compiler@0.92.4':
dependencies:
'@glimmer/debug': 0.92.4
@@ -16258,21 +16140,10 @@ snapshots:
'@glimmer/vm': 0.92.3
'@glimmer/wire-format': 0.92.3
- '@glimmer/opcode-compiler@0.94.7':
- dependencies:
- '@glimmer/encoder': 0.93.6
- '@glimmer/interfaces': 0.94.5
- '@glimmer/manager': 0.94.7
- '@glimmer/util': 0.94.6
- '@glimmer/vm': 0.94.6
- '@glimmer/wire-format': 0.94.6
-
'@glimmer/owner@0.92.3':
dependencies:
'@glimmer/util': 0.92.3
- '@glimmer/owner@0.93.2': {}
-
'@glimmer/program@0.92.4':
dependencies:
'@glimmer/encoder': 0.92.3
@@ -16284,15 +16155,6 @@ snapshots:
'@glimmer/vm': 0.92.3
'@glimmer/wire-format': 0.92.3
- '@glimmer/program@0.94.7':
- dependencies:
- '@glimmer/interfaces': 0.94.5
- '@glimmer/manager': 0.94.7
- '@glimmer/opcode-compiler': 0.94.7
- '@glimmer/util': 0.94.6
- '@glimmer/vm': 0.94.6
- '@glimmer/wire-format': 0.94.6
-
'@glimmer/reference@0.84.3':
dependencies:
'@glimmer/env': 0.1.7
@@ -16309,13 +16171,6 @@ snapshots:
'@glimmer/util': 0.92.3
'@glimmer/validator': 0.94.6
- '@glimmer/reference@0.94.6':
- dependencies:
- '@glimmer/global-context': 0.93.2
- '@glimmer/interfaces': 0.94.5
- '@glimmer/util': 0.94.6
- '@glimmer/validator': 0.94.6
-
'@glimmer/runtime@0.92.4':
dependencies:
'@glimmer/destroyable': 0.92.3
@@ -16331,19 +16186,6 @@ snapshots:
'@glimmer/vm': 0.92.3
'@glimmer/wire-format': 0.92.3
- '@glimmer/runtime@0.94.7':
- dependencies:
- '@glimmer/destroyable': 0.94.6
- '@glimmer/global-context': 0.93.2
- '@glimmer/interfaces': 0.94.5
- '@glimmer/manager': 0.94.7
- '@glimmer/owner': 0.93.2
- '@glimmer/program': 0.94.7
- '@glimmer/reference': 0.94.6
- '@glimmer/util': 0.94.6
- '@glimmer/validator': 0.94.6
- '@glimmer/vm': 0.94.6
-
'@glimmer/syntax@0.84.3':
dependencies:
'@glimmer/env': 0.1.7
@@ -16361,15 +16203,6 @@ snapshots:
'@handlebars/parser': 2.0.0
simple-html-tokenizer: 0.5.11
- '@glimmer/syntax@0.94.7':
- dependencies:
- '@glimmer/env': 0.1.7
- '@glimmer/interfaces': 0.94.5
- '@glimmer/util': 0.94.6
- '@glimmer/wire-format': 0.94.6
- '@handlebars/parser': 2.0.0
- simple-html-tokenizer: 0.5.11
-
'@glimmer/tracking@1.1.2':
dependencies:
'@glimmer/env': 0.1.7
@@ -16388,10 +16221,6 @@ snapshots:
'@glimmer/env': 0.1.7
'@glimmer/interfaces': 0.92.3
- '@glimmer/util@0.94.6':
- dependencies:
- '@glimmer/interfaces': 0.94.5
-
'@glimmer/validator@0.94.6':
dependencies:
'@glimmer/global-context': 0.93.2
@@ -16403,30 +16232,16 @@ snapshots:
transitivePeerDependencies:
- '@babel/core'
- '@glimmer/vm-babel-plugins@0.93.3(@babel/core@7.26.9)':
- dependencies:
- babel-plugin-debug-macros: 0.3.4(@babel/core@7.26.9)
- transitivePeerDependencies:
- - '@babel/core'
-
'@glimmer/vm@0.92.3':
dependencies:
'@glimmer/interfaces': 0.92.3
'@glimmer/util': 0.92.3
- '@glimmer/vm@0.94.6':
- dependencies:
- '@glimmer/interfaces': 0.94.5
-
'@glimmer/wire-format@0.92.3':
dependencies:
'@glimmer/interfaces': 0.92.3
'@glimmer/util': 0.92.3
- '@glimmer/wire-format@0.94.6':
- dependencies:
- '@glimmer/interfaces': 0.94.5
-
'@glint/core@1.5.2(typescript@5.8.2)':
dependencies:
'@glimmer/syntax': 0.84.3
@@ -17933,17 +17748,17 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@warp-drive/schema-record@file:packages/schema-record(1180fba2e999f1c9edce011af67d47b1)':
+ '@warp-drive/schema-record@file:packages/schema-record(4eed1bb7ada307d4903e1ac38a5e65f3)':
dependencies:
'@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember-data/tracking': file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember-data/tracking': file:packages/tracking(705310b48e66482cebd843ac2ea54e02)
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
optionalDependencies:
- '@ember-data/model': file:packages/model(3b1e9f9e630fe03b8eade0af75b22636)
+ '@ember-data/model': file:packages/model(490b236d01687caf06cfad4afe0dc969)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -19962,7 +19777,7 @@ snapshots:
- '@babel/core'
- supports-color
- ember-cached-decorator-polyfill@1.0.2(8cf4fcab81fc3906e6e66c90f19bddef):
+ ember-cached-decorator-polyfill@1.0.2(6bdc1548f7ec55b645542e5984f71664):
dependencies:
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@glimmer/tracking': 1.1.2
@@ -19970,7 +19785,7 @@ snapshots:
ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.26.9)
ember-cli-babel: 8.2.0(@babel/core@7.26.9)
ember-cli-babel-plugin-helpers: 1.1.1
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
transitivePeerDependencies:
- '@babel/core'
- '@glint/template'
@@ -20374,26 +20189,26 @@ snapshots:
- '@babel/core'
- supports-color
- ember-data@file:packages/-ember-data(3a60c434391300970a0600e5463be104):
+ ember-data@file:packages/-ember-data(33c23c96805705da3699f473c0b38806):
dependencies:
- '@ember-data/adapter': file:packages/adapter(69e6cac629d60cb27e5329b4f9de3a43)
- '@ember-data/debug': file:packages/debug(cfb627c7838fc2095423bc7c1f084b9d)
- '@ember-data/graph': file:packages/graph(3d168c37b1debde6680eb08ae068ae4e)
- '@ember-data/json-api': file:packages/json-api(05676ec33b6f3e4f589c1d3a2872f0a0)
- '@ember-data/legacy-compat': file:packages/legacy-compat(cd899b193abe547f7301c4c289032045)
- '@ember-data/model': file:packages/model(3b1e9f9e630fe03b8eade0af75b22636)
+ '@ember-data/adapter': file:packages/adapter(65216b275277e266899a4839df928e58)
+ '@ember-data/debug': file:packages/debug(3410cd21b55c2a8b1a09fcf68b94f6f2)
+ '@ember-data/graph': file:packages/graph(5dbe7d8cd74a2eeba9d1645c2cf9a1b3)
+ '@ember-data/json-api': file:packages/json-api(32b3f52911f12801bdd727e95d220732)
+ '@ember-data/legacy-compat': file:packages/legacy-compat(030800564500aeb1445d1f93686a6cfe)
+ '@ember-data/model': file:packages/model(490b236d01687caf06cfad4afe0dc969)
'@ember-data/request': file:packages/request(a616a2f4498bd7bc4cbe317548554807)
- '@ember-data/request-utils': file:packages/request-utils(27efc869a44f5fafffa358009428a357)
- '@ember-data/serializer': file:packages/serializer(69e6cac629d60cb27e5329b4f9de3a43)
- '@ember-data/store': file:packages/store(b5c06f80147830daf16c42d352e22eff)
- '@ember-data/tracking': file:packages/tracking(44c924812bf5144daf5ab5ce44b3f332)
+ '@ember-data/request-utils': file:packages/request-utils(ca462bafddd3fa37f81fd7f64cdbf1ab)
+ '@ember-data/serializer': file:packages/serializer(65216b275277e266899a4839df928e58)
+ '@ember-data/store': file:packages/store(ff13348e66f438b86ccc4e4d3021637f)
+ '@ember-data/tracking': file:packages/tracking(705310b48e66482cebd843ac2ea54e02)
'@ember/edition-utils': 1.2.0
'@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/build-config': file:packages/build-config(658d807f647ac6163015a3907b2e8c81)
'@warp-drive/core-types': file:packages/core-types(658d807f647ac6163015a3907b2e8c81)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
optionalDependencies:
- '@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(8cf4fcab81fc3906e6e66c90f19bddef)
+ '@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(6bdc1548f7ec55b645542e5984f71664)
'@ember/test-waiters': 3.1.0(@babel/core@7.26.9)
qunit: 2.19.4(patch_hash=44177f0047189d474ebdeba20fc8ddc3c8c2a5777d65cbb5f0fac0979bf66301)
transitivePeerDependencies:
@@ -20543,7 +20358,7 @@ snapshots:
transitivePeerDependencies:
- eslint
- ember-exam@9.0.0(e7b153d02552abd15524b376ba8b55f2):
+ ember-exam@9.0.0(2a2e1d0ba684b2e0f02867435e927e5d):
dependencies:
'@babel/core': 7.26.9
chalk: 5.4.1
@@ -20552,8 +20367,8 @@ snapshots:
ember-auto-import: 2.10.0(@glint/template@1.5.2)
ember-cli: 6.2.2
ember-cli-babel: 8.2.0(@babel/core@7.26.9)
- ember-qunit: 8.0.2(74ae58be428444c84c1b0a96d34e4da6)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
+ ember-qunit: 8.0.2(d4125475e230561fc7ca973784afad87)
+ ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
execa: 8.0.1
fs-extra: 11.3.0
js-yaml: 4.1.0
@@ -20590,10 +20405,6 @@ snapshots:
dependencies:
ember-source: 5.12.0(52231e613efa7f4c5391783e56c7d9be)
- ember-load-initializers@3.0.1(c060943494665cf8806af572b33eddfe):
- dependencies:
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
-
ember-maybe-import-regenerator@1.0.0(@babel/core@7.26.9):
dependencies:
broccoli-funnel: 3.0.8
@@ -20648,19 +20459,6 @@ snapshots:
- '@glint/template'
- supports-color
- ember-qunit@8.0.2(74ae58be428444c84c1b0a96d34e4da6):
- dependencies:
- '@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(8cf4fcab81fc3906e6e66c90f19bddef)
- '@embroider/addon-shim': 1.9.0
- '@embroider/macros': 1.16.11(658d807f647ac6163015a3907b2e8c81)
- ember-cli-test-loader: 3.1.0(@babel/core@7.26.9)
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- qunit: 2.19.4(patch_hash=44177f0047189d474ebdeba20fc8ddc3c8c2a5777d65cbb5f0fac0979bf66301)
- transitivePeerDependencies:
- - '@babel/core'
- - '@glint/template'
- - supports-color
-
ember-qunit@8.0.2(d4125475e230561fc7ca973784afad87):
dependencies:
'@ember/test-helpers': 5.1.0(patch_hash=ed8cc42d8dc0ec69d7f3c00f5c943370ae4b36fe4fa06afd3b5658bbf75bc421)(6bdc1548f7ec55b645542e5984f71664)
@@ -20703,15 +20501,6 @@ snapshots:
- '@babel/core'
- supports-color
- ember-resolver@11.0.1(824ca145128a2e0f190c5305efbce50c):
- dependencies:
- ember-cli-babel: 8.2.0(@babel/core@7.26.9)
- optionalDependencies:
- ember-source: https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d)
- transitivePeerDependencies:
- - '@babel/core'
- - supports-color
-
ember-resolver@11.0.1(b7bd70fa55d8dcc6fec132f7d004fc3f):
dependencies:
ember-cli-babel: 8.2.0(@babel/core@7.26.9)
@@ -20988,59 +20777,6 @@ snapshots:
- uglify-js
- webpack-cli
- ember-source@https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz(ec1e7e9319201c91f4dab5a0c78f277d):
- dependencies:
- '@babel/core': 7.26.9
- '@ember/edition-utils': 1.2.0
- '@embroider/addon-shim': 1.9.0
- '@glimmer/compiler': 0.94.8
- '@glimmer/component': 1.1.2(@babel/core@7.26.9)
- '@glimmer/destroyable': 0.94.6
- '@glimmer/env': 0.1.7
- '@glimmer/global-context': 0.93.2
- '@glimmer/interfaces': 0.94.5
- '@glimmer/manager': 0.94.7
- '@glimmer/node': 0.94.7
- '@glimmer/opcode-compiler': 0.94.7
- '@glimmer/owner': 0.93.2
- '@glimmer/program': 0.94.7
- '@glimmer/reference': 0.94.6
- '@glimmer/runtime': 0.94.7
- '@glimmer/syntax': 0.94.7
- '@glimmer/util': 0.94.6
- '@glimmer/validator': 0.94.6
- '@glimmer/vm': 0.94.6
- '@glimmer/vm-babel-plugins': 0.93.3(@babel/core@7.26.9)
- '@simple-dom/interface': 1.4.0
- backburner.js: 2.8.0
- broccoli-file-creator: 2.1.1
- broccoli-funnel: 3.0.8
- broccoli-merge-trees: 4.2.0
- chalk: 4.1.2
- ember-cli-babel: 8.2.0(@babel/core@7.26.9)
- 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: 2.0.1
- route-recognizer: 0.3.4
- router_js: 8.0.6(route-recognizer@0.3.4)
- semver: 7.7.1
- silent-error: 1.1.1
- simple-html-tokenizer: 0.5.11
- webpack: 5.98.0
- transitivePeerDependencies:
- - '@swc/core'
- - esbuild
- - rsvp
- - supports-color
- - uglify-js
- - webpack-cli
-
ember-strict-resolver@1.3.0(@babel/core@7.26.9):
dependencies:
ember-cli-babel: 8.2.0(@babel/core@7.26.9)
diff --git a/tests/ember-data__request/tests/integration/service-test.ts b/tests/ember-data__request/tests/integration/service-test.ts
index 2a50290d42e..7c51d62295c 100644
--- a/tests/ember-data__request/tests/integration/service-test.ts
+++ b/tests/ember-data__request/tests/integration/service-test.ts
@@ -1,5 +1,5 @@
import { getOwner } from '@ember/application';
-import Service, { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import type { TestContext } from '@ember/test-helpers';
import Resolver from 'ember-resolver';
@@ -8,6 +8,9 @@ import RequestManager from '@ember-data/request';
import { module, test } from '@warp-drive/diagnostic';
import { setupTest } from '@warp-drive/diagnostic/ember';
+const Service = s.default;
+const service = s.service ?? s.inject;
+
module('RequestManager | Ember Service Setup', function (hooks) {
setupTest(hooks, { resolver: new Resolver() });
diff --git a/tests/fastboot/app/routes/index.ts b/tests/fastboot/app/routes/index.ts
index 635dda5f2b6..54519658a14 100644
--- a/tests/fastboot/app/routes/index.ts
+++ b/tests/fastboot/app/routes/index.ts
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
// @ts-expect-error untyped
import { buildTree } from 'ember-simple-tree/utils/tree';
@@ -10,6 +10,8 @@ import { setBuildURLConfig } from '@ember-data/request-utils';
import type Person from '../models/person';
import type Store from '../services/store';
+const service = s.service ?? s.inject;
+
export default class IndexRoute extends Route {
@service declare store: Store;
@service declare fastboot: {
diff --git a/tests/fastboot/app/routes/person/new.js b/tests/fastboot/app/routes/person/new.js
index 439137bfdde..32b54107537 100644
--- a/tests/fastboot/app/routes/person/new.js
+++ b/tests/fastboot/app/routes/person/new.js
@@ -1,5 +1,7 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
+
+const service = s.service ?? s.inject;
export default class PersonNewRoute extends Route {
@service store;
diff --git a/tests/main/app/route.ts b/tests/main/app/route.ts
index 92acf0bce89..e1bb764544a 100644
--- a/tests/main/app/route.ts
+++ b/tests/main/app/route.ts
@@ -1,10 +1,11 @@
import Route from '@ember/routing/route';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
import type Store from '@ember-data/store';
+const service = s.service ?? s.inject;
export default class ApplicationRoute extends Route {
- @inject declare store: Store;
+ @service declare store: Store;
override model() {
// adding a model to the store to enable manually testing the debug-adapter
diff --git a/tests/main/app/routes/application.ts b/tests/main/app/routes/application.ts
index 92acf0bce89..e1bb764544a 100644
--- a/tests/main/app/routes/application.ts
+++ b/tests/main/app/routes/application.ts
@@ -1,10 +1,11 @@
import Route from '@ember/routing/route';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
import type Store from '@ember-data/store';
+const service = s.service ?? s.inject;
export default class ApplicationRoute extends Route {
- @inject declare store: Store;
+ @service declare store: Store;
override model() {
// adding a model to the store to enable manually testing the debug-adapter
diff --git a/tests/main/ember-cli-build.js b/tests/main/ember-cli-build.js
index 856779f10af..2e46453e43e 100644
--- a/tests/main/ember-cli-build.js
+++ b/tests/main/ember-cli-build.js
@@ -61,6 +61,9 @@ module.exports = async function (defaults) {
setConfig(app, __dirname, {
compatWith: isEnabled(process.env.EMBER_DATA_FULL_COMPAT) ? '99.0' : null,
+ deprecations: {
+ DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
+ },
debug: {
// LOG_GRAPH: true,
// LOG_IDENTIFIERS: true,
diff --git a/tests/main/package.json b/tests/main/package.json
index 30e653ec4a2..6bc876bb167 100644
--- a/tests/main/package.json
+++ b/tests/main/package.json
@@ -55,11 +55,11 @@
"@glint/environment-ember-template-imports": "1.5.2",
"@glint/template": "1.5.2",
"@types/qunit": "2.19.10",
- "@warp-drive/core-types": "workspace:*",
- "@warp-drive/schema-record": "workspace:*",
"@warp-drive/build-config": "workspace:*",
+ "@warp-drive/core-types": "workspace:*",
"@warp-drive/holodeck": "workspace:*",
"@warp-drive/internal-config": "workspace:*",
+ "@warp-drive/schema-record": "workspace:*",
"broccoli-concat": "^4.2.5",
"broccoli-merge-trees": "^4.2.0",
"broccoli-stew": "^3.0.0",
@@ -82,12 +82,12 @@
"ember-inflector": "5.0.2",
"ember-load-initializers": "^3.0.1",
"ember-maybe-import-regenerator": "^1.0.0",
- "ember-template-imports": "4.3.0",
"ember-qunit": "8.0.2",
"ember-resolver": "^11.0.1",
- "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz",
+ "ember-source": "~5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-strict-resolver": "^1.3.0",
+ "ember-template-imports": "4.3.0",
"ember-try": "^3.0.0",
"loader.js": "^4.7.0",
"pretender": "^3.4.7",
diff --git a/tests/main/tests/acceptance/relationships/has-many-test.js b/tests/main/tests/acceptance/relationships/has-many-test.js
index 4548a68c6d3..192f92d2b56 100644
--- a/tests/main/tests/acceptance/relationships/has-many-test.js
+++ b/tests/main/tests/acceptance/relationships/has-many-test.js
@@ -2,7 +2,7 @@ import ArrayProxy from '@ember/array/proxy';
import { setComponentTemplate } from '@ember/component';
import { action } from '@ember/object';
import { sort } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import { click, find, findAll, render, rerender, settled } from '@ember/test-helpers';
import Component from '@glimmer/component';
@@ -18,6 +18,8 @@ import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
import { LEGACY_SUPPORT } from '@ember-data/model/-private';
import JSONAPISerializer from '@ember-data/serializer/json-api';
+const service = s.service ?? s.inject;
+
class Person extends Model {
@attr()
name;
diff --git a/tests/main/tests/acceptance/relationships/tracking-record-state-test.js b/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
index 5fd60de73e3..2709523c972 100644
--- a/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
+++ b/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
@@ -1,6 +1,6 @@
import { setComponentTemplate } from '@ember/component';
import { action } from '@ember/object';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
import { click, findAll, render } from '@ember/test-helpers';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
@@ -12,6 +12,8 @@ import { setupRenderingTest } from 'ember-qunit';
import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+const service = s.service ?? s.inject;
+
class Tag {
@tracked rev = 0;
}
@@ -54,7 +56,7 @@ module('tracking state flags on a record', function (hooks) {
}
let childId = 1;
class ChildrenList extends Component {
- @inject store;
+ @service store;
@tracked newChild = null;
// an intentionally complicated way of resolving the async proxy
diff --git a/tests/main/tests/acceptance/tracking-create-record-test.js b/tests/main/tests/acceptance/tracking-create-record-test.js
index f2ee519a95a..08e26bc5e9c 100644
--- a/tests/main/tests/acceptance/tracking-create-record-test.js
+++ b/tests/main/tests/acceptance/tracking-create-record-test.js
@@ -1,5 +1,5 @@
import { setComponentTemplate } from '@ember/component';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import { render, settled } from '@ember/test-helpers';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
@@ -12,6 +12,8 @@ import { setupRenderingTest } from 'ember-qunit';
import Model, { attr } from '@ember-data/model';
import { cached, memoTransact, transact, untracked } from '@ember-data/tracking';
+const service = s.service ?? s.inject;
+
module('acceptance/tracking-transactions', function (hooks) {
setupRenderingTest(hooks);
diff --git a/tests/main/tests/integration/application-test.js b/tests/main/tests/integration/application-test.js
index 1346c928a6e..528b37d1377 100644
--- a/tests/main/tests/integration/application-test.js
+++ b/tests/main/tests/integration/application-test.js
@@ -1,6 +1,6 @@
// ensure DS namespace is set
import Controller from '@ember/controller';
-import Service, { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import { module, test } from 'qunit';
@@ -9,6 +9,9 @@ import { setupTest } from 'ember-qunit';
import JSONAPIAdapter from '@ember-data/adapter/json-api';
+const Service = s.default;
+const service = s.service ?? s.inject;
+
module('integration/application - Injecting a Custom Store', function (hooks) {
setupTest(hooks);
diff --git a/tests/main/tests/integration/cache-handler/store-package-setup-test.ts b/tests/main/tests/integration/cache-handler/store-package-setup-test.ts
index a6f16ef951a..1633f476c14 100644
--- a/tests/main/tests/integration/cache-handler/store-package-setup-test.ts
+++ b/tests/main/tests/integration/cache-handler/store-package-setup-test.ts
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import { module, test } from 'qunit';
@@ -30,6 +30,8 @@ import type {
import type { ExistingResourceObject, ResourceIdentifierObject } from '@warp-drive/core-types/spec/json-api-raw';
import type { Type } from '@warp-drive/core-types/symbols';
+const service = s.service ?? s.inject;
+
type FakeRecord = { [key: string]: unknown; destroy: () => void };
type UserRecord = {
id: string;
diff --git a/tests/main/tests/integration/store-extension-test.ts b/tests/main/tests/integration/store-extension-test.ts
index 0e19d59bd8f..b5ab1706697 100644
--- a/tests/main/tests/integration/store-extension-test.ts
+++ b/tests/main/tests/integration/store-extension-test.ts
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
import { module, test } from 'qunit';
@@ -7,6 +7,8 @@ import { setupTest } from 'ember-qunit';
import RequestManager from '@ember-data/request';
+const service = s.service ?? s.inject;
+
module('Integration | Store Extension', function (hooks) {
setupTest(hooks);
diff --git a/tests/main/tests/integration/store/model-name-test.js b/tests/main/tests/integration/store/model-name-test.js
index 113d7ac9c02..1dfd33417de 100644
--- a/tests/main/tests/integration/store/model-name-test.js
+++ b/tests/main/tests/integration/store/model-name-test.js
@@ -1,5 +1,5 @@
import { computed } from '@ember/object';
-import Service, { inject } from '@ember/service';
+import * as s from '@ember/service';
import { module, test } from 'qunit';
@@ -7,6 +7,9 @@ import { setupTest } from 'ember-qunit';
import Model, { attr } from '@ember-data/model';
+const Service = s.default;
+const service = s.service ?? s.inject;
+
function startsWith(str, substr) {
if (typeof str.startsWith === 'function') {
return str.startsWith(substr);
@@ -26,7 +29,7 @@ module('@ember-data/model klass.modelName', function (hooks) {
@attr() name;
}
class AnimalHelper extends Service {
- @inject store;
+ @service store;
@computed('animal.constructor.modelName')
get animalModelName() {
diff --git a/tests/performance/app/routes/add-children-then-materialize.js b/tests/performance/app/routes/add-children-then-materialize.js
index 989ddaa7c5f..392bf39b908 100644
--- a/tests/performance/app/routes/add-children-then-materialize.js
+++ b/tests/performance/app/routes/add-children-then-materialize.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/add-children-to-materialized.js b/tests/performance/app/routes/add-children-to-materialized.js
index 93ba22676d0..62bab14735b 100644
--- a/tests/performance/app/routes/add-children-to-materialized.js
+++ b/tests/performance/app/routes/add-children-to-materialized.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/add-children.js b/tests/performance/app/routes/add-children.js
index 84988578a6b..30f95499b5e 100644
--- a/tests/performance/app/routes/add-children.js
+++ b/tests/performance/app/routes/add-children.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/destroy.js b/tests/performance/app/routes/destroy.js
index caedca9cf14..2bf55ffb68d 100644
--- a/tests/performance/app/routes/destroy.js
+++ b/tests/performance/app/routes/destroy.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import { deleteRecord } from '@ember-data/json-api/request';
diff --git a/tests/performance/app/routes/relationship-materialization-complex.js b/tests/performance/app/routes/relationship-materialization-complex.js
index 297e86a678d..6e5e1b049d0 100644
--- a/tests/performance/app/routes/relationship-materialization-complex.js
+++ b/tests/performance/app/routes/relationship-materialization-complex.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/relationship-materialization-simple.js b/tests/performance/app/routes/relationship-materialization-simple.js
index d42bea9d456..ce10ff14454 100644
--- a/tests/performance/app/routes/relationship-materialization-simple.js
+++ b/tests/performance/app/routes/relationship-materialization-simple.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import { query } from '@ember-data/json-api/request';
diff --git a/tests/performance/app/routes/unload-all.js b/tests/performance/app/routes/unload-all.js
index da4e567871d..e4cb847f38b 100644
--- a/tests/performance/app/routes/unload-all.js
+++ b/tests/performance/app/routes/unload-all.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/unload.js b/tests/performance/app/routes/unload.js
index 9e3326942a4..5a36f93f80a 100644
--- a/tests/performance/app/routes/unload.js
+++ b/tests/performance/app/routes/unload.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),
diff --git a/tests/performance/app/routes/unused-relationships.js b/tests/performance/app/routes/unused-relationships.js
index 5c3d278119f..96dbdac7ffe 100644
--- a/tests/performance/app/routes/unused-relationships.js
+++ b/tests/performance/app/routes/unused-relationships.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
/**
* Measures the performance characteristics of pushing a large payload
diff --git a/tests/performance/app/routes/update-with-same-state-m2m.js b/tests/performance/app/routes/update-with-same-state-m2m.js
index 42205e7155f..31eef4334e3 100644
--- a/tests/performance/app/routes/update-with-same-state-m2m.js
+++ b/tests/performance/app/routes/update-with-same-state-m2m.js
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
/* eslint-disable no-undef */
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
const DEBUG = false;
diff --git a/tests/performance/app/routes/update-with-same-state.js b/tests/performance/app/routes/update-with-same-state.js
index 26ada32b96b..243a68e2f10 100644
--- a/tests/performance/app/routes/update-with-same-state.js
+++ b/tests/performance/app/routes/update-with-same-state.js
@@ -1,5 +1,5 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default Route.extend({
store: service(),