From 59e5d29f8d9f11445418792ab52675bcc13b79c8 Mon Sep 17 00:00:00 2001
From: Noah Klayman <noahklayman@gmail.com>
Date: Thu, 4 Oct 2018 13:35:58 -0700
Subject: [PATCH 1/2] feat(serve): include networkUrl in resolved promise

---
 packages/@vue/cli-service/lib/commands/serve.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index dcd4cf30c7..3eed481463 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -262,7 +262,13 @@ module.exports = (api, options) => {
           // so other commands can do api.service.run('serve').then(...)
           resolve({
             server,
-            url: urls.localUrlForBrowser
+            url: urls.localUrlForBrowser,
+            networkUrl: url.format({
+              protocol,
+              hostname: urls.lanUrlForConfig,
+              port: port,
+              pathname: options.baseUrl || '/'
+            })
           })
         } else if (process.env.VUE_CLI_TEST) {
           // signal for test to check HMR

From 46a60db7a9041c4aa184eb9f3f465cdca0e6f0d5 Mon Sep 17 00:00:00 2001
From: Noah Klayman <noahklayman@gmail.com>
Date: Tue, 9 Oct 2018 11:30:01 -0700
Subject: [PATCH 2/2] fix(serve): set networkURL in prepareURLs instead of
 serve command

---
 packages/@vue/cli-service/lib/commands/serve.js   | 7 +------
 packages/@vue/cli-service/lib/util/prepareURLs.js | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index 3eed481463..d8dfe5e1cf 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -263,12 +263,7 @@ module.exports = (api, options) => {
           resolve({
             server,
             url: urls.localUrlForBrowser,
-            networkUrl: url.format({
-              protocol,
-              hostname: urls.lanUrlForConfig,
-              port: port,
-              pathname: options.baseUrl || '/'
-            })
+            networkUrl: urls.lanUrlForBrowser
           })
         } else if (process.env.VUE_CLI_TEST) {
           // signal for test to check HMR
diff --git a/packages/@vue/cli-service/lib/util/prepareURLs.js b/packages/@vue/cli-service/lib/util/prepareURLs.js
index 2a26030231..15b99e87eb 100644
--- a/packages/@vue/cli-service/lib/util/prepareURLs.js
+++ b/packages/@vue/cli-service/lib/util/prepareURLs.js
@@ -29,6 +29,7 @@ module.exports = function prepareUrls (protocol, host, port, pathname = '/') {
   const isUnspecifiedHost = host === '0.0.0.0' || host === '::'
   let prettyHost, lanUrlForConfig
   let lanUrlForTerminal = chalk.gray('unavailable')
+  let lanUrlForBrowser
   if (isUnspecifiedHost) {
     prettyHost = 'localhost'
     try {
@@ -44,6 +45,7 @@ module.exports = function prepareUrls (protocol, host, port, pathname = '/') {
         ) {
           // Address is private, format it for later use
           lanUrlForTerminal = prettyPrintUrl(lanUrlForConfig)
+          lanUrlForBrowser = formatUrl(lanUrlForConfig)
         } else {
           // Address is not private, so we will discard it
           lanUrlForConfig = undefined
@@ -56,12 +58,14 @@ module.exports = function prepareUrls (protocol, host, port, pathname = '/') {
     prettyHost = host
     lanUrlForConfig = host
     lanUrlForTerminal = prettyPrintUrl(lanUrlForConfig)
+    lanUrlForBrowser = formatUrl(lanUrlForConfig)
   }
   const localUrlForTerminal = prettyPrintUrl(prettyHost)
   const localUrlForBrowser = formatUrl(prettyHost)
   return {
     lanUrlForConfig,
     lanUrlForTerminal,
+    lanUrlForBrowser,
     localUrlForTerminal,
     localUrlForBrowser
   }