wrangler 2.0.12 → 2.0.16

package/src/dev/use-esbuild.ts

@@ -1,4 +1,5 @@
 import assert from "node:assert";
+import { watch } from "chokidar";
 import { useApp } from "ink";
 import { useState, useEffect } from "react";
 import { bundleWorker } from "../bundle";
@@ -9,107 +10,141 @@ import type { CfModule } from "../worker";
 import type { WatchMode } from "esbuild";
 
 export type EsbuildBundle = {
-  id: number;
-  path: string;
-  entry: Entry;
-  type: "esm" | "commonjs";
-  modules: CfModule[];
+	id: number;
+	path: string;
+	entry: Entry;
+	type: "esm" | "commonjs";
+	modules: CfModule[];
 };
 
 export function useEsbuild({
-  entry,
-  destination,
-  staticRoot,
-  jsxFactory,
-  jsxFragment,
-  rules,
-  serveAssetsFromWorker,
-  tsconfig,
-  minify,
-  nodeCompat,
+	entry,
+	destination,
+	jsxFactory,
+	jsxFragment,
+	rules,
+	serveAssetsFromWorker,
+	tsconfig,
+	minify,
+	nodeCompat,
+	define,
+	noBundle,
 }: {
-  entry: Entry;
-  destination: string | undefined;
-  staticRoot: string | undefined;
-  jsxFactory: string | undefined;
-  jsxFragment: string | undefined;
-  rules: Config["rules"];
-  serveAssetsFromWorker: boolean;
-  tsconfig: string | undefined;
-  minify: boolean | undefined;
-  nodeCompat: boolean | undefined;
+	entry: Entry;
+	destination: string | undefined;
+	jsxFactory: string | undefined;
+	jsxFragment: string | undefined;
+	rules: Config["rules"];
+	define: Config["define"];
+	serveAssetsFromWorker: boolean;
+	tsconfig: string | undefined;
+	minify: boolean | undefined;
+	nodeCompat: boolean | undefined;
+	noBundle: boolean;
 }): EsbuildBundle | undefined {
-  const [bundle, setBundle] = useState<EsbuildBundle>();
-  const { exit } = useApp();
-  useEffect(() => {
-    let stopWatching: (() => void) | undefined = undefined;
+	const [bundle, setBundle] = useState<EsbuildBundle>();
+	const { exit } = useApp();
+	useEffect(() => {
+		let stopWatching: (() => void) | undefined = undefined;
 
-    const watchMode: WatchMode = {
-      async onRebuild(error) {
-        if (error) logger.error("Watch build failed:", error);
-        else {
-          // nothing really changes here, so let's increment the id
-          // to change the return object's identity
-          setBundle((previousBundle) => {
-            assert(
-              previousBundle,
-              "Rebuild triggered with no previous build available"
-            );
-            return { ...previousBundle, id: previousBundle.id + 1 };
-          });
-        }
-      },
-    };
+		function updateBundle() {
+			// nothing really changes here, so let's increment the id
+			// to change the return object's identity
+			setBundle((previousBundle) => {
+				assert(
+					previousBundle,
+					"Rebuild triggered with no previous build available"
+				);
+				return { ...previousBundle, id: previousBundle.id + 1 };
+			});
+		}
 
-    async function build() {
-      if (!destination) return;
+		const watchMode: WatchMode = {
+			async onRebuild(error) {
+				if (error) logger.error("Watch build failed:", error);
+				else {
+					updateBundle();
+				}
+			},
+		};
 
-      const { resolvedEntryPointPath, bundleType, modules, stop } =
-        await bundleWorker(entry, destination, {
-          serveAssetsFromWorker,
-          jsxFactory,
-          jsxFragment,
-          rules,
-          watch: watchMode,
-          tsconfig,
-          minify,
-          nodeCompat,
-        });
+		async function build() {
+			if (!destination) return;
 
-      // Capture the `stop()` method to use as the `useEffect()` destructor.
-      stopWatching = stop;
+			const {
+				resolvedEntryPointPath,
+				bundleType,
+				modules,
+				stop,
+			}: Awaited<ReturnType<typeof bundleWorker>> = noBundle
+				? {
+						modules: [],
+						resolvedEntryPointPath: entry.file,
+						bundleType: entry.format === "modules" ? "esm" : "commonjs",
+						stop: undefined,
+				  }
+				: await bundleWorker(entry, destination, {
+						serveAssetsFromWorker,
+						jsxFactory,
+						jsxFragment,
+						rules,
+						watch: watchMode,
+						tsconfig,
+						minify,
+						nodeCompat,
+						define,
+						checkFetch: true,
+				  });
 
-      setBundle({
-        id: 0,
-        entry,
-        path: resolvedEntryPointPath,
-        type: bundleType,
-        modules,
-      });
-    }
+			// Capture the `stop()` method to use as the `useEffect()` destructor.
+			stopWatching = stop;
 
-    build().catch((err) => {
-      // If esbuild fails on first run, we want to quit the process
-      // since we can't recover from here
-      // related: https://github.com/evanw/esbuild/issues/1037
-      exit(err);
-    });
+			// if "noBundle" is true, then we need to manually watch the entry point and
+			// trigger "builds" when it changes
+			if (noBundle) {
+				const watcher = watch(entry.file, {
+					persistent: true,
+				}).on("change", async (_event) => {
+					updateBundle();
+				});
 
-    return () => {
-      stopWatching?.();
-    };
-  }, [
-    entry,
-    destination,
-    staticRoot,
-    jsxFactory,
-    jsxFragment,
-    serveAssetsFromWorker,
-    rules,
-    tsconfig,
-    exit,
-    minify,
-    nodeCompat,
-  ]);
-  return bundle;
+				stopWatching = () => {
+					watcher.close();
+				};
+			}
+
+			setBundle({
+				id: 0,
+				entry,
+				path: resolvedEntryPointPath,
+				type: bundleType,
+				modules,
+			});
+		}
+
+		build().catch((err) => {
+			// If esbuild fails on first run, we want to quit the process
+			// since we can't recover from here
+			// related: https://github.com/evanw/esbuild/issues/1037
+			exit(err);
+		});
+
+		return () => {
+			stopWatching?.();
+		};
+	}, [
+		entry,
+		destination,
+		jsxFactory,
+		jsxFragment,
+		serveAssetsFromWorker,
+		rules,
+		tsconfig,
+		exit,
+		noBundle,
+		minify,
+		nodeCompat,
+		define,
+	]);
+	return bundle;
 }