diff --git a/app/vue/package.json b/app/vue/package.json index 2e4757a5fc5b..04356dd9b445 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -30,12 +30,12 @@ }, "devDependencies": { "vue": "^2.5.16", - "vue-loader": "^14.2.3", + "vue-loader": "15.x.x", "vue-template-compiler": "^2.5.16" }, "peerDependencies": { "vue": "2.5.16", - "vue-loader": "14.2.3", + "vue-loader": "15.x.x", "vue-template-compiler": "2.5.16" } } diff --git a/app/vue/src/server/wrapInitialConfig.js b/app/vue/src/server/wrapInitialConfig.js index 87d2d6d6a3a1..b4b66c8e49d3 100644 --- a/app/vue/src/server/wrapInitialConfig.js +++ b/app/vue/src/server/wrapInitialConfig.js @@ -1,5 +1,8 @@ +const VueLoaderPlugin = require('vue-loader/lib/plugin'); + export default config => ({ ...config, + plugins: [...config.plugins, new VueLoaderPlugin()], module: { ...config.module, rules: [ diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index b19ebe2e5e62..c32cb064b26a 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -32,7 +32,7 @@ "cross-env": "^5.1.6", "file-loader": "^1.1.11", "svg-url-loader": "^2.3.2", - "vue-loader": "^14.2.3", + "vue-loader": "^15.2.4", "webpack": "^4.10.2", "webpack-dev-server": "^3.1.4" } diff --git a/examples/vue-kitchen-sink/webpack.config.js b/examples/vue-kitchen-sink/webpack.config.js index 5791e9ab0a02..9c5664d66051 100644 --- a/examples/vue-kitchen-sink/webpack.config.js +++ b/examples/vue-kitchen-sink/webpack.config.js @@ -1,5 +1,6 @@ const path = require('path'); const webpack = require('webpack'); +const VueLoaderPlugin = require('vue-loader/lib/plugin'); module.exports = { entry: './src/index.js', @@ -8,6 +9,7 @@ module.exports = { publicPath: '/dist/', filename: 'build.js', }, + plugins: [new VueLoaderPlugin()], module: { rules: [ { diff --git a/yarn.lock b/yarn.lock index 24a73c22a771..afaac343dc3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -476,6 +476,20 @@ version "2.53.43" resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707" +"@vue/component-compiler-utils@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.1.0.tgz#8331eadc8acdbc35aace5a61d2153e6f6434bfe2" + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^6.0.20" + postcss-selector-parser "^3.1.1" + prettier "^1.13.7" + source-map "^0.5.6" + vue-template-es2015-compiler "^1.6.0" + "@webassemblyjs/ast@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" @@ -4459,9 +4473,9 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" -consolidate@^0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63" +consolidate@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" dependencies: bluebird "^3.1.1" @@ -5619,7 +5633,7 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -dot-prop@^4.1.0: +dot-prop@^4.1.0, dot-prop@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" dependencies: @@ -11185,6 +11199,13 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@~4.1.1: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" @@ -11532,6 +11553,12 @@ merge-dirs@^0.2.1: node-fs "~0.1.7" path "^0.12.7" +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + dependencies: + source-map "^0.6.1" + merge-stream@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" @@ -13388,7 +13415,7 @@ postcss-import@^11.1.0: read-cache "^1.0.0" resolve "^1.1.7" -postcss-load-config@^1.1.0, postcss-load-config@^1.2.0: +postcss-load-config@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a" dependencies: @@ -13574,6 +13601,14 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" + dependencies: + dot-prop "^4.1.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-svgo@^2.1.1: version "2.1.6" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" @@ -13622,7 +13657,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.8, postcss@^6.0.9: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.9: version "6.0.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" dependencies: @@ -13630,6 +13665,14 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.8, postcss@^6.0.9: source-map "^0.6.1" supports-color "^5.1.0" +postcss@^6.0.20: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + postcss@^6.0.22: version "6.0.22" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3" @@ -13654,9 +13697,9 @@ prettier@^1.13.4: version "1.13.4" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.4.tgz#31bbae6990f13b1093187c731766a14036fa72e6" -prettier@^1.7.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" +prettier@^1.13.7: + version "1.13.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" pretty-bytes@^4.0.2: version "4.0.2" @@ -15481,7 +15524,7 @@ resolve@^1.1.3, resolve@^1.1.4, resolve@^1.6.0: dependencies: path-parse "^1.0.5" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" dependencies: @@ -18140,27 +18183,19 @@ vue-class-component@^6.0.0: version "6.1.2" resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.1.2.tgz#87ac0265b0db71a3f49f10d90e4f69f9be9c2fbd" -vue-hot-reload-api@^2.2.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f" +vue-hot-reload-api@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926" -vue-loader@^14.2.3: - version "14.2.3" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.3.tgz#3b39645c322d956e287d8d36eb77475f78c9b8e0" +vue-loader@15.x.x, vue-loader@^15.2.4: + version "15.2.6" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.6.tgz#4ad4e56a0ca1fd89ebc4220f9e3bd4723097b397" dependencies: - consolidate "^0.14.0" + "@vue/component-compiler-utils" "^2.0.0" hash-sum "^1.0.2" loader-utils "^1.1.0" - lru-cache "^4.1.1" - postcss "^6.0.8" - postcss-load-config "^1.1.0" - postcss-selector-parser "^2.0.0" - prettier "^1.7.0" - resolve "^1.4.0" - source-map "^0.6.1" - vue-hot-reload-api "^2.2.0" - vue-style-loader "^4.0.1" - vue-template-es2015-compiler "^1.6.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" vue-property-decorator@6.0.0: version "6.0.0" @@ -18169,9 +18204,9 @@ vue-property-decorator@6.0.0: reflect-metadata "^0.1.10" vue-class-component "^6.0.0" -vue-style-loader@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.0.2.tgz#e89aa4702a0c6b9630d8de70b1cbddb06b9ad254" +vue-style-loader@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.1.tgz#7c1d051b24f60b1707602b549ed50b4c8111d316" dependencies: hash-sum "^1.0.2" loader-utils "^1.0.2"