Skip to content

Commit 79d10ed

Browse files
authored
fix: add missing awaits (#20697)
1 parent 8099582 commit 79d10ed

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

packages/vite/src/node/__tests__/dev.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ describe('resolveBuildEnvironmentOptions in dev', () => {
2424
describe('the dev server', () => {
2525
let server: ViteDevServer
2626

27-
afterEach(() => {
28-
server?.close()
27+
afterEach(async () => {
28+
await server?.close()
2929
})
3030

3131
test('resolves the server URLs before the httpServer listening events are called', async () => {

packages/vite/src/node/cli.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ cli
278278
logger.error(colors.red(`error when starting dev server:\n${e.stack}`), {
279279
error: e,
280280
})
281-
stopProfiler(logger.info)
281+
await stopProfiler(logger.info)
282282
process.exit(1)
283283
}
284284
})
@@ -353,7 +353,9 @@ cli
353353
)
354354
process.exit(1)
355355
} finally {
356-
stopProfiler((message) => createLogger(options.logLevel).info(message))
356+
await stopProfiler((message) =>
357+
createLogger(options.logLevel).info(message),
358+
)
357359
}
358360
},
359361
)
@@ -444,7 +446,9 @@ cli
444446
)
445447
process.exit(1)
446448
} finally {
447-
stopProfiler((message) => createLogger(options.logLevel).info(message))
449+
await stopProfiler((message) =>
450+
createLogger(options.logLevel).info(message),
451+
)
448452
}
449453
},
450454
)

packages/vite/src/node/plugins/css.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,8 @@ const makeScssWorker = (
24812481
} satisfies ScssWorkerResult
24822482
},
24832483
async stop() {
2484-
;(await compilerPromise)?.dispose()
2484+
const compiler = await compilerPromise
2485+
await compiler?.dispose()
24852486
compilerPromise = undefined
24862487
},
24872488
}

packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ async function createDevServer() {
1717
noDiscovery: true,
1818
},
1919
})
20-
server.environments.ssr.pluginContainer.buildStart({})
20+
await server.environments.ssr.pluginContainer.buildStart({})
2121
return server
2222
}
2323

@@ -93,7 +93,7 @@ test('virtual module invalidation simple', async () => {
9393
},
9494
],
9595
})
96-
server.environments.ssr.pluginContainer.buildStart({})
96+
await server.environments.ssr.pluginContainer.buildStart({})
9797

9898
const mod1 = await server.ssrLoadModule('virtual:test')
9999
expect(mod1.default).toEqual(1)
@@ -151,7 +151,7 @@ test('virtual module invalidation nested', async () => {
151151
},
152152
],
153153
})
154-
server.environments.ssr.pluginContainer.buildStart({})
154+
await server.environments.ssr.pluginContainer.buildStart({})
155155

156156
const mod1 = await server.ssrLoadModule('virtual:test')
157157
expect(mod1.default).toEqual(1)

packages/vite/src/node/ssr/__tests__/ssrStacktrace.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async function createDevServer() {
1313
noDiscovery: true,
1414
},
1515
})
16-
server.environments.ssr.pluginContainer.buildStart({})
16+
await server.environments.ssr.pluginContainer.buildStart({})
1717
return server
1818
}
1919

packages/vite/src/node/ssr/runtime/__tests__/server-worker-runner.invoke.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ describe('running module runner inside a worker and using the ModuleRunnerTransp
5959
)
6060
})
6161

62-
afterAll(() => {
63-
server.close()
64-
worker.terminate()
62+
afterAll(async () => {
63+
await Promise.allSettled([server.close(), worker.terminate()])
6564
rpc.$close()
6665
})
6766

packages/vite/src/node/ssr/runtime/__tests__/server-worker-runner.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@ describe('running module runner inside a worker', () => {
7575
},
7676
},
7777
})
78-
onTestFinished(() => {
79-
server.close()
80-
worker.terminate()
78+
onTestFinished(async () => {
79+
await Promise.allSettled([server.close(), worker.terminate()])
8180
})
8281
const channel = new BroadcastChannel('vite-worker')
8382
return new Promise<void>((resolve, reject) => {

0 commit comments

Comments
 (0)