Merge pull request #116 from marp-team/fix-up-watch

Fix up not working watch mode
marp-team · Jun 28, 2019 · 3f13d98 · 3f13d98
2 parents 3da75c5 + 5d3578e
commit 3f13d98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Downgrade pkg to v4.3.x to fix segfault in the standalone build for Windows ([#111](https://github.com/marp-team/marp-cli/issues/111), [#112](https://github.com/marp-team/marp-cli/pull/112))
 - Improve error handling while running server ([#115](https://github.com/marp-team/marp-cli/pull/115))
+- Fix up not working watch mode ([#116](https://github.com/marp-team/marp-cli/pull/116))
 
 ## v0.11.0 - 2019-06-24
 

diff --git a/src/marp-cli.ts b/src/marp-cli.ts
@@ -313,11 +313,14 @@ export default async function(argv: string[] = []): Promise<number> {
     if (!(e instanceof CLIError)) throw e
 
     cli.error(e.message)
+
+    // Stop running notifier and watcher to exit process correctly
+    // (NOTE: Don't close in the finally block to keep watching)
+    notifier.stop()
+    if (watcherInstance) watcherInstance.chokidar.close()
+
     return e.errorCode
   } finally {
     await Converter.closeBrowser()
-    notifier.stop()
-
-    if (watcherInstance) watcherInstance.chokidar.close()
   }
 }