fix: speed-up exit when stopping watch (#591)

vitest-dev · Jan 20, 2022 · ae17bb9 · ae17bb9
1 parent 9a7458a
commit ae17bb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
@@ -350,13 +350,15 @@ export class Vitest {
     return this.closingPromise
   }
 
-  async exit() {
+  async exit(force = false) {
     setTimeout(() => {
       console.warn(`close timed out after ${CLOSE_TIMEOUT}ms`)
       process.exit()
     }, CLOSE_TIMEOUT).unref()
 
     await this.close()
+    if (force)
+      process.exit()
   }
 
   async report<T extends keyof Reporter>(name: T, ...args: ArgumentsType<Reporter[T]>) {

diff --git a/packages/vitest/src/node/stdin.ts b/packages/vitest/src/node/stdin.ts
@@ -24,7 +24,7 @@ export function registerConsoleShortcuts(ctx: Vitest) {
   process.stdin.on('keypress', (str: string, key: any) => {
     // ctrl-c or esc
     if (str === '\x03' || str === '\x1B' || (key && key.ctrl && key.name === 'c'))
-      return ctx.exit()
+      return ctx.exit(true)
 
     // is running, ignore keypress
     if (ctx.runningPromise)
@@ -43,7 +43,7 @@ export function registerConsoleShortcuts(ctx: Vitest) {
       return ctx.rerunFiles(undefined, 'rerun all')
     // quit
     if (name === 'q')
-      return ctx.exit()
+      return ctx.exit(true)
 
     // TODO: add more commands
   })