Skip to content

Commit acebe26

Browse files
committed
use correct base path
1 parent a3dc5cb commit acebe26

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.changeset/fresh-sheep-help.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
'@sveltejs/kit': patch
33
---
44

5-
[chore] get base from Vite server for welcome message
5+
[chore] return config from server start methods

packages/kit/src/cli.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,31 @@ prog
6464
async function start() {
6565
const { dev } = await import('./core/dev/index.js');
6666

67-
const { address_info, config, close } = await dev({
67+
const { server, config } = await dev({
6868
port,
6969
host,
7070
https
7171
});
7272

73+
const address_info = /** @type {import('net').AddressInfo} */ (
74+
/** @type {import('http').Server} */ (server.httpServer).address()
75+
);
76+
77+
const vite_config = server.config;
78+
7379
welcome({
7480
port: address_info.port,
7581
host: address_info.address,
76-
https: !!(https || config.server.https),
77-
open: first && (open || !!config.server.open),
78-
base: config.base,
79-
loose: config.server.fs.strict === false,
80-
allow: config.server.fs.allow
82+
https: !!(https || vite_config.server.https),
83+
open: first && (open || !!vite_config.server.open),
84+
base: config.kit.paths.base,
85+
loose: vite_config.server.fs.strict === false,
86+
allow: vite_config.server.fs.allow
8187
});
8288

8389
first = false;
8490

85-
return close;
91+
return server.close;
8692
}
8793

8894
async function relaunch() {
@@ -177,9 +183,9 @@ prog
177183

178184
const { preview } = await import('./core/preview/index.js');
179185

180-
const server = await preview({ port, host, https });
186+
const { config } = await preview({ port, host, https });
181187

182-
welcome({ port, host, https, open, base: server.config.base });
188+
welcome({ port, host, https, open, base: config.kit.paths.base });
183189
} catch (error) {
184190
handle_error(error);
185191
}

packages/kit/src/core/dev/index.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,8 @@ export async function dev({ port, host, https }) {
100100
const server = await vite.createServer(merged_config);
101101
await server.listen(port);
102102

103-
const address_info = /** @type {import('net').AddressInfo} */ (
104-
/** @type {import('http').Server} */ (server.httpServer).address()
105-
);
106-
107103
return {
108-
address_info,
109-
config: server.config,
110-
close: () => server.close()
104+
server,
105+
config
111106
};
112107
}

packages/kit/src/core/preview/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export async function preview({ port, host, https: use_https = false }) {
164164

165165
return new Promise((fulfil) => {
166166
http_server.listen(port, host, () => {
167-
fulfil(http_server);
167+
fulfil({ server: http_server, config });
168168
});
169169
});
170170
}

0 commit comments

Comments
 (0)