Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Also check react version before setting jsx value in tsconfig
  • Loading branch information
iansu committed Oct 23, 2020
commit ba0e466c4ef7b5c19ea2c5ae4affc265d070cc42
20 changes: 18 additions & 2 deletions packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@ const semver = require('semver');
const immer = require('react-dev-utils/immer').produce;
const globby = require('react-dev-utils/globby').sync;

const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false;
}

try {
require.resolve('react/jsx-runtime', { paths: [paths.appPath] });
return true;
} catch (e) {
return false;
}
})();

function writeJson(fileName, object) {
fs.writeFileSync(
fileName,
Expand Down Expand Up @@ -134,8 +147,11 @@ function verifyTypeScriptSetup() {
noEmit: { value: true },
jsx: {
parsedValue: ts.JsxEmit.React,
value: semver.gte(ts.version, '4.1.0-beta') ? 'react-jsx' : 'react',
reason: 'to support the new JSX transform in React 17'
value:
hasJsxRuntime && semver.gte(ts.version, '4.1.0-beta')
? 'react-jsx'
: 'react',
reason: 'to support the new JSX transform in React 17',
},
paths: { value: undefined, reason: 'aliased imports are not supported' },
};
Expand Down