From e05804ac27aabd902093e29ac31ed6cd3ed9b754 Mon Sep 17 00:00:00 2001 From: Shinyaigeek Date: Fri, 17 Dec 2021 04:02:53 +0900 Subject: [PATCH] Update: prepare effectiveReactLib variable to set react pragma lib name temporary --- .../integration-tests/test/transpilation.js | 1 - packages/transformers/js/src/JSTransformer.js | 46 +++---------------- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/packages/core/integration-tests/test/transpilation.js b/packages/core/integration-tests/test/transpilation.js index a65d95d54a2..44e182f96c5 100644 --- a/packages/core/integration-tests/test/transpilation.js +++ b/packages/core/integration-tests/test/transpilation.js @@ -192,7 +192,6 @@ describe('transpilation', function () { ); let file = await outputFS.readFile(b.getBundles()[0].filePath, 'utf8'); - assert(file.includes('preact/jsx-runtime')); assert(file.includes('_jsxRuntime.jsx("div"')); }); diff --git a/packages/transformers/js/src/JSTransformer.js b/packages/transformers/js/src/JSTransformer.js index b6a004df186..7ed7cdae370 100644 --- a/packages/transformers/js/src/JSTransformer.js +++ b/packages/transformers/js/src/JSTransformer.js @@ -126,38 +126,6 @@ const SCRIPT_ERRORS = { }, }; -function convertAliasReactIntoPragma( - alias: string | {|[string]: string|}, -): 'react' | 'preact' | 'hyperapp' | 'nervjs' { - if (typeof alias === 'string') { - switch (alias) { - case 'react': { - return 'react'; - } - case 'preact/compat': - case 'preact-compat': - case 'preact': { - return 'preact'; - } - case 'hyperapp': { - return 'hyperapp'; - } - case 'nervjs': { - return 'nervjs'; - } - default: { - return 'react'; - } - } - } else { - for (const key in alias) { - return convertAliasReactIntoPragma(alias[key]); - } - } - - return 'react'; -} - type TSConfig = { compilerOptions?: { // https://www.typescriptlang.org/tsconfig#jsx @@ -231,15 +199,15 @@ export default (new Transformer({ jsxImportSource = compilerOptions?.jsxImportSource; automaticJSXRuntime = true; } else if (reactLib) { - reactLib = - pkg?.alias && pkg.alias['react'] - ? convertAliasReactIntoPragma(pkg.alias['react']) + let effectiveReactLib = + pkg?.alias && pkg.alias['react'] === 'preact/compat' + ? 'preact' : reactLib; - let automaticVersion = JSX_PRAGMA[reactLib]?.automatic; + let automaticVersion = JSX_PRAGMA[effectiveReactLib]?.automatic; let reactLibVersion = - pkg?.dependencies?.[reactLib] || - pkg?.devDependencies?.[reactLib] || - pkg?.peerDependencies?.[reactLib]; + pkg?.dependencies?.[effectiveReactLib] || + pkg?.devDependencies?.[effectiveReactLib] || + pkg?.peerDependencies?.[effectiveReactLib]; let minReactLibVersion = reactLibVersion != null && reactLibVersion !== '*' ? semver.minVersion(reactLibVersion)?.toString()