Skip to content

Commit 6c68706

Browse files
alan-agius4Keen Yee Liau
authored andcommitted
build: update webpack and postcss
1 parent 644f65d commit 6c68706

File tree

3 files changed

+36
-19
lines changed

3 files changed

+36
-19
lines changed

packages/angular_devkit/build_angular/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"opn": "5.3.0",
3131
"parse5": "4.0.0",
3232
"portfinder": "1.0.17",
33-
"postcss": "7.0.5",
33+
"postcss": "7.0.11",
3434
"postcss-import": "12.0.0",
3535
"postcss-loader": "3.0.0",
3636
"raw-loader": "0.5.1",
@@ -44,9 +44,9 @@
4444
"style-loader": "0.23.1",
4545
"stylus": "0.54.5",
4646
"stylus-loader": "3.0.2",
47-
"tree-kill": "1.2.0",
4847
"terser-webpack-plugin": "1.2.1",
49-
"webpack": "4.23.1",
48+
"tree-kill": "1.2.0",
49+
"webpack": "4.28.4",
5050
"webpack-dev-middleware": "3.4.0",
5151
"webpack-dev-server": "3.1.14",
5252
"webpack-merge": "4.1.4",

packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
169169
let modified = false;
170170

171171
// We want to load it relative to the file that imports
172-
const context = path.dirname(decl.source.input.file);
172+
const inputFile = decl.source && decl.source.input.file;
173+
const context = inputFile && path.dirname(inputFile) || loader.context;
173174

174175
// tslint:disable-next-line:no-conditional-assignment
175176
while (match = urlRegex.exec(value)) {

yarn.lock

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
18871887
escape-string-regexp "^1.0.5"
18881888
supports-color "^5.3.0"
18891889

1890+
chalk@^2.4.2:
1891+
version "2.4.2"
1892+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
1893+
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
1894+
dependencies:
1895+
ansi-styles "^3.2.1"
1896+
escape-string-regexp "^1.0.5"
1897+
supports-color "^5.3.0"
1898+
18901899
chardet@^0.7.0:
18911900
version "0.7.0"
18921901
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -7622,14 +7631,14 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
76227631
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
76237632
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
76247633

7625-
[email protected].5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
7626-
version "7.0.5"
7627-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
7628-
integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
7634+
[email protected].11, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
7635+
version "7.0.11"
7636+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
7637+
integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
76297638
dependencies:
7630-
chalk "^2.4.1"
7639+
chalk "^2.4.2"
76317640
source-map "^0.6.1"
7632-
supports-color "^5.5.0"
7641+
supports-color "^6.1.0"
76337642

76347643
postcss@^7.0.6:
76357644
version "7.0.7"
@@ -9588,6 +9597,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co
95889597
dependencies:
95899598
has-flag "^3.0.0"
95909599

9600+
supports-color@^6.1.0:
9601+
version "6.1.0"
9602+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
9603+
integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
9604+
dependencies:
9605+
has-flag "^3.0.0"
9606+
95919607
95929608
version "1.2.0"
95939609
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -10468,15 +10484,15 @@ [email protected]:
1046810484
dependencies:
1046910485
webpack-core "^0.6.8"
1047010486

10471-
webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
10472-
version "4.23.1"
10473-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
10474-
integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
10487+
webpack@4.28.4, webpack@^4.0.0, webpack@^4.6.0:
10488+
version "4.28.4"
10489+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
10490+
integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
1047510491
dependencies:
10476-
"@webassemblyjs/ast" "1.7.10"
10477-
"@webassemblyjs/helper-module-context" "1.7.10"
10478-
"@webassemblyjs/wasm-edit" "1.7.10"
10479-
"@webassemblyjs/wasm-parser" "1.7.10"
10492+
"@webassemblyjs/ast" "1.7.11"
10493+
"@webassemblyjs/helper-module-context" "1.7.11"
10494+
"@webassemblyjs/wasm-edit" "1.7.11"
10495+
"@webassemblyjs/wasm-parser" "1.7.11"
1048010496
acorn "^5.6.2"
1048110497
acorn-dynamic-import "^3.0.0"
1048210498
ajv "^6.1.0"
@@ -10494,7 +10510,7 @@ [email protected], webpack@^4.0.0, webpack@^4.6.0:
1049410510
node-libs-browser "^2.0.0"
1049510511
schema-utils "^0.4.4"
1049610512
tapable "^1.1.0"
10497-
uglifyjs-webpack-plugin "^1.2.4"
10513+
terser-webpack-plugin "^1.1.0"
1049810514
watchpack "^1.5.0"
1049910515
webpack-sources "^1.3.0"
1050010516

0 commit comments

Comments
 (0)