Skip to content

Commit

Permalink
feat!: transform jsx with esbuild instead of babel (#9590)
Browse files Browse the repository at this point in the history
  • Loading branch information
rtsao authored Nov 8, 2022
1 parent ff3eacf commit f677b62
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 949 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"conventional-changelog-cli": "^2.2.2",
"esbuild": "^0.14.47",
"esbuild": "^0.15.9",
"eslint": "^8.27.0",
"eslint-define-config": "^1.11.0",
"eslint-plugin-import": "^2.26.0",
Expand Down
67 changes: 21 additions & 46 deletions packages/plugin-react/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import path from 'node:path'
import type { ParserOptions, TransformOptions, types as t } from '@babel/core'
import * as babel from '@babel/core'
import { createFilter, normalizePath } from 'vite'
import { createFilter } from 'vite'
import type { Plugin, PluginOption, ResolvedConfig } from 'vite'
import MagicString from 'magic-string'
import type { SourceMap } from 'magic-string'
Expand All @@ -12,8 +11,6 @@ import {
runtimeCode,
runtimePublicPath
} from './fast-refresh'
import { babelImportToRequire } from './jsx-runtime/babel-import-to-require'
import { restoreJSX } from './jsx-runtime/restore-jsx'

export interface Options {
include?: string | RegExp | Array<string | RegExp>
Expand All @@ -40,11 +37,6 @@ export interface Options {
* @default true
*/
jsxPure?: boolean
/**
* Toggles whether or not to throw an error if an XML namespaced tag name is used.
* @default true
*/
jsxThrowIfNamespace?: boolean
/**
* Babel configuration applied in both dev and prod.
*/
Expand Down Expand Up @@ -100,7 +92,6 @@ const prependReactImportCode = "import React from 'react'; "
export default function viteReact(opts: Options = {}): PluginOption[] {
// Provide default values for Rollup compat.
let devBase = '/'
let resolvedCacheDir: string
let filter = createFilter(opts.include, opts.exclude)
let needHiresSourcemap = false
let isProduction = true
Expand All @@ -127,21 +118,37 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
const viteBabel: Plugin = {
name: 'vite:react-babel',
enforce: 'pre',
config() {
config(_, { mode }) {
// Copied from https://github.com/vitejs/vite/blob/4e9bdd4fb3654a9d43917e1cb682d3d2bad25115/packages/vite/src/node/config.ts#L488-L490
const isProduction =
(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,
jsxSideEffects: opts.jsxPure === false
}
}
} else {
return {
esbuild: {
jsxDev: !isProduction,
jsx: 'automatic',
jsxImportSource: opts.jsxImportSource,
jsxSideEffects: opts.jsxPure === false
}
}
}
},
configResolved(config) {
devBase = config.base
projectRoot = config.root
resolvedCacheDir = normalizePath(path.resolve(config.cacheDir))
filter = createFilter(opts.include, opts.exclude, {
resolve: projectRoot
})
Expand Down Expand Up @@ -231,39 +238,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
let ast: t.File | null | undefined
let prependReactImport = false
if (!isProjectFile || isJSX) {
if (useAutomaticRuntime) {
// By reverse-compiling "React.createElement" calls into JSX,
// React elements provided by dependencies will also use the
// automatic runtime!
// Avoid parsing the optimized react-dom since it will never
// contain compiled JSX and it's a pretty big file (800kb).
const isOptimizedReactDom =
id.startsWith(resolvedCacheDir) && id.includes('/react-dom.js')
const [restoredAst, isCommonJS] =
!isProjectFile && !isJSX && !isOptimizedReactDom
? await restoreJSX(babel, code, id)
: [null, false]

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

// Avoid inserting `import` statements into CJS modules.
if (isCommonJS) {
plugins.push(babelImportToRequire)
}
}
} else if (isProjectFile) {
if (!useAutomaticRuntime && isProjectFile) {
// These plugins are only needed for the classic runtime.
if (!isProduction) {
plugins.push(
Expand Down
35 changes: 0 additions & 35 deletions packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts

This file was deleted.

132 changes: 0 additions & 132 deletions packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts

This file was deleted.

Loading

0 comments on commit f677b62

Please sign in to comment.