Merge pull request ejgallego#1033 from ejgallego/bump_esbuild2

[build] [code] [wasm] Bump esbuild deps, make extension build less verbose

Author: ejgallego

CHANGES.md

@@ -1,3 +1,9 @@
+# unreleased
+------------------------------
+
+ - [build] [wasm] [code] bump esbuild from 0.16 to 0.25, miscellaneous
+   npm dependencies bump (@ejgallego, #1033)
+
 # coq-lsp 0.2.4: (W)Activation
 ------------------------------
 

Makefile

@@ -29,7 +29,7 @@ ocaml-lsp-server
 
 .PHONY: build
 build: coq_boot
-	dune build $(DUNEOPT) $(PKG_SET)
+	@dune build $(DUNEOPT) $(PKG_SET)
 
 .PHONY: check
 check: coq_boot
@@ -159,26 +159,33 @@ OUTDIR_NODE=editor/code/wasm-bin/node_modules
 
 ifdef ESBUILD_DEBUG
 NPM_TARGET=esbuild
+NPM_OPTS=
 else
 NPM_TARGET=vscode:prepublish
+NPM_OPTS=--silent
 endif
 
 .PHONY: wasm-bin
 wasm-bin:
-	dune build $(WAFILES)
-	mkdir -p $(OUTDIR)
-	cp -af _build/default/lsp-server/wasm/wacoq_worker.bc $(OUTDIR)
-	cp -af _build/default/lsp-server/wasm/*.wasm $(OUTDIR)
-	cd lsp-server/wasm/ && npm i && npm run $(NPM_TARGET)
-	cp -af lsp-server/wasm/out/wacoq_worker.js $(OUTDIR)
-	mkdir -p $(OUTDIR_NODE)/ocaml-wasm/                        && cp -af $(WASM_NODE)/ocaml-wasm/bin/                        $(OUTDIR_NODE)/ocaml-wasm/
-	mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--num/             && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--num/bin/             $(OUTDIR_NODE)/@ocaml-wasm/4.12--num/
-	mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--zarith/          && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--zarith/bin/          $(OUTDIR_NODE)/@ocaml-wasm/4.12--zarith/
-	mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--janestreet-base/ && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--janestreet-base/bin/ $(OUTDIR_NODE)/@ocaml-wasm/4.12--janestreet-base/
+	@dune build $(WAFILES)
+	@mkdir -p $(OUTDIR)
+	@cp -af _build/default/lsp-server/wasm/wacoq_worker.bc $(OUTDIR)
+	@cp -af _build/default/lsp-server/wasm/*.wasm $(OUTDIR)
+	@cd lsp-server/wasm/ && npm i $(NPM_OPTS) && npm run $(NPM_OPTS) $(NPM_TARGET)
+	@cp -af lsp-server/wasm/out/wacoq_worker.js $(OUTDIR)
+	@mkdir -p $(OUTDIR_NODE)/ocaml-wasm/                        && cp -af $(WASM_NODE)/ocaml-wasm/bin/                        $(OUTDIR_NODE)/ocaml-wasm/
+	@mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--num/             && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--num/bin/             $(OUTDIR_NODE)/@ocaml-wasm/4.12--num/
+	@mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--zarith/          && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--zarith/bin/          $(OUTDIR_NODE)/@ocaml-wasm/4.12--zarith/
+	@mkdir -p $(OUTDIR_NODE)/@ocaml-wasm/4.12--janestreet-base/ && cp -af $(WASM_NODE)/@ocaml-wasm/4.12--janestreet-base/bin/ $(OUTDIR_NODE)/@ocaml-wasm/4.12--janestreet-base/
 
 .PHONY: extension
 extension: wasm-bin
-	cd editor/code && npm i && npm run $(NPM_TARGET)
+	@cd editor/code && npm i $(NPM_OPTS) && npm run $(NPM_OPTS) $(NPM_TARGET)
+
+# Without the wasm
+.PHONY: extension-code
+extension-code:
+	@cd editor/code && npm i $(NPM_OPTS) && npm run $(NPM_OPTS) $(NPM_TARGET)
 
 # Run prettier
 .PHONY: ts-fmt

editor/code/esbuild.mjs

@@ -2,30 +2,58 @@
 import process from "process";
 import * as esbuild from "esbuild";
 
-let watchConfig = (entry) => {
-  return {
-    onRebuild(error, result) {
-      console.log(`[watch] build started (rebuild for ${entry})`);
-      if (error) {
-        error.errors.forEach((error) =>
-          console.error(
-            `> ${error.location.file}:${error.location.line}:${error.location.column}: error: ${error.text}`
-          )
-        );
-      } else console.log(`[watch] build finished (rebuild for ${entry}`);
-    },
-  };
-};
-
-let watch = process.argv.includes("--watch") ? watchConfig : (entry) => false;
 let minify = process.argv.includes("--minify");
 let disable_sourcemap = process.argv.includes("--sourcemap=no");
 let sourcemap_client = disable_sourcemap ? null : { sourcemap: true };
 let sourcemap_view = disable_sourcemap ? null : { sourcemap: "inline" };
 
+let enableMeta = false;
+
+const plugins = [
+  {
+    name: "esbuild-problem-matcher",
+    setup(build) {
+      let file = build.initialOptions.entryPoints[0];
+
+      build.onStart(() => {
+        console.log(`[watch] build started for ${file}`);
+      });
+
+      build.onEnd((result) => {
+        if (result.errors.length > 0) {
+          result.errors.forEach((e) =>
+            console.error(
+              `> ${e.location.file}:${e.location.line}:${e.location.column}: error: ${e.text}`
+            )
+          );
+        } else {
+          console.log(`[watch] build finished for ${file}`);
+          if (enableMeta) {
+            fs.writeFileSync(
+              `${file}.json`,
+              JSON.stringify(result.metafile, null, 2)
+            );
+          }
+        }
+      });
+    },
+  },
+];
+
+const watchContext = async (ctxp) => {
+  let ctx = await ctxp;
+
+  if (process.argv.includes("--watch")) {
+    await ctx.watch();
+  } else {
+    await ctx.rebuild();
+    await ctx.dispose();
+  }
+};
+
 // Build of the VS Code extension, for electron (hence cjs + node)
-var node = esbuild
-  .build({
+var node = watchContext(
+  esbuild.context({
     entryPoints: ["./src/node.ts"],
     bundle: true,
     ...sourcemap_client,
@@ -34,15 +62,12 @@ var node = esbuild
     external: ["vscode"],
     outfile: "out/src/node.js",
     minify,
-    watch: watch("./src/node.ts"),
+    plugins,
   })
-  .then(() => {
-    console.log("[watch] build finished for ./src/node.ts");
-  })
-  .catch(() => process.exit(1));
+);
 
-var browser = esbuild
-  .build({
+var browser = watchContext(
+  esbuild.context({
     entryPoints: ["./src/browser.ts"],
     bundle: true,
     ...sourcemap_client,
@@ -51,30 +76,24 @@ var browser = esbuild
     external: ["vscode"],
     outfile: "out/src/browser.js",
     minify,
-    watch: watch("./src/browser.ts"),
-  })
-  .then(() => {
-    console.log("[watch] build finished for ./src/browser.ts");
+    plugins,
   })
-  .catch(() => process.exit(1));
+);
 
 // Build of the VS Code view, for modern Chrome (webview)
 function viewBuild(file) {
-  return esbuild
-    .build({
+  return watchContext(
+    esbuild.context({
       entryPoints: [file],
       bundle: true,
       ...sourcemap_view,
       platform: "browser",
       outdir: "out",
       outbase: ".",
       minify,
-      watch: watch(file),
-    })
-    .then(() => {
-      console.log(`[watch] build finished for ${file}`);
+      plugins,
     })
-    .catch(() => process.exit(1));
+  );
 }
 
 var infoView = viewBuild("./views/info/index.tsx");