Use TypeScript parser to read tsconfig.json (facebook#5532)

ONTW · Oct 30, 2018 · 2eb0f82 · 2eb0f82
1 parent 876a738
commit 2eb0f82
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js b/packages/react-scripts/scripts/utils/verifyTypeScriptSetup.js
@@ -52,10 +52,11 @@ function verifyTypeScriptSetup() {
   const isYarn = fs.existsSync(paths.yarnLockFile);
 
   // Ensure typescript is installed
+  let ts;
   try {
-    resolve.sync('typescript', {
+    ts = require(resolve.sync('typescript', {
       basedir: paths.appNodeModules,
-    });
+    }));
   } catch (_) {
     console.error(
       chalk.red(
@@ -88,7 +89,16 @@ function verifyTypeScriptSetup() {
   const messages = [];
   let tsconfig;
   try {
-    tsconfig = require(paths.appTsConfig);
+    const { config, error } = ts.readConfigFile(
+      paths.appTsConfig,
+      ts.sys.readFile
+    );
+
+    if (error) {
+      throw error;
+    }
+
+    tsconfig = config;
   } catch (_) {
     console.error(
       chalk.red.bold(