Skip to content

Commit ea349c3

Browse files
clydinBrocco
authored andcommitted
fix(@angular/cli): ensure webpack 3 sass-loader support
1 parent 93e5d46 commit ea349c3

File tree

4 files changed

+178
-24
lines changed

4 files changed

+178
-24
lines changed

Diff for: package-lock.json

+173-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"raw-loader": "^0.5.1",
8383
"resolve": "^1.1.7",
8484
"rxjs": "^5.5.2",
85-
"sass-loader": "^6.0.3",
85+
"sass-loader": "^6.0.6",
8686
"semver": "^5.3.0",
8787
"silent-error": "^1.0.0",
8888
"source-map": "^0.5.6",
@@ -146,6 +146,6 @@
146146
"tslint": "^5.1.0"
147147
},
148148
"optionalDependencies": {
149-
"node-sass": "^4.3.0"
149+
"node-sass": "^4.7.2"
150150
}
151151
}

Diff for: packages/@angular/cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"raw-loader": "^0.5.1",
6868
"resolve": "^1.1.7",
6969
"rxjs": "^5.5.2",
70-
"sass-loader": "^6.0.3",
70+
"sass-loader": "^6.0.6",
7171
"semver": "^5.1.0",
7272
"silent-error": "^1.0.0",
7373
"source-map-loader": "^0.2.0",
@@ -87,6 +87,6 @@
8787
"zone.js": "^0.8.14"
8888
},
8989
"optionalDependencies": {
90-
"node-sass": "^4.3.0"
90+
"node-sass": "^4.7.2"
9191
}
9292
}

Diff for: scripts/test-licenses.js

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ const ignoredPackages = [
7979
'spdx-license-ids@2.0.1', // CC0 but it's content only (index.json, no code) and not distributed.
8080
'map-stream@0.1.0', // MIT, license but it's not listed in package.json.
8181
'xmldom@0.1.27', // LGPL,MIT but has a broken licenses array.
82+
'true-case-path@1.0.2', // Apache-2.0 but broken license in package.json
8283

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

0 commit comments

Comments
 (0)