Fix TypeScript verification

facebook · Sep 23, 2019 · 3964653 · 3964653
1 parent 565fc1a
commit 3964653
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
@@ -206,7 +206,6 @@ module.exports = function(
   if ((!isReactInstalled(appPackage) || templateName) && args.length > 1) {
     console.log();
     console.log(`Installing template dependencies using ${command}...`);
-    console.log();
 
     const proc = spawn.sync(command, args, { stdio: 'inherit' });
     if (proc.status !== 0) {
@@ -215,12 +214,12 @@ module.exports = function(
     }
   }
 
-  if (appPackage.dependencies['typescript'] != null) {
+  if (args.find(arg => arg.includes('typescript'))) {
+    console.log();
     verifyTypeScriptSetup();
   }
 
   // Remove template
-  console.log();
   console.log(`Removing template package using ${command}...`);
   console.log();
 

diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh
@@ -162,6 +162,8 @@ exists tsconfig.json
 exists src/react-app-env.d.ts
 checkTypeScriptDependencies
 
+node node_modules/react-scripts/scripts/utils/verifyTypeScriptSetup.js
+
 # Check that the TypeScript template passes smoke tests, build, and normal tests
 yarn start --smoke-test
 yarn build