From 20c66f07b14c1369a97d1680c85021cfb5d4ac71 Mon Sep 17 00:00:00 2001 From: LuckyPigeon Date: Wed, 23 Jan 2019 15:22:44 -0500 Subject: [PATCH 1/6] Add yarn install --- lifecycleScripts/preinstall.js | 59 +++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index 6d481658b..188bafc11 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -7,25 +7,48 @@ var buildFlags = require(local("../utils/buildFlags")); 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"); - } + try { + 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"); + } - return Promise.resolve(); - }) - .then(function() { - if (buildFlags.isGitRepo) { - var submodules = require(local("submodules")); - var generate = require(local("../generate")); - return submodules() - .then(function() { - return generate(); - }); - } - }); + return Promise.resolve(); + }) + .then(function() { + if (buildFlags.isGitRepo) { + var submodules = require(local("submodules")); + var generate = require(local("../generate")); + return submodules() + .then(function() { + return generate(); + }); + } + }); + } catch(err) { + console.log("npm install failed, change to yarn install"); + return exec("yarn --version") + .then(function(yarnVersion) { + if (yarnVersion.split(".")[0] < 1) { + console.log("[nodegit] yarn installed, pre-loading required packages"); + return exec("yarn install --ignore-scripts"); + } + + return Promise.resolve(); + }) + .then(function() { + if (buildFlags.isGitRepo) { + var submodules = require(local("submodules")); + var generate = require(local("../generate")); + return submodules() + .then(function() { + return generate(); + }); + } + }); + } }; // Called on the command line From 2ee5c5da3c9e279151ce27284b0d8ef68963c82d Mon Sep 17 00:00:00 2001 From: LuckyPigeon Date: Tue, 29 Jan 2019 23:19:20 -0500 Subject: [PATCH 2/6] Update #1612 --- lifecycleScripts/preinstall.js | 81 +++++++++++++++++----------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index 188bafc11..ae8dba8eb 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -7,48 +7,49 @@ var buildFlags = require(local("../utils/buildFlags")); module.exports = function prepareForBuild() { console.log("[nodegit] Running pre-install script"); - try { - 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"); - } + 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"); + } - return Promise.resolve(); - }) - .then(function() { - if (buildFlags.isGitRepo) { - var submodules = require(local("submodules")); - var generate = require(local("../generate")); - return submodules() - .then(function() { - return generate(); - }); - } - }); - } catch(err) { - console.log("npm install failed, change to yarn install"); - return exec("yarn --version") - .then(function(yarnVersion) { - if (yarnVersion.split(".")[0] < 1) { - console.log("[nodegit] yarn installed, pre-loading required packages"); - return exec("yarn install --ignore-scripts"); - } + return Promise.resolve(); + }) + .then(function() { + if (buildFlags.isGitRepo) { + var submodules = require(local("submodules")); + var generate = require(local("../generate")); + return submodules() + .then(function() { + return generate(); + }); + } + }) + .catch(function(err) { + console.log("npm install failed, change to yarn install"); + return exec("yarn --version") + .then(function(yarnVersion) { + if (yarnVersion.split(".")[0] < 1) { + console.log("[nodegit] yarn installed,\ + pre-loading required packages"); + return exec("yarn install --ignore-scripts"); + } - return Promise.resolve(); - }) - .then(function() { - if (buildFlags.isGitRepo) { - var submodules = require(local("submodules")); - var generate = require(local("../generate")); - return submodules() - .then(function() { - return generate(); - }); - } - }); - } + return Promise.resolve(); + }) + .then(function() { + if (buildFlags.isGitRepo) { + var submodules = require(local("submodules")); + var generate = require(local("../generate")); + return submodules() + .then(function() { + return generate(); + }); + } + }); + }); }; // Called on the command line From daebc14bd3e8d21841196eadee47c4851b2f47c3 Mon Sep 17 00:00:00 2001 From: Pigeon <32315294+LuckyPigeon@users.noreply.github.com> Date: Sat, 2 Feb 2019 01:32:13 +0800 Subject: [PATCH 3/6] Update preinstall.js --- lifecycleScripts/preinstall.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index ae8dba8eb..c306649de 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -10,8 +10,8 @@ module.exports = function prepareForBuild() { return exec("npm -v") .then(function(npmVersion) { if (npmVersion.split(".")[0] < 3) { - console.log("[nodegit] npm@2 installed,\ - pre-loading required packages"); + console.log("[nodegit] npm@2 installed, " + + "pre-loading required packages"); return exec("npm install --ignore-scripts"); } @@ -32,8 +32,8 @@ module.exports = function prepareForBuild() { return exec("yarn --version") .then(function(yarnVersion) { if (yarnVersion.split(".")[0] < 1) { - console.log("[nodegit] yarn installed,\ - pre-loading required packages"); + console.log("[nodegit] yarn installed, " + + "pre-loading required packages"); return exec("yarn install --ignore-scripts"); } From 21bc746fb3e4c6a6bc808bc8df29211e704f8f0e Mon Sep 17 00:00:00 2001 From: Pigeon <32315294+LuckyPigeon@users.noreply.github.com> Date: Sun, 3 Feb 2019 23:39:37 +0800 Subject: [PATCH 4/6] Move yarn install block after npm install --- lifecycleScripts/preinstall.js | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index c306649de..1989cd691 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -17,16 +17,6 @@ module.exports = function prepareForBuild() { return Promise.resolve(); }) - .then(function() { - if (buildFlags.isGitRepo) { - var submodules = require(local("submodules")); - var generate = require(local("../generate")); - return submodules() - .then(function() { - return generate(); - }); - } - }) .catch(function(err) { console.log("npm install failed, change to yarn install"); return exec("yarn --version") @@ -39,16 +29,16 @@ module.exports = function prepareForBuild() { return Promise.resolve(); }) - .then(function() { - if (buildFlags.isGitRepo) { - var submodules = require(local("submodules")); - var generate = require(local("../generate")); - return submodules() - .then(function() { - return generate(); - }); - } - }); + }) + .then(function() { + if (buildFlags.isGitRepo) { + var submodules = require(local("submodules")); + var generate = require(local("../generate")); + return submodules() + .then(function() { + return generate(); + }); + } }); }; From 6a5b1e181b30e4d9f7e3992bd2c0933c1bacf37e Mon Sep 17 00:00:00 2001 From: Pigeon <32315294+LuckyPigeon@users.noreply.github.com> Date: Mon, 4 Feb 2019 00:05:43 +0800 Subject: [PATCH 5/6] Update preinstall.js --- lifecycleScripts/preinstall.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index 1989cd691..0553d0b2b 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -28,7 +28,7 @@ module.exports = function prepareForBuild() { } return Promise.resolve(); - }) + }); }) .then(function() { if (buildFlags.isGitRepo) { From 0c8b2828fc6229c572894b70932d8ba8b76864b2 Mon Sep 17 00:00:00 2001 From: Pigeon <32315294+LuckyPigeon@users.noreply.github.com> Date: Thu, 21 Feb 2019 14:25:22 +0800 Subject: [PATCH 6/6] Fix indentation from 4 spaces to 6 spaces --- lifecycleScripts/preinstall.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lifecycleScripts/preinstall.js b/lifecycleScripts/preinstall.js index 0553d0b2b..6cd912dd7 100644 --- a/lifecycleScripts/preinstall.js +++ b/lifecycleScripts/preinstall.js @@ -9,13 +9,13 @@ module.exports = function prepareForBuild() { 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"); - } + 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(); }) .catch(function(err) { console.log("npm install failed, change to yarn install");