Merge pull request #2542 from miragejs/ember-data-v5-compat-discoverE…

…mberDataModels feat: access Ember Data models via Store service
miragejs · Oct 4, 2023 · 8f7bbdb · 8f7bbdb
2 parents ba14481 + 72cceec
commit 8f7bbdb
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 444 deletions.
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
@@ -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
@@ -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/...ember-cli-mirage-docs/app/templates/docs/getting-started/upgrade-guide/index.md b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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),
     });
   });