Skip to content

Commit 9dc7c5d

Browse files
clydinBrocco
authored andcommitted
fix(@angular/cli): ensure webpack 3 sass-loader support
1 parent 31f5b54 commit 9dc7c5d

File tree

4 files changed

+178
-24
lines changed

4 files changed

+178
-24
lines changed

package-lock.json

Lines changed: 173 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"raw-loader": "^0.5.1",
8282
"resolve": "^1.1.7",
8383
"rxjs": "^5.5.2",
84-
"sass-loader": "^6.0.3",
84+
"sass-loader": "^6.0.6",
8585
"semver": "^5.3.0",
8686
"silent-error": "^1.0.0",
8787
"source-map": "^0.5.6",
@@ -145,6 +145,6 @@
145145
"tslint": "^5.1.0"
146146
},
147147
"optionalDependencies": {
148-
"node-sass": "^4.3.0"
148+
"node-sass": "^4.7.2"
149149
}
150150
}

packages/@angular/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"raw-loader": "^0.5.1",
6767
"resolve": "^1.1.7",
6868
"rxjs": "^5.5.2",
69-
"sass-loader": "^6.0.3",
69+
"sass-loader": "^6.0.6",
7070
"semver": "^5.1.0",
7171
"silent-error": "^1.0.0",
7272
"source-map-loader": "^0.2.0",
@@ -86,6 +86,6 @@
8686
"zone.js": "^0.8.14"
8787
},
8888
"optionalDependencies": {
89-
"node-sass": "^4.3.0"
89+
"node-sass": "^4.7.2"
9090
}
9191
}

scripts/test-licenses.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ const ignoredPackages = [
7979
'[email protected]', // CC0 but it's content only (index.json, no code) and not distributed.
8080
'[email protected]', // MIT, license but it's not listed in package.json.
8181
'[email protected]', // LGPL,MIT but has a broken licenses array.
82+
'[email protected]', // Apache-2.0 but broken license in package.json
8283

8384
'[email protected]', // 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)