Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/vite/src/node/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,23 @@ export async function preview(

const closeHttpServer = createServerCloseFn(httpServer)

// Promise used by `server.close()` to ensure `closeServer()` is only called once
let closeServerPromise: Promise<void> | undefined
const closeServer = async () => {
teardownSIGTERMListener(closeServerAndExit)
await closeHttpServer()
server.resolvedUrls = null
}

const server: PreviewServer = {
config,
middlewares: app,
httpServer,
async close() {
teardownSIGTERMListener(closeServerAndExit)
await closeHttpServer()
server.resolvedUrls = null
if (!closeServerPromise) {
closeServerPromise = closeServer()
}
return closeServerPromise
},
resolvedUrls: null,
printUrls() {
Expand Down
41 changes: 25 additions & 16 deletions packages/vite/src/node/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,28 @@ export async function _createServer(

const devHtmlTransformFn = createDevHtmlTransformFn(config)

// Promise used by `server.close()` to ensure `closeServer()` is only called once
let closeServerPromise: Promise<void> | undefined
const closeServer = async () => {
if (!middlewareMode) {
teardownSIGTERMListener(closeServerAndExit)
}

await Promise.allSettled([
watcher.close(),
ws.close(),
Promise.allSettled(
Object.values(server.environments).map((environment) =>
environment.close(),
),
),
closeHttpServer(),
server._ssrCompatModuleRunner?.close(),
])
server.resolvedUrls = null
server._ssrCompatModuleRunner = undefined
}

let server: ViteDevServer = {
config,
middlewares,
Expand Down Expand Up @@ -674,23 +696,10 @@ export async function _createServer(
}
},
async close() {
if (!middlewareMode) {
teardownSIGTERMListener(closeServerAndExit)
if (!closeServerPromise) {
closeServerPromise = closeServer()
}

await Promise.allSettled([
watcher.close(),
ws.close(),
Promise.allSettled(
Object.values(server.environments).map((environment) =>
environment.close(),
),
),
closeHttpServer(),
server._ssrCompatModuleRunner?.close(),
])
server.resolvedUrls = null
server._ssrCompatModuleRunner = undefined
return closeServerPromise
},
printUrls() {
if (server.resolvedUrls) {
Expand Down
Loading