Merge branch 'main' into 07-06-test_debug_flaky

hi-ogawa · web-flow · commit b911ee9c5dd3 · 2025-07-07T11:34:58.000+09:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -43,5 +43,9 @@
     "kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
 
     "prettier", // waiting for stable choice on ternaries
+
+    // plugin-rsc
+    "react-router",
+    "@react-router/dev",
   ],
 }
diff --git a/.github/workflows/ci-rsc.yml b/.github/workflows/ci-rsc.yml
@@ -1,4 +1,7 @@
 name: ci-rsc
+
+permissions: {}
+
 on:
   push:
     branches:
diff --git a/.npmrc b/.npmrc
@@ -5,3 +5,5 @@ hoist-pattern[]=eslint-import-resolver-*
 strict-peer-dependencies=false
 shell-emulator=true
 auto-install-peers=false
+link-workspace-packages=true
+prefer-workspace-packages=true
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@vitejs/release-scripts": "^1.6.0",
     "eslint": "^9.30.1",
     "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-n": "^17.21.0",
     "eslint-plugin-regexp": "^2.9.0",
     "fs-extra": "^11.3.0",
     "globals": "^16.3.0",
@@ -72,9 +72,6 @@
     ]
   },
   "pnpm": {
-    "overrides": {
-      "@vitejs/plugin-rsc": "workspace:*"
-    },
     "packageExtensions": {
       "generouted": {
         "peerDependencies": {
diff --git a/packages/plugin-react-oxc/CHANGELOG.md b/packages/plugin-react-oxc/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+### Return `Plugin[]` instead of `PluginOption[]`
+
 ## 0.2.3 (2025-06-16)
 
 ### Disable refresh transform when `server.hmr: false` is set [#502](https://github.com/vitejs/vite-plugin-react/pull/502)
diff --git a/packages/plugin-react-oxc/package.json b/packages/plugin-react-oxc/package.json
@@ -48,6 +48,6 @@
     "vite": "catalog:rolldown-vite"
   },
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-beta.23"
+    "@rolldown/pluginutils": "1.0.0-beta.24"
   }
 }
diff --git a/packages/plugin-react-oxc/src/index.ts b/packages/plugin-react-oxc/src/index.ts
@@ -1,7 +1,7 @@
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { readFileSync } from 'node:fs'
-import type { BuildOptions, Plugin, PluginOption } from 'vite'
+import type { BuildOptions, Plugin } from 'vite'
 import {
   addRefreshWrapper,
   avoidSourceMapOption,
@@ -30,7 +30,7 @@ export interface Options {
 
 const defaultIncludeRE = /\.[tj]sx?(?:$|\?)/
 
-export default function viteReact(opts: Options = {}): PluginOption[] {
+export default function viteReact(opts: Options = {}): Plugin[] {
   const include = opts.include ?? defaultIncludeRE
   const exclude = [
     ...(Array.isArray(opts.exclude)
diff --git a/packages/plugin-react-swc/CHANGELOG.md b/packages/plugin-react-swc/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+### Return `Plugin[]` instead of `PluginOption[]`
+
 ## 3.10.2 (2025-06-10)
 
 ### Suggest `@vitejs/plugin-react-oxc` if rolldown-vite is detected [#491](https://github.com/vitejs/vite-plugin-react/pull/491)
diff --git a/packages/plugin-react-swc/package.json b/packages/plugin-react-swc/package.json
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
   "dependencies": {
-    "@rolldown/pluginutils": "1.0.0-beta.23",
+    "@rolldown/pluginutils": "1.0.0-beta.24",
     "@swc/core": "^1.12.9"
   },
   "peerDependencies": {
diff --git a/packages/plugin-react-swc/src/index.ts b/packages/plugin-react-swc/src/index.ts
@@ -11,7 +11,7 @@ import {
   type Options as SWCOptions,
   transform,
 } from '@swc/core'
-import type { PluginOption } from 'vite'
+import type { Plugin } from 'vite'
 import {
   addRefreshWrapper,
   getPreambleCode,
@@ -83,7 +83,7 @@ type Options = {
   disableOxcRecommendation?: boolean
 }
 
-const react = (_options?: Options): PluginOption[] => {
+const react = (_options?: Options): Plugin[] => {
   let hmrDisabled = false
   const options = {
     jsxImportSource: _options?.jsxImportSource ?? 'react',
diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+### Return `Plugin[]` instead of `PluginOption[]`
+
+The return type has changed from `react(): PluginOption[]` to more specialized type `react(): Plugin[]`. This allows for type-safe manipulation of plugins, for example:
+
+```tsx
+// previously this causes type errors
+react({ babel: { plugins: ['babel-plugin-react-compiler'] } })
+  .map(p => ({ ...p, applyToEnvironment: e => e.name === 'client' }))
+```
+
 ## 4.6.0 (2025-06-23)
 
 ### Add raw Rolldown support
diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
@@ -49,10 +49,10 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.27.7",
+    "@babel/core": "^7.28.0",
     "@babel/plugin-transform-react-jsx-self": "^7.27.1",
     "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-    "@rolldown/pluginutils": "1.0.0-beta.23",
+    "@rolldown/pluginutils": "1.0.0-beta.24",
     "@types/babel__core": "^7.20.5",
     "react-refresh": "^0.17.0"
   },
@@ -64,7 +64,7 @@
     "babel-plugin-react-compiler": "19.1.0-rc.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "rolldown": "1.0.0-beta.23",
+    "rolldown": "1.0.0-beta.24",
     "unbuild": "^3.5.0",
     "vitest": "^3.2.4"
   }
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
@@ -5,7 +5,7 @@ import type * as babelCore from '@babel/core'
 import type { ParserOptions, TransformOptions } from '@babel/core'
 import { createFilter } from 'vite'
 import * as vite from 'vite'
-import type { Plugin, PluginOption, ResolvedConfig } from 'vite'
+import type { Plugin, ResolvedConfig } from 'vite'
 import {
   addRefreshWrapper,
   getPreambleCode,
@@ -109,7 +109,7 @@ export type ViteReactPluginApi = {
 const defaultIncludeRE = /\.[tj]sx?$/
 const tsRE = /\.tsx?$/
 
-export default function viteReact(opts: Options = {}): PluginOption[] {
+export default function viteReact(opts: Options = {}): Plugin[] {
   const include = opts.include ?? defaultIncludeRE
   const exclude = opts.exclude
   const filter = createFilter(include, exclude)
diff --git a/packages/plugin-rsc/examples/basic/package.json b/packages/plugin-rsc/examples/basic/package.json
@@ -13,21 +13,22 @@
   },
   "dependencies": {
     "@vitejs/plugin-rsc": "latest",
-    "react": "latest",
-    "react-dom": "latest"
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@tailwindcss/vite": "^4.1.4",
-    "@types/react": "latest",
-    "@types/react-dom": "latest",
+    "@tailwindcss/vite": "^4.1.11",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "latest",
     "@vitejs/test-dep-client-in-server": "file:./test-dep/client-in-server",
     "@vitejs/test-dep-client-in-server2": "file:./test-dep/client-in-server2",
     "@vitejs/test-dep-server-in-client": "file:./test-dep/server-in-client",
     "@vitejs/test-dep-server-in-server": "file:./test-dep/server-in-server",
     "babel-plugin-react-compiler": "19.1.0-rc.2",
-    "tailwindcss": "^4.1.4",
+    "tailwindcss": "^4.1.11",
     "vite": "^7.0.2",
-    "vite-plugin-inspect": "^11.2.0"
+    "vite-plugin-inspect": "^11.3.0",
+    "wrangler": "^4.23.0"
   }
 }
diff --git a/packages/plugin-rsc/examples/basic/vite.config.ts b/packages/plugin-rsc/examples/basic/vite.config.ts
@@ -23,12 +23,12 @@ export default defineConfig({
   plugins: [
     tailwindcss(),
     process.env.TEST_REACT_COMPILER
-      ? (react({
+      ? react({
           babel: { plugins: ['babel-plugin-react-compiler'] },
         }).map((p) => ({
           ...p,
-          applyToEnvironment: (e: any) => e.name === 'client',
-        })) as any)
+          applyToEnvironment: (e) => e.name === 'client',
+        }))
       : react(),
     vitePluginUseCache(),
     rsc({
diff --git a/packages/plugin-rsc/examples/react-router/package.json b/packages/plugin-rsc/examples/react-router/package.json
@@ -14,21 +14,21 @@
   },
   "dependencies": {
     "@vitejs/plugin-rsc": "latest",
-    "react": "latest",
-    "react-dom": "latest",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "react-router": "0.0.0-experimental-23decd7bc"
   },
   "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.8.0",
+    "@cloudflare/vite-plugin": "^1.9.0",
     "@react-router/dev": "0.0.0-experimental-23decd7bc",
     "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "^4.1.4",
-    "@types/react": "latest",
-    "@types/react-dom": "latest",
+    "@tailwindcss/vite": "^4.1.11",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "latest",
-    "tailwindcss": "^4.1.4",
+    "tailwindcss": "^4.1.11",
     "vite": "^7.0.2",
-    "vite-plugin-inspect": "^11.2.0",
-    "wrangler": "^4.22.0"
+    "vite-plugin-inspect": "^11.3.0",
+    "wrangler": "^4.23.0"
   }
 }
diff --git a/packages/plugin-rsc/examples/ssg/package.json b/packages/plugin-rsc/examples/ssg/package.json
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@vitejs/plugin-rsc": "latest",
-    "react": "latest",
-    "react-dom": "latest"
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
   },
   "devDependencies": {
     "@mdx-js/rollup": "^3.1.0",
-    "@types/react": "latest",
-    "@types/react-dom": "latest",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "latest",
-    "vite-plugin-inspect": "latest"
+    "vite-plugin-inspect": "^11.3.0"
   }
 }
diff --git a/packages/plugin-rsc/examples/starter-cf-single/package.json b/packages/plugin-rsc/examples/starter-cf-single/package.json
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@vitejs/plugin-rsc": "latest",
-    "react": "latest",
-    "react-dom": "latest"
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@cloudflare/vite-plugin": "^1.8.0",
-    "@types/react": "latest",
-    "@types/react-dom": "latest",
+    "@cloudflare/vite-plugin": "^1.9.0",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "latest"
   }
 }
diff --git a/packages/plugin-rsc/examples/starter/package.json b/packages/plugin-rsc/examples/starter/package.json
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@vitejs/plugin-rsc": "latest",
-    "react": "latest",
-    "react-dom": "latest"
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
   },
   "devDependencies": {
-    "@types/react": "latest",
-    "@types/react-dom": "latest",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "latest",
     "vite": "^7.0.2",
-    "vite-plugin-inspect": "latest"
+    "vite-plugin-inspect": "^11.3.0"
   }
 }
diff --git a/packages/plugin-rsc/package.json b/packages/plugin-rsc/package.json
@@ -37,20 +37,20 @@
     "build": "tsdown"
   },
   "dependencies": {
-    "@mjackson/node-fetch-server": "^0.6.1",
-    "es-module-lexer": "^1.6.0",
+    "@mjackson/node-fetch-server": "^0.7.0",
+    "es-module-lexer": "^1.7.0",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.17",
     "periscopic": "^4.0.2",
     "turbo-stream": "^3.1.0",
-    "vitefu": "^1.0.5"
+    "vitefu": "^1.1.1"
   },
   "devDependencies": {
     "@hiogawa/utils": "^1.7.0",
-    "@playwright/test": "^1.53.1",
+    "@playwright/test": "^1.53.2",
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.16.0",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,9 @@`
`43`	`43`	"kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
`44`	`44`
`45`	`45`	`"prettier", // waiting for stable choice on ternaries`
	`46`	`+`
	`47`	`+ // plugin-rsc`
	`48`	`+ "react-router",`
	`49`	`+ "@react-router/dev",`
`46`	`50`	`],`
`47`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@`
`48`	`48`	`"vite": "catalog:rolldown-vite"`
`49`	`49`	`},`
`50`	`50`	`"dependencies": {`
`51`		`- "@rolldown/pluginutils": "1.0.0-beta.23"`
	`51`	`+ "@rolldown/pluginutils": "1.0.0-beta.24"`
`52`	`52`	`}`
`53`	`53`	`}`