Skip to content

Commit e086bc2

Browse files
committed
fix(@angular/cli): unpin webpack 3.3.0
Followup to angular#7130
1 parent db34f58 commit e086bc2

File tree

3 files changed

+136
-21
lines changed

3 files changed

+136
-21
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"typescript": "~2.4.2",
9999
"url-loader": "^0.5.7",
100100
"walk-sync": "^0.3.1",
101-
"webpack": "3.3.0",
101+
"webpack": "~3.4.1",
102102
"webpack-dev-middleware": "^1.11.0",
103103
"webpack-dev-server": "~2.5.1",
104104
"webpack-merge": "^4.1.0",

packages/@angular/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"typescript": ">=2.0.0 <2.5.0",
8484
"url-loader": "^0.5.7",
8585
"walk-sync": "^0.3.1",
86-
"webpack": "3.3.0",
86+
"webpack": "~3.4.1",
8787
"webpack-dev-middleware": "^1.11.0",
8888
"webpack-dev-server": "~2.5.1",
8989
"webpack-merge": "^4.1.0",

yarn.lock

+134-19
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,10 @@ camelcase@^3.0.0:
695695
version "3.0.0"
696696
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
697697

698+
camelcase@^4.1.0:
699+
version "4.1.0"
700+
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
701+
698702
caniuse-api@^1.5.2:
699703
version "1.6.1"
700704
resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
@@ -1571,16 +1575,7 @@ encodeurl@~1.0.1:
15711575
version "1.0.1"
15721576
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
15731577

1574-
1575-
version "3.3.0"
1576-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
1577-
dependencies:
1578-
graceful-fs "^4.1.2"
1579-
memory-fs "^0.4.0"
1580-
object-assign "^4.0.1"
1581-
tapable "^0.2.5"
1582-
1583-
enhanced-resolve@^3.3.0:
1578+
enhanced-resolve@^3.4.0, enhanced-resolve@^3.4.1:
15841579
version "3.4.1"
15851580
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
15861581
dependencies:
@@ -1814,6 +1809,18 @@ evp_bytestokey@^1.0.0:
18141809
dependencies:
18151810
create-hash "^1.1.1"
18161811

1812+
execa@^0.7.0:
1813+
version "0.7.0"
1814+
resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
1815+
dependencies:
1816+
cross-spawn "^5.0.1"
1817+
get-stream "^3.0.0"
1818+
is-stream "^1.1.0"
1819+
npm-run-path "^2.0.0"
1820+
p-finally "^1.0.0"
1821+
signal-exit "^3.0.0"
1822+
strip-eof "^1.0.0"
1823+
18171824
exit-hook@^1.0.0:
18181825
version "1.1.1"
18191826
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -1992,6 +1999,12 @@ find-up@^1.0.0:
19921999
path-exists "^2.0.0"
19932000
pinkie-promise "^2.0.0"
19942001

2002+
find-up@^2.0.0:
2003+
version "2.1.0"
2004+
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
2005+
dependencies:
2006+
locate-path "^2.0.0"
2007+
19952008
flat-cache@^1.2.1:
19962009
version "1.2.2"
19972010
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -2149,6 +2162,10 @@ get-stdin@^4.0.1:
21492162
version "4.0.1"
21502163
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
21512164

2165+
get-stream@^3.0.0:
2166+
version "3.0.0"
2167+
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
2168+
21522169
getpass@^0.1.1:
21532170
version "0.1.7"
21542171
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2775,6 +2792,10 @@ is-resolvable@^1.0.0:
27752792
dependencies:
27762793
tryit "^1.0.1"
27772794

2795+
is-stream@^1.1.0:
2796+
version "1.1.0"
2797+
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
2798+
27782799
is-subset@^0.1.1:
27792800
version "0.1.1"
27802801
resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
@@ -3093,6 +3114,13 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
30933114
emojis-list "^2.0.0"
30943115
json5 "^0.5.0"
30953116

