Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move yarn install block after npm install
  • Loading branch information
LuckyPigeon authored Feb 3, 2019
commit 21bc746fb3e4c6a6bc808bc8df29211e704f8f0e
30 changes: 10 additions & 20 deletions lifecycleScripts/preinstall.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ module.exports = function prepareForBuild() {

return Promise.resolve();
Comment thread
LuckyPigeon marked this conversation as resolved.
Outdated
})
.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")
Comment thread
LuckyPigeon marked this conversation as resolved.
Expand All @@ -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();
});
}
});
};

Expand Down