Kill the ReScript process if applicable when bundle is closing (#21)

jihchi · Sep 27, 2023 · e758f57 · e758f57
1 parent 09a3138
commit e758f57
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,11 @@ import parseCompilerLog from './parseCompilerLog.js';
 
 const logPrefix = chalk.cyan('[@jihchi/vite-plugin-rescript]');
 
-async function launchReScript(watch: boolean) {
+type ReScriptProcess = {
+  shutdown: () => void;
+};
+
+async function launchReScript(watch: boolean): Promise<ReScriptProcess> {
   const cmd = watch
     ? 'rescript build -with-deps -w'
     : 'rescript build -with-deps';
@@ -44,6 +48,14 @@ async function launchReScript(watch: boolean) {
   } else {
     await result;
   }
+
+  return {
+    shutdown() {
+      if (!result.killed) {
+        result.kill();
+      }
+    },
+  };
 }
 
 interface Config {
@@ -56,6 +68,7 @@ interface Config {
 export default function createReScriptPlugin(config?: Config): Plugin {
   let root: string;
   let usingLoader = false;
+  let childProcessReScript: undefined | ReScriptProcess;
 
   // Retrieve loader config
   const output = config?.loader?.output ?? './lib/es6';
@@ -82,7 +95,7 @@ export default function createReScriptPlugin(config?: Config): Plugin {
       const isLocked = existsSync(path.resolve('./.bsb.lock'));
 
       if (needReScript) {
-        await launchReScript(
+        childProcessReScript = await launchReScript(
           !isLocked && (command === 'serve' || Boolean(build.watch))
         );
       }
@@ -187,5 +200,9 @@ export default function createReScriptPlugin(config?: Config): Plugin {
 
       return;
     },
+    async closeBundle() {
+      childProcessReScript?.shutdown();
+      return;
+    },
   };
 }
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -8,4 +8,10 @@ describe('@jihchi/vite-plugin-rescript', () => {
     expect(actual).toHaveProperty('configResolved');
     expect(actual.configResolved).toBeInstanceOf(Function);
   });
+
+  it('invokes closeBundle hook without crashing', async () => {
+    const actual = Plugin();
+    expect(actual).toHaveProperty('closeBundle');
+    await expect(actual.closeBundle()).resolves.toEqual(undefined);
+  });
 });