Merge branch 'main' into 07-06-test_debug_flaky

hi-ogawa · web-flow · commit 55f1e961bebb · 2025-07-11T12:22:23.000+09:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -36,8 +36,6 @@
     // manually bumping
     "node",
 
-    "generouted", // testing lib shipping JSX (new version ship transpiled JS)
-
     // breaking changes
     "source-map", // `source-map:v0.7.0+` needs more investigation
     "kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
diff --git a/.github/workflows/ci-rsc.yml b/.github/workflows/ci-rsc.yml
@@ -31,18 +31,21 @@ jobs:
       - run: pnpm -C packages/plugin-rsc test
 
   test-e2e:
-    name: test-rsc (${{ matrix.os }} / ${{ matrix.browser }})
+    name: test-rsc (${{ matrix.os }} / ${{ matrix.browser }}) ${{ matrix.rolldown == true && '(rolldown)' || '' }}
     runs-on: ${{ matrix.os }}
     strategy:
-      # TODO: shard?
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         browser: [chromium]
+        rolldown: [false]
         include:
           - os: ubuntu-latest
             browser: firefox
           - os: macos-latest
             browser: webkit
+          - os: ubuntu-latest
+            browser: chromium
+            rolldown: true
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -52,6 +55,11 @@ jobs:
       - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - run: pnpm i
       - run: pnpm build
+      - name: install rolldown
+        if: ${{ matrix.rolldown }}
+        run: |
+          echo 'overrides: { vite: "npm:rolldown-vite@latest" }' >> pnpm-workspace.yaml
+          pnpm i --no-frozen-lockfile
       - run: pnpm -C packages/plugin-rsc exec playwright install ${{ matrix.browser }}
       - run: pnpm -C packages/plugin-rsc test-e2e-ci --project=${{ matrix.browser }}
         env:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,12 +13,10 @@ This repo is a monorepo using pnpm workspaces. The package manager used to insta
 - Checkout a topic branch from a base branch (e.g. `main`), and merge back against that branch.
 
 - If adding a new feature:
-
   - Add accompanying test case.
   - Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first, and have it approved before working on it.
 
 - If fixing a bug:
-
   - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log (e.g. `fix: update entities encoding/decoding (fix #3899)`).
   - Provide a detailed description of the bug in the PR. Live demo preferred.
   - Add appropriate test coverage if applicable.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "lint-staged": "^15.5.2",
     "picocolors": "^1.1.1",
     "playwright-chromium": "^1.53.2",
-    "prettier": "^3.0.3",
+    "prettier": "^3.6.2",
     "simple-git-hooks": "^2.13.0",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
@@ -70,15 +70,5 @@
     "playground/**/__tests__/**/*.ts": [
       "eslint --cache --fix"
     ]
-  },
-  "pnpm": {
-    "packageExtensions": {
-      "generouted": {
-        "peerDependencies": {
-          "react": "*",
-          "react-router-dom": "*"
-        }
-      }
-    }
   }
 }
diff --git a/packages/plugin-react-swc/playground/ts-lib/__tests__/ts-lib.spec.ts b/packages/plugin-react-swc/playground/ts-lib/__tests__/ts-lib.spec.ts
@@ -1,24 +1,22 @@
-import { expect, test } from '@playwright/test'
+import { type Page, expect, test } from '@playwright/test'
 import { setupBuildAndPreview, setupDevServer } from '../../utils.ts'
 
 test('TS lib build', async ({ page }) => {
   const { testUrl, server } = await setupBuildAndPreview('ts-lib')
   await page.goto(testUrl)
-  await expect(page.locator('main')).toHaveText('Home page')
-
-  await page.locator('a', { hasText: 'About' }).click()
-  await expect(page.locator('main')).toHaveText('About page')
-
+  await testNonJs(page)
   await server.httpServer.close()
 })
 
 test('TS lib dev', async ({ page }) => {
   const { testUrl, server } = await setupDevServer('ts-lib')
   await page.goto(testUrl)
-  await expect(page.locator('main')).toHaveText('Home page')
-
-  await page.locator('a', { hasText: 'About' }).click()
-  await expect(page.locator('main')).toHaveText('About page')
-
+  await testNonJs(page)
   await server.close()
 })
