Skip to content
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

Jump to bottom

feat!: transform jsx with esbuild instead of babel #9590

Merged
merged 14 commits into from
Nov 8, 2022
Merged

feat!: transform jsx with esbuild instead of babel #9590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c96f6ed
feat: transform jsx with esbuild instead of babel
rtsao Aug 9, 2022
c549d86
Merge branch 'main' into esbuild-jsx
rtsao Aug 9, 2022
6844436
chore: update lockfile
rtsao Aug 9, 2022
746f5b8
fix: remove jsxPure option
rtsao Aug 9, 2022
9fac441
Update index.ts
rtsao Aug 15, 2022
e2ef295
chore: update esbuild
rtsao Sep 19, 2022
a610b0f
Merge branch 'main' into esbuild-jsx
rtsao Sep 19, 2022
6bed321
feat: use esbuild jsx side effects option
rtsao Sep 19, 2022
e3e4d99
Merge branch 'main' into esbuild-jsx
rtsao Sep 19, 2022
74481c7
Merge branch 'main' into esbuild-jsx
rtsao Oct 19, 2022
faa13a6
Merge branch 'main' into esbuild-jsx
rtsao Oct 24, 2022
595af8c
Merge branch 'main' into esbuild-jsx
rtsao Nov 3, 2022
ee396ba
fix: remove broken restoreJsx
rtsao Nov 3, 2022
3c97078
Merge branch 'main' into esbuild-jsx
rtsao Nov 7, 2022
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@typescript-eslint/parser": "^5.31.0",
"conventional-changelog-cli": "^2.2.2",
"cross-env": "^7.0.3",
"esbuild": "^0.14.47",
"esbuild": "^0.14.53",
"eslint": "^8.21.0",
"eslint-define-config": "^1.6.0",
"eslint-plugin-import": "^2.26.0",
Expand Down
30 changes: 16 additions & 14 deletions packages/plugin-react/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,27 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
const viteBabel: Plugin = {
name: 'vite:react-babel',
enforce: 'pre',
config() {
config(_, { mode }) {
const isProduction =
rtsao marked this conversation as resolved.
Show resolved Hide resolved
rtsao marked this conversation as resolved.
Show resolved Hide resolved
(process.env.NODE_ENV || process.env.VITE_USER_NODE_ENV || mode) ===
'production'

if (opts.jsxRuntime === 'classic') {
return {
esbuild: {
logOverride: {
'this-is-undefined-in-esm': 'silent'
}
},
jsx: 'transform',
jsxImportSource: opts.jsxImportSource
}
}
} else {
return {
esbuild: {
jsxDev: !isProduction,
jsx: 'automatic',
jsxImportSource: opts.jsxImportSource
}
}
}
Expand Down Expand Up @@ -240,18 +254,6 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
: [null, false]

if (isJSX || (ast = restoredAst)) {
plugins.push([
rtsao marked this conversation as resolved.
Show resolved Hide resolved
await loadPlugin(
'@babel/plugin-transform-react-jsx' +
(isProduction ? '' : '-development')
),
{
runtime: 'automatic',
importSource: opts.jsxImportSource,
pure: opts.jsxPure !== false
}
])

// Avoid inserting `import` statements into CJS modules.
if (isCommonJS) {
plugins.push(babelImportToRequire)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
"dependencies": {
"esbuild": "^0.14.47",
"esbuild": "^0.14.53",
"postcss": "^8.4.14",
"resolve": "^1.22.1",
"rollup": "^2.75.6"
Expand Down
Loading