Detect @ember-data/model in addition to meta-package

While ember-data is usually installed it's also possible to use @ember-data/model (and other packages directly).
miragejs · Sep 13, 2023 · 5cdcf75 · 5cdcf75
1 parent f93a678
commit 5cdcf75
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/packages/ember-cli-mirage/addon/utils/ember-data.js b/packages/ember-cli-mirage/addon/utils/ember-data.js
@@ -3,7 +3,9 @@ import { dependencySatisfies } from '@embroider/macros';
 /**
   @hide
 */
-export const hasEmberData = dependencySatisfies('ember-data', '*');
+export const hasEmberData =
+  dependencySatisfies('@ember-data/model', '*') ||
+  dependencySatisfies('ember-data', '*');
 
 /**
   @hide

diff --git a/packages/ember-cli-mirage/package.json b/packages/ember-cli-mirage/package.json
@@ -53,6 +53,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.9.3",
+    "@ember-data/model": "~4.11.3",
     "@embroider/test-setup": "^2.1.1",
     "@faker-js/faker": "^6.3.1",
     "@glimmer/component": "^1.1.2",
@@ -99,6 +100,7 @@
   },
   "peerDependencies": {
     "@ember/test-helpers": "*",
+    "@ember-data/model": "*",
     "ember-data": "*",
     "ember-qunit": "*",
     "ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0",
@@ -108,6 +110,9 @@
     "@ember/test-helpers": {
       "optional": true
     },
+    "@ember-data/model": {
+      "optional": true
+    },
     "ember-data": {
       "optional": true
     },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml