Skip to content

Commit

Permalink
fix(@angular/cli): ensure webpack 3 sass-loader support
Browse files Browse the repository at this point in the history
  • Loading branch information
clydin authored and Brocco committed Jan 19, 2018
1 parent e1dbb71 commit 94d8cb0
Show file tree
Hide file tree
Showing 4 changed files with 178 additions and 24 deletions.
193 changes: 173 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"raw-loader": "^0.5.1",
"resolve": "^1.1.7",
"rxjs": "^5.5.2",
"sass-loader": "^6.0.3",
"sass-loader": "^6.0.6",
"semver": "^5.3.0",
"silent-error": "^1.0.0",
"source-map": "^0.5.6",
Expand Down Expand Up @@ -146,6 +146,6 @@
"tslint": "^5.1.0"
},
"optionalDependencies": {
"node-sass": "^4.3.0"
"node-sass": "^4.7.2"
}
}
4 changes: 2 additions & 2 deletions packages/@angular/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"raw-loader": "^0.5.1",
"resolve": "^1.1.7",
"rxjs": "^5.5.2",
"sass-loader": "^6.0.3",
"sass-loader": "^6.0.6",
"semver": "^5.1.0",
"silent-error": "^1.0.0",
"source-map-loader": "^0.2.0",
Expand All @@ -87,6 +87,6 @@
"zone.js": "^0.8.14"
},
"optionalDependencies": {
"node-sass": "^4.3.0"
"node-sass": "^4.7.2"
}
}
1 change: 1 addition & 0 deletions scripts/test-licenses.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const ignoredPackages = [
'spdx-license-ids@2.0.1', // CC0 but it's content only (index.json, no code) and not distributed.
'map-stream@0.1.0', // MIT, license but it's not listed in package.json.
'xmldom@0.1.27', // LGPL,MIT but has a broken licenses array.
'true-case-path@1.0.2', // Apache-2.0 but broken license in package.json

'jsonify@0.0.0', // TODO(hansl): fix this. this is not an acceptable license, but is 8 deps down
// so hard to manage. In talk with owner and users to switch over.
Expand Down

0 comments on commit 94d8cb0

Please sign in to comment.