From 9bb982eb28feeaf7896112a28996e1e6ba72f8a2 Mon Sep 17 00:00:00 2001 From: "Adrian B. Danieli" Date: Fri, 8 Jun 2018 16:41:28 -0700 Subject: [PATCH 1/2] Use devServer.public to build sockjsUrl, if defined. --- packages/@vue/cli-service/lib/commands/serve.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js index 38a971e9d0..c433b6cef7 100644 --- a/packages/@vue/cli-service/lib/commands/serve.js +++ b/packages/@vue/cli-service/lib/commands/serve.js @@ -82,7 +82,8 @@ module.exports = (api, options) => { // inject dev & hot-reload middleware entries if (!isProduction) { - const sockjsUrl = url.format({ + const public = projectDevServerOptions.public + const sockjsUrl = public ? `//${public}/sockjs-node` : url.format({ protocol, port, hostname: urls.lanUrlForConfig || 'localhost', From 97e67728f4b3032502bdd38fda6da6b56998025d Mon Sep 17 00:00:00 2001 From: "Adrian B. Danieli" Date: Fri, 8 Jun 2018 17:25:04 -0700 Subject: [PATCH 2/2] Rename `public` to `publicOpt`, as it is a reserve word. --- packages/@vue/cli-service/lib/commands/serve.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js index c433b6cef7..11b91bfbf1 100644 --- a/packages/@vue/cli-service/lib/commands/serve.js +++ b/packages/@vue/cli-service/lib/commands/serve.js @@ -82,8 +82,8 @@ module.exports = (api, options) => { // inject dev & hot-reload middleware entries if (!isProduction) { - const public = projectDevServerOptions.public - const sockjsUrl = public ? `//${public}/sockjs-node` : url.format({ + const publicOpt = projectDevServerOptions.public + const sockjsUrl = publicOpt ? `//${publicOpt}/sockjs-node` : url.format({ protocol, port, hostname: urls.lanUrlForConfig || 'localhost',