Merge remote-tracking branch 'upstream/main' into codex/server-function-directives

# Conflicts:
#	packages/plugin-rsc/src/core/rsc.ts
#	packages/plugin-rsc/src/core/shared.ts
#	packages/plugin-rsc/src/react/rsc.ts
#	packages/plugin-rsc/src/transforms/wrap-export.test.ts
#	packages/plugin-rsc/src/transforms/wrap-export.ts

Author: james-elicx

.github/workflows/ci-rsc.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           persist-credentials: false
-      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           persist-credentials: false
-      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - name: Set node version to ${{ matrix.node_version }}
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
@@ -71,7 +71,7 @@ jobs:
           echo "PLAYWRIGHT_VERSION=$env:PLAYWRIGHT_VERSION" >> $env:GITHUB_ENV
 
       - name: Cache Playwright's binary
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+        uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
         with:
           key: ${{ runner.os }}-playwright-bin-v1-${{ env.PLAYWRIGHT_VERSION }}
           path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
@@ -106,7 +106,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - name: Set node version to 24
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6

.github/workflows/copilot-setup-steps.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           persist-credentials: false
-      - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: 24

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - name: Set node version
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6

.github/workflows/release-continuous.yml

@@ -23,7 +23,7 @@ jobs:
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:

.github/workflows/zizmor.yml

@@ -27,4 +27,4 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7

AGENTS.md

@@ -13,7 +13,7 @@ This monorepo contains multiple packages (see [README.md](README.md#packages) fo
 
 - `packages/plugin-react/` - Main React plugin with Babel
 - `packages/plugin-react-swc/` - SWC-based React plugin
-- `packages/plugin-rsc/` - React Server Components ([AI guidance](packages/plugin-rsc/AGENTS.md), [architecture](packages/plugin-rsc/docs/architecture.md))
+- `packages/plugin-rsc/` - React Server Components ([AI guidance](packages/plugin-rsc/AGENTS.md))
 
 ### Essential Setup Commands
 

package.json

@@ -27,29 +27,30 @@
     "dev": "pnpm -r --parallel --filter='./packages/*' run dev",
     "release": "node scripts/release.ts",
     "ci-publish": "node scripts/publishCI.ts",
+    "override-react": "bash scripts/override-react.sh",
     "override-vite7": "yq -i '.overrides.vite = \"^7\"' pnpm-workspace.yaml && yq -i '.overrides.\"@vitejs/plugin-react\" = \"^5\"' pnpm-workspace.yaml && yq -i '.packages += [\"!packages/plugin-react\"]' pnpm-workspace.yaml"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.4",
+    "@eslint/js": "^9.39.5",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.12.4",
-    "@vitejs/release-scripts": "^1.7.1",
-    "eslint": "^9.39.4",
-    "eslint-plugin-import-x": "^4.16.2",
+    "@types/node": "^24.13.3",
+    "@vitejs/release-scripts": "^1.8.0",
+    "eslint": "^9.39.5",
+    "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-n": "^17.24.0",
-    "eslint-plugin-regexp": "^3.1.0",
-    "fs-extra": "^11.3.5",
-    "globals": "^17.6.0",
+    "eslint-plugin-regexp": "^3.1.1",
+    "fs-extra": "^11.3.6",
+    "globals": "^17.7.0",
     "lint-staged": "^16.4.0",
-    "oxfmt": "^0.53.0",
+    "oxfmt": "^0.58.0",
     "picocolors": "^1.1.1",
-    "playwright-chromium": "^1.60.0",
+    "playwright-chromium": "^1.61.1",
     "simple-git-hooks": "^2.13.1",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.60.1",
-    "vite": "^8.0.16",
+    "typescript-eslint": "^8.64.0",
+    "vite": "^8.1.4",
     "vite-plugin-inspect": "^11.4.1",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.10"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm exec lint-staged --concurrent false"
@@ -71,5 +72,5 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
-  "packageManager": "pnpm@10.34.1"
+  "packageManager": "pnpm@10.34.5"
 }

packages/plugin-react-swc/package.json

@@ -33,13 +33,13 @@
     "@swc/core": "^1.15.11"
   },
   "devDependencies": {
-    "@playwright/test": "^1.60.0",
+    "@playwright/test": "^1.61.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.12.4",
+    "@types/node": "^24.13.3",
     "@vitejs/react-common": "workspace:*",
-    "fs-extra": "^11.3.5",
+    "fs-extra": "^11.3.6",
     "prettier": "^3.0.3",
-    "tsdown": "^0.22.1",
+    "tsdown": "^0.22.7",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {

packages/plugin-react-swc/playground/styled-components/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "styled-components": "^6.4.2"
+    "styled-components": "^6.4.3"
   },
   "devDependencies": {
     "@swc/plugin-styled-components": "^12.5.0",