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

Author: github-actions[bot]

packages/plugin-react/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+### Skip transform hook completely in rolldown-vite in dev if possible ([#783](https://github.com/vitejs/vite-plugin-react/pull/783))
+
 ## 5.0.1 (2025-08-19)
 
 ### Set `optimizeDeps.rollupOptions.transform.jsx` instead of `optimizeDeps.rollupOptions.jsx` for rolldown-vite ([#735](https://github.com/vitejs/vite-plugin-react/pull/735))

packages/plugin-react/src/index.ts

@@ -208,8 +208,8 @@ export default function viteReact(opts: Options = {}): Plugin[] {
         staticBabelOptions = createBabelOptions(opts.babel)
 
         if (
+          (isRolldownVite || skipFastRefresh) &&
           canSkipBabel(staticBabelOptions.plugins, staticBabelOptions) &&
-          skipFastRefresh &&
           (opts.jsxRuntime === 'classic' ? isProduction : true)
         ) {
           delete viteBabel.transform
@@ -269,8 +269,7 @@ export default function viteReact(opts: Options = {}): Plugin[] {
 
         const isJSX = filepath.endsWith('x')
         const useFastRefresh =
-          !isRolldownVite &&
-          !skipFastRefresh &&
+          !(isRolldownVite || skipFastRefresh) &&
           !ssr &&
           (isJSX ||
             (opts.jsxRuntime === 'classic'

packages/plugin-rsc/e2e/basic.test.ts

@@ -238,6 +238,42 @@ function defineTest(f: Fixture) {
     await testUseActionState(page)
   })
 
+  test('useActionState nojs to js', async ({ page, browserName }) => {
+    // firefox seems to cache html and route interception doesn't work
+    test.skip(browserName === 'firefox')
+
+    // this test fails without `formState` passed to `hydrateRoot(..., { formState })`
+
+    // intercept request to disable js
+    let js: boolean
+    await page.route(f.url(), async (route) => {
+      if (!js) {
+        await route.continue({ url: route.request().url() + '?__nojs' })
+        return
+      }
+      await route.continue()
+    })
+
+    // no js
+    js = false
+    await page.goto(f.url())
+    await expect(page.getByTestId('use-action-state')).toContainText(
+      'test-useActionState: 0',
+    )
+    await page.getByTestId('use-action-state').click()
+    await expect(page.getByTestId('use-action-state')).toContainText(
+      'test-useActionState: 1',
+    )
+
+    // with js (hydration)
+    js = true
+    await page.getByTestId('use-action-state').click()
+    await waitForHydration(page)
+    await expect(page.getByTestId('use-action-state')).toContainText(
+      'test-useActionState: 2', // this becomes "0" without formState
+    )
+  })
+
   async function testUseActionState(page: Page) {
     await expect(page.getByTestId('use-action-state')).toContainText(
       'test-useActionState: 0',