+
+async function testNonJs(page: Page) {
+  await expect(page.getByTestId('test-non-js')).toHaveText('test-non-js: 0')
+  await page.getByTestId('test-non-js').click()
+  await expect(page.getByTestId('test-non-js')).toHaveText('test-non-js: 1')
+}
diff --git a/packages/plugin-react-swc/playground/ts-lib/package.json b/packages/plugin-react-swc/playground/ts-lib/package.json
@@ -8,11 +8,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@generouted/react-router": "^1.20.0",
-    "generouted": "1.11.7",
+    "@vitejs/test-dep-non-js": "file:./test-dep/non-js",
     "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "react-router-dom": "^7.6.3"
+    "react-dom": "^19.1.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/app.tsx b/packages/plugin-react-swc/playground/ts-lib/src/app.tsx
@@ -0,0 +1,11 @@
+import TestNonJs from '@vitejs/test-dep-non-js'
+
+export default function App() {
+  return (
+    <section style={{ margin: 24 }}>
+      <main>
+        <TestNonJs />
+      </main>
+    </section>
+  )
+}
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/index.tsx b/packages/plugin-react-swc/playground/ts-lib/src/index.tsx
@@ -1,9 +1,9 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import { Routes } from 'generouted/react-router'
+import App from './app'
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <Routes />
+    <App />
   </StrictMode>,
 )
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/pages/404.tsx b/packages/plugin-react-swc/playground/ts-lib/src/pages/404.tsx
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/pages/_app.tsx b/packages/plugin-react-swc/playground/ts-lib/src/pages/_app.tsx
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/pages/about.tsx b/packages/plugin-react-swc/playground/ts-lib/src/pages/about.tsx
diff --git a/packages/plugin-react-swc/playground/ts-lib/src/pages/index.tsx b/packages/plugin-react-swc/playground/ts-lib/src/pages/index.tsx
diff --git a/packages/plugin-react-swc/playground/ts-lib/test-dep/non-js/index.tsx b/packages/plugin-react-swc/playground/ts-lib/test-dep/non-js/index.tsx
@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default function TestNonJs() {
+  const [count, setCount] = React.useState(0)
+  return (
+    <button data-testid="test-non-js" onClick={() => setCount(count + 1)}>
+      test-non-js: {count}
+    </button>
+  )
+}
diff --git a/packages/plugin-react-swc/playground/ts-lib/test-dep/non-js/package.json b/packages/plugin-react-swc/playground/ts-lib/test-dep/non-js/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@vitejs/test-dep-non-js",
+  "private": true,
+  "type": "module",
+  "exports": "./index.tsx",
+  "peerDependencies": {
+    "react": "*"
+  }
+}
diff --git a/packages/plugin-react-swc/playground/ts-lib/vite.config.ts b/packages/plugin-react-swc/playground/ts-lib/vite.config.ts
@@ -2,6 +2,5 @@ import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react-swc'
 
 export default defineConfig({
-  optimizeDeps: { include: ['react-router-dom'] },
   plugins: [react()],
 })
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
@@ -351,7 +351,7 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     jsxImportRuntime,
   ]
   const staticBabelPlugins =
-    typeof opts.babel === 'object' ? opts.babel?.plugins ?? [] : []
+    typeof opts.babel === 'object' ? (opts.babel?.plugins ?? []) : []
   const reactCompilerPlugin = getReactCompilerPlugin(staticBabelPlugins)
   if (reactCompilerPlugin != null) {
     const reactCompilerRuntimeModule =
diff --git a/packages/plugin-rsc/README.md b/packages/plugin-rsc/README.md
@@ -130,7 +130,7 @@ export default defineConfig({
 - [`entry.rsc.tsx`](./examples/starter/src/framework/entry.rsc.tsx)
 
 ```tsx
-import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge
+import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge and client.edge
 
 // the plugin assumes `rsc` entry having default export of request handler
 export default async function handler(request: Request): Promise<Response> {
@@ -214,11 +214,12 @@ main();
 
 ### `@vitejs/plugin-rsc/rsc`
 
-This module re-exports RSC runtime API provided by `react-server-dom/server.edge`
+This module re-exports RSC runtime API provided by `react-server-dom/server.edge` and `react-server-dom/client.edge` such as:
 
 - `renderToReadableStream`: RSC serialization (React VDOM -> RSC stream)
 - `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM). This is also available on rsc environment itself. For example, it allows saving serailized RSC and deserializing it for later use.
-- `decodeAction/decodeReply/loadServerAction`: server function related...
+- `decodeAction/decodeReply/decodeFormState/loadServerAction/createTemporaryReferenceSet`
+- `encodeReply/createClientTemporaryReferenceSet`
 
 ### `@vitejs/plugin-rsc/ssr`
 
diff --git a/packages/plugin-rsc/examples/basic/wrangler.jsonc b/packages/plugin-rsc/examples/basic/wrangler.jsonc
@@ -3,9 +3,9 @@
   "name": "vite-rsc-basic",
   "main": "dist/rsc/cloudflare.js",
   "assets": {
-    "directory": "dist/client"
+    "directory": "dist/client",
   },
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }
diff --git a/packages/plugin-rsc/examples/react-router/app/paper.css b/packages/plugin-rsc/examples/react-router/app/paper.css
@@ -87,8 +87,8 @@
 }
 
 @utility btn-* {
-  border-color: --value(--btn-color- *);
-  color: --value(--btn-color- *);
+  border-color: --value(--btn-color-*);
+  color: --value(--btn-color-*);
 }
 
 @utility btn-sm {
diff --git a/packages/plugin-rsc/examples/react-router/cf/vite.config.ts b/packages/plugin-rsc/examples/react-router/cf/vite.config.ts
@@ -36,19 +36,6 @@ export default defineConfig({
         },
       ],
     }),
