From 27fa7c8867d3f975547923b32daefa60a9baafac Mon Sep 17 00:00:00 2001
From: slavo23 <crymodder@yandex.ru>
Date: Tue, 22 Dec 2020 18:43:52 +0300
Subject: [PATCH 1/2] fix: fixed crash with newer version of TS

---
 .../scripts/utils/verifyTypeScriptSetup.js    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
index 00139ee4caf..4e4a3475978 100644
--- a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
+++ b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
@@ -105,8 +105,8 @@ function verifyTypeScriptSetup() {
     console.error(
       chalk.bold(
         'If you are not trying to use TypeScript, please remove the ' +
-          chalk.cyan('tsconfig.json') +
-          ' file from your package root (and any TypeScript files).'
+        chalk.cyan('tsconfig.json') +
+        ' file from your package root (and any TypeScript files).'
       )
     );
     console.error();
@@ -185,13 +185,13 @@ function verifyTypeScriptSetup() {
     // Calling this function also mutates the tsconfig above,
     // adding in "include" and "exclude", but the compilerOptions remain untouched
     let result;
-    parsedTsConfig = immer(readTsConfig, config => {
-      result = ts.parseJsonConfigFileContent(
-        config,
-        ts.sys,
-        path.dirname(paths.appTsConfig)
-      );
-    });
+    parsedTsConfig = { ...readTsConfig };
+
+    result = ts.parseJsonConfigFileContent(
+      parsedTsConfig,
+      ts.sys,
+      path.dirname(paths.appTsConfig)
+    );
 
     if (result.errors && result.errors.length) {
       throw new Error(
@@ -241,7 +241,7 @@ function verifyTypeScriptSetup() {
         `${coloredOption} ${chalk.bold(
           valueToCheck == null ? 'must not' : 'must'
         )} be ${valueToCheck == null ? 'set' : chalk.cyan.bold(value)}` +
-          (reason != null ? ` (${reason})` : '')
+        (reason != null ? ` (${reason})` : '')
       );
     }
   }
@@ -289,4 +289,4 @@ function verifyTypeScriptSetup() {
   }
 }
 
-module.exports = verifyTypeScriptSetup;
+module.exports = verifyTypeScriptSetup;
\ No newline at end of file

From c51a247dafa88992d55cd5f8ba50ce9d6337d22c Mon Sep 17 00:00:00 2001
From: slavo23 <crymodder@yandex.ru>
Date: Tue, 22 Dec 2020 19:09:50 +0300
Subject: [PATCH 2/2] refactor: fixed whitespace issues

---
 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 4e4a3475978..6838d471dc6 100644
--- a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
+++ b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
@@ -186,7 +186,7 @@ function verifyTypeScriptSetup() {
     // adding in "include" and "exclude", but the compilerOptions remain untouched
     let result;
     parsedTsConfig = { ...readTsConfig };
-
+    
     result = ts.parseJsonConfigFileContent(
       parsedTsConfig,
       ts.sys,