Merge branch 'main' into fix/keyed-mutator-type-error

Key5n · Jun 1, 2024 · b4681da · b4681da
2 parents 4882ab3 + 1585a3e
commit b4681da
Show file tree

Hide file tree

Showing 15 changed files with 142 additions and 130 deletions.
diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml
@@ -4,10 +4,10 @@ runs:
   using: composite
   steps:
     - name: Setup pnpm
-      uses: pnpm/action-setup@v2.2.4
+      uses: pnpm/action-setup@v3
 
     - name: Use Node.js 18
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 18
         cache: pnpm

diff --git a/.github/workflows/test-canary.yml b/.github/workflows/test-canary.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/workflows/install

diff --git a/.github/workflows/test-legacy-react.yml b/.github/workflows/test-legacy-react.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/workflows/install

diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/workflows/install
@@ -23,6 +23,7 @@ jobs:
           pnpm clean
           pnpm build
           pnpm run-all-checks
+          npm pack
           pnpm attw
           pnpm test
           pnpm test:build
@@ -32,7 +33,7 @@ jobs:
       image: mcr.microsoft.com/playwright:v1.34.3-focal
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/workflows/install
@@ -45,7 +46,7 @@ jobs:
           pnpm test:e2e
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: playwright-report
           path: playwright-report
@@ -57,7 +58,7 @@ jobs:
       id-token: write
     steps:
       - name: Check out
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install
         uses: ./.github/workflows/install

diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -17,10 +17,6 @@ on:
           - minor
           - major
 
-    secrets:
-      RELEASE_BOT_GITHUB_TOKEN:
-        required: true
-
 name: Trigger Release
 
 env:
@@ -34,36 +30,13 @@ jobs:
 
     environment: release-${{ github.event.inputs.releaseType }}-${{ github.event.inputs.semverType }}
     steps:
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: ${{ steps.docs-change.outputs.docsChange == 'nope' }}
-        with:
-          node-version: 18
-          check-latest: true
-
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 10
           token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
-
-      - run: npm i -g pnpm@${PNPM_VERSION}
-
-      - id: get-store-path
-        run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        timeout-minutes: 5
-        id: cache-pnpm-store
-        with:
-          path: ${{ steps.get-store-path.outputs.STORE_PATH }}
-          key: pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: |
-            pnpm-store-
-            pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
-
-      - run: pnpm install
-
+      - name: Install
+        uses: ./.github/workflows/install
       - run: |
           pnpm clean
           pnpm build

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swr",
-  "version": "2.2.6-beta.2",
+  "version": "2.2.6-beta.4",
   "description": "React Hooks library for remote data fetching",
   "keywords": [
     "swr",
@@ -100,7 +100,7 @@
     "watch": "bunchee -w",
     "build": "bunchee",
     "build:e2e": "pnpm next build e2e/site",
-    "attw": "attw --pack",
+    "attw": "attw --pack .",
     "types:check": "tsc --noEmit",
     "prepublishOnly": "pnpm clean && pnpm build",
     "publish-beta": "pnpm publish --tag beta",
@@ -121,7 +121,7 @@
     ]
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.7.0",
+    "@arethetypeswrong/cli": "^0.15.3",
     "@playwright/test": "^1.34.3",
     "@swc/core": "^1.3.62",
     "@swc/jest": "0.2.26",
@@ -156,7 +156,7 @@
     "typescript": "5.1.3"
   },
   "peerDependencies": {
-    "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
+    "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-0"
   },
   "prettier": {
     "tabWidth": 2,
@@ -167,6 +167,7 @@
     "trailingComma": "none"
   },
   "dependencies": {
+    "dequal": "^2.0.3",
     "use-sync-external-store": "^1.2.0"
   }
 }