Merge pull request #312283 from mjbvz/dev/mjbvz/vague-dormouse

Switch to esbuild's native watcher for building extensions

Author: mjbvz

extensions/esbuild-extension-common.mts

@@ -12,25 +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);
-}
-
-/**
- * Build the source code once using esbuild, logging errors instead of throwing.
- */
-async function tryBuild(options: BuildOptions, didBuild?: (outDir: string) => unknown): Promise<void> {
-	try {
-		await build(options, didBuild);
-	} catch (err) {
-		console.error(err);
-	}
-}
-
 interface RunConfig {
 	readonly platform: 'node' | 'browser';
 	readonly format?: 'cjs' | 'esm';
@@ -88,10 +69,34 @@ export async function run(config: RunConfig, args: string[], didBuild?: (outDir:
 
 	const isWatch = args.indexOf('--watch') >= 0;
 	if (isWatch) {
-		await tryBuild(resolvedOptions, didBuild);
-		const watcher = await import('@parcel/watcher');
-		watcher.subscribe(config.srcDir, () => tryBuild(resolvedOptions, didBuild));
+		if (didBuild) {
+			resolvedOptions.plugins = [
+				...(resolvedOptions.plugins || []),
+				{
+					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,38 +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({
-		bundle: true,
-		minify: true,
-		sourcemap: false,
-		format: 'esm',
-		platform: 'browser',
-		target: ['es2024'],
-		...options,
-	});
-
-	await didBuild?.(options.outdir);
-}
-
-/**
- * Build the source code once using esbuild, logging errors instead of throwing.
- */
-async function tryBuild(options: BuildOptions, didBuild?: (outDir: string) => unknown): Promise<void> {
-	try {
-		await build(options, didBuild);
-	} catch (err) {
-		console.error(err);
-	}
-}
-
 export async function run(
 	config: {
 		srcDir: string;
@@ -61,6 +33,12 @@ export async function run(
 	}
 
 	const resolvedOptions: BuildOptions = {
+		bundle: true,
+		minify: true,
+		sourcemap: false,
+		format: 'esm',
+		platform: 'browser',
+		target: ['es2024'],
 		entryPoints: config.entryPoints,
 		outdir,
 		logOverride: {
@@ -71,10 +49,34 @@ export async function run(
 
 	const isWatch = args.indexOf('--watch') >= 0;
 	if (isWatch) {
-		await tryBuild(resolvedOptions, didBuild);
-		const watcher = await import('@parcel/watcher');
-		watcher.subscribe(config.srcDir, () => tryBuild(resolvedOptions, didBuild));
+		if (didBuild) {
+			resolvedOptions.plugins = [
+				...(resolvedOptions.plugins || []),
+				{
+					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);
+		}
 	}
 }