From ffd927e1ce5f9eb1efb5f2ec88f7508e5ec158a7 Mon Sep 17 00:00:00 2001 From: Jonas Metzener Date: Fri, 26 Jul 2024 14:46:33 +0200 Subject: [PATCH] fix(deps): fix ember data dependencies --- package.json | 7 +++++-- pnpm-lock.yaml | 15 ++++++++++++--- tests/dummy/config/ember-try.js | 3 +++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e5ae6171..9be7498f 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@babel/core": "^7.24.9", "@embroider/macros": "^1.16.5", "@glimmer/tracking": "^1.1.2", + "ember-auto-import": "^2.7.4", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0" }, @@ -48,7 +49,6 @@ "@glimmer/component": "1.1.2", "broccoli-asset-rev": "3.0.0", "concurrently": "8.2.2", - "ember-auto-import": "2.7.4", "ember-cli": "5.10.0", "ember-cli-clean-css": "3.0.0", "ember-cli-dependency-checker": "3.3.2", @@ -83,7 +83,10 @@ "webpack": "5.93.0" }, "peerDependencies": { - "ember-data": "~4.12.0 || ^5.0.0", + "@ember-data/adapter": "~4.12.0 || >= 5.0.0", + "@ember-data/model": "~4.12.0 || >= 5.0.0", + "@ember-data/serializer": "~4.12.0 || >= 5.0.0", + "ember-data": "~4.12.0 || >= 5.0.0", "ember-intl": "^7.0.0", "ember-source": ">= 4.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b988140d..45fc67f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,12 +11,24 @@ importers: '@babel/core': specifier: ^7.24.9 version: 7.24.9 + '@ember-data/adapter': + specifier: ~4.12.0 || >= 5.0.0 + version: 5.3.8(@ember-data/legacy-compat@5.3.8(mll6wcpq3ptuq7qudxsg45sd2u))(@ember-data/request-utils@5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/store@5.3.8(@ember-data/request-utils@5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/request@5.3.8(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/tracking@5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@5.10.1(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@warp-drive/core-types@0.0.0-beta.11))(@warp-drive/core-types@0.0.0-beta.11) + '@ember-data/model': + specifier: ~4.12.0 || >= 5.0.0 + version: 5.3.8(hr4xisq4wdr2yr3vobtprfixti) + '@ember-data/serializer': + specifier: ~4.12.0 || >= 5.0.0 + version: 5.3.8(@ember-data/legacy-compat@5.3.8(mll6wcpq3ptuq7qudxsg45sd2u))(@ember-data/request-utils@5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/store@5.3.8(@ember-data/request-utils@5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/request@5.3.8(@warp-drive/core-types@0.0.0-beta.11))(@ember-data/tracking@5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@5.10.1(@glimmer/component@1.1.2(@babel/core@7.24.9))(rsvp@4.8.5)(webpack@5.93.0)))(@warp-drive/core-types@0.0.0-beta.11))(@warp-drive/core-types@0.0.0-beta.11) '@embroider/macros': specifier: ^1.16.5 version: 1.16.5 '@glimmer/tracking': specifier: ^1.1.2 version: 1.1.2 + ember-auto-import: + specifier: ^2.7.4 + version: 2.7.4(webpack@5.93.0) ember-cli-babel: specifier: ^8.2.0 version: 8.2.0(@babel/core@7.24.9) @@ -54,9 +66,6 @@ importers: concurrently: specifier: 8.2.2 version: 8.2.2 - ember-auto-import: - specifier: 2.7.4 - version: 2.7.4(webpack@5.93.0) ember-cli: specifier: 5.10.0 version: 5.10.0(handlebars@4.7.8)(underscore@1.13.7) diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 4d1ba533..afa598cf 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -28,6 +28,9 @@ module.exports = async function () { npm: { devDependencies: { "ember-data": "~4.12.0", + "@ember-data/adapter": "~4.12.0", + "@ember-data/model": "~4.12.0", + "@ember-data/serializer": "~4.12.0", }, }, },