Cleanup

Co-authored-by: Copilot <copilot@github.com>

Author: mjbvz

extensions/esbuild-extension-common.mts

@@ -12,14 +12,6 @@ type BuildOptions = Partial<esbuild.BuildOptions> & {
 	outdir: string;
 };
 
-/**
- * Build the source code once using esbuild.
- */
-async function build(options: BuildOptions, didBuild?: (outDir: string) => unknown): Promise<void> {
-	await esbuild.build(options);
-	await didBuild?.(options.outdir);
-}
-
 interface RunConfig {
 	readonly platform: 'node' | 'browser';
 	readonly format?: 'cjs' | 'esm';
@@ -80,12 +72,31 @@ export async function run(config: RunConfig, args: string[], didBuild?: (outDir:
 		if (didBuild) {
 			resolvedOptions.plugins = [
 				...(resolvedOptions.plugins || []),
-				{ name: 'did-build', setup(pluginBuild) { pluginBuild.onEnd(() => { didBuild(outdir); }); } },
+				{
+					name: 'did-build', setup(pluginBuild) {
+						pluginBuild.onEnd(async result => {
+							if (result.errors.length > 0) {
+								return;
+							}
+
+							try {
+								await didBuild(outdir);
+							} catch (error) {
+								console.error('didBuild failed:', error);
+							}
+						});
+					},
+				}
 			];
 		}
 		const ctx = await esbuild.context(resolvedOptions);
 		await ctx.watch();
 	} else {
-		return build(resolvedOptions, didBuild).catch(() => process.exit(1));
+		try {
+			await esbuild.build(resolvedOptions);
+			await didBuild?.(outdir);
+		} catch {
+			process.exit(1);
+		}
 	}
 }

extensions/esbuild-webview-common.mts

@@ -10,18 +10,10 @@ import path from 'node:path';
 import esbuild from 'esbuild';
 
 export type BuildOptions = Partial<esbuild.BuildOptions> & {
-	entryPoints: string[] | Record<string, string> | { in: string; out: string }[];
-	outdir: string;
+	readonly entryPoints: esbuild.BuildOptions['entryPoints'];
+	readonly outdir: string;
 };
 
-/**
- * Build the source code once using esbuild.
- */
-async function build(options: BuildOptions, didBuild?: (outDir: string) => unknown): Promise<void> {
-	await esbuild.build(options);
-	await didBuild?.(options.outdir);
-}
-
 export async function run(
 	config: {
 		srcDir: string;
@@ -60,12 +52,31 @@ export async function run(
 		if (didBuild) {
 			resolvedOptions.plugins = [
 				...(resolvedOptions.plugins || []),
-				{ name: 'did-build', setup(pluginBuild) { pluginBuild.onEnd(() => { didBuild(outdir); }); } },
+				{
+					name: 'did-build', setup(pluginBuild) {
+						pluginBuild.onEnd(async result => {
+							if (result.errors.length > 0) {
+								return;
+							}
+
+							try {
+								await didBuild(outdir);
+							} catch (error) {
+								console.error('didBuild failed:', error);
+							}
+						});
+					},
+				}
 			];
 		}
 		const ctx = await esbuild.context(resolvedOptions);
 		await ctx.watch();
 	} else {
-		return build(resolvedOptions, didBuild).catch(() => process.exit(1));
+		try {
+			await esbuild.build(resolvedOptions);
+			await didBuild?.(outdir);
+		} catch {
+			process.exit(1);
+		}
 	}
 }