From 11cf8727d1157b2e5983cacb0aae7be406353e2c Mon Sep 17 00:00:00 2001 From: deshanm Date: Mon, 23 May 2022 22:31:52 +0530 Subject: [PATCH 1/2] bug-version: re-applied the bug codebase --- packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js index cdc2d77..2fec103 100644 --- a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js +++ b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js @@ -148,7 +148,7 @@ function verifyTypeScriptSetup() { jsx: { parsedValue: hasJsxRuntime && semver.gte(ts.version, '4.1.0-beta') - ? ts.JsxEmit.ReactJSX + ? ts.JsxEmit.ReactJsx : ts.JsxEmit.React, value: hasJsxRuntime && semver.gte(ts.version, '4.1.0-beta') From b63b882030d668cc75b0c4cfc19ac0c4bbbee131 Mon Sep 17 00:00:00 2001 From: deshanm Date: Mon, 23 May 2022 23:10:03 +0530 Subject: [PATCH 2/2] ts-version: introduce new type called tsType for ts variable --- ...fyTypeScriptSetup.js => verifyTypeScriptSetup.ts} | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) rename packages/react-scripts/scripts/utils/{verifyTypeScriptSetup.js => verifyTypeScriptSetup.ts} (98%) diff --git a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.ts similarity index 98% rename from packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js rename to packages/react-scripts/scripts/utils/verifyTypeScriptSetup.ts index 2fec103..1719f3d 100644 --- a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js +++ b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.ts @@ -57,6 +57,15 @@ function verifyNoTypeScript() { return true; } +type TsType = { + [key: string] : any; + JsxEmit: { + ReactJSX: string; + React: string, + } +} + + function verifyTypeScriptSetup() { let firstTimeSetup = false; @@ -71,7 +80,7 @@ function verifyTypeScriptSetup() { const isYarn = fs.existsSync(paths.yarnLockFile); // Ensure typescript is installed - let ts; + let ts: TsType; try { // TODO: Remove this hack once `globalThis` issue is resolved // https://github.com/jsdom/jsdom/issues/2961 @@ -112,6 +121,7 @@ function verifyTypeScriptSetup() { console.error(); process.exit(1); } + const compilerOptions = { // These are suggested values and will be set when not present in the