Fix CI errors

facebook · Sep 22, 2019 · eda43e2 · eda43e2
1 parent eea0627
commit eda43e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
@@ -588,7 +588,7 @@ function getInstallPackage(version, originalDirectory) {
 function getTemplateInstallPackage(template, originalDirectory) {
   let templateToInstall = 'create-react-app-template';
   if (template) {
-    if (template.startsWith('file:')) {
+    if (template.match(/^file:/)) {
       templateToInstall = `file:${path.resolve(
         originalDirectory,
         template.match(/^file:(.*)?$/)[1]

diff --git a/...sink/template/.template.dependencies.json → ...cripts/fixtures/kitchensink/template.json b/...sink/template/.template.dependencies.json → ...cripts/fixtures/kitchensink/template.json
diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
@@ -153,7 +153,6 @@ module.exports = function(
 
   if (fs.existsSync(templateJsonPath)) {
     const templateDependencies = require(templateJsonPath).dependencies;
-    console.log(templateDependencies);
     args = args.concat(
       Object.keys(templateDependencies).map(key => {
         return `${key}@${templateDependencies[key]}`;
@@ -170,7 +169,8 @@ module.exports = function(
 
   // Install template dependencies, and react and react-dom if missing.
   if ((!isReactInstalled(appPackage) || templateName) && args.length > 1) {
-    console.log(`Installing react and react-dom using ${command}...`);
+    console.log();
+    console.log(`Installing template dependencies using ${command}...`);
     console.log();
 
     const proc = spawn.sync(command, args, { stdio: 'inherit' });
@@ -184,11 +184,6 @@ module.exports = function(
     verifyTypeScriptSetup();
   }
 
-  if (tryGitInit(appPath)) {
-    console.log();
-    console.log('Initialized a git repository.');
-  }
-
   // Remove template
   console.log();
   console.log(`Removing template package using ${command}...`);
@@ -202,6 +197,11 @@ module.exports = function(
     return;
   }
 
+  if (tryGitInit(appPath)) {
+    console.log();
+    console.log('Initialized a git repository.');
+  }
+
   // Display the most elegant way to cd.
   // This needs to handle an undefined originalDirectory for
   // backward compatibility with old global-cli's.

diff --git a/tasks/e2e-kitchensink-eject.sh b/tasks/e2e-kitchensink-eject.sh
@@ -64,6 +64,10 @@ set -x
 # Go to root
 cd ..
 root_path=$PWD
+# Set a Windows path for GitBash on Windows
+if [ $AGENT_OS == 'Windows_NT' ]; then
+  root_path=$(cmd //c cd)
+fi
 
 if hash npm 2>/dev/null
 then