diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index e38ba86e3..a70c778a0 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -23,6 +23,7 @@ extractExample({ module.exports = { entry: { + vendor: ['packages'], 'vant-docs': './docs/src/index.js', 'vant-examples': './docs/src/examples.js' }, @@ -87,7 +88,18 @@ module.exports = { }, { test: /\.md/, - loader: 'vue-markdown-loader' + loader: 'vue-markdown-loader', + options: { + preventExtract: true, + use: [[require('markdown-it-container'), 'demo']], + preprocess(MarkdownIt, source) { + const styleRegexp = /)<[^<]*)*<\/style>/i; + const scriptRegexp = /)<[^<]*)*<\/script>/i; + MarkdownIt.renderer.rules.table_open = () => + ''; + return source.replace(styleRegexp, '').replace(scriptRegexp, ''); + } + } }, { test: /\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/, @@ -98,37 +110,6 @@ module.exports = { devtool: 'source-map', plugins: [ new ProgressBarPlugin(), - new webpack.LoaderOptionsPlugin({ - minimize: true, - options: { - vue: { - autoprefixer: false - }, - vueMarkdown: { - use: [ - [ - require('markdown-it-container'), - 'demo', - { - validate: function(params) { - return params.trim().match(/^demo\s*(.*)$/); - }, - - render: function(tokens, idx) { - return tokens[idx].nesting === 1 - ? `
` - :`
\n`; - } - } - ] - ], - preprocess: function(MarkdownIt, source) { - MarkdownIt.renderer.rules.table_open = () => '
'; - return source; - } - } - } - }), new HtmlWebpackPlugin({ chunks: ['vendor', 'vant-docs'], template: 'docs/src/index.tpl', @@ -143,9 +124,9 @@ module.exports = { }), new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', - minChunks: 2 + minChunks: 2, + filename: isProduction ? 'vendor.[hash:8].js' : 'vendor.js' }), - new webpack.HotModuleReplacementPlugin(), new OptimizeCssAssetsPlugin(), new ExtractTextPlugin({ filename: isProduction ? '[name].[hash:8].css' : '[name].css', diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js index 204bf81a5..74c54b30e 100644 --- a/build/webpack.config.prod.js +++ b/build/webpack.config.prod.js @@ -27,10 +27,6 @@ module.exports = merge(devConfig, { comments: false }, sourceMap: false - }), - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks: Infinity }) ] }); diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md index 09cd0fef6..f1ccf7955 100644 --- a/docs/examples-docs/actionsheet.md +++ b/docs/examples-docs/actionsheet.md @@ -73,8 +73,9 @@ Vue.component(Actionsheet.name, Actionsheet); 弹出actionsheet +``` - ``` ::: @@ -122,8 +122,9 @@ export default { 弹出带取消按钮的actionsheet +``` - ``` ::: diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md index ef23ecd81..d40c791b7 100644 --- a/docs/examples-docs/checkbox.md +++ b/docs/examples-docs/checkbox.md @@ -52,16 +52,16 @@ Vue.component(Checkbox.name, Checkbox);
复选框1
+``` - +}; ``` ::: @@ -74,16 +74,16 @@ export default {
复选框2
+``` - +}; ``` ::: @@ -98,8 +98,9 @@ export default { 复选框{{item}} +``` - ``` ::: @@ -133,8 +133,9 @@ export default { 复选框{{item}} +``` - ``` ::: @@ -164,8 +164,9 @@ export default { +``` - ``` ::: diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md index dd4973ea6..9465a6ecf 100644 --- a/docs/examples-docs/datetime-picker.md +++ b/docs/examples-docs/datetime-picker.md @@ -50,8 +50,9 @@ Vue.component(DatetimePicker.name, DatetimePicker); :max-date="maxDate" @change="handlePickerChange"> +``` - ``` ::: diff --git a/docs/examples-docs/deep-select.md b/docs/examples-docs/deep-select.md index 846fdd9c5..0c32a8f61 100644 --- a/docs/examples-docs/deep-select.md +++ b/docs/examples-docs/deep-select.md @@ -119,7 +119,6 @@ export default { } } } - ``` ::: diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md index cb71eacc0..a1f6a77a5 100644 --- a/docs/examples-docs/dialog.md +++ b/docs/examples-docs/dialog.md @@ -7,7 +7,7 @@ ``` ::: @@ -89,8 +89,9 @@ export default { :::demo 消息确认 ```html Confirm +``` - ``` ::: diff --git a/docs/examples-docs/express-way.md b/docs/examples-docs/express-way.md index ee4d0ded4..0ab6453dd 100644 --- a/docs/examples-docs/express-way.md +++ b/docs/examples-docs/express-way.md @@ -1,7 +1,7 @@ ## ExpressWay 配送方式 @@ -47,17 +43,16 @@ Vue.component(ExpressWay.name, ExpressWay); :::demo 基础用法 ```html -