From ac68434b1b3b576c855623549bc71656cb93321f Mon Sep 17 00:00:00 2001 From: fadysamirsadek Date: Sun, 15 Apr 2018 01:49:09 +0200 Subject: [PATCH 1/4] fix(dev build): reserving unused port #26 --- lib/dev.js | 8 +++++++- package.json | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/dev.js b/lib/dev.js index 3b95a09680..fadc095f7b 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -10,6 +10,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { const serveStatic = require('koa-static') const HTMLPlugin = require('html-webpack-plugin') const history = require('connect-history-api-fallback') + const portfinder = require('portfinder') const prepare = require('./prepare') const HeadPlugin = require('./webpack/HeadPlugin') @@ -71,7 +72,12 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { } const compiler = webpack(config) - const port = cliOptions.port || options.siteConfig.port || 8080 + portfinder.basePort = cliOptions.port || options.siteConfig.port || 8080 + const port = await portfinder.getPortPromise() + .then((port) => { + return port + }) + .catch(err => console.log(err)) let isFirst = true compiler.hooks.done.tap('vuepress', () => { diff --git a/package.json b/package.json index fc199cecc6..165c2de7d6 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "nprogress": "^0.2.0", "object-assign": "^4.1.1", "optimize-css-assets-webpack-plugin": "^4.0.0", + "portfinder": "^1.0.13", "postcss-loader": "^2.1.3", "prismjs": "^1.13.0", "register-service-worker": "^1.2.0", From bdf22f01ebf2a00d4378c30707ac38875357724c Mon Sep 17 00:00:00 2001 From: fadysamirsadek Date: Sun, 15 Apr 2018 02:47:25 +0200 Subject: [PATCH 2/4] removed unused code --- lib/dev.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/dev.js b/lib/dev.js index fadc095f7b..4ae7511802 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -74,9 +74,6 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { const compiler = webpack(config) portfinder.basePort = cliOptions.port || options.siteConfig.port || 8080 const port = await portfinder.getPortPromise() - .then((port) => { - return port - }) .catch(err => console.log(err)) let isFirst = true From 2c2fed8b97cfc7f8a9e7dee84070908214348681 Mon Sep 17 00:00:00 2001 From: fadysamirsadek Date: Sun, 15 Apr 2018 20:04:23 +0200 Subject: [PATCH 3/4] fix(dev build): removed catch statement and replaced port 8080 with 8000 as port 8080 was used by webpack --- lib/dev.js | 3 +-- yarn.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/dev.js b/lib/dev.js index 4ae7511802..b67d1337f1 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -72,9 +72,8 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { } const compiler = webpack(config) - portfinder.basePort = cliOptions.port || options.siteConfig.port || 8080 + portfinder.basePort = cliOptions.port || options.siteConfig.port || 8000 const port = await portfinder.getPortPromise() - .catch(err => console.log(err)) let isFirst = true compiler.hooks.done.tap('vuepress', () => { diff --git a/yarn.lock b/yarn.lock index 4ba91a7de7..6500970102 100644 --- a/yarn.lock +++ b/yarn.lock @@ -298,6 +298,10 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" +async@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -4229,6 +4233,14 @@ pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" +portfinder@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" + dependencies: + async "^1.5.2" + debug "^2.2.0" + mkdirp "0.5.x" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" From e79651b7b1288883a72c10802186621dc461e861 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 15 Apr 2018 14:19:26 -0400 Subject: [PATCH 4/4] Update dev.js --- lib/dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dev.js b/lib/dev.js index b67d1337f1..601ff4c2e1 100644 --- a/lib/dev.js +++ b/lib/dev.js @@ -72,7 +72,7 @@ module.exports = async function dev (sourceDir, cliOptions = {}) { } const compiler = webpack(config) - portfinder.basePort = cliOptions.port || options.siteConfig.port || 8000 + portfinder.basePort = cliOptions.port || options.siteConfig.port || 8080 const port = await portfinder.getPortPromise() let isFirst = true