From 607b103e1d990268a80b33048832dd7e458ceebf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 23:09:32 +0000 Subject: [PATCH 1/3] Initial plan From 5ff72043168b07ef058ceffbfc5b39b6418bc220 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 23:14:58 +0000 Subject: [PATCH 2/3] Fix rolldownVersion detection pattern in plugin-react-oxc and plugin-rsc Co-authored-by: hi-ogawa <4232207+hi-ogawa@users.noreply.github.com> --- packages/plugin-react-oxc/src/index.ts | 5 ++++- packages/plugin-rsc/src/plugin.ts | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/plugin-react-oxc/src/index.ts b/packages/plugin-react-oxc/src/index.ts index 86e8d0dc4..f850ac8dd 100644 --- a/packages/plugin-react-oxc/src/index.ts +++ b/packages/plugin-react-oxc/src/index.ts @@ -1,6 +1,7 @@ import { dirname, join } from 'node:path' import { fileURLToPath } from 'node:url' import { readFileSync } from 'node:fs' +import * as vite from 'vite' import type { BuildOptions, Plugin } from 'vite' import { addRefreshWrapper, @@ -35,6 +36,8 @@ export default function viteReact(opts: Options = {}): Plugin[] { const jsxImportRuntime = `${jsxImportSource}/jsx-runtime` const jsxImportDevRuntime = `${jsxImportSource}/jsx-dev-runtime` + const isRolldownVite = 'rolldownVersion' in vite + const viteConfig: Plugin = { name: 'vite:react-oxc:config', config(userConfig, { command }) { @@ -70,7 +73,7 @@ export default function viteReact(opts: Options = {}): Plugin[] { ) }, options() { - if (!this.meta.rolldownVersion) { + if (!isRolldownVite) { throw new Error( '@vitejs/plugin-react-oxc requires rolldown-vite to be used. ' + 'See https://vitejs.dev/guide/rolldown for more details about rolldown-vite.', diff --git a/packages/plugin-rsc/src/plugin.ts b/packages/plugin-rsc/src/plugin.ts index 94f3c5022..f98634c43 100644 --- a/packages/plugin-rsc/src/plugin.ts +++ b/packages/plugin-rsc/src/plugin.ts @@ -6,6 +6,7 @@ import { pathToFileURL } from 'node:url' import { createRequestListener } from '@remix-run/node-fetch-server' import * as esModuleLexer from 'es-module-lexer' import MagicString from 'magic-string' +import * as vite from 'vite' import { type BuilderOptions, type DevEnvironment, @@ -1269,7 +1270,7 @@ function customOptimizerMetadataPlugin({ environments: { client: { optimizeDeps: - 'rolldownVersion' in this.meta + 'rolldownVersion' in vite ? ({ rolldownOptions: { plugins: [optimizerPluginRolldown()], From 9133654362b1d6bb569dd02815ec24e296edd161 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 23:23:10 +0000 Subject: [PATCH 3/3] revert: restore original rolldown detection in plugin-react-oxc Co-authored-by: hi-ogawa <4232207+hi-ogawa@users.noreply.github.com> --- packages/plugin-react-oxc/src/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/plugin-react-oxc/src/index.ts b/packages/plugin-react-oxc/src/index.ts index f850ac8dd..86e8d0dc4 100644 --- a/packages/plugin-react-oxc/src/index.ts +++ b/packages/plugin-react-oxc/src/index.ts @@ -1,7 +1,6 @@ import { dirname, join } from 'node:path' import { fileURLToPath } from 'node:url' import { readFileSync } from 'node:fs' -import * as vite from 'vite' import type { BuildOptions, Plugin } from 'vite' import { addRefreshWrapper, @@ -36,8 +35,6 @@ export default function viteReact(opts: Options = {}): Plugin[] { const jsxImportRuntime = `${jsxImportSource}/jsx-runtime` const jsxImportDevRuntime = `${jsxImportSource}/jsx-dev-runtime` - const isRolldownVite = 'rolldownVersion' in vite - const viteConfig: Plugin = { name: 'vite:react-oxc:config', config(userConfig, { command }) { @@ -73,7 +70,7 @@ export default function viteReact(opts: Options = {}): Plugin[] { ) }, options() { - if (!isRolldownVite) { + if (!this.meta.rolldownVersion) { throw new Error( '@vitejs/plugin-react-oxc requires rolldown-vite to be used. ' + 'See https://vitejs.dev/guide/rolldown for more details about rolldown-vite.',