diff --git a/packages/ember-cli-mirage-docs/app/templates/docs/advanced/environment-options.md b/packages/ember-cli-mirage-docs/app/templates/docs/advanced/environment-options.md index 1db66ed48..f2716f6dd 100644 --- a/packages/ember-cli-mirage-docs/app/templates/docs/advanced/environment-options.md +++ b/packages/ember-cli-mirage-docs/app/templates/docs/advanced/environment-options.md @@ -51,7 +51,10 @@ export default function(config) { let finalConfig = { ...config, trackRequests: true, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, routes, }; diff --git a/packages/ember-cli-mirage-docs/app/templates/docs/advanced/server-configuration.md b/packages/ember-cli-mirage-docs/app/templates/docs/advanced/server-configuration.md index 445ba5ea0..7ab339b1b 100644 --- a/packages/ember-cli-mirage-docs/app/templates/docs/advanced/server-configuration.md +++ b/packages/ember-cli-mirage-docs/app/templates/docs/advanced/server-configuration.md @@ -59,7 +59,10 @@ import { createServer } from 'miragejs'; export default function(config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, routes() { // this.namespace = '/api' @@ -77,7 +80,10 @@ import { createServer } from 'miragejs'; export default function(config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, routes, }; @@ -116,7 +122,10 @@ import { createServer } from 'miragejs'; export default function(config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, serializers: applyEmberDataSerializers(config.serializers), routes, }; diff --git a/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/upgrade-guide/index.md b/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/upgrade-guide/index.md index daa434ed4..661757634 100644 --- a/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/upgrade-guide/index.md +++ b/packages/ember-cli-mirage-docs/app/templates/docs/getting-started/upgrade-guide/index.md @@ -42,7 +42,10 @@ import { createServer } from 'miragejs'; export default function (config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, routes, }; @@ -55,7 +58,7 @@ function routes() { ``` The environment variable discoverEmberDataModels is no longer used. If you wish to -not have `ember-cli-mirage` auto discover the models, just remove the `...discoverEmberDataModels(),` +not have `ember-cli-mirage` auto discover the models, just remove the `...discoverEmberDataModels(config.store),` ## 2.0 Upgrade guide diff --git a/packages/ember-cli-mirage-docs/app/templates/docs/testing/setup-mirage.md b/packages/ember-cli-mirage-docs/app/templates/docs/testing/setup-mirage.md index e351f31dc..65dafd1a4 100644 --- a/packages/ember-cli-mirage-docs/app/templates/docs/testing/setup-mirage.md +++ b/packages/ember-cli-mirage-docs/app/templates/docs/testing/setup-mirage.md @@ -42,7 +42,10 @@ If it is not desirable to use the default config from the mirage directory you c const makeServer = function(config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, routes() { this.namespace = "api" this.timing = 2000 diff --git a/packages/ember-cli-mirage-docs/mirage/config.js b/packages/ember-cli-mirage-docs/mirage/config.js index e9914bf42..a7b334315 100644 --- a/packages/ember-cli-mirage-docs/mirage/config.js +++ b/packages/ember-cli-mirage-docs/mirage/config.js @@ -7,7 +7,10 @@ import { createServer } from 'miragejs'; export default function (config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models, + }, serializers: applyEmberDataSerializers(config.serializers), routes, }; diff --git a/packages/ember-cli-mirage/addon/ember-data.js b/packages/ember-cli-mirage/addon/ember-data.js index 931478225..07946c1d9 100644 --- a/packages/ember-cli-mirage/addon/ember-data.js +++ b/packages/ember-cli-mirage/addon/ember-data.js @@ -20,9 +20,10 @@ let DsSerializers, Serializers; * @method getDsModels * @private * @hide + * @param {StoreService} store * @return {Object} models */ -export function getDsModels() { +export function getDsModels(store) { if (DsModels) { return DsModels; } @@ -46,7 +47,7 @@ export function getDsModels() { if (matches && matches[1]) { let modelName = matches[1]; - let model = require(path, null, null, true).default; + let model = store.modelFor(modelName); if (isDsModel(model)) { DsModels[modelName] = model; } @@ -60,14 +61,15 @@ export function getDsModels() { * Get all mirage models for each of the ember-data models * * @method discoverEmberDataModels + * @param {StoreService} store * @return {Object} models */ -export function discoverEmberDataModels() { - if (Models) { +export function discoverEmberDataModels(store) { + if (Models || !store) { return Models; } - let emberDataModels = getDsModels(); + let emberDataModels = getDsModels(store); Models = {}; Object.keys(emberDataModels).forEach((modelName) => { diff --git a/packages/ember-cli-mirage/addon/start-mirage.js b/packages/ember-cli-mirage/addon/start-mirage.js index 9b264a877..dcfbc50e3 100644 --- a/packages/ember-cli-mirage/addon/start-mirage.js +++ b/packages/ember-cli-mirage/addon/start-mirage.js @@ -27,6 +27,7 @@ export default function startMirage(owner, { env, makeServer } = {}) { let options = Object.assign(modules, { environment, + store: owner.lookup('service:store'), }); options.inflector = { singularize, pluralize }; diff --git a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/files/__root__/config.js b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/files/__root__/config.js index 632f11c3c..05a573ae9 100644 --- a/packages/ember-cli-mirage/blueprints/ember-cli-mirage/files/__root__/config.js +++ b/packages/ember-cli-mirage/blueprints/ember-cli-mirage/files/__root__/config.js @@ -8,7 +8,10 @@ export default function (config) { let finalConfig = { ...config, // Remove discoverEmberDataModels if you do not want ember-cli-mirage to auto discover the ember models - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models + }, // uncomment to opt into ember-cli-mirage to auto discover ember serializers // serializers: applyEmberDataSerializers(config.serializers), routes, diff --git a/packages/ember-cli-mirage/package.json b/packages/ember-cli-mirage/package.json index 4cced138b..32f8a35dd 100644 --- a/packages/ember-cli-mirage/package.json +++ b/packages/ember-cli-mirage/package.json @@ -53,9 +53,9 @@ "devDependencies": { "@babel/eslint-parser": "^7.22.15", "@babel/plugin-proposal-decorators": "^7.23.0", - "@ember-data/model": "~4.11.3", - "@ember-data/store": "~4.11.3", - "@ember-data/tracking": "~4.11.3", + "@ember-data/model": "~5.3.0", + "@ember-data/store": "~5.3.0", + "@ember-data/tracking": "~5.3.0", "@ember/jquery": "^2.0.0", "@ember/optional-features": "^2.0.0", "@ember/string": "^3.1.1", @@ -77,7 +77,7 @@ "ember-cli-moment-shim": "^3.8.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~4.11.3", + "ember-data": "~5.3.0", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", "ember-moment": "^9.0.1", diff --git a/packages/ember-cli-mirage/tests/dummy/config/ember-try.js b/packages/ember-cli-mirage/tests/dummy/config/ember-try.js index 96714cf23..a3780d34b 100644 --- a/packages/ember-cli-mirage/tests/dummy/config/ember-try.js +++ b/packages/ember-cli-mirage/tests/dummy/config/ember-try.js @@ -24,6 +24,7 @@ module.exports = async function () { name: 'ember-lts-4.4', npm: { devDependencies: { + 'ember-data': '~4.4.0', 'ember-source': '~4.4.0', }, }, @@ -32,6 +33,7 @@ module.exports = async function () { name: 'ember-lts-4.8', npm: { devDependencies: { + 'ember-data': '~4.8.0', 'ember-source': '~4.8.0', }, }, @@ -40,6 +42,7 @@ module.exports = async function () { name: 'ember-lts-4.12', npm: { devDependencies: { + 'ember-data': '~4.12.0', 'ember-source': '~4.12.0', }, }, diff --git a/packages/ember-cli-mirage/tests/dummy/mirage/config.js b/packages/ember-cli-mirage/tests/dummy/mirage/config.js index e9914bf42..a7b334315 100644 --- a/packages/ember-cli-mirage/tests/dummy/mirage/config.js +++ b/packages/ember-cli-mirage/tests/dummy/mirage/config.js @@ -7,7 +7,10 @@ import { createServer } from 'miragejs'; export default function (config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models, + }, serializers: applyEmberDataSerializers(config.serializers), routes, }; diff --git a/packages/ember-cli-mirage/tests/unit/models/ember-data-model-discover-test.js b/packages/ember-cli-mirage/tests/unit/models/ember-data-model-discover-test.js index 9d14fe7e1..1a180e9b6 100644 --- a/packages/ember-cli-mirage/tests/unit/models/ember-data-model-discover-test.js +++ b/packages/ember-cli-mirage/tests/unit/models/ember-data-model-discover-test.js @@ -10,8 +10,9 @@ module('Unit | Model | ember data model discover', function (hooks) { let server; hooks.beforeEach(function () { + const store = this.owner.lookup('service:store'); server = createServer({ - models: discoverEmberDataModels({}), + models: discoverEmberDataModels(store), }); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a72d30916..e72390485 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,14 +55,14 @@ importers: specifier: ^7.23.0 version: 7.23.0(@babel/core@7.23.0) '@ember-data/model': - specifier: ~4.11.3 - version: 4.11.3(@babel/core@7.23.0)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2) + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0) '@ember-data/store': - specifier: ~4.11.3 - version: 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) '@ember-data/tracking': - specifier: ~4.11.3 - version: 4.11.3 + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0) '@ember/jquery': specifier: ^2.0.0 version: 2.0.0 @@ -127,8 +127,8 @@ importers: specifier: ^4.0.2 version: 4.0.2 ember-data: - specifier: ~4.11.3 - version: 4.11.3(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) ember-fetch: specifier: ^8.1.2 version: 8.1.2 @@ -460,8 +460,8 @@ importers: specifier: ^4.0.2 version: 4.0.2 ember-data: - specifier: ~4.12.3 - version: 4.12.3(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) ember-fetch: specifier: ^8.1.2 version: 8.1.2 @@ -2133,29 +2133,6 @@ packages: postcss-selector-parser: 6.0.13 dev: true - /@ember-data/adapter@4.11.3(@ember-data/store@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(webpack@5.88.2): - resolution: {integrity: sha512-G7dbaPnYMW8VYxIT75KAkzax2mkWTs2TYxS7+qbphs6esXpO9Y/iNp5fTqLaACb9JqUypwEA/rlfC7/zkcGbBw==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 4.11.3 - '@ember/string': ^3.0.1 - ember-inflector: ^4.0.2 - dependencies: - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - ember-cli-test-info: 1.0.0 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - dev: true - /@ember-data/adapter@4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2): resolution: {integrity: sha512-8XFAV/J6MbaDC8mQ9omOpbAHJ0ywOlDofEA1P1bgX9hHF0AKzuxosUU/KBtcvLjurFO4G8Ir/L7rus8sgWQRpA==} engines: {node: 16.* || >= 18.*} @@ -2165,7 +2142,7 @@ packages: ember-inflector: ^4.0.2 dependencies: '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3) '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 ember-cli-babel: 7.26.11 @@ -2197,35 +2174,6 @@ packages: - supports-color dev: true - /@ember-data/canary-features@4.11.3: - resolution: {integrity: sha512-RTLY2N9t1SXr4e90VBKi+3PIitwjTMBU8BcEhnKovT//sGlywohHq7T36H6nJuITRtki3On9PpbJOhhQZuyAlQ==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - dependencies: - '@embroider/macros': 1.13.1 - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - - /@ember-data/debug@4.11.3(@ember/string@3.1.1)(webpack@5.88.2): - resolution: {integrity: sha512-3pA5u3qy+pjtwcoyMzs7WijRrSQz5z+Vgn9b5Y4cEOHn8loS9riLCMScnFaQT3HjxQgq+3NkNb52sJafHPzs4Q==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember/string': ^3.0.1 - dependencies: - '@ember-data/private-build-infra': 4.11.3 - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - dev: true - /@ember-data/debug@4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(webpack@5.88.2): resolution: {integrity: sha512-nZ5e5zDpSY8Tcc2shimX7CezgBbDnb7m6/RLgCWWzQpmMz9IoZhs0ZqrfvgObIsiMmYZWJCiXjP3kedSHQe+KA==} engines: {node: 16.* || >= 18.*} @@ -2234,7 +2182,7 @@ packages: '@ember/string': ^3.0.1 dependencies: '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 @@ -2278,7 +2226,7 @@ packages: '@ember-data/store': 4.12.3 dependencies: '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.13.1 ember-cli-babel: 7.26.11 @@ -2313,7 +2261,7 @@ packages: dependencies: '@ember-data/graph': 4.12.3(@ember-data/store@4.12.3) '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.13.1 ember-cli-babel: 7.26.11 @@ -2392,79 +2340,6 @@ packages: - supports-color dev: true - /@ember-data/model@4.11.3(@babel/core@7.23.0)(@ember-data/record-data@4.11.3)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-nkDru5TZmOp4J1xp65D1bR3hBJ3u5KhKKfDpWeGnHW2YDCVUdLORRwW7vfrPnnXDIoJij42DwDVCiTY25Xhrqw==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/record-data': 4.11.3 - '@ember-data/store': 4.11.3 - '@ember-data/tracking': 4.11.3 - '@ember/string': ^3.0.1 - ember-inflector: ^4.0.2 - peerDependenciesMeta: - '@ember-data/record-data': - optional: true - dependencies: - '@ember-data/canary-features': 4.11.3 - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/record-data': 4.11.3(@ember-data/store@4.11.3)(webpack@5.88.2) - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/tracking': 4.11.3 - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 - ember-cli-string-utils: 1.1.0 - ember-cli-test-info: 1.0.0 - ember-compatibility-helpers: 1.2.6(@babel/core@7.23.0) - ember-inflector: 4.0.2 - inflection: 2.0.1 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - - /@ember-data/model@4.11.3(@babel/core@7.23.0)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-nkDru5TZmOp4J1xp65D1bR3hBJ3u5KhKKfDpWeGnHW2YDCVUdLORRwW7vfrPnnXDIoJij42DwDVCiTY25Xhrqw==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/record-data': 4.11.3 - '@ember-data/store': 4.11.3 - '@ember-data/tracking': 4.11.3 - '@ember/string': ^3.0.1 - ember-inflector: ^4.0.2 - peerDependenciesMeta: - '@ember-data/record-data': - optional: true - dependencies: - '@ember-data/canary-features': 4.11.3 - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/tracking': 4.11.3 - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 - ember-cli-string-utils: 1.1.0 - ember-cli-test-info: 1.0.0 - ember-compatibility-helpers: 1.2.6(@babel/core@7.23.0) - ember-inflector: 4.0.2 - inflection: 2.0.1 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - /@ember-data/model@4.12.3(@babel/core@7.23.0)(@ember-data/debug@4.12.3)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/store@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@4.12.3): resolution: {integrity: sha512-ygVkv3NT/PweY3/RlN4zjF64Drl2dgcN/OLDnk71CW7OcW0k3Im0f1hXyiPDsHKWYxs05rND/JxuN2kXaDksog==} engines: {node: 16.* || >= 18.*} @@ -2508,17 +2383,17 @@ packages: - supports-color dev: true - /@ember-data/model@4.12.3(@babel/core@7.23.0)(@ember-data/debug@4.12.3)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/store@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0): - resolution: {integrity: sha512-ygVkv3NT/PweY3/RlN4zjF64Drl2dgcN/OLDnk71CW7OcW0k3Im0f1hXyiPDsHKWYxs05rND/JxuN2kXaDksog==} + /@ember-data/model@5.3.0(@babel/core@7.23.0)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0): + resolution: {integrity: sha512-9DckZXu3DZk1fYd1js6kS2SCxuuaQBDE1N3NMc+Zz55n8qu1LKHLxr+dGwVqV+Wtl7LGcAU1ocnm7gKNhC1vuw==} engines: {node: 16.* || >= 18.*} peerDependencies: - '@ember-data/debug': 4.12.3 - '@ember-data/graph': 4.12.3 - '@ember-data/json-api': 4.12.3 - '@ember-data/legacy-compat': 4.12.3 - '@ember-data/store': 4.12.3 - '@ember-data/tracking': 4.12.3 - '@ember/string': ^3.0.1 + '@ember-data/debug': 5.3.0 + '@ember-data/graph': 5.3.0 + '@ember-data/json-api': 5.3.0 + '@ember-data/legacy-compat': 5.3.0 + '@ember-data/store': 5.3.0 + '@ember-data/tracking': 5.3.0 + '@ember/string': ^3.1.1 ember-inflector: ^4.0.2 peerDependenciesMeta: '@ember-data/debug': @@ -2528,18 +2403,18 @@ packages: '@ember-data/json-api': optional: true dependencies: - '@ember-data/debug': 4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(webpack@5.88.2) - '@ember-data/graph': 4.12.3(@ember-data/store@4.12.3) - '@ember-data/json-api': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/store@4.12.3) - '@ember-data/legacy-compat': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3) - '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) - '@ember-data/tracking': 4.12.3 + '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1) + '@ember-data/graph': 5.3.0(@babel/core@7.23.0)(@ember-data/store@5.3.0) + '@ember-data/json-api': 5.3.0(@babel/core@7.23.0)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2) + '@ember-data/legacy-compat': 5.3.0(@babel/core@7.23.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0) + '@ember-data/private-build-infra': 5.3.0 + '@ember-data/store': 5.3.0(@babel/core@7.23.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/tracking': 5.3.0(@babel/core@7.23.0) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 + ember-cli-babel: 8.0.0(@babel/core@7.23.0) ember-cli-string-utils: 1.1.0 ember-cli-test-info: 1.0.0 ember-inflector: 4.0.2 @@ -2551,7 +2426,7 @@ packages: - supports-color dev: true - /@ember-data/model@5.3.0(@babel/core@7.23.0)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0): + /@ember-data/model@5.3.0(@babel/core@7.23.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0): resolution: {integrity: sha512-9DckZXu3DZk1fYd1js6kS2SCxuuaQBDE1N3NMc+Zz55n8qu1LKHLxr+dGwVqV+Wtl7LGcAU1ocnm7gKNhC1vuw==} engines: {node: 16.* || >= 18.*} peerDependencies: @@ -2571,10 +2446,6 @@ packages: '@ember-data/json-api': optional: true dependencies: - '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1) - '@ember-data/graph': 5.3.0(@babel/core@7.23.0)(@ember-data/store@5.3.0) - '@ember-data/json-api': 5.3.0(@babel/core@7.23.0)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2) - '@ember-data/legacy-compat': 5.3.0(@babel/core@7.23.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0) '@ember-data/private-build-infra': 5.3.0 '@ember-data/store': 5.3.0(@babel/core@7.23.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) '@ember-data/tracking': 5.3.0(@babel/core@7.23.0) @@ -2594,43 +2465,6 @@ packages: - supports-color dev: true - /@ember-data/private-build-infra@4.11.3: - resolution: {integrity: sha512-bXFQMEegUc+vKn/vD7FmAkq7ECE0okZ2sbtv/0RXqYn7TLk44rvGzpqSUXUowpCaGI/87MmaW8JaZMMdqF9wuw==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - dependencies: - '@babel/core': 7.23.0 - '@babel/plugin-transform-block-scoping': 7.22.10(@babel/core@7.23.0) - '@babel/runtime': 7.22.10 - '@ember-data/canary-features': 4.11.3 - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.13.1 - babel-import-util: 1.4.1 - babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.0) - babel-plugin-filter-imports: 4.0.0 - babel6-plugin-strip-class-callcheck: 6.0.0 - broccoli-debug: 0.6.5 - broccoli-file-creator: 2.1.1 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-rollup: 5.0.0 - calculate-cache-key-for-tree: 2.0.0 - chalk: 4.1.2 - ember-cli-babel: 7.26.11 - ember-cli-path-utils: 1.0.0 - ember-cli-string-utils: 1.1.0 - ember-cli-version-checker: 5.1.2 - git-repo-info: 2.1.1 - glob: 8.1.0 - npm-git-info: 1.0.3 - rimraf: 3.0.2 - rsvp: 4.8.5 - semver: 7.5.4 - silent-error: 1.1.1 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/private-build-infra@4.12.3: resolution: {integrity: sha512-i2bWz319iIrNdl/BUDXX9a+E/6zP/2mYle6Tk3F0nqiDB3410y61pdRwnuZT1pchM04hcw4TS7Ye2/DmAuoW2g==} engines: {node: 16.* || >= 18.*} @@ -2696,25 +2530,6 @@ packages: - supports-color dev: true - /@ember-data/record-data@4.11.3(@ember-data/store@4.11.3)(webpack@5.88.2): - resolution: {integrity: sha512-8NmeEZJ7or354NLZJgibJ1FuhWL70H6G24tGSEIzM8IV7wr6TreIyaWODaW372QwamWYgFIpfnFwWt5MTlY/gw==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 4.11.3 - dependencies: - '@ember-data/canary-features': 4.11.3 - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - dev: true - /@ember-data/request-utils@5.3.0(@babel/core@7.23.0): resolution: {integrity: sha512-f/DGyW7tKbx1NCxz/arDBXTwEiV0+a0m8AStTMOlPkGLvnDhuHAH3jVlhuNweFxI6CmfXaL+UAY7g+uWAwCn0Q==} engines: {node: 16.* || >= 18} @@ -2755,28 +2570,6 @@ packages: /@ember-data/rfc395-data@0.0.4: resolution: {integrity: sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==} - /@ember-data/serializer@4.11.3(@ember-data/store@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(webpack@5.88.2): - resolution: {integrity: sha512-Qnzrowinz14/onQfwd4TPwNG0sMTAwTWE0RajYo2fysF3CKyAua0nIzmFtXKx0CogD7TYd0C5xf6nMjFesT09Q==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 4.11.3 - '@ember/string': ^3.0.1 - ember-inflector: ^4.0.2 - dependencies: - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - ember-cli-test-info: 1.0.0 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - dev: true - /@ember-data/serializer@4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2): resolution: {integrity: sha512-Zt/4vC+6zDwRX60tYRF+B01W77Vez74SEoTN9Q3jRH2i3LChzosLlea8ElsbuJguTkeprS80F0MboauRIrE+JQ==} engines: {node: 16.* || >= 18.*} @@ -2786,7 +2579,7 @@ packages: ember-inflector: ^4.0.2 dependencies: '@ember-data/private-build-infra': 4.12.3 - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) + '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3) '@ember/string': 3.1.1 '@embroider/macros': 1.13.1 ember-cli-babel: 7.26.11 @@ -2816,73 +2609,6 @@ packages: - supports-color dev: true - /@ember-data/store@4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-ogwWy+VqMpkCGs4n30pzuB2vqv/dJRL6wdV3fdNKpXrDugffjuMPpLBQYF937qztDUZKxmnbWAZe5PbQOz8b1Q==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/model': 4.11.3 - '@ember-data/record-data': 4.11.3 - '@ember-data/tracking': 4.11.3 - '@ember/string': ^3.0.1 - '@glimmer/tracking': ^1.1.2 - peerDependenciesMeta: - '@ember-data/model': - optional: true - '@ember-data/record-data': - optional: true - dependencies: - '@ember-data/canary-features': 4.11.3 - '@ember-data/model': 4.11.3(@babel/core@7.23.0)(@ember-data/record-data@4.11.3)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/record-data': 4.11.3(@ember-data/store@4.11.3)(webpack@5.88.2) - '@ember-data/tracking': 4.11.3 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - - /@ember-data/store@4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-ogwWy+VqMpkCGs4n30pzuB2vqv/dJRL6wdV3fdNKpXrDugffjuMPpLBQYF937qztDUZKxmnbWAZe5PbQOz8b1Q==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/model': 4.11.3 - '@ember-data/record-data': 4.11.3 - '@ember-data/tracking': 4.11.3 - '@ember/string': ^3.0.1 - '@glimmer/tracking': ^1.1.2 - peerDependenciesMeta: - '@ember-data/model': - optional: true - '@ember-data/record-data': - optional: true - dependencies: - '@ember-data/canary-features': 4.11.3 - '@ember-data/model': 4.11.3(@babel/core@7.23.0)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/tracking': 4.11.3 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - '@glimmer/tracking': 1.1.2 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - /@ember-data/store@4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3): resolution: {integrity: sha512-PtsXffYry9ZHXdaPvJf/+NX8Boe371WLwgiboZ6DI/E2MzAhobO6JT4lvK/YMUJpJ9qtjuFYUli5xVVXlc3Sxg==} engines: {node: 16.* || >= 18.*} @@ -2922,45 +2648,6 @@ packages: - supports-color dev: true - /@ember-data/store@4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0): - resolution: {integrity: sha512-PtsXffYry9ZHXdaPvJf/+NX8Boe371WLwgiboZ6DI/E2MzAhobO6JT4lvK/YMUJpJ9qtjuFYUli5xVVXlc3Sxg==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/graph': 4.12.3 - '@ember-data/json-api': 4.12.3 - '@ember-data/legacy-compat': 4.12.3 - '@ember-data/model': 4.12.3 - '@ember-data/tracking': 4.12.3 - '@ember/string': ^3.0.1 - '@glimmer/tracking': ^1.1.2 - peerDependenciesMeta: - '@ember-data/graph': - optional: true - '@ember-data/json-api': - optional: true - '@ember-data/legacy-compat': - optional: true - '@ember-data/model': - optional: true - dependencies: - '@ember-data/graph': 4.12.3(@ember-data/store@4.12.3) - '@ember-data/json-api': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/store@4.12.3) - '@ember-data/legacy-compat': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3) - '@ember-data/model': 4.12.3(@babel/core@7.23.0)(@ember-data/debug@4.12.3)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/store@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0) - '@ember-data/private-build-infra': 4.12.3 - '@ember-data/tracking': 4.12.3 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - '@glimmer/tracking': 1.1.2 - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.0)(ember-source@5.3.0) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - ember-source - - supports-color - dev: true - /@ember-data/store@5.3.0(@babel/core@7.23.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0): resolution: {integrity: sha512-okM7AJmgM8Wz+FNgsDXVUVw32UZVLKko2K/2GfBmOjOcKVnfwLKI08HmQNLnT5IXiOsJW5mA4mRESuVgN8L4lQ==} engines: {node: 16.* || >= 18.*} @@ -2983,15 +2670,6 @@ packages: - supports-color dev: true - /@ember-data/tracking@4.11.3: - resolution: {integrity: sha512-YZxFTMe2TBL8H8/GrnrvP7Wc/uuAijoSyiP2g6TMNRsL1e/3BWDT0EIl+B/5Wji+dchofY8iuMWfpY7VDvPIzA==} - engines: {node: 14.* || 16.* || >= 18} - dependencies: - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - supports-color - dev: true - /@ember-data/tracking@4.12.3: resolution: {integrity: sha512-wgyjeGJXnwmgXHwFkIqPzBhy0piSwrt4OtwOAVCVVetiHI3M7Cr1soC3FFvsge7X7B2WPcIweFt8lURq5XyniA==} engines: {node: 16.* || >= 18} @@ -10339,37 +10017,6 @@ packages: - supports-color dev: true - /ember-data@4.11.3(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-7vir6Re3M3M6yJoCHy6UxEg3oSY1JEnsuTByY3lJquWPaUamn7qbPQvNr16Tqh8EKrt+e/+X26czFm4kRGhpVg==} - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember/string': ^3.0.1 - dependencies: - '@ember-data/adapter': 4.11.3(@ember-data/store@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(webpack@5.88.2) - '@ember-data/debug': 4.11.3(@ember/string@3.1.1)(webpack@5.88.2) - '@ember-data/model': 4.11.3(@babel/core@7.23.0)(@ember-data/record-data@4.11.3)(@ember-data/store@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/private-build-infra': 4.11.3 - '@ember-data/record-data': 4.11.3(@ember-data/store@4.11.3)(webpack@5.88.2) - '@ember-data/serializer': 4.11.3(@ember-data/store@4.11.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(webpack@5.88.2) - '@ember-data/store': 4.11.3(@babel/core@7.23.0)(@ember-data/model@4.11.3)(@ember-data/record-data@4.11.3)(@ember-data/tracking@4.11.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2) - '@ember-data/tracking': 4.11.3 - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - '@glimmer/env': 0.1.7 - broccoli-merge-trees: 4.2.0 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@babel/core' - - '@glimmer/tracking' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - /ember-data@4.12.3(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.3)(webpack@5.88.2): resolution: {integrity: sha512-MCQV6RllCZCkwNAIk0MVFSQa6o1n8w1TipaDomumpR/xY69zm2zQ6guXfhOZfMA7ef5OpVpVcYpUoReFTMvqww==} engines: {node: 16.* || >= 18.*} @@ -10404,40 +10051,6 @@ packages: - webpack dev: true - /ember-data@4.12.3(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0)(webpack@5.88.2): - resolution: {integrity: sha512-MCQV6RllCZCkwNAIk0MVFSQa6o1n8w1TipaDomumpR/xY69zm2zQ6guXfhOZfMA7ef5OpVpVcYpUoReFTMvqww==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember/string': ^3.0.1 - dependencies: - '@ember-data/adapter': 4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/debug': 4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(webpack@5.88.2) - '@ember-data/graph': 4.12.3(@ember-data/store@4.12.3) - '@ember-data/json-api': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/store@4.12.3) - '@ember-data/legacy-compat': 4.12.3(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3) - '@ember-data/model': 4.12.3(@babel/core@7.23.0)(@ember-data/debug@4.12.3)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/store@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.3.0) - '@ember-data/private-build-infra': 4.12.3 - '@ember-data/request': 4.12.3 - '@ember-data/serializer': 4.12.3(@ember-data/store@4.12.3)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/store': 4.12.3(@babel/core@7.23.0)(@ember-data/graph@4.12.3)(@ember-data/json-api@4.12.3)(@ember-data/legacy-compat@4.12.3)(@ember-data/model@4.12.3)(@ember-data/tracking@4.12.3)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0) - '@ember-data/tracking': 4.12.3 - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.1 - '@glimmer/env': 0.1.7 - broccoli-merge-trees: 4.2.0 - ember-auto-import: 2.6.3(webpack@5.88.2) - ember-cli-babel: 7.26.11 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@babel/core' - - '@glimmer/tracking' - - '@glint/template' - - ember-source - - supports-color - - webpack - dev: true - /ember-data@5.3.0(@babel/core@7.23.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.3.0): resolution: {integrity: sha512-ca8udUa2SrWyYxPckYc89Fdv/9pCG3X360zHvlGxtB4C87o3dWp6sle98tP9G1TjximKhrU/PMrqpdhJ8rOGtA==} engines: {node: 16.* || >= 18.*} diff --git a/test-packages/01-basic-app/mirage/config.js b/test-packages/01-basic-app/mirage/config.js index 7483f4d8c..852125a49 100644 --- a/test-packages/01-basic-app/mirage/config.js +++ b/test-packages/01-basic-app/mirage/config.js @@ -7,7 +7,10 @@ import { createServer } from 'miragejs'; export default function (config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models, + }, serializers: applyEmberDataSerializers(config.serializers), routes, }; diff --git a/test-packages/01-basic-app/package.json b/test-packages/01-basic-app/package.json index a815ada19..f980b6af1 100644 --- a/test-packages/01-basic-app/package.json +++ b/test-packages/01-basic-app/package.json @@ -49,7 +49,7 @@ "ember-cli-mirage": "workspace:*", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~4.12.3", + "ember-data": "~5.3.0", "ember-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", "ember-modifier": "^4.1.0", diff --git a/test-packages/01-basic-app/tests/acceptance/ember-data-test.js b/test-packages/01-basic-app/tests/acceptance/ember-data-test.js index a4c3d5dd4..c68762b36 100644 --- a/test-packages/01-basic-app/tests/acceptance/ember-data-test.js +++ b/test-packages/01-basic-app/tests/acceptance/ember-data-test.js @@ -1,4 +1,5 @@ import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; import { createServer } from 'miragejs'; import { Model } from 'miragejs'; import { modelFor } from 'ember-cli-mirage/ember-data'; @@ -8,13 +9,16 @@ const CustomTag = Model.extend(); CustomTag.__isCustom__ = true; module('Acceptance | Ember Data', function (hooks) { + setupTest(hooks); + hooks.beforeEach(function () { + const store = this.owner.lookup('service:store'); this.server = createServer({ scenarios: { default() {}, }, models: { - ...discoverEmberDataModels(), + ...discoverEmberDataModels(store), // Tag exists in dummy/app/models. We want to make sure pre-defined // models take precedence tag: CustomTag, diff --git a/test-packages/02-app-that-excludes-mirage/mirage/config.js b/test-packages/02-app-that-excludes-mirage/mirage/config.js index ebf480f7f..48d1d6130 100644 --- a/test-packages/02-app-that-excludes-mirage/mirage/config.js +++ b/test-packages/02-app-that-excludes-mirage/mirage/config.js @@ -7,7 +7,10 @@ import { createServer } from 'miragejs'; export default function (config) { let finalConfig = { ...config, - models: { ...discoverEmberDataModels(), ...config.models }, + models: { + ...discoverEmberDataModels(config.store), + ...config.models, + }, serializers: applyEmberDataSerializers(config.serializers), routes() {}, };