Skip to content

Adds Support for Yarn Install If Supported #2537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 10 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,16 @@ gulp.task('installFixtures', function() {
}, 1 * 1000);
shell.cd('test/fixtures');

execAsync('npm install --quiet', {cwd: '../fixtures'}).then(() => {
let installCommand;
if(process.platform === 'win32') {
installCommand = 'yarn --version >nul 2>&1 && ( yarn install ) || ( npm install --quiet )';
} else {
installCommand = 'type yarn &> /dev/null | yarn install || npm install --quiet';
}

execAsync(installCommand, {
cwd: '../fixtures'
}).then(() => {
process.stdout.write('\n');
if(!process.env.SAUCE_USERNAME) {
gutil.log('running npm run-script update-webdriver');
Expand Down
10 changes: 9 additions & 1 deletion src/generators/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,15 @@ export class Generator extends Base {

install() {
if(!this.options['skip-install']) {
this.spawnCommand('npm', ['install']);
let yarnCheckCommand;
if (process.platform === 'win32') {
yarnCheckCommand = 'yarn --version >nul 2>&1';
} else {
yarnCheckCommand = 'type yarn &> /dev/null';
}
exec(yarnCheckCommand, (error, stdout, stderr) => {
return this.spawnCommand((!error) ? 'yarn' : 'npm', ['install']);
});
}
}

Expand Down