Commit f5405dca authored by Evan You's avatar Evan You

include webpack beta.26 fix with vue-loader@9.9.1

parent 4f92d4ec
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
"stylus-loader": "^2.1.2", "stylus-loader": "^2.1.2",
"sw-precache-webpack-plugin": "^0.5.1", "sw-precache-webpack-plugin": "^0.5.1",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"vue-loader": "^9.7.0", "vue-loader": "^9.9.1",
"webpack": "2.1.0-beta.25", "webpack": "^2.1.0-beta.26",
"webpack-dev-middleware": "^1.6.1", "webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.12.2" "webpack-hot-middleware": "^2.12.2"
} }
......
...@@ -23,13 +23,21 @@ acorn-object-spread@^1.0.0: ...@@ -23,13 +23,21 @@ acorn-object-spread@^1.0.0:
dependencies: dependencies:
acorn "^3.1.0" acorn "^3.1.0"
acorn@^3.0.4, acorn@^3.1.0, acorn@^3.2.0, acorn@^3.3.0: acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
version "3.3.0" version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
acorn@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.3.tgz#1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"
ajv-keywords@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.1.1.tgz#02550bc605a3e576041565628af972e06c549d50"
ajv@^4.7.0: ajv@^4.7.0:
version "4.8.2" version "4.9.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.8.2.tgz#65486936ca36fea39a1504332a78bebd5d447bdc" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.9.0.tgz#5a358085747b134eb567d6d15e015f1d7802f45c"
dependencies: dependencies:
co "^4.6.0" co "^4.6.0"
json-stable-stringify "^1.0.1" json-stable-stringify "^1.0.1"
...@@ -152,10 +160,16 @@ async-each@^1.0.0: ...@@ -152,10 +160,16 @@ async-each@^1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
async@^1.3.0, async@^1.5.0: async@^1.5.0:
version "1.5.2" version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
async@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/async/-/async-2.1.2.tgz#612a4ab45ef42a70cde806bad86ee6db047e8385"
dependencies:
lodash "^4.14.0"
async@~0.2.6: async@~0.2.6:
version "0.2.10" version "0.2.10"
resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
...@@ -1427,7 +1441,7 @@ html-minifier@^3.1.0: ...@@ -1427,7 +1441,7 @@ html-minifier@^3.1.0:
relateurl "0.2.x" relateurl "0.2.x"
uglify-js "2.7.x" uglify-js "2.7.x"
html-webpack-plugin: html-webpack-plugin@^2.24.1:
version "2.24.1" version "2.24.1"
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.24.1.tgz#7f45fc678f66eac2d433f22336b4399da023b57e" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.24.1.tgz#7f45fc678f66eac2d433f22336b4399da023b57e"
dependencies: dependencies:
...@@ -1809,7 +1823,7 @@ loader-runner@^2.2.0: ...@@ -1809,7 +1823,7 @@ loader-runner@^2.2.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
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: 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:
version "0.2.16" version "0.2.16"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
dependencies: dependencies:
...@@ -1872,10 +1886,6 @@ lodash.assign@^3.2.0: ...@@ -1872,10 +1886,6 @@ lodash.assign@^3.2.0:
lodash._createassigner "^3.0.0" lodash._createassigner "^3.0.0"
lodash.keys "^3.0.0" lodash.keys "^3.0.0"
lodash.assign@^4.0.3, lodash.assign@^4.0.6:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
lodash.camelcase@^3.0.1: lodash.camelcase@^3.0.1:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz#932c8b87f8a4377897c67197533282f97aeac298" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-3.0.1.tgz#932c8b87f8a4377897c67197533282f97aeac298"
...@@ -1935,14 +1945,10 @@ lodash.words@^3.0.0: ...@@ -1935,14 +1945,10 @@ lodash.words@^3.0.0:
dependencies: dependencies:
lodash._root "^3.0.0" lodash._root "^3.0.0"
lodash@^4.16.4: lodash@^4.14.0, lodash@^4.16.4, lodash@^4.3.0:
version "4.17.0" version "4.17.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.0.tgz#93f4466e5ab73e5a1f1216c34eea11535f0a8df5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.0.tgz#93f4466e5ab73e5a1f1216c34eea11535f0a8df5"
lodash@^4.3.0:
version "4.16.6"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777"
longest@^1.0.1: longest@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
...@@ -2757,8 +2763,8 @@ read-pkg@^1.0.0: ...@@ -2757,8 +2763,8 @@ read-pkg@^1.0.0:
path-type "^1.0.0" path-type "^1.0.0"
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5: "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5:
version "2.2.1" version "2.2.2"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.1.tgz#c459a6687ad6195f936b959870776edef27a7655" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
dependencies: dependencies:
buffer-shims "^1.0.0" buffer-shims "^1.0.0"
core-util-is "~1.0.0" core-util-is "~1.0.0"
...@@ -2915,7 +2921,7 @@ right-align@^0.1.1: ...@@ -2915,7 +2921,7 @@ right-align@^0.1.1:
dependencies: dependencies:
align-text "^0.1.1" align-text "^0.1.1"
rimraf, rimraf@^2.2.8, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2: rimraf@^2.2.8, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
version "2.5.4" version "2.5.4"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
dependencies: dependencies:
...@@ -3112,7 +3118,7 @@ string_decoder@~0.10.25, string_decoder@~0.10.x: ...@@ -3112,7 +3118,7 @@ string_decoder@~0.10.25, string_decoder@~0.10.x:
version "0.10.31" version "0.10.31"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
string-width@^1.0.1: string-width@^1.0.1, string-width@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
dependencies: dependencies:
...@@ -3412,9 +3418,9 @@ vue-hot-reload-api@^2.0.1: ...@@ -3412,9 +3418,9 @@ vue-hot-reload-api@^2.0.1:
version "2.0.6" version "2.0.6"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.6.tgz#817d4bfb30f55428aa1012d029499e07f3147d21" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.0.6.tgz#817d4bfb30f55428aa1012d029499e07f3147d21"
vue-loader@^9.7.0: vue-loader@^9.9.1:
version "9.9.0" version "9.9.1"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.0.tgz#cf4d9fddd5ef22e0d1642153f4722fb310001c80" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-9.9.1.tgz#2867dd29027fab6d0f94bef98c607dc2d3a36304"
dependencies: dependencies:
consolidate "^0.14.0" consolidate "^0.14.0"
hash-sum "^1.0.2" hash-sum "^1.0.2"
...@@ -3431,8 +3437,8 @@ vue-loader@^9.7.0: ...@@ -3431,8 +3437,8 @@ vue-loader@^9.7.0:
vue-template-es2015-compiler "^1.2.2" vue-template-es2015-compiler "^1.2.2"
vue-router@^2.0.0: vue-router@^2.0.0:
version "2.0.1" version "2.0.2"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.0.1.tgz#88b83cdc9497bad5b20b579e847a7e7240e221dd" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.0.2.tgz#1cdd469cc8a037f92fd711683ca23a11840a5006"
vue-server-renderer@^2.0.0: vue-server-renderer@^2.0.0:
version "2.0.5" version "2.0.5"
...@@ -3455,8 +3461,8 @@ vue-template-compiler@^2.0.5: ...@@ -3455,8 +3461,8 @@ vue-template-compiler@^2.0.5:
he "^1.1.0" he "^1.1.0"
vue-template-es2015-compiler@^1.2.2: vue-template-es2015-compiler@^1.2.2:
version "1.2.2" version "1.2.3"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.2.2.tgz#41aad1cb385cce2b84089fd55c4ffb39db670fb1" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.2.3.tgz#59695cb1d74f8a575b28e7afe82ce1828200899f"
vue@^2.0.0: vue@^2.0.0:
version "2.0.5" version "2.0.5"
...@@ -3503,18 +3509,18 @@ webpack-sources@^0.1.0: ...@@ -3503,18 +3509,18 @@ webpack-sources@^0.1.0:
source-list-map "~0.1.0" source-list-map "~0.1.0"
source-map "~0.5.3" source-map "~0.5.3"
webpack@2.1.0-beta.25: webpack@^2.1.0-beta.26:
version "2.1.0-beta.25" version "2.1.0-beta.26"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.25.tgz#c35ff4da4ee70344a2f14c35258d95412709e9ed" resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.26.tgz#770eed2b04ce9863107ff138caa701a85e7b4e12"
dependencies: dependencies:
acorn "^3.2.0" acorn "^4.0.3"
ajv "^4.7.0" ajv "^4.7.0"
async "^1.3.0" ajv-keywords "^1.1.1"
clone "^1.0.2" async "^2.1.2"
enhanced-resolve "^2.2.0" enhanced-resolve "^2.2.0"
interpret "^1.0.0" interpret "^1.0.0"
loader-runner "^2.2.0" loader-runner "^2.2.0"
loader-utils "^0.2.11" loader-utils "^0.2.16"
memory-fs "~0.3.0" memory-fs "~0.3.0"
mkdirp "~0.5.0" mkdirp "~0.5.0"
node-libs-browser "^1.0.0" node-libs-browser "^1.0.0"
...@@ -3525,7 +3531,7 @@ webpack@2.1.0-beta.25: ...@@ -3525,7 +3531,7 @@ webpack@2.1.0-beta.25:
uglify-js "~2.7.3" uglify-js "~2.7.3"
watchpack "^1.0.0" watchpack "^1.0.0"
webpack-sources "^0.1.0" webpack-sources "^0.1.0"
yargs "^4.7.1" yargs "^6.0.0"
websocket-driver@>=0.5.1: websocket-driver@>=0.5.1:
version "0.6.5" version "0.6.5"
...@@ -3603,31 +3609,30 @@ yallist@^2.0.0: ...@@ -3603,31 +3609,30 @@ yallist@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
yargs-parser@^2.4.1: yargs-parser@^4.1.0:
version "2.4.1" version "4.1.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.1.0.tgz#313df030f20124124aeae8fbab2da53ec28c56d7"
dependencies: dependencies:
camelcase "^3.0.0" camelcase "^3.0.0"
lodash.assign "^4.0.6"
yargs@^4.7.1: yargs@^6.0.0:
version "4.8.1" version "6.4.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
dependencies: dependencies:
camelcase "^3.0.0"
cliui "^3.2.0" cliui "^3.2.0"
decamelize "^1.1.1" decamelize "^1.1.1"
get-caller-file "^1.0.1" get-caller-file "^1.0.1"
lodash.assign "^4.0.3"
os-locale "^1.4.0" os-locale "^1.4.0"
read-pkg-up "^1.0.1" read-pkg-up "^1.0.1"
require-directory "^2.1.1" require-directory "^2.1.1"
require-main-filename "^1.0.1" require-main-filename "^1.0.1"
set-blocking "^2.0.0" set-blocking "^2.0.0"
string-width "^1.0.1" string-width "^1.0.2"
which-module "^1.0.0" which-module "^1.0.0"
window-size "^0.2.0" window-size "^0.2.0"
y18n "^3.2.1" y18n "^3.2.1"
yargs-parser "^2.4.1" yargs-parser "^4.1.0"
yargs@~3.10.0: yargs@~3.10.0:
version "3.10.0" version "3.10.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment