fix: watch related fixes (#158)

Author: sapphi-red

packages/vite/src/node/build.ts

@@ -860,8 +860,7 @@ async function buildEnvironment(
             prepareOutDir(resolvedOutDirs, emptyOutDir, environment)
           }
         } else if (event.code === 'BUNDLE_END') {
-          // FIXME: https://github.com/rolldown/rolldown/issues/4380
-          // event.result.close()
+          event.result.close()
           logger.info(colors.cyan(`built in ${event.duration}ms.`))
         } else if (event.code === 'ERROR') {
           outputBuildError(event.error)

playground/vitestSetup.ts

@@ -303,17 +303,14 @@ export async function notifyRebuildComplete(
   const callback = (event: RolldownWatcherEvent): void => {
     if (event.code === 'END') {
       resolveFn?.()
-      resolveFn = undefined // set to undefined instead of watcher.off for now
     }
   }
   watcher.on('event', callback)
   await new Promise<void>((resolve) => {
     resolveFn = resolve
   })
 
-  // TODO: not supported yet (https://github.com/rolldown/rolldown/issues/4382)
-  // return watcher.off('event', callback)
-  return watcher
+  return watcher.off('event', callback)
 }
 
 export function createInMemoryLogger(logs: string[]): Logger {