Merge branch 'main' into chore/dev-store

pmndrs · Dec 20, 2024 · e34ffcf · e34ffcf
2 parents 5d920a8 + 7883c4e
commit e34ffcf
Show file tree

Hide file tree

Showing 26 changed files with 658 additions and 534 deletions.
diff --git a/.github/workflows/compressed-size-action.yml b/.github/workflows/compressed-size-action.yml
@@ -12,7 +12,6 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
       - uses: preactjs/compressed-size-action@v2
         with:
           pattern: './dist/**/*.{js,mjs}'
diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20

diff --git a/.github/workflows/ecosystem-ci.yml b/.github/workflows/ecosystem-ci.yml
@@ -17,8 +17,7 @@ jobs:
         with:
           node-version: 22
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - name: Get Short SHA
         id: short_sha
         run: |

diff --git a/.github/workflows/lint-and-type.yml b/.github/workflows/lint-and-type.yml
@@ -16,8 +16,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm test:format
       - run: pnpm test:types
       - run: pnpm test:lint
diff --git a/.github/workflows/livecodes-preview.yml b/.github/workflows/livecodes-preview.yml
@@ -12,9 +12,8 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
       - uses: live-codes/preview-in-livecodes@v1
         with:
-          install-command: pnpm install --frozen-lockfile
+          install-command: pnpm install
           build-command: pnpm build
           base-url: 'https://{{LC::REF}}.preview-in-livecodes-demo.pages.dev'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,8 +15,7 @@ jobs:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm test
       - run: pnpm build
       - run: npm publish

diff --git a/.github/workflows/test-multiple-builds.yml b/.github/workflows/test-multiple-builds.yml
@@ -21,13 +21,11 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build
       - name: Use React 17 for production test
         if: ${{ matrix.env == 'production' }}
         run: |
-          pnpm json -I -f package.json -e "this.pnpm.patchedDependencies={};"
           pnpm add -D [email protected] [email protected] @testing-library/[email protected]
       - name: Patch for DEV-ONLY
         if: ${{ matrix.env == 'development' }}

diff --git a/.github/workflows/test-multiple-versions.yml b/.github/workflows/test-multiple-versions.yml
@@ -16,8 +16,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build # we don't have any other workflows to test build
       - run: pnpm test:spec
 
@@ -43,12 +42,10 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - name: Install legacy testing-library
         if: ${{ startsWith(matrix.react, '16.') || startsWith(matrix.react, '17.') }}
         run: |
-          pnpm json -I -f package.json -e "this.pnpm.patchedDependencies={};"
           pnpm add -D @testing-library/[email protected]
       - name: Patch for React 16
         if: ${{ startsWith(matrix.react, '16.') }}

diff --git a/.github/workflows/test-old-typescript.yml b/.github/workflows/test-old-typescript.yml
@@ -38,8 +38,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build
       - name: Patch for all TS
         run: |
@@ -91,7 +90,6 @@ jobs:
       - name: Patch testing setup for older TS
         if: ${{ matrix.typescript == '4.0.5' || startsWith(matrix.typescript, '3.') }}
         run: |
-          pnpm json -I -f package.json -e "this.pnpm.patchedDependencies={};"
           pnpm add -D @testing-library/[email protected] @testing-library/[email protected] @types/[email protected]
           rm node_modules/vitest/dist/*.d.ts
           echo "declare module 'vitest'" >> ./src/types.d.ts

diff --git a/package.json b/package.json
@@ -158,8 +158,8 @@
     "jsdom": "^25.0.1",
     "json": "^11.0.0",
     "prettier": "^3.4.2",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "rollup": "^4.28.1",
     "rollup-plugin-banner2": "^1.3.1",
     "rollup-plugin-esbuild": "^6.1.1",
@@ -182,10 +182,5 @@
     "react": {
       "optional": true
     }
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "@testing-library/[email protected]": "patches/@[email protected]"
-    }
   }
 }
diff --git a/patches/@[email protected] b/patches/@[email protected]
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/react/abortable.test.tsx b/tests/react/abortable.test.tsx
@@ -38,14 +38,17 @@ describe('abortable atom test', () => {
       )
     }
 
-    render(
-      <StrictMode>
-        <Suspense fallback="loading">
-          <Component />
-          <Controls />
-        </Suspense>
-      </StrictMode>,
-    )
+    // eslint-disable-next-line testing-library/no-unnecessary-act
+    await act(async () => {
+      render(
+        <StrictMode>
+          <Suspense fallback="loading">
+            <Component />
+            <Controls />
+          </Suspense>
+        </StrictMode>,
+      )
+    })
 
     await screen.findByText('loading')
 
@@ -95,14 +98,17 @@ describe('abortable atom test', () => {
       )
     }
 
-    render(
-      <StrictMode>
-        <Suspense fallback="loading">
-          <Component />
-          <Controls />
-        </Suspense>
-      </StrictMode>,
-    )
+    // eslint-disable-next-line testing-library/no-unnecessary-act
+    await act(async () => {
+      render(
+        <StrictMode>
+          <Suspense fallback="loading">
+            <Component />
+            <Controls />
+          </Suspense>
+        </StrictMode>,
+      )
+    })
 
     await screen.findByText('loading')
     resolve.splice(0).forEach((fn) => fn())
@@ -154,13 +160,16 @@ describe('abortable atom test', () => {
       )
     }
 
-    render(
-      <StrictMode>
-        <Suspense fallback="loading">
-          <Parent />
-        </Suspense>
-      </StrictMode>,
-    )
+    // eslint-disable-next-line testing-library/no-unnecessary-act
+    await act(async () => {
+      render(
+        <StrictMode>
+          <Suspense fallback="loading">
+            <Parent />
+          </Suspense>
+        </StrictMode>,
+      )
+    })
 
     await screen.findByText('loading')
 
@@ -203,14 +212,17 @@ describe('abortable atom test', () => {
       )
     }
 
-    render(
-      <StrictMode>
-        <Suspense fallback="loading">
-          <Component />
-          <Controls />
-        </Suspense>
-      </StrictMode>,
-    )
+    // eslint-disable-next-line testing-library/no-unnecessary-act
+    await act(async () => {
+      render(
+        <StrictMode>
+          <Suspense fallback="loading">
+            <Component />
+            <Controls />
+          </Suspense>
+        </StrictMode>,
+      )
+    })
 
     await screen.findByText('loading')