refactor: react jsx runtime respect tsconfig.json (#561)

* refactor: react jsx runtime respect tsconfig.json * chore: update pnpm-lock.yaml * style: update istanbul comment * test: workaround use istanbul ignore with esbuild ref: vitest-dev/vitest#2021 (comment) * chore: update
umijs · Dec 20, 2022 · 5e1d3b1 · 5e1d3b1
1 parent 38aa7c0
commit 5e1d3b1
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 37 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/builder/bundle/index.ts b/src/builder/bundle/index.ts
@@ -69,7 +69,10 @@ export default async (opts: {
           presetEnv: {
             targets: getBundleTargets(config),
           },
-          presetReact: getBabelPresetReactOpts(opts.configProvider.pkg),
+          presetReact: getBabelPresetReactOpts(
+            opts.configProvider.pkg,
+            opts.cwd,
+          ),
           presetTypeScript: {},
           pluginTransformRuntime: {},
           pluginLockCoreJS: {},

diff --git a/src/builder/bundless/loaders/javascript/babel.ts b/src/builder/bundless/loaders/javascript/babel.ts
@@ -39,7 +39,10 @@ const babelTransformer: IJSTransformer = function (content) {
       targets: getBundlessTargets(this.config),
       modules: this.config.format === IFatherBundlessTypes.ESM ? false : 'auto',
     },
-    presetReact: getBabelPresetReactOpts(this.pkg),
+    presetReact: getBabelPresetReactOpts(
+      this.pkg,
+      path.dirname(this.paths.fileAbsPath),
+    ),
     presetTypeScript: {},
   };
 
@@ -68,7 +71,6 @@ const babelTransformer: IJSTransformer = function (content) {
       version: this.pkg.dependencies?.['@babel/runtime'],
     };
   }
-  // TODO: recommend install @babel/runtime in doctor
   const { code, map } = transform(content, {
     filename: this.paths.fileAbsPath,
     cwd: this.paths.cwd,

diff --git a/src/builder/bundless/loaders/javascript/swc.ts b/src/builder/bundless/loaders/javascript/swc.ts
@@ -143,7 +143,10 @@ const swcTransformer: IJSTransformer = async function (content) {
         ...(!isTSFile && isJSXFile ? { jsx: true } : {}),
       },
       transform: {
-        react: getSWCTransformReactOpts(this.pkg),
+        react: getSWCTransformReactOpts(
+          this.pkg,
+          path.dirname(this.paths.fileAbsPath),
+        ),
       },
     },
     module: {

diff --git a/src/builder/utils.ts b/src/builder/utils.ts
@@ -6,6 +6,7 @@ import {
   IFatherJSTransformerTypes,
   IFatherPlatformTypes,
 } from '../types';
+import { getTsconfig } from './bundless/dts';
 import type { IBundlessConfig } from './config';
 
 export function addSourceMappingUrl(code: string, loc: string) {
@@ -16,16 +17,7 @@ export function addSourceMappingUrl(code: string, loc: string) {
   );
 }
 
-export function getIsLTRReact17(pkg: IApi['pkg']) {
-  const reactVer = Object.assign(
-    {},
-    pkg.dependencies,
-    pkg.peerDependencies,
-  ).react;
-  return semver.subset(reactVer, '>=17.0.0-0');
-}
-
-export function getBaseTransformReactOpts(pkg: IApi['pkg']) {
+export function getBaseTransformReactOpts(pkg: IApi['pkg'], cwd: string) {
   const reactVer = Object.assign(
     {},
     pkg.dependencies,
@@ -34,30 +26,44 @@ export function getBaseTransformReactOpts(pkg: IApi['pkg']) {
   let opts: Record<string, any> = {};
 
   if (reactVer) {
-    const isLTRReact17 = getIsLTRReact17(pkg);
+    let isNewJSX: boolean;
+    const tsconfig = getTsconfig(cwd);
+
+    /* istanbul ignore else -- @preserve */
+    if (tsconfig) {
+      // respect tsconfig first, `4` means `react-jsx`
+      isNewJSX = tsconfig.options?.jsx === 4;
+    } else {
+      // fallback to match react versions which support new JSX transform
+      // ref: https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html#how-to-upgrade-to-the-new-jsx-transform
+      isNewJSX = semver.subset(
+        reactVer,
+        '>=17.0.0-0||^16.14.0||^15.7.0||^0.14.10',
+      );
+    }
 
     opts = {
       // force use production mode, to make sure dist of dev/build are consistent
       // ref: https://github.com/umijs/umi/blob/6f63435d42f8ef7110f73dcf33809e6cda750332/packages/babel-preset-umi/src/index.ts#L45
       development: false,
-      // use legacy jsx runtime for react@<17
-      runtime: isLTRReact17 ? 'automatic' : 'classic',
-      ...(isLTRReact17 ? {} : { importSource: undefined }),
+      // set jsx runtime automatically
+      runtime: isNewJSX ? 'automatic' : 'classic',
+      ...(isNewJSX ? {} : { importSource: undefined }),
     };
   }
 
   return opts;
 }
 
-export function getBabelPresetReactOpts(pkg: IApi['pkg']) {
+export function getBabelPresetReactOpts(pkg: IApi['pkg'], cwd: string) {
   return {
-    ...getBaseTransformReactOpts(pkg),
+    ...getBaseTransformReactOpts(pkg, cwd),
   };
 }
 
-export function getSWCTransformReactOpts(pkg: IApi['pkg']) {
+export function getSWCTransformReactOpts(pkg: IApi['pkg'], cwd: string) {
   return {
-    ...getBaseTransformReactOpts(pkg),
+    ...getBaseTransformReactOpts(pkg, cwd),
   };
 }
 

diff --git a/tests/fixtures/build/automatic-jsx/package.json b/tests/fixtures/build/automatic-jsx/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "react": "^17.0.0"
+    "react": "^16.14.0"
   }
 }
diff --git a/tests/fixtures/build/automatic-jsx/tsconfig.json b/tests/fixtures/build/automatic-jsx/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx"
+  }
+}