Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: merge tsconfig jsx options even when oxc.jsx.runtime is set #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
+21 −17
Merged

fix: merge tsconfig jsx options even when oxc.jsx.runtime is set #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions packages/vite/src/node/plugins/oxc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,27 @@ export function setOxcTransformOptionsFromTsconfigOptions(
// when both the normal options and tsconfig is set,
// we want to prioritize the normal options
if (
oxcOptions.jsx === undefined ||
(typeof oxcOptions.jsx === 'object' && oxcOptions.jsx.runtime === undefined)
tsCompilerOptions.jsx === 'preserve' &&
(oxcOptions.jsx === undefined ||
(typeof oxcOptions.jsx === 'object' &&
oxcOptions.jsx.runtime === undefined))
) {
if (tsCompilerOptions.jsx === 'preserve') {
oxcOptions.jsx = 'preserve'
} else {
const jsxOptions: OxcJsxOptions = { ...oxcOptions.jsx }
oxcOptions.jsx = 'preserve'
}
if (oxcOptions.jsx !== 'preserve') {
const jsxOptions: OxcJsxOptions = { ...oxcOptions.jsx }

if (tsCompilerOptions.jsxFactory) {
jsxOptions.pragma ??= tsCompilerOptions.jsxFactory
}
if (tsCompilerOptions.jsxFragmentFactory) {
jsxOptions.pragmaFrag ??= tsCompilerOptions.jsxFragmentFactory
}
if (tsCompilerOptions.jsxImportSource) {
jsxOptions.importSource ??= tsCompilerOptions.jsxImportSource
}
if (tsCompilerOptions.jsxFactory) {
jsxOptions.pragma ??= tsCompilerOptions.jsxFactory
}
if (tsCompilerOptions.jsxFragmentFactory) {
jsxOptions.pragmaFrag ??= tsCompilerOptions.jsxFragmentFactory
}
if (tsCompilerOptions.jsxImportSource) {
jsxOptions.importSource ??= tsCompilerOptions.jsxImportSource
}

if (!jsxOptions.runtime) {
switch (tsCompilerOptions.jsx) {
case 'react':
jsxOptions.runtime = 'classic'
Expand All @@ -99,10 +102,11 @@ export function setOxcTransformOptionsFromTsconfigOptions(
default:
break
}

oxcOptions.jsx = jsxOptions
}

oxcOptions.jsx = jsxOptions
}

if (oxcOptions.decorator?.legacy === undefined) {
const experimentalDecorators = tsCompilerOptions.experimentalDecorators
if (experimentalDecorators !== undefined) {
Expand Down
Loading