From addccbdb5609dec38da30921df42bcb632c9326e Mon Sep 17 00:00:00 2001 From: Xinyu Liu Date: Sat, 12 May 2018 15:42:11 +0800 Subject: [PATCH 1/3] chore: upgrade webpack-serve --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8103d9b85e..56cf5cdea0 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "webpack": "^4.8.1", "webpack-chain": "^4.6.0", "webpack-merge": "^4.1.2", - "webpack-serve": "^0.3.1", + "webpack-serve": "0.3.2", "webpackbar": "^2.6.1", "workbox-build": "^3.1.0" }, diff --git a/yarn.lock b/yarn.lock index 5c6c39b37a..e426d629e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7437,9 +7437,9 @@ webpack-merge@^4.1.2: dependencies: lodash "^4.17.5" -webpack-serve@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-0.3.1.tgz#a91a99d013a70d2c15df2d12c5d31a8842c033ba" +webpack-serve@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/webpack-serve/-/webpack-serve-0.3.2.tgz#9cfd823dd570438d8cf362e70586bc54af1f0c92" dependencies: "@shellscape/koa-static" "^4.0.4" chalk "^2.3.0" From a8875701a655abed1d339e103f890a7a83a5e413 Mon Sep 17 00:00:00 2001 From: Xinyu Liu Date: Sat, 12 May 2018 15:43:07 +0800 Subject: [PATCH 2/3] fix: the port confilct of webpack-serve --- lib/dev.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dev.js b/lib/dev.js index 79ed21a570..82e3cd2925 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -107,7 +107,10 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { compiler, host, dev: { logLevel: 'warn' }, - hot: { logLevel: 'error' }, + hot: { + port: parseInt(port) + 1, + logLevel: 'error' + }, logLevel: 'error', port, add: app => { From 0be59f339fd8ea58029632e2d9927dccca5d6ea9 Mon Sep 17 00:00:00 2001 From: Xinyu Liu Date: Sun, 13 May 2018 16:24:34 +0800 Subject: [PATCH 3/3] tweaks --- lib/dev.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dev.js b/lib/dev.js index 82e3cd2925..8e91c32d9c 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -108,7 +108,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { host, dev: { logLevel: 'warn' }, hot: { - port: parseInt(port) + 1, + port: port + 1, logLevel: 'error' }, logLevel: 'error', diff --git a/package.json b/package.json index 56cf5cdea0..54aa096792 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "webpack": "^4.8.1", "webpack-chain": "^4.6.0", "webpack-merge": "^4.1.2", - "webpack-serve": "0.3.2", + "webpack-serve": "^0.3.2", "webpackbar": "^2.6.1", "workbox-build": "^3.1.0" },