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
4 changes: 2 additions & 2 deletions packages/vite/src/node/__tests__/dev.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ describe('resolveBuildEnvironmentOptions in dev', () => {
describe('the dev server', () => {
let server: ViteDevServer

afterEach(() => {
server?.close()
afterEach(async () => {
await server?.close()
})

test('resolves the server URLs before the httpServer listening events are called', async () => {
Expand Down
10 changes: 7 additions & 3 deletions packages/vite/src/node/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ cli
logger.error(colors.red(`error when starting dev server:\n${e.stack}`), {
error: e,
})
stopProfiler(logger.info)
await stopProfiler(logger.info)
process.exit(1)
}
})
Expand Down Expand Up @@ -353,7 +353,9 @@ cli
)
process.exit(1)
} finally {
stopProfiler((message) => createLogger(options.logLevel).info(message))
await stopProfiler((message) =>
createLogger(options.logLevel).info(message),
)
}
},
)
Expand Down Expand Up @@ -444,7 +446,9 @@ cli
)
process.exit(1)
} finally {
stopProfiler((message) => createLogger(options.logLevel).info(message))
await stopProfiler((message) =>
createLogger(options.logLevel).info(message),
)
}
},
)
Expand Down
3 changes: 2 additions & 1 deletion packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2485,7 +2485,8 @@ const makeScssWorker = (
} satisfies ScssWorkerResult
},
async stop() {
;(await compilerPromise)?.dispose()
const compiler = await compilerPromise
await compiler?.dispose()
compilerPromise = undefined
},
}
Expand Down
6 changes: 3 additions & 3 deletions packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async function createDevServer() {
noDiscovery: true,
},
})
server.environments.ssr.pluginContainer.buildStart({})
await server.environments.ssr.pluginContainer.buildStart({})
return server
}

Expand Down Expand Up @@ -93,7 +93,7 @@ test('virtual module invalidation simple', async () => {
},
],
})
server.environments.ssr.pluginContainer.buildStart({})
await server.environments.ssr.pluginContainer.buildStart({})

const mod1 = await server.ssrLoadModule('virtual:test')
expect(mod1.default).toEqual(1)
Expand Down Expand Up @@ -151,7 +151,7 @@ test('virtual module invalidation nested', async () => {
},
],
})
server.environments.ssr.pluginContainer.buildStart({})
await server.environments.ssr.pluginContainer.buildStart({})

const mod1 = await server.ssrLoadModule('virtual:test')
expect(mod1.default).toEqual(1)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/ssr/__tests__/ssrStacktrace.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async function createDevServer() {
noDiscovery: true,
},
})
server.environments.ssr.pluginContainer.buildStart({})
await server.environments.ssr.pluginContainer.buildStart({})
return server
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ describe('running module runner inside a worker and using the ModuleRunnerTransp
)
})

afterAll(() => {
server.close()
worker.terminate()
afterAll(async () => {
await Promise.allSettled([server.close(), worker.terminate()])
rpc.$close()
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ describe('running module runner inside a worker', () => {
},
},
})
onTestFinished(() => {
server.close()
worker.terminate()
onTestFinished(async () => {
await Promise.allSettled([server.close(), worker.terminate()])
})
const channel = new BroadcastChannel('vite-worker')
return new Promise<void>((resolve, reject) => {
Expand Down
Loading