fix(shortcuts): cleanup

Author: sxzz

src/features/shortcuts.ts

@@ -11,7 +11,7 @@ export interface Shortcut {
   action: () => void | Promise<void>
 }
 
-export function shortcuts(restart: () => void): void {
+export function shortcuts(restart: () => void): () => void {
   let actionRunning = false
   async function onInput(input: string) {
     if (actionRunning) return
@@ -20,7 +20,6 @@ export function shortcuts(restart: () => void): void {
         key: 'r',
         description: 'reload config and rebuild',
         action() {
-          rl.close()
           restart()
         },
       },
@@ -72,4 +71,5 @@ export function shortcuts(restart: () => void): void {
     input: process.stdin,
   })
   rl.on('line', onInput)
+  return () => rl.close()
 }

src/index.ts

@@ -36,7 +36,7 @@ export async function build(userOptions: Options = {}): Promise<void> {
   const rebuilds = await Promise.all(
     configs.map((options) => buildSingle(options, clean)),
   )
-  const disposeCbs: (() => Promise<void>)[] = []
+  const disposeCbs: (() => void | Promise<void>)[] = []
 
   for (const [i, config] of configs.entries()) {
     const rebuild = rebuilds[i]
@@ -46,8 +46,9 @@ export async function build(userOptions: Options = {}): Promise<void> {
     disposeCbs.push(() => watcher.close())
   }
 
+  // Watch mode with shortcuts
   if (disposeCbs.length) {
-    shortcuts(restart)
+    disposeCbs.push(shortcuts(restart))
   }
 
   async function restart() {