Skip to content

fix(@angular/cli): don't fail install due to node-sass #5282

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

Merged
filipesilva merged 1 commit into from
Mar 16, 2017
Merged

fix(@angular/cli): don't fail install due to node-sass #5282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
"magic-string": "^0.19.0",
"minimatch": "^3.0.3",
"node-modules-path": "^1.0.0",
"node-sass": "^4.3.0",
"nopt": "^4.0.1",
"opn": "4.0.2",
"portfinder": "~1.0.12",
Expand Down Expand Up @@ -151,5 +150,8 @@
"tree-kill": "^1.0.0",
"ts-node": "^2.0.0",
"tslint": "^4.0.2"
},
"optionalDependencies": {
"node-sass": "^4.3.0"
}
}
4 changes: 3 additions & 1 deletion packages/@angular/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"lodash": "^4.11.1",
"minimatch": "^3.0.3",
"node-modules-path": "^1.0.0",
"node-sass": "^4.3.0",
"nopt": "^4.0.1",
"opn": "4.0.2",
"portfinder": "~1.0.12",
Expand Down Expand Up @@ -90,6 +89,9 @@
"webpack-merge": "^2.4.0",
"zone.js": "^0.7.2"
},
"optionalDependencies": {
"node-sass": "^4.3.0"
},
"ember-addon": {
"paths": [
"./"
Expand Down
2 changes: 2 additions & 0 deletions scripts/publish/validate_dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ for (const packageName of Object.keys(packages)) {
const packageJson = JSON.parse(fs.readFileSync(packages[packageName].packageJson, 'utf8'));
const allDeps = []
.concat(Object.keys(packageJson['dependencies'] || {}))
.concat(Object.keys(packageJson['optionalDependencies'] || {}))
.concat(Object.keys(packageJson['devDependencies'] || {}))
.concat(Object.keys(packageJson['peerDependencies'] || {}));

Expand All @@ -142,6 +143,7 @@ const rootPackageJson = JSON.parse(fs.readFileSync(rootPackagePath, 'utf8'));
// devDependencies are ignored
const allRootDeps = []
.concat(Object.keys(rootPackageJson['dependencies'] || {}))
.concat(Object.keys(rootPackageJson['optionalDependencies'] || {}))
.concat(Object.keys(rootPackageJson['peerDependencies'] || {}));

const internalPackages = Object.keys(packages);
Expand Down