Merge remote-tracking branch 'upstream/main' into chore-rsc-nightly

Author: github-actions[bot]

packages/plugin-react/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.0.4 (2025-09-27)
+
 ### Perf: use native refresh wrapper plugin in rolldown-vite ([#881](https://github.com/vitejs/vite-plugin-react/pull/881))
 
 ## 5.0.3 (2025-09-17)

packages/plugin-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "license": "MIT",
   "author": "Evan You",
   "description": "The default Vite plugin for React projects",

packages/plugin-react/src/index.ts

@@ -117,6 +117,8 @@ export default function viteReact(opts: Options = {}): Plugin[] {
   let isProduction = true
   let projectRoot = process.cwd()
   let skipFastRefresh = true
+  let base: string
+  let isFullBundle = false
   let runPluginOverrides:
     | ((options: ReactBabelOptions, context: ReactBabelHookContext) => void)
     | undefined
@@ -185,6 +187,11 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     },
     configResolved(config) {
       runningInVite = true
+      base = config.base
+      // @ts-expect-error only available in newer rolldown-vite
+      if (config.experimental.fullBundleMode) {
+        isFullBundle = true
+      }
       projectRoot = config.root
       isProduction = config.isProduction
       skipFastRefresh =
@@ -434,6 +441,27 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     },
   }
 
+  // for rolldown-vite + full bundle mode
+  const viteReactRefreshFullBundleMode: Plugin = {
+    name: 'vite:react-refresh-fbm',
+    enforce: 'pre',
+    transformIndexHtml: {
+      handler() {
+        if (!skipFastRefresh && isFullBundle)
+          return [
+            {
+              tag: 'script',
+              attrs: { type: 'module' },
+              children: getPreambleCode(base),
+            },
+          ]
+      },
+      // In unbundled mode, Vite transforms any requests.
+      // But in full bundled mode, Vite only transforms / bundles the scripts injected in `order: 'pre'`.
+      order: 'pre',
+    },
+  }
+
   const dependencies = [
     'react',
     'react-dom',
@@ -477,21 +505,23 @@ export default function viteReact(opts: Options = {}): Plugin[] {
         }
       },
     },
-    transformIndexHtml(_, config) {
-      if (!skipFastRefresh)
+    transformIndexHtml() {
+      if (!skipFastRefresh && !isFullBundle)
         return [
           {
             tag: 'script',
             attrs: { type: 'module' },
-            children: getPreambleCode(config.server!.config.base),
+            children: getPreambleCode(base),
           },
         ]
     },
   }
 
   return [
     viteBabel,
-    ...(isRolldownVite ? [viteRefreshWrapper, viteConfigPost] : []),
+    ...(isRolldownVite
+      ? [viteRefreshWrapper, viteConfigPost, viteReactRefreshFullBundleMode]
+      : []),
     viteReactRefresh,
   ]
 }