@vitejs/plugin-react 1.3.2 → 2.0.0-alpha.2

package/src/jsx-runtime/babel-import-to-require.ts

@@ -1,5 +1,4 @@
 import type * as babelCore from '@babel/core'
-import type { types as t, Visitor } from '@babel/core'
 
 /**
  * Replace this:
@@ -11,13 +10,13 @@ import type { types as t, Visitor } from '@babel/core'
  *     var _jsx = require("react/jsx-runtime").jsx
  */
 export function babelImportToRequire({ types: t }: typeof babelCore): {
-  visitor: Visitor
+  visitor: babelCore.Visitor
 } {
   return {
     visitor: {
       ImportDeclaration(path) {
         const decl = path.node
-        const spec = decl.specifiers[0] as t.ImportSpecifier
+        const spec = decl.specifiers[0] as babelCore.types.ImportSpecifier
 
         path.replaceWith(
           t.variableDeclaration('var', [

package/src/jsx-runtime/babel-restore-jsx.spec.ts

@@ -1,5 +1,6 @@
-import babelRestoreJSX from './babel-restore-jsx'
 import * as babel from '@babel/core'
+import { describe, expect, it } from 'vitest'
+import babelRestoreJSX from './babel-restore-jsx'
 
 function jsx(code: string) {
   return babel.transform(code, {

package/src/jsx-runtime/restore-jsx.spec.ts

@@ -1,9 +1,10 @@
-import { restoreJSX } from './restore-jsx'
 import * as babel from '@babel/core'
+import { describe, expect, it } from 'vitest'
+import { restoreJSX } from './restore-jsx'
 
 async function jsx(sourceCode: string) {
   const [ast] = await restoreJSX(babel, sourceCode, 'test.js')
-  if (ast === null) {
+  if (ast == null) {
     return ast
   }
   const { code } = await babel.transformFromAstAsync(ast, null, {

package/src/jsx-runtime/restore-jsx.ts

@@ -1,24 +1,32 @@
 import type * as babelCore from '@babel/core'
-import type { PluginItem, types as t } from '@babel/core'
 
-type RestoredJSX = [result: t.File | null | undefined, isCommonJS: boolean]
+type RestoredJSX = [
+  result: babelCore.types.File | null | undefined,
+  isCommonJS: boolean
+]
 
-let babelRestoreJSX: Promise<PluginItem> | undefined
+let babelRestoreJSX: Promise<babelCore.PluginItem> | undefined
 
 const jsxNotFound: RestoredJSX = [null, false]
 
+async function getBabelRestoreJSX() {
+  if (!babelRestoreJSX)
+    babelRestoreJSX = import('./babel-restore-jsx').then((r) => {
+      const fn = r.default
+      if ('default' in fn)
+        // @ts-expect-error
+        return fn.default
+      return fn
+    })
+  return babelRestoreJSX
+}
+
 /** Restore JSX from `React.createElement` calls */
 export async function restoreJSX(
   babel: typeof babelCore,
   code: string,
   filename: string
 ): Promise<RestoredJSX> {
-  // Avoid parsing the optimized react-dom since it will never
-  // contain compiled JSX and it's a pretty big file (800kb).
-  if (filename.includes('/.vite/react-dom.js')) {
-    return jsxNotFound
-  }
-
   const [reactAlias, isCommonJS] = parseReactAlias(code)
 
   if (!reactAlias) {
@@ -56,8 +64,6 @@ export async function restoreJSX(
     return jsxNotFound
   }
 
-  babelRestoreJSX ||= import('./babel-restore-jsx')
-
   const result = await babel.transformAsync(code, {
     babelrc: false,
     configFile: false,
@@ -67,8 +73,7 @@ export async function restoreJSX(
     parserOpts: {
       plugins: ['jsx']
     },
-    // @ts-ignore
-    plugins: [(await babelRestoreJSX).default]
+    plugins: [await getBabelRestoreJSX()]
   })
 
   return [result?.ast, isCommonJS]