Working on #671

smapiot · Feb 5, 2024 · 3b5ce14 · 3b5ce14
1 parent b77d506
commit 3b5ce14
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/tooling/piral-cli/src/apps/debug-piral.ts b/src/tooling/piral-cli/src/apps/debug-piral.ts
@@ -142,9 +142,6 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
 
     await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, piralInstances });
 
-    watcherContext.watch(join(root, packageJson));
-    watcherContext.watch(join(root, piralJson));
-
     const bundler = await callPiralDebug(
       {
         root,
@@ -162,6 +159,10 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
       bundlerName,
     );
 
+    watcherContext.watch(join(root, packageJson));
+    watcherContext.watch(join(root, piralJson));
+    watcherContext.onClean(() => bundler.stop());
+
     bundler.ready().then(() => logDone(`Ready!`));
 
     bundler.on((args) => {

diff --git a/src/tooling/piral-cli/src/build/bundler-calls.ts b/src/tooling/piral-cli/src/build/bundler-calls.ts
@@ -37,6 +37,9 @@ function createBundler(cwd: string, ps: ChildProcess, args: any) {
         });
       }
     },
+    stop() {
+      ps.kill();
+    },
     on(cb: BundleListener) {
       listeners.push(cb);
     },

diff --git a/src/tooling/piral-cli/src/common/watcher.ts b/src/tooling/piral-cli/src/common/watcher.ts
@@ -7,7 +7,7 @@ export interface WatcherRef<T> {
 }
 
 export interface WatcherContext {
-  onClean(dispose: () => void): void;
+  onClean(dispose: () => void | Promise<void>): void;
   watch(file: string): void;
   dependOn<T>(ref: WatcherRef<T>): void;
   close(): void;
@@ -19,7 +19,7 @@ export function watcherTask<T = void>(cb: (watcherContext: WatcherContext) => Pr
   let pending = false;
   let notify = () => {};
 
-  const disposers: Array<() => void> = [];
+  const disposers: Array<() => void | Promise<void>> = [];
   const triggers: Array<() => void> = [];
   const end = new Promise<void>(resolve => {
     notify = resolve;
@@ -36,16 +36,13 @@ export function watcherTask<T = void>(cb: (watcherContext: WatcherContext) => Pr
     if (!pending) {
       pending = true;
       await running;
-      disposers.splice(0, disposers.length).forEach((dispose) => {
-        dispose();
-      });
+      await Promise.all(disposers.splice(0, disposers.length).map((dispose) => dispose()));
+
       pending = false;
       context.status = 'reoccuring';
       await run();
 
-      triggers.splice(0, triggers.length).forEach((trigger) => {
-        trigger();
-      });
+      triggers.splice(0, triggers.length).forEach((trigger) => trigger());
     }
   };
 

diff --git a/src/tooling/piral-cli/src/types/common.ts b/src/tooling/piral-cli/src/types/common.ts
@@ -112,6 +112,7 @@ export interface BundleDetails {
 export interface Bundler {
   readonly bundle: BundleDetails;
   start(): void;
+  stop(): void;
   on(cb: (args: any) => void): void;
   off(cb: (args: any) => void): void;
   ready(): Promise<void>;