Test against ember-resources@v7

NullVoxPopuli · Jan 20, 2024 · 965dc3f · 965dc3f
1 parent 1315046
commit 965dc3f
Show file tree

Hide file tree

Showing 8 changed files with 678 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,6 +114,7 @@ jobs:
         allow-failure: [false]
         try-scenario:
           - ember-resources-5.3
+          - ember-resources-7
           - ember-lts-3.28
           - ember-lts-4.4
           # - ember-lts-4.8

diff --git a/README.md b/README.md
@@ -1,13 +1,14 @@
 # ember-data-resources
 
-Resources for reactive data fetching with ember-data
+Resources for reactive data fetching with ember-data's `store` service.
 
 
 ## Compatibility
 
 * ember-source v3.28 or above
 * ember-data v3.28 or above
 * ember-auto-import v2 or above
+* ember-resources v5.3 or above
 * typescript v4.8 or above
 
 

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   },
   "volta": {
     "node": "20.10.0",
-    "pnpm": "8.10.5"
+    "pnpm": "8.14.1"
   },
   "pnpm": {
     "overrides": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -20,6 +20,17 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-resources-7',
+        npm: {
+          devDependencies: {
+            'ember-resources': '^7.0.0',
+            'ember-source': '~3.28.11',
+            'ember-data': '~3.28.13',
+            '@ember-data/store': '~3.28.3',
+          },
+        },
+      },
       {
         name: 'ember-lts-3.28',
         npm: {

diff --git a/test-app/package.json b/test-app/package.json
@@ -28,8 +28,6 @@
   "devDependencies": {
     "@babel/core": "^7.23.7",
     "@babel/eslint-parser": "^7.23.3",
-    "@ember-data/store": "^5.0.0",
-    "@ember-data/tracking": "^5.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.1",
@@ -73,14 +71,13 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.7.2",
-    "ember-cli": "~4.12.0",
+    "ember-cli": "~5.5.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-deprecation-workflow": "^2.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~5.2.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
@@ -121,6 +118,12 @@
     "edition": "octane"
   },
   "dependencies": {
+    "@ember-data/adapter": "^5.3.0",
+    "@ember-data/model": "^5.3.0",
+    "@ember-data/serializer": "^5.3.0",
+    "@ember-data/store": "^5.3.0",
+    "@ember-data/tracking": "^5.3.0",
+    "ember-data": "^5.3.0",
     "decorator-transforms": "^1.1.0",
     "ember-data-resources": "workspace:*"
   },

diff --git a/test-embroider-app/config/ember-try.js b/test-embroider-app/config/ember-try.js
@@ -20,6 +20,17 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-resources-7',
+        npm: {
+          devDependencies: {
+            'ember-resources': '^7.0.0',
+            'ember-source': '~3.28.11',
+            'ember-data': '~3.28.13',
+            '@ember-data/store': '~3.28.3',
+          },
+        },
+      },
       {
         name: 'ember-lts-3.28',
         npm: {

diff --git a/test-embroider-app/ember-cli-build.js b/test-embroider-app/ember-cli-build.js
@@ -27,5 +27,18 @@ module.exports = function (defaults) {
         package: 'qunit',
       },
     ],
+    extraPublicTrees: [],
+    staticAddonTrees: true,
+    staticAddonTestSupportTrees: true,
+    staticHelpers: true,
+    staticModifiers: true,
+    staticComponents: true,
+    staticEmberSource: true,
+    implicitModulesStrategy: 'packageNames',
+    packagerOptions: {
+      webpackConfig: {
+        devtool: 'source-map',
+      },
+    },
   });
 };