3117+
locate-path@^2.0.0:
3118+
version "2.0.0"
3119+
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
3120+
dependencies:
3121+
p-locate "^2.0.0"
3122+
path-exists "^3.0.0"
3123+
30963124
lodash._reinterpolate@~3.0.0:
30973125
version "3.0.0"
30983126
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -3212,6 +3240,12 @@ [email protected]:
32123240
version "0.3.0"
32133241
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
32143242

3243+
mem@^1.1.0:
3244+
version "1.1.0"
3245+
resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
3246+
dependencies:
3247+
mimic-fn "^1.0.0"
3248+
32153249
memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
32163250
version "0.4.1"
32173251
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -3545,6 +3579,12 @@ npm-run-all@^4.0.0:
35453579
shell-quote "^1.6.1"
35463580
string.prototype.padend "^3.0.0"
35473581

3582+
npm-run-path@^2.0.0:
3583+
version "2.0.2"
3584+
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
3585+
dependencies:
3586+
path-key "^2.0.0"
3587+
35483588
npm-run@^4.1.0:
35493589
version "4.1.2"
35503590
resolved "https://registry.yarnpkg.com/npm-run/-/npm-run-4.1.2.tgz#1030e1ec56908c89fcc3fa366d03a2c2ba98eb99"
@@ -3693,6 +3733,14 @@ os-locale@^1.4.0:
36933733
dependencies:
36943734
lcid "^1.0.0"
36953735

3736+
os-locale@^2.0.0:
3737+
version "2.1.0"
3738+
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
3739+
dependencies:
3740+
execa "^0.7.0"
3741+
lcid "^1.0.0"
3742+
mem "^1.1.0"
3743+
36963744
os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
36973745
version "1.0.2"
36983746
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -3704,6 +3752,20 @@ osenv@0, osenv@^0.1.4:
37043752
os-homedir "^1.0.0"
37053753
os-tmpdir "^1.0.0"
37063754

3755+
p-finally@^1.0.0:
3756+
version "1.0.0"
3757+
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
3758+
3759+
p-limit@^1.1.0:
3760+
version "1.1.0"
3761+
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
3762+
3763+
p-locate@^2.0.0:
3764+
version "2.0.0"
3765+
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
3766+
dependencies:
3767+
p-limit "^1.1.0"
3768+
37073769
p-map@^1.1.1:
37083770
version "1.1.1"
37093771
resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"
@@ -3761,6 +3823,10 @@ path-exists@^2.0.0:
37613823
dependencies:
37623824
pinkie-promise "^2.0.0"
37633825

3826+
path-exists@^3.0.0:
3827+
version "3.0.0"
3828+
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
3829+
37643830
path-is-absolute@^1.0.0:
37653831
version "1.0.1"
37663832
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3769,6 +3835,10 @@ path-is-inside@^1.0.1:
37693835
version "1.0.2"
37703836
resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
37713837

3838+
path-key@^2.0.0:
3839+
version "2.0.1"
3840+
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
3841+
37723842
path-parse@^1.0.5:
37733843
version "1.0.5"
37743844
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -4279,6 +4349,13 @@ read-pkg-up@^1.0.1:
42794349
find-up "^1.0.0"
42804350
read-pkg "^1.0.0"
42814351

4352+
read-pkg-up@^2.0.0:
4353+
version "2.0.0"
4354+
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
4355+
dependencies:
4356+
find-up "^2.0.0"
4357+
read-pkg "^2.0.0"
4358+
42824359
read-pkg@^1.0.0, read-pkg@^1.1.0:
42834360
version "1.1.0"
42844361
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -5010,6 +5087,10 @@ strip-bom@^3.0.0:
50105087
version "3.0.0"
50115088
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
50125089

5090+
strip-eof@^1.0.0:
5091+
version "1.0.0"
5092+
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
5093+
50135094
strip-indent@^1.0.1:
50145095
version "1.0.1"
50155096
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
@@ -5049,7 +5130,7 @@ supports-color@^2.0.0:
50495130
version "2.0.0"
50505131
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
50515132

5052-
supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
5133+
supports-color@^3.1.1, supports-color@^3.2.3:
50535134
version "3.2.3"
50545135
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
50555136
dependencies:
@@ -5061,6 +5142,12 @@ supports-color@^4.0.0:
50615142
dependencies:
50625143
has-flag "^2.0.0"
50635144

