Merge pull request #1644 from implausible/fix/yarn-with-no-npm

implausible · web-flow · commit ab3f379970dc · 2019-03-04T11:50:10.000-07:00
Don't fail yarn installs when we can't find npm
diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js
@@ -8,14 +8,22 @@ module.exports = function prepareForBuild() {
   console.log("[nodegit] Running pre-install script");
 
   return exec("npm -v")
-    .then(function(npmVersion) {
-      if (npmVersion.split(".")[0] < 3) {
-        console.log("[nodegit] npm@2 installed, pre-loading required packages");
-        return exec("npm install --ignore-scripts");
-      }
+    .then(
+      function(npmVersion) {
+        if (npmVersion.split(".")[0] < 3) {
+          console.log(
+            "[nodegit] npm@2 installed, pre-loading required packages"
+          );
+          return exec("npm install --ignore-scripts");
+        }
 
-      return Promise.resolve();
-    })
+        return Promise.resolve();
+      },
+      function() {
+        // We're installing via yarn, so don't
+        // care about compability with npm@2
+      }
+    )
     .then(function() {
       if (buildFlags.isGitRepo) {
         var submodules = require(local("submodules"));
