Merge pull request #712 from KxSystems/ee-watch

Enhance watching

Author: ecmel

.vscode/tasks.json

@@ -8,19 +8,8 @@
       "isBackground": true,
       "label": "npm: watch",
       "problemMatcher": {
-        "owner": "typescript",
-        "source": "ts",
-        "applyTo": "closedDocuments",
-        "fileLocation": ["relative", "${cwd}"],
-        "pattern": {
-          "regexp": "^Error: Build failed[^:]*:([^:]*):([^:]*):([^:]*): (ERROR:.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "message": 4
-        },
+        "base": "$eslint-stylish",
         "background": {
-          "activeOnStart": true,
           "beginsPattern": {
             "regexp": "^esbuild:started$"
           },

esbuild.mjs

@@ -61,16 +61,20 @@ const webviewConfig = {
         context(webviewConfig),
         context(extensionConfig),
       ]);
-      await Promise.all(contexts.map((ctx) => ctx.rebuild()));
-      contexts.forEach((ctx) => ctx.watch({ delay: 500 }));
-      console.log("esbuild:watching");
+      await Promise.all(contexts.map((ctx) => ctx.rebuild())).finally(() =>
+        Promise.all(contexts.map((ctx) => ctx.watch({ delay: 500 })))
+          .then(() => console.log("esbuild:watching"))
+          .catch((err) => {
+            console.error(err);
+            process.exit(1);
+          }),
+      );
     } else {
       await build(serverConfig);
       await build(webviewConfig);
       await build(extensionConfig);
     }
   } catch (err) {
     console.error(err);
-    process.exit(1);
   }
 })();