From 3b57e336548e571e43e343c98109218e0ce775fa Mon Sep 17 00:00:00 2001 From: neverland Date: Sun, 13 May 2018 09:04:58 +0800 Subject: [PATCH] [Build] upgrade to webpack-serve (#1056) --- build/webpack.dev.js | 11 +- docs/src/DocsApp.vue | 3 +- package.json | 4 +- packages/datetime-picker/demo/index.vue | 2 +- .../test/__snapshots__/demo.spec.js.snap | 44 +- yarn.lock | 1169 ++++++++--------- 6 files changed, 585 insertions(+), 648 deletions(-) diff --git a/build/webpack.dev.js b/build/webpack.dev.js index 192a20276..b8c574812 100644 --- a/build/webpack.dev.js +++ b/build/webpack.dev.js @@ -14,14 +14,11 @@ module.exports = { publicPath: '/', chunkFilename: 'async_[name].js' }, - devServer: { + serve: { + open: true, host: '0.0.0.0', - stats: 'errors-only', - historyApiFallback: { - rewrites: [ - { from: /^\/zanui\/vant\/examples/, to: '/examples.html' }, - { from: /^\/zanui\/vant/, to: '/index.html' } - ] + dev: { + logLevel: 'warn' } }, resolve: { diff --git a/docs/src/DocsApp.vue b/docs/src/DocsApp.vue index bfd6890b7..6da044395 100644 --- a/docs/src/DocsApp.vue +++ b/docs/src/DocsApp.vue @@ -11,8 +11,9 @@ import docConfig from './doc.config'; export default { data() { + const path = location.pathname === '/' ? 'examples.html' : '/zanui/vant/examples'; return { - simulators: [`/zanui/vant/examples${location.hash}`], + simulators: [`${path}${location.hash}`], demoURL: '' }; }, diff --git a/package.json b/package.json index 196623594..6affc2137 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ ], "scripts": { "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../", - "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.dev.js", + "dev": "npm run build:file && webpack-serve --config build/webpack.dev.js", "build:file": "node build/bin/build-entry.js", "build:components": "node build/bin/build-components.js --color", "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color", @@ -102,7 +102,7 @@ "vue-template-es2015-compiler": "^1.6.0", "webpack": "^4.8.2", "webpack-cli": "^2.0.15", - "webpack-dev-server": "3.1.4" + "webpack-serve": "^0.3.2" }, "jest": { "moduleFileExtensions": [ diff --git a/packages/datetime-picker/demo/index.vue b/packages/datetime-picker/demo/index.vue index e90eaed8b..57c681be5 100644 --- a/packages/datetime-picker/demo/index.vue +++ b/packages/datetime-picker/demo/index.vue @@ -57,7 +57,7 @@ export default { return { minHour: 10, maxHour: 20, - minDate: new Date(), + minDate: new Date(2018, 0, 1), maxDate: new Date(2019, 10, 1), currentDate1: new Date(2018, 0, 1), currentDate2: null, diff --git a/packages/datetime-picker/test/__snapshots__/demo.spec.js.snap b/packages/datetime-picker/test/__snapshots__/demo.spec.js.snap index 9ace71158..61069edbd 100644 --- a/packages/datetime-picker/test/__snapshots__/demo.spec.js.snap +++ b/packages/datetime-picker/test/__snapshots__/demo.spec.js.snap @@ -19,7 +19,11 @@ exports[`renders demo correctly 1`] = `