diff --git a/build/webpack.build.js b/build/webpack.build.js index 6c1e7cf28..d9a196d7e 100644 --- a/build/webpack.build.js +++ b/build/webpack.build.js @@ -1,5 +1,4 @@ const path = require('path'); -const webpack = require('webpack'); const config = require('./webpack.config.dev.js'); const isMinify = process.argv.indexOf('-p') !== -1; @@ -24,7 +23,6 @@ module.exports = Object.assign({}, config, { amd: 'vue' } }, - plugins: [], performance: false, optimization: { minimize: isMinify diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index 377466cbf..8e67b3f29 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -1,9 +1,9 @@ const path = require('path'); -const webpack = require('webpack'); const HtmlWebpackPlugin = require('html-webpack-plugin'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin') const ProgressBarPlugin = require('progress-bar-webpack-plugin'); const isProduction = process.env.NODE_ENV === 'production'; +const { VueLoaderPlugin } = require('vue-loader') module.exports = { mode: 'development', @@ -41,25 +41,25 @@ module.exports = { { loader: 'vue-loader', options: { - preserveWhitespace: false, - extractCSS: true + compilerOptions: { + preserveWhitespace: false + } } } ] }, { test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\//, + exclude: /node_modules/, use: 'babel-loader' }, { - test: /\.css$/, - use: ExtractTextPlugin.extract({ - use: [ - 'css-loader', - 'postcss-loader' - ] - }) + test: /\.(css|postcss)$/, + use: [ + MiniCssExtractPlugin.loader, + 'css-loader', + 'postcss-loader' + ] }, { test: /\.md/, @@ -69,12 +69,13 @@ module.exports = { ] }, { - test: /\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/, + test: /\.(woff2?|eot|ttf|svg)(\?.*)?$/, loader: 'url-loader' } ] }, plugins: [ + new VueLoaderPlugin(), new ProgressBarPlugin(), new HtmlWebpackPlugin({ chunks: ['vendor', 'vant-docs'], @@ -88,9 +89,8 @@ module.exports = { filename: 'examples.html', inject: true }), - new ExtractTextPlugin({ - filename: isProduction ? '[name].[hash:8].css' : '[name].css', - allChunks: true + new MiniCssExtractPlugin({ + filename: isProduction ? '[name].[hash:8].css' : '[name].css' }) ] }; diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js index 115f1679f..31eaa22b1 100644 --- a/build/webpack.config.prod.js +++ b/build/webpack.config.prod.js @@ -1,4 +1,3 @@ -const webpack = require('webpack'); const merge = require('webpack-merge'); const path = require('path'); const devConfig = require('./webpack.config.dev.js'); diff --git a/package.json b/package.json index d63f7b963..f729b99d6 100644 --- a/package.json +++ b/package.json @@ -78,12 +78,11 @@ "dependency-tree": "^6.1.0", "eslint": "^4.19.1", "eslint-plugin-vue": "^4.5.0", - "extract-text-webpack-plugin": "^4.0.0-beta.0", "fast-vue-md-loader": "^1.0.3", "gh-pages": "^1.0.0", "html-webpack-plugin": "3.2.0", "husky": "^0.14.3", - "isparta-loader": "^2.0.0", + "istanbul-instrumenter-loader": "^3.0.1", "karma": "^2.0.0", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.1", @@ -93,6 +92,7 @@ "karma-spec-reporter": "^0.0.32", "karma-webpack": "3.0.0", "lint-staged": "^7.0.4", + "mini-css-extract-plugin": "^0.4.0", "mocha": "^5.1.1", "postcss": "^6.0.21", "postcss-calc": "^6.0.0", @@ -109,7 +109,7 @@ "url-loader": "^1.0.1", "vant-doc": "1.0.4", "vue": "2.5.16", - "vue-loader": "^14.2.2", + "vue-loader": "^15.0.0", "vue-router": "^3.0.1", "vue-sfc-compiler": "^0.0.8", "vue-style-loader": "^4.1.0", diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json index fd6c39134..cb45edb23 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -14,13 +14,13 @@ }, "license": "MIT", "devDependencies": { - "autoprefixer": "^7.1.4", + "autoprefixer": "^8.3.0", "gulp": "^3.9.1", "gulp-clean-css": "^3.9.0", "gulp-iconfont": "^9.0.2", "gulp-iconfont-css": "^2.1.0", "gulp-postcss": "^7.0.0", - "md5-file": "^3.2.3", + "md5-file": "^4.0.0", "postcss-easy-import": "^3.0.0", "precss": "^2.0.0" } diff --git a/packages/vant-css/yarn.lock b/packages/vant-css/yarn.lock index 4faa16170..1881fb155 100644 --- a/packages/vant-css/yarn.lock +++ b/packages/vant-css/yarn.lock @@ -163,15 +163,15 @@ atob@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" -autoprefixer@^7.1.4: - version "7.2.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc" +autoprefixer@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.3.0.tgz#22ac5151c3c8946bb8f75f337d5c5042c0ec6404" dependencies: - browserslist "^2.11.3" - caniuse-lite "^1.0.30000805" + browserslist "^3.2.4" + caniuse-lite "^1.0.30000830" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.17" + postcss "^6.0.21" postcss-value-parser "^3.2.3" aws-sign2@~0.7.0: @@ -264,27 +264,12 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" -browserslist@^2.11.3: - version "2.11.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" +browserslist@^3.2.4: + version "3.2.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.5.tgz#aa46a5ea33b5330178f3c91cfd85e148fcb57080" dependencies: - caniuse-lite "^1.0.30000792" - electron-to-chromium "^1.3.30" - -buffer-alloc-unsafe@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a" - -buffer-alloc@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303" - dependencies: - buffer-alloc-unsafe "^0.1.0" - buffer-fill "^0.1.0" - -buffer-fill@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071" + caniuse-lite "^1.0.30000830" + electron-to-chromium "^1.3.42" bufferstreams@^1.0.2, bufferstreams@^1.1.0: version "1.1.3" @@ -325,7 +310,7 @@ camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" -caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805: +caniuse-lite@^1.0.30000830: version "1.0.30000830" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328" @@ -600,7 +585,7 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" -electron-to-chromium@^1.3.30: +electron-to-chromium@^1.3.42: version "1.3.42" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" @@ -1706,11 +1691,9 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -md5-file@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-3.2.3.tgz#f9bceb941eca2214a4c0727f5e700314e770f06f" - dependencies: - buffer-alloc "^1.1.0" +md5-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-4.0.0.tgz#f3f7ba1e2dd1144d5bf1de698d0e5f44a4409584" meow@^3.3.0: version "3.7.0" @@ -2300,7 +2283,7 @@ postcss@^5.0.10, postcss@^5.0.4, postcss@^5.0.5: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.17, postcss@^6.0.18, postcss@^6.0.3, postcss@^6.0.9: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.18, postcss@^6.0.21, postcss@^6.0.3, postcss@^6.0.9: version "6.0.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d" dependencies: diff --git a/test/get-webpack-conf.js b/test/get-webpack-conf.js index 9f047037c..8570b3489 100644 --- a/test/get-webpack-conf.js +++ b/test/get-webpack-conf.js @@ -1,6 +1,8 @@ const path = require('path'); const webpack = require('webpack'); const ProgressBarPlugin = require('progress-bar-webpack-plugin'); +const { VueLoaderPlugin } = require('vue-loader'); +const webpackDevConfig = require('../build/webpack.config.dev'); function getWebpackConfig(testFileName) { return { @@ -12,100 +14,51 @@ function getWebpackConfig(testFileName) { chunkFilename: '[id].js', libraryTarget: 'umd' }, + resolve: webpackDevConfig.resolve, plugins: [ + new VueLoaderPlugin(), new ProgressBarPlugin(), - new webpack.LoaderOptionsPlugin({ - minimize: true, - options: { - babel: { - presets: ['env'], - plugins: ['transform-runtime', 'transform-object-rest-spread'] - }, - vue: { - autoprefixer: false, - preserveWhitespace: false - } - } - }), new webpack.DefinePlugin({ 'process.env': { TEST_FILE: `"${testFileName}"` } }) ], - stats: 'errors-only', - resolve: { - modules: [path.resolve(process.cwd(), 'node_modules'), 'node_modules'], - extensions: ['.js', '.vue', '.css'], - alias: { - src: path.resolve(process.cwd(), 'src'), - packages: path.resolve(process.cwd(), 'packages'), - vue$: 'vue/dist/vue.common.js' - } - }, module: { rules: [ { - enforce: 'pre', test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/, - use: 'isparta-loader' + exclude: /node_modules|test|mock|swipe|locale|waterfall/, + use: [ + { + loader: 'istanbul-instrumenter-loader', + options: { esModules: true } + }, + 'babel-loader' + ] }, { test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\//, - use: 'babel-loader' + exclude: /node_modules/, + use: [ + 'babel-loader' + ] }, { - test: /\.(css|pcss)$/, + test: /\.(css|postcss)$/, use: ['style-loader', 'css-loader', { loader: 'postcss-loader', options: { sourceMap: true } }] }, { - test: /\.(gif|png|jpe?g)(\?\S*)?$/, - use: [ - { - loader: 'url-loader', - options: { - query: { - limit: 10000, - name: 'static/[name].[hash:7].[ext]' - } - } - } - ] - }, - { - test: /test\/components\/.*\.vue$|packages\/swipe.*\.vue$/, + test: /\.vue$/, use: [ { loader: 'vue-loader', options: { - loaders: { - css: ['style-loader', 'css-loader', { - loader: 'postcss-loader', - options: { sourceMap: true } - }] - } - } - } - ] - }, - { - test: /packages\/.*\.vue$/, - exclude: /packages\/swipe.*\.vue$/, - use: [ - { - loader: 'vue-loader', - options: { - loaders: { - css: ['style-loader', 'css-loader', { - loader: 'postcss-loader', - options: { sourceMap: true } - }], - js: ['isparta-loader'] + compilerOptions: { + preserveWhitespace: false } } } diff --git a/test/karma.conf.js b/test/karma.conf.js index f2a7a669c..aab423525 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -1,9 +1,3 @@ -require('babel-polyfill'); - -require('babel-core/register')({ - presets: [require('babel-preset-env')] -}); - const getWebpackConfig = require('./get-webpack-conf'); module.exports = function(config) { @@ -13,13 +7,9 @@ module.exports = function(config) { reporters: ['spec', 'coverage'], files: ['./index.js'], preprocessors: { - './index.js': ['webpack'], - 'test/!(components)/**/*.vue': ['coverage'] + './index.js': ['webpack'] }, webpack: getWebpackConfig(getTestFileName()), - webpackMiddleware: { - noInfo: true - }, coverageReporter: { dir: './coverage', reporters: [ diff --git a/yarn.lock b/yarn.lock index a9fe6c722..d5fa10dbb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,6 +20,20 @@ version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" +"@vue/component-compiler-utils@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.1.0.tgz#e3ca46ebbe3ebb1f7716da4602b06735fb8c9e97" + 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.11.1" + source-map "^0.5.6" + vue-template-es2015-compiler "^1.6.0" + abab@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" @@ -95,7 +109,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -353,7 +367,7 @@ async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@2.6.0, async@^2.0.0, async@^2.4.1, async@^2.6.0: +async@2.6.0, async@^2.0.0, async@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: @@ -448,7 +462,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.1.4, babel-core@^6.26.0: +babel-core@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" dependencies: @@ -472,7 +486,7 @@ babel-core@^6.1.4, babel-core@^6.26.0: slash "^1.0.0" source-map "^0.5.6" -babel-generator@^6.26.0: +babel-generator@^6.18.0, babel-generator@^6.26.0: version "6.26.1" resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" dependencies: @@ -1044,7 +1058,7 @@ babel-runtime@6.x, babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6 core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0: +babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" dependencies: @@ -1054,7 +1068,7 @@ babel-template@^6.24.1, babel-template@^6.26.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@^6.24.1, babel-traverse@^6.26.0: +babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" dependencies: @@ -1068,7 +1082,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: +babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" dependencies: @@ -1949,9 +1963,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" @@ -2629,6 +2643,12 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" +dot-prop@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + double-ended-queue@^2.1.0-0: version "2.1.0-0" resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" @@ -2826,7 +2846,7 @@ escodegen@1.8.x: optionalDependencies: source-map "~0.2.0" -escodegen@1.x.x, escodegen@^1.6.1, escodegen@^1.8.0, escodegen@^1.9.0: +escodegen@1.x.x, escodegen@^1.8.0, escodegen@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2" dependencies: @@ -2904,7 +2924,7 @@ espree@^3.5.2, espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" -esprima@2.7.x, esprima@^2.1.0, esprima@^2.6.0, esprima@^2.7.1: +esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" @@ -3128,15 +3148,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-text-webpack-plugin@^4.0.0-beta.0: - version "4.0.0-beta.0" - resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz#f7361d7ff430b42961f8d1321ba8c1757b5d4c42" - dependencies: - async "^2.4.1" - loader-utils "^1.1.0" - schema-utils "^0.4.5" - webpack-sources "^1.1.0" - extract-zip@^1.6.5: version "1.6.6" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" @@ -4504,7 +4515,7 @@ is-number@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" -is-obj@^1.0.1: +is-obj@^1.0.0, is-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" @@ -4658,30 +4669,35 @@ isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -isparta-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isparta-loader/-/isparta-loader-2.0.0.tgz#4425f496c93f765bbceb4dd938576da307566ed1" - dependencies: - isparta "4.x.x" - -isparta@4.x.x: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isparta/-/isparta-4.0.0.tgz#1de91996f480b22dcb1aca8510255bae1574446e" - dependencies: - babel-core "^6.1.4" - escodegen "^1.6.1" - esprima "^2.1.0" - istanbul "^0.4.0" - mkdirp "^0.5.0" - nomnomnomnom "^2.0.0" - object-assign "^4.0.1" - source-map "^0.5.0" - which "^1.0.9" - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +istanbul-instrumenter-loader@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949" + dependencies: + convert-source-map "^1.5.0" + istanbul-lib-instrument "^1.7.3" + loader-utils "^1.1.0" + schema-utils "^0.3.0" + +istanbul-lib-coverage@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" + +istanbul-lib-instrument@^1.7.3: + version "1.10.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.18.0" + istanbul-lib-coverage "^1.2.0" + semver "^5.3.0" + istanbul@^0.4.0: version "0.4.5" resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b" @@ -5475,7 +5491,7 @@ lru-cache@2.2.x: version "2.2.4" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" -lru-cache@^4.0.1, lru-cache@^4.1.1: +lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" dependencies: @@ -5619,6 +5635,12 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" +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" + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -5696,6 +5718,13 @@ mimic-response@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e" +mini-css-extract-plugin@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9" + dependencies: + loader-utils "^1.1.0" + webpack-sources "^1.1.0" + minimalistic-assert@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -6040,13 +6069,6 @@ nomnom@^1.8.1: chalk "~0.4.0" underscore "~1.6.0" -nomnomnomnom@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/nomnomnomnom/-/nomnomnomnom-2.0.1.tgz#b2239f031c8d04da67e32836e1e3199e12f7a8e2" - dependencies: - chalk "~0.4.0" - underscore "~1.6.0" - nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6792,7 +6814,7 @@ postcss-js@^1.0.1: camelcase-css "^1.0.1" postcss "^6.0.11" -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: @@ -7021,6 +7043,14 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector 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-simple-vars@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.1.0.tgz#043248cfef8d3f51b3486a28c09f8375dbf1b2f9" @@ -7073,7 +7103,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.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.18, postcss@^6.0.21, postcss@^6.0.3, postcss@^6.0.8, postcss@^6.0.9: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.18, postcss@^6.0.20, postcss@^6.0.21, postcss@^6.0.3, postcss@^6.0.9: version "6.0.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d" dependencies: @@ -7136,7 +7166,7 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.5.3, prettier@^1.7.0: +prettier@^1.11.1, prettier@^1.5.3: version "1.12.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" @@ -7806,7 +7836,7 @@ resolve@1.1.7, resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0, resolve@^1.5.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.5.0: version "1.7.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" dependencies: @@ -7920,6 +7950,12 @@ sax@^1.2.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" +schema-utils@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" + dependencies: + ajv "^5.0.0" + schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" @@ -8277,7 +8313,7 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -9171,7 +9207,7 @@ vue-eslint-parser@^2.0.3: esquery "^1.0.0" lodash "^4.17.4" -vue-hot-reload-api@^2.2.0: +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" @@ -9179,23 +9215,15 @@ vue-lazyload@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c" -vue-loader@^14.2.2: - version "14.2.2" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.2.tgz#c8cf3c2e29b6fb2ee595248a2aa6005038a125b3" +vue-loader@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.0.0.tgz#536dd4ea8bb6e2a070ac70a9d0ca2f2ca073c604" dependencies: - consolidate "^0.14.0" + "@vue/component-compiler-utils" "^1.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-router@^3.0.1: version "3.0.1" @@ -9207,7 +9235,7 @@ vue-sfc-compiler@^0.0.8: dependencies: babel-polyfill "^6.26.0" -vue-style-loader@^4.0.1, vue-style-loader@^4.1.0: +vue-style-loader@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.0.tgz#7588bd778e2c9f8d87bfc3c5a4a039638da7a863" dependencies: @@ -9434,7 +9462,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9: +which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: