Skip to content

chore(gitignore) #4011

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

chore(gitignore) #4011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ab042
chore(new): by default, use cnpm if installed
Jan 2, 2017
c43a78a
chore(gitignore): asterisk is necessary
Jan 14, 2017
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
2 changes: 1 addition & 1 deletion packages/angular-cli/blueprints/ng2/files/gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.settings/

# IDE - VSCode
.vscode/
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
Expand Down
12 changes: 11 additions & 1 deletion packages/angular-cli/ember-cli/lib/tasks/npm-task.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,17 @@ module.exports = Task.extend({
// npm otherwise is otherwise noisy, already submitted PR for npm to fix
// misplaced console.log
this.disableLogger();
return spawn('npm', [this.command].concat(packages, npmOptions)).

// by default, use cnpm if installed
var strNPM = 'cnpm';
try {
console.log(require.resolve("cnpm"));
} catch(e) {
console.error("Cnpm is not found");
strNPM = 'npm';
}

return spawn(strNPM, [this.command].concat(packages, npmOptions)).
// return npm(this.command, packages, npmOptions, this.npm).
finally(this.finally.bind(this)).
then(this.announceCompletion.bind(this));
Expand Down