Merge branch 'main' into feat/recommend-oxc-plugin-if-rolldown

Author: TheAlexLichter

README.md

@@ -20,6 +20,7 @@ See [`@vitejs/plugin-react` documentation](packages/plugin-react/README.md) and
 | Package                                               | Version (click for changelogs)                                                                                                             |
 | ----------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------- |
 | [@vitejs/plugin-react](packages/plugin-react)         | [![plugin-react version](https://img.shields.io/npm/v/@vitejs/plugin-react.svg?label=%20)](packages/plugin-react/CHANGELOG.md)             |
+| [@vitejs/plugin-react-oxc](packages/plugin-react-oxc) | [![plugin-react-oxc version](https://img.shields.io/npm/v/@vitejs/plugin-react-oxc.svg?label=%20)](packages/plugin-react-oxc/CHANGELOG.md) |
 | [@vitejs/plugin-react-swc](packages/plugin-react-swc) | [![plugin-react-swc version](https://img.shields.io/npm/v/@vitejs/plugin-react-swc.svg?label=%20)](packages/plugin-react-swc/CHANGELOG.md) |
 
 ## License

packages/plugin-react-swc/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Use `optimizeDeps.rollupOptions` instead of `optimizeDeps.esbuildOptions` for rolldown-vite [#489](https://github.com/vitejs/vite-plugin-react/pull/489)
+
+This suppresses the warning about `optimizeDeps.esbuildOptions` being deprecated in rolldown-vite.
+
 ## 3.10.1 (2025-06-03)
 
 ### Add explicit semicolon in preambleCode [#485](https://github.com/vitejs/vite-plugin-react/pull/485)

packages/plugin-react-swc/src/index.ts

@@ -12,6 +12,7 @@ import {
   transform,
 } from '@swc/core'
 import type { PluginOption } from 'vite'
+import * as vite from 'vite'
 import {
   addRefreshWrapper,
   getPreambleCode,
@@ -131,7 +132,9 @@ const react = (_options?: Options): PluginOption[] => {
         oxc: false,
         optimizeDeps: {
           include: [`${options.jsxImportSource}/jsx-dev-runtime`],
-          esbuildOptions: { jsx: 'automatic' },
+          ...('rolldownVersion' in vite
+            ? { rollupOptions: { jsx: { mode: 'automatic' } } }
+            : { esbuildOptions: { jsx: 'automatic' } }),
         },
       }),
       configResolved(config) {

packages/plugin-react/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Use `optimizeDeps.rollupOptions` instead of `optimizeDeps.esbuildOptions` for rolldown-vite [#489](https://github.com/vitejs/vite-plugin-react/pull/489)
+
+This suppresses the warning about `optimizeDeps.esbuildOptions` being deprecated in rolldown-vite.
+
 ## 4.5.1 (2025-06-03)
 
 ### Add explicit semicolon in preambleCode [#485](https://github.com/vitejs/vite-plugin-react/pull/485)

packages/plugin-react/src/index.ts

@@ -162,7 +162,10 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
             jsx: 'automatic',
             jsxImportSource: opts.jsxImportSource,
           },
-          optimizeDeps: { esbuildOptions: { jsx: 'automatic' } },
+          optimizeDeps:
+            'rolldownVersion' in vite
+              ? { rollupOptions: { jsx: { mode: 'automatic' } } }
+              : { esbuildOptions: { jsx: 'automatic' } },
         }
       }
     },