Merge pull request #392 from NullVoxPopuli/test-against-ember-resourc…

…esc-7 Test against ember-resources@v7
NullVoxPopuli · Jan 21, 2024 · f6aa10f · f6aa10f
2 parents 1315046 + 0cac368
commit f6aa10f
Show file tree

Hide file tree

Showing 26 changed files with 46,687 additions and 17,053 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: pnpm turbo test --filter test-app
+      - run: pnpm turbo test:ember --filter test-app
 
   floating:
     name: "Floating Dependencies"
@@ -101,7 +101,7 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pnpm-args: --no-lockfile
-      - run: pnpm turbo test --filter test-app
+      - run: pnpm turbo test:ember --filter test-app
 
   try-scenarios:
     name: "${{ matrix.try-scenario }} ${{ matrix.test-app == 'test-app' && '(Classic)' || '(Embroider)' }}"
@@ -114,41 +114,30 @@ 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
+          # - ember-data @ 4.8 has incorrect peers, so we can't test it
           - ember-lts-4.12
           - ember-5.0
+          - ember-lts-5.4
 
           - ember-release
           - ember-beta
           - ember-canary
         test-app:
           - test-app
           - test-embroider-app
-        include:
-           - try-scenario: ember-lts-4.8
-             test-app: test-embroider-app
-             allow-failure: true
-           - try-scenario: ember-lts-4.8
-             test-app: test-app
-             allow-failure: false
 
     steps:
       - uses: wyvox/action@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run Tests
-        id: tests
-        continue-on-error: ${{matrix.allow-failure}}
         run: pnpm turbo test:scenario --filter ${{ matrix.test-app }} --log-prefix none -- --skip-cleanup
         env:
           SCENARIO: ${{ matrix.try-scenario }}
-      - uses: mainmatter/continue-on-error-comment@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          outcome: ${{ steps.tests.outcome }}
-          test-id: "${{ matrix.test-app }} :: ${{ matrix.try-scenario }}"
 
   typecheck_v4:
     name: '4.* ${{ matrix.typescript-scenario }}'

diff --git a/.npmrc b/.npmrc
@@ -6,4 +6,6 @@ ignore-scripts=true
 auto-install-peers=false
 resolve-peers-from-workspace-root=false
 
-
+# default is true, we do this to try to have more isolation
+# since we test with incompatible sets of TS types.
+shared-workspace-lockfile=false
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/dev/package.json b/dev/package.json
@@ -25,8 +25,8 @@
     "@babel/core": "^7.23.7",
     "@babel/eslint-parser": "^7.23.3",
     "@nullvoxpopuli/eslint-configs": "^3.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
     "eslint": "^8.41.0",
     "prettier": "^3.2.4",
     "typescript": "^5.1.3"