-    {
-      name: 'react-router-fixup',
-      transform(code) {
-        if (code.includes(`import { AsyncLocalStorage } from 'async_hooks';`)) {
-          code = code.replaceAll('async_hooks', 'node:async_hooks')
-          code = code.replaceAll(
-            `global.___reactRouterServerStorage___`,
-            `globalThis.___reactRouterServerStorage___`,
-          )
-          return code
-        }
-      },
-    },
   ],
   environments: {
     client: {
@@ -61,12 +48,24 @@ export default defineConfig({
         include: ['react-router > cookie', 'react-router > set-cookie-parser'],
         exclude: ['react-router'],
       },
+      build: {
+        rollupOptions: {
+          // @ts-ignore rolldown
+          platform: 'neutral',
+        },
+      },
     },
     rsc: {
       optimizeDeps: {
         include: ['react-router > cookie', 'react-router > set-cookie-parser'],
         exclude: ['react-router'],
       },
+      build: {
+        rollupOptions: {
+          // @ts-ignore rolldown
+          platform: 'neutral',
+        },
+      },
     },
   },
 })
diff --git a/packages/plugin-rsc/examples/react-router/cf/wrangler.rsc.jsonc b/packages/plugin-rsc/examples/react-router/cf/wrangler.rsc.jsonc
@@ -4,5 +4,5 @@
   "main": "./entry.rsc.tsx",
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }
diff --git a/packages/plugin-rsc/examples/react-router/cf/wrangler.ssr.jsonc b/packages/plugin-rsc/examples/react-router/cf/wrangler.ssr.jsonc
@@ -5,5 +5,5 @@
   "workers_dev": true,
   "services": [{ "binding": "RSC", "service": "vite-rsc-react-router-rsc" }],
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }
diff --git a/packages/plugin-rsc/examples/starter-cf-single/vite.config.ts b/packages/plugin-rsc/examples/starter-cf-single/vite.config.ts
@@ -3,7 +3,7 @@ import rsc from '@vitejs/plugin-rsc'
 import react from '@vitejs/plugin-react'
 import { defineConfig } from 'vite'
 
-export default defineConfig((_env) => ({
+export default defineConfig({
   clearScreen: false,
   build: {
     minify: false,
@@ -31,6 +31,8 @@ export default defineConfig((_env) => ({
         rollupOptions: {
           // ensure `default` export only in cloudflare entry output
           preserveEntrySignatures: 'exports-only',
+          // @ts-ignore rolldown
+          platform: 'neutral',
         },
       },
     },
@@ -43,4 +45,4 @@ export default defineConfig((_env) => ({
       },
     },
   },
-}))
+})
diff --git a/packages/plugin-rsc/examples/starter-cf-single/wrangler.jsonc b/packages/plugin-rsc/examples/starter-cf-single/wrangler.jsonc
@@ -4,5 +4,5 @@
   "main": "./src/framework/entry.rsc.tsx",
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }
diff --git a/packages/plugin-rsc/playwright.config.ts b/packages/plugin-rsc/playwright.config.ts
@@ -27,6 +27,7 @@ export default defineConfig({
       use: devices['Desktop Safari'],
     },
   ],
+  workers: 1,
   forbidOnly: !!process.env.CI,
   // retries: process.env.CI ? 2 : 0,
   reporter: ['list', process.env.CI && 'github']
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
