From 2802b6fe64576affb339c11eab4bae80e3fba7f3 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Thu, 17 Nov 2022 15:21:46 +0200
Subject: [PATCH] fix(bundling): fix baseUrl resolution for vite dev server
 (#13219)

---
 .../vite/src/executors/dev-server/dev-server.impl.ts  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/executors/dev-server/dev-server.impl.ts b/packages/vite/src/executors/dev-server/dev-server.impl.ts
index e472a4e2bf891..0ab106463f269 100644
--- a/packages/vite/src/executors/dev-server/dev-server.impl.ts
+++ b/packages/vite/src/executors/dev-server/dev-server.impl.ts
@@ -44,13 +44,11 @@ export default async function* viteDevServerExecutor(
 
   const server = await createServer(serverConfig);
 
-  await runViteDevServer(server, assetsResult);
+  const baseUrl = await runViteDevServer(server, assetsResult);
 
   yield {
     success: true,
-    baseUrl: `${mergedOptions.https ? 'https' : 'http'}://${
-      mergedOptions.host ?? 'localhost'
-    }:${mergedOptions.port ?? 4200}`,
+    baseUrl: baseUrl,
   };
 
   // This Promise intentionally never resolves, leaving the process running
@@ -60,7 +58,7 @@ export default async function* viteDevServerExecutor(
 async function runViteDevServer(
   server: ViteDevServer,
   assetsResult: CopyAssetsResult
-) {
+): Promise<string> {
   try {
     await server.listen();
     server.printUrls();
@@ -75,6 +73,9 @@ async function runViteDevServer(
     process.on('SIGINT', processOnExit);
     process.on('SIGTERM', processOnExit);
     process.on('exit', processOnExit);
+    return `${server.config?.server?.https ? 'https' : 'http'}://${
+      server.config?.server?.host
+    }:${server.config?.server?.port}`;
   } catch (err) {
     console.log(err);
   }