5145+
supports-color@^4.2.1:
5146+
version "4.2.1"
5147+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
5148+
dependencies:
5149+
has-flag "^2.0.0"
5150+
50645151
svgo@^0.7.0:
50655152
version "0.7.2"
50665153
resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -5092,7 +5179,7 @@ table@^3.7.8:
50925179
slice-ansi "0.0.4"
50935180
string-width "^2.0.0"
50945181

5095-
tapable@^0.2.5, tapable@^0.2.7, tapable@~0.2.5:
5182+
tapable@^0.2.7:
50965183
version "0.2.7"
50975184
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.7.tgz#e46c0daacbb2b8a98b9b0cea0f4052105817ed5c"
50985185

@@ -5535,16 +5622,16 @@ webpack-sources@^1.0.1:
55355622
source-list-map "^2.0.0"
55365623
source-map "~0.5.3"
55375624

5538-
webpack@3.3.0:
5539-
version "3.3.0"
5540-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc"
5625+
webpack@~3.4.1:
5626+
version "3.4.1"
5627+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.1.tgz#4c3f4f3fb318155a4db0cb6a36ff05c5697418f4"
55415628
dependencies:
55425629
acorn "^5.0.0"
55435630
acorn-dynamic-import "^2.0.0"
55445631
ajv "^5.1.5"
55455632
ajv-keywords "^2.0.0"
55465633
async "^2.1.2"
5547-
enhanced-resolve "^3.3.0"
5634+
enhanced-resolve "^3.4.0"
55485635
escope "^3.6.0"
55495636
interpret "^1.0.0"
55505637
json-loader "^0.5.4"
@@ -5555,12 +5642,12 @@ [email protected]:
55555642
mkdirp "~0.5.0"
55565643
node-libs-browser "^2.0.0"
55575644
source-map "^0.5.3"
5558-
supports-color "^3.1.0"
5559-
tapable "~0.2.5"
5645+
supports-color "^4.2.1"
5646+
tapable "^0.2.7"
55605647
uglifyjs-webpack-plugin "^0.4.6"
55615648
watchpack "^1.4.0"
55625649
webpack-sources "^1.0.1"
5563-
yargs "^6.0.0"
5650+
yargs "^8.0.2"
55645651

55655652
websocket-driver@>=0.5.1:
55665653
version "0.6.5"
@@ -5584,6 +5671,10 @@ which-module@^1.0.0:
55845671
version "1.0.0"
55855672
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
55865673

5674+
which-module@^2.0.0:
5675+
version "2.0.0"
5676+
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
5677+
55875678
which@1, which@^1.2.10, which@^1.2.9:
55885679
version "1.2.14"
55895680
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
@@ -5661,6 +5752,12 @@ yargs-parser@^5.0.0:
56615752
dependencies:
56625753
camelcase "^3.0.0"
56635754

5755+
yargs-parser@^7.0.0:
5756+
version "7.0.0"
5757+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
5758+
dependencies:
5759+
camelcase "^4.1.0"
5760+
56645761
yargs@^6.0.0:
56655762
version "6.6.0"
56665763
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
@@ -5697,6 +5794,24 @@ yargs@^7.0.0:
56975794
y18n "^3.2.1"
56985795
yargs-parser "^5.0.0"
56995796

5797+
yargs@^8.0.2:
5798+
version "8.0.2"
5799+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
5800+
dependencies:
5801+
camelcase "^4.1.0"
5802+
cliui "^3.2.0"
5803+
decamelize "^1.1.1"
5804+
get-caller-file "^1.0.1"
5805+
os-locale "^2.0.0"
5806+
read-pkg-up "^2.0.0"
5807+
require-directory "^2.1.1"
5808+
require-main-filename "^1.0.1"
5809+
set-blocking "^2.0.0"
5810+
string-width "^2.0.0"
5811+
which-module "^2.0.0"
5812+
y18n "^3.2.1"
5813+
yargs-parser "^7.0.0"
5814+
57005815
yargs@~3.10.0:
57015816
version "3.10.0"
57025817
resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"

0 commit comments

Comments
 (0)