From 5cdcf750babf88b4288643013623573edce850d5 Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Wed, 9 Feb 2022 20:25:25 -0800 Subject: [PATCH] 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). --- .../addon/utils/ember-data.js | 4 +- packages/ember-cli-mirage/package.json | 5 +++ pnpm-lock.yaml | 37 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/packages/ember-cli-mirage/addon/utils/ember-data.js b/packages/ember-cli-mirage/addon/utils/ember-data.js index fc6a7ce4a..801056207 100644 --- 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 index 036c457b3..0de851dd2 100644 --- 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 index 130880859..62f6caaeb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,6 +48,9 @@ importers: '@babel/core': specifier: ^7.22.10 version: 7.22.10 + '@ember-data/model': + specifier: ~4.11.3 + version: 4.11.3(@babel/core@7.22.10)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@4.11.0)(webpack@5.75.0) '@ember/jquery': specifier: ^2.0.0 version: 2.0.0 @@ -2071,6 +2074,40 @@ packages: - webpack dev: true + /@ember-data/model@4.11.3(@babel/core@7.22.10)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@4.11.0)(webpack@5.75.0): + 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/edition-utils': 1.2.0 + '@ember/string': 3.1.1 + '@embroider/macros': 1.13.1 + ember-auto-import: 2.6.3(webpack@5.75.0) + ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.22.10)(ember-source@4.11.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.22.10) + ember-inflector: 4.0.2 + inflection: 2.0.1 + transitivePeerDependencies: + - '@babel/core' + - '@glint/template' + - ember-source + - supports-color + - webpack + 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.*}