Skip to content

Commit 2802b6f

Browse files
authored
fix(bundling): fix baseUrl resolution for vite dev server (#13219)
1 parent 2bc9e84 commit 2802b6f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

packages/vite/src/executors/dev-server/dev-server.impl.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ export default async function* viteDevServerExecutor(
4444

4545
const server = await createServer(serverConfig);
4646

47-
await runViteDevServer(server, assetsResult);
47+
const baseUrl = await runViteDevServer(server, assetsResult);
4848

4949
yield {
5050
success: true,
51-
baseUrl: `${mergedOptions.https ? 'https' : 'http'}://${
52-
mergedOptions.host ?? 'localhost'
53-
}:${mergedOptions.port ?? 4200}`,
51+
baseUrl: baseUrl,
5452
};
5553

5654
// This Promise intentionally never resolves, leaving the process running
@@ -60,7 +58,7 @@ export default async function* viteDevServerExecutor(
6058
async function runViteDevServer(
6159
server: ViteDevServer,
6260
assetsResult: CopyAssetsResult
63-
) {
61+
): Promise<string> {
6462
try {
6563
await server.listen();
6664
server.printUrls();
@@ -75,6 +73,9 @@ async function runViteDevServer(
7573
process.on('SIGINT', processOnExit);
7674
process.on('SIGTERM', processOnExit);
7775
process.on('exit', processOnExit);
76+
return `${server.config?.server?.https ? 'https' : 'http'}://${
77+
server.config?.server?.host
78+
}:${server.config?.server?.port}`;
7879
} catch (err) {
7980
console.log(err);
8081
}

0 commit comments

Comments
 (0)