Skip to content

Commit f5405dc

Browse files
committed
include webpack beta.26 fix with vue-loader@9.9.1
1 parent 4f92d4e commit f5405dc

File tree

2 files changed

+51
-46
lines changed

2 files changed

+51
-46
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"stylus-loader": "^2.1.2",
4343
"sw-precache-webpack-plugin": "^0.5.1",
4444
"url-loader": "^0.5.7",
45-
"vue-loader": "^9.7.0",
46-
"webpack": "2.1.0-beta.25",
45+
"vue-loader": "^9.9.1",
46+
"webpack": "^2.1.0-beta.26",
4747
"webpack-dev-middleware": "^1.6.1",
4848
"webpack-hot-middleware": "^2.12.2"
4949
}

yarn.lock

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,21 @@ acorn-object-spread@^1.0.0:
2323
dependencies:
2424
acorn "^3.1.0"
2525

26-
acorn@^3.0.4, acorn@^3.1.0, acorn@^3.2.0, acorn@^3.3.0:
26+
acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
2727
version "3.3.0"
2828
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
2929

30+
acorn@^4.0.3:
31+
version "4.0.3"
32+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.3.tgz#1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"
33+
34+
ajv-keywords@^1.1.1:
35+
version "1.1.1"
36+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.1.1.tgz#02550bc605a3e576041565628af972e06c549d50"
37+
3038
ajv@^4.7.0:
31-
version "4.8.2"
32-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.8.2.tgz#65486936ca36fea39a1504332a78bebd5d447bdc"
39+
version "4.9.0"
40+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.9.0.tgz#5a358085747b134eb567d6d15e015f1d7802f45c"
3341
dependencies:
3442
co "^4.6.0"
3543
json-stable-stringify "^1.0.1"
@@ -152,10 +160,16 @@ async-each@^1.0.0:
152160
version "1.0.1"
153161
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
154162

155-
async@^1.3.0, async@^1.5.0:
163+
async@^1.5.0:
156164
version "1.5.2"
157165
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
158166

167+
async@^2.1.2:
168+
version "2.1.2"
169+
resolved "https://registry.yarnpkg.com/async/-/async-2.1.2.tgz#612a4ab45ef42a70cde806bad86ee6db047e8385"
170+
dependencies:
171+
lodash "^4.14.0"
172+
159173
async@~0.2.6:
160174
version "0.2.10"
161175
resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -1427,7 +1441,7 @@ html-minifier@^3.1.0:
14271441
relateurl "0.2.x"
14281442
uglify-js "2.7.x"
14291443

1430-
html-webpack-plugin:
1444+
html-webpack-plugin@^2.24.1:
14311445
version "2.24.1"
14321446
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.24.1.tgz#7f45fc678f66eac2d433f22336b4399da023b57e"
14331447
dependencies:
@@ -1809,7 +1823,7 @@ loader-runner@^2.2.0:
18091823
version "2.2.0"
18101824
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
18111825

1812-
loader-utils@^0.2.10, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.7, loader-utils@^0.2.9, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
1826+
loader-utils@^0.2.10, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.7, loader-utils@^0.2.9, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
18131827
version "0.2.16"
18141828
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
18151829
dependencies:
@@ -1872,10 +1886,6 @@ lodash.assign@^3.2.0:
18721886
lodash._createassigner "^3.0.0"
18731887
lodash.keys "^3.0.0"
18741888

1875-
lodash.assign@^4.0.3, lodash.assign@^4.0.6:
1876-
version "4.2.0"
1877-
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
1878-
18791889
lodash.camelcase@^3.0.1:
18801890
version "3.0.1"
18811891
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz#932c8b87f8a4377897c67197533282f97aeac298"
@@ -1935,14 +1945,10 @@ lodash.words@^3.0.0:
19351945
dependencies:
19361946
lodash._root "^3.0.0"
19371947

1938-
lodash@^4.16.4:
1948+
lodash@^4.14.0, lodash@^4.16.4, lodash@^4.3.0:
19391949
version "4.17.0"
19401950
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.0.tgz#93f4466e5ab73e5a1f1216c34eea11535f0a8df5"
19411951

1942-
lodash@^4.3.0:
1943-
version "4.16.6"
1944-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777"
1945-
19461952
longest@^1.0.1:
19471953
version "1.0.1"
19481954
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -2757,8 +2763,8 @@ read-pkg@^1.0.0:
27572763
path-type "^1.0.0"
27582764

27592765
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5:
2760-
version "2.2.1"
2761-
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.1.tgz#c459a6687ad6195f936b959870776edef27a7655"
2766+
version "2.2.2"
2767+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
27622768
dependencies:
27632769
buffer-shims "^1.0.0"
27642770
core-util-is "~1.0.0"
@@ -2915,7 +2921,7 @@ right-align@^0.1.1:
29152921
dependencies:
29162922
align-text "^0.1.1"
29172923

2918-
rimraf, rimraf@^2.2.8, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
2924+
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
29192925
version "2.5.4"
29202926
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
29212927
dependencies:
@@ -3112,7 +3118,7 @@ string_decoder@~0.10.25, string_decoder@~0.10.x:
31123118
version "0.10.31"
31133119
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
31143120

3115-
string-width@^1.0.1:
3121+
string-width@^1.0.1, string-width@^1.0.2:
31163122
version "1.0.2"
31173123
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
31183124
dependencies:
@@ -3412,9 +3418,9 @@ vue-hot-reload-api@^2.0.1:
34123418
version "2.0.6"
34133419
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.6.tgz#817d4bfb30f55428aa1012d029499e07f3147d21"
34143420

3415-
vue-loader@^9.7.0:
3416-
version "9.9.0"
3417-
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.0.tgz#cf4d9fddd5ef22e0d1642153f4722fb310001c80"
3421+
vue-loader@^9.9.1:
3422+
version "9.9.1"
3423+
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.1.tgz#2867dd29027fab6d0f94bef98c607dc2d3a36304"
34183424
dependencies:
34193425
consolidate "^0.14.0"
34203426
hash-sum "^1.0.2"
@@ -3431,8 +3437,8 @@ vue-loader@^9.7.0:
34313437
vue-template-es2015-compiler "^1.2.2"
34323438

34333439
vue-router@^2.0.0:
3434-
version "2.0.1"
3435-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.0.1.tgz#88b83cdc9497bad5b20b579e847a7e7240e221dd"
3440+
version "2.0.2"
3441+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.0.2.tgz#1cdd469cc8a037f92fd711683ca23a11840a5006"
34363442

34373443
vue-server-renderer@^2.0.0:
34383444
version "2.0.5"
@@ -3455,8 +3461,8 @@ vue-template-compiler@^2.0.5:
34553461
he "^1.1.0"
34563462

34573463
vue-template-es2015-compiler@^1.2.2:
3458-
version "1.2.2"
3459-
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.2.2.tgz#41aad1cb385cce2b84089fd55c4ffb39db670fb1"
3464+
version "1.2.3"
3465+
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.2.3.tgz#59695cb1d74f8a575b28e7afe82ce1828200899f"
34603466

34613467
vue@^2.0.0:
34623468
version "2.0.5"
@@ -3503,18 +3509,18 @@ webpack-sources@^0.1.0:
35033509
source-list-map "~0.1.0"
35043510
source-map "~0.5.3"
35053511

3506-
webpack@2.1.0-beta.25:
3507-
version "2.1.0-beta.25"
3508-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.25.tgz#c35ff4da4ee70344a2f14c35258d95412709e9ed"
3512+
webpack@^2.1.0-beta.26:
3513+
version "2.1.0-beta.26"
3514+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.26.tgz#770eed2b04ce9863107ff138caa701a85e7b4e12"
35093515
dependencies:
3510-
acorn "^3.2.0"
3516+
acorn "^4.0.3"
35113517
ajv "^4.7.0"
3512-
async "^1.3.0"
3513-
clone "^1.0.2"
3518+
ajv-keywords "^1.1.1"
3519+
async "^2.1.2"
35143520
enhanced-resolve "^2.2.0"
35153521
interpret "^1.0.0"
35163522
loader-runner "^2.2.0"
3517-
loader-utils "^0.2.11"
3523+
loader-utils "^0.2.16"
35183524
memory-fs "~0.3.0"
35193525
mkdirp "~0.5.0"
35203526
node-libs-browser "^1.0.0"
@@ -3525,7 +3531,7 @@ webpack@2.1.0-beta.25:
35253531
uglify-js "~2.7.3"
35263532
watchpack "^1.0.0"
35273533
webpack-sources "^0.1.0"
3528-
yargs "^4.7.1"
3534+
yargs "^6.0.0"
35293535

35303536
websocket-driver@>=0.5.1:
35313537
version "0.6.5"
@@ -3603,31 +3609,30 @@ yallist@^2.0.0:
36033609
version "2.0.0"
36043610
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
36053611

3606-
yargs-parser@^2.4.1:
3607-
version "2.4.1"
3608-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
3612+
yargs-parser@^4.1.0:
3613+
version "4.1.0"
3614+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.1.0.tgz#313df030f20124124aeae8fbab2da53ec28c56d7"
36093615
dependencies:
36103616
camelcase "^3.0.0"
3611-
lodash.assign "^4.0.6"
36123617

3613-
yargs@^4.7.1:
3614-
version "4.8.1"
3615-
resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
3618+
yargs@^6.0.0:
3619+
version "6.4.0"
3620+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
36163621
dependencies:
3622+
camelcase "^3.0.0"
36173623
cliui "^3.2.0"
36183624
decamelize "^1.1.1"
36193625
get-caller-file "^1.0.1"
3620-
lodash.assign "^4.0.3"
36213626
os-locale "^1.4.0"
36223627
read-pkg-up "^1.0.1"
36233628
require-directory "^2.1.1"
36243629
require-main-filename "^1.0.1"
36253630
set-blocking "^2.0.0"
3626-
string-width "^1.0.1"
3631+
string-width "^1.0.2"
36273632
which-module "^1.0.0"
36283633
window-size "^0.2.0"
36293634
y18n "^3.2.1"
3630-
yargs-parser "^2.4.1"
3635+
yargs-parser "^4.1.0"
36313636

36323637
yargs@~3.10.0:
36333638
version "3.10.0"

0 commit comments

Comments
 (0)