wrangler 0.0.0-e1c615f → 0.0.0-e3cab74

package/src/dev.tsx

@@ -1,64 +1,67 @@
-import esbuild from "esbuild";
-import { readFile } from "fs/promises";
-import { existsSync } from "fs";
-import type { DirectoryResult } from "tmp-promise";
-import tmp from "tmp-promise";
-import type { CfPreviewToken } from "./api/preview";
+import assert from "node:assert";
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { watch } from "chokidar";
+import clipboardy from "clipboardy";
+import commandExists from "command-exists";
+import { execaCommand } from "execa";
 import { Box, Text, useApp, useInput } from "ink";
 import React, { useState, useEffect, useRef } from "react";
-import path from "path";
-import open from "open";
-import { DtInspector } from "./api/inspect";
-import type { CfModule } from "./api/worker";
-import { createWorker } from "./api/worker";
-import type { CfWorkerInit } from "./api/worker";
-import { spawn } from "child_process";
+import { withErrorBoundary, useErrorHandler } from "react-error-boundary";
 import onExit from "signal-exit";
+import tmp from "tmp-promise";
+import { fetch } from "undici";
+import { createWorker } from "./api/worker";
+import { bundleWorker } from "./bundle";
+import guessWorkerFormat from "./guess-worker-format";
+import useInspector from "./inspect";
+import { DEFAULT_MODULE_RULES } from "./module-collection";
+import openInBrowser from "./open-in-browser";
+import { usePreviewServer, waitForPortToBeAvailable } from "./proxy";
 import { syncAssets } from "./sites";
-import clipboardy from "clipboardy";
-import http from "node:http";
-import commandExists from "command-exists";
-import assert from "assert";
 import { getAPIToken } from "./user";
-import fetch from "node-fetch";
-import makeModuleCollector from "./module-collection";
-import { withErrorBoundary, useErrorHandler } from "react-error-boundary";
-import { createHttpProxy } from "./proxy";
-import { execa } from "execa";
-import { watch } from "chokidar";
-
-type CfScriptFormat = void | "modules" | "service-worker";
+import type { CfPreviewToken } from "./api/preview";
+import type { CfModule, CfWorkerInit, CfScriptFormat } from "./api/worker";
+import type { Config } from "./config";
+import type { Entry } from "./entry";
+import type { AssetPaths } from "./sites";
+import type { WatchMode } from "esbuild";
+import type { ExecaChildProcess } from "execa";
+import type { DirectoryResult } from "tmp-promise";
 
 export type DevProps = {
   name?: string;
-  entry: string;
+  entry: Entry;
   port?: number;
-  format: CfScriptFormat;
-  accountId: void | string;
+  inspectorPort: number;
+  format: CfScriptFormat | undefined;
+  rules: Config["rules"];
+  accountId: undefined | string;
   initialMode: "local" | "remote";
-  jsxFactory: void | string;
-  jsxFragment: void | string;
+  jsxFactory: undefined | string;
+  jsxFragment: undefined | string;
+  enableLocalPersistence: boolean;
   bindings: CfWorkerInit["bindings"];
-  public: void | string;
-  site: void | string;
-  compatibilityDate: void | string;
-  compatibilityFlags: void | string[];
-  usageModel: void | "bundled" | "unbound";
+  public: undefined | string;
+  assetPaths: undefined | AssetPaths;
+  compatibilityDate: undefined | string;
+  compatibilityFlags: undefined | string[];
+  usageModel: undefined | "bundled" | "unbound";
   buildCommand: {
     command?: undefined | string;
     cwd?: undefined | string;
     watch_dir?: undefined | string;
   };
+  env: string | undefined;
+  legacyEnv: boolean;
+  zone: string | undefined;
 };
 
 function Dev(props: DevProps): JSX.Element {
-  if (props.public && props.format === "service-worker") {
-    throw new Error(
-      "You cannot use the service worker format with a `public` directory."
-    );
-  }
-  const port = props.port || 8787;
-  const apiToken = getAPIToken();
+  const port = props.port ?? 8787;
+  const apiToken = props.initialMode === "remote" ? getAPIToken() : undefined;
   const directory = useTmpDir();
 
   // if there isn't a build command, we just return the entry immediately
@@ -66,58 +69,81 @@ function Dev(props: DevProps): JSX.Element {
   // kinda forbid that, so we thread the entry through useCustomBuild
   const entry = useCustomBuild(props.entry, props.buildCommand);
 
+  const format = useWorkerFormat({ entry: props.entry, format: props.format });
+  if (format && props.public && format === "service-worker") {
+    throw new Error(
+      "You cannot use the service worker format with a `public` directory."
+    );
+  }
+
+  if (props.bindings.wasm_modules && format === "modules") {
+    throw new Error(
+      "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
+    );
+  }
+
+  if (props.bindings.text_blobs && format === "modules") {
+    throw new Error(
+      "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[build.upload.rules]` in your wrangler.toml"
+    );
+  }
+
   const bundle = useEsbuild({
     entry,
+    format,
     destination: directory,
     staticRoot: props.public,
     jsxFactory: props.jsxFactory,
+    rules: props.rules,
     jsxFragment: props.jsxFragment,
+    serveAssetsFromWorker: !!props.public,
   });
-  if (bundle && bundle.type === "commonjs" && !props.format && props.public) {
-    throw new Error(
-      "You cannot use the service worker format with a `public` directory."
-    );
-  }
-
-  // @ts-expect-error whack
-  useDevtoolsRefresh(bundle?.id ?? 0);
 
   const toggles = useHotkeys(
     {
       local: props.initialMode === "local",
       tunnel: false,
     },
-    port
+    port,
+    props.inspectorPort
   );
 
   useTunnel(toggles.tunnel);
+  const scriptName = props.name || path.basename(props.entry.file);
 
   return (
     <>
       {toggles.local ? (
         <Local
-          name={props.name}
+          name={scriptName}
           bundle={bundle}
-          format={props.format}
+          format={format}
           bindings={props.bindings}
-          site={props.site}
+          assetPaths={props.assetPaths}
           public={props.public}
-          port={props.port}
+          port={port}
+          rules={props.rules}
+          inspectorPort={props.inspectorPort}
+          enableLocalPersistence={props.enableLocalPersistence}
         />
       ) : (
         <Remote
           name={props.name}
           bundle={bundle}
-          format={props.format}
+          format={format}
           accountId={props.accountId}
           apiToken={apiToken}
           bindings={props.bindings}
-          site={props.site}
+          assetPaths={props.assetPaths}
           public={props.public}
-          port={props.port}
+          port={port}
+          inspectorPort={props.inspectorPort}
           compatibilityDate={props.compatibilityDate}
           compatibilityFlags={props.compatibilityFlags}
           usageModel={props.usageModel}
+          env={props.env}
+          legacyEnv={props.legacyEnv}
+          zone={props.zone}
         />
       )}
       <Box borderStyle="round" paddingLeft={1} paddingRight={1}>
@@ -133,53 +159,46 @@ function Dev(props: DevProps): JSX.Element {
   );
 }
 
-function useDevtoolsRefresh(bundleId: number) {
-  // TODO: this is a hack while we figure out
-  // a better cleaner solution to get devtools to reconnect
-  // without having to do a full refresh
-  const ref = useRef();
-  // @ts-expect-error whack
-  ref.current = bundleId;
-
+function useWorkerFormat(props: {
+  entry: Entry | undefined;
+  format: undefined | CfScriptFormat;
+}): CfScriptFormat | undefined {
+  const [format, setFormat] = useState<CfScriptFormat | undefined>();
   useEffect(() => {
-    const server = http.createServer((req, res) => {
-      res.setHeader("Access-Control-Allow-Origin", "*");
-      res.setHeader("Access-Control-Request-Method", "*");
-      res.setHeader("Access-Control-Allow-Methods", "OPTIONS, GET");
-      res.setHeader("Access-Control-Allow-Headers", "*");
-      if (req.method === "OPTIONS") {
-        res.writeHead(200);
-        res.end();
+    async function validateFormat() {
+      if (!props.entry || format) {
         return;
       }
-      res.writeHead(200, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ value: ref.current }));
+      setFormat(await guessWorkerFormat(props.entry, props.format));
+    }
+    validateFormat().catch((err) => {
+      console.error("Failed to validate worker format:", err);
     });
-
-    server.listen(3142);
-    return () => {
-      server.close();
-    };
-  }, []);
+  }, [props.entry, props.format, format]);
+  return format;
 }
 
 function Remote(props: {
-  name: void | string;
-  bundle: EsbuildBundle | void;
-  format: CfScriptFormat;
-  public: void | string;
-  site: void | string;
+  name: undefined | string;
+  bundle: EsbuildBundle | undefined;
+  format: CfScriptFormat | undefined;
+  public: undefined | string;
+  assetPaths: undefined | AssetPaths;
   port: number;
-  accountId: void | string;
-  apiToken: void | string;
+  inspectorPort: number;
+  accountId: undefined | string;
+  apiToken: undefined | string;
   bindings: CfWorkerInit["bindings"];
-  compatibilityDate: string | void;
-  compatibilityFlags: void | string[];
-  usageModel: void | "bundled" | "unbound";
+  compatibilityDate: string | undefined;
+  compatibilityFlags: undefined | string[];
+  usageModel: undefined | "bundled" | "unbound";
+  env: string | undefined;
+  legacyEnv: boolean | undefined;
+  zone: string | undefined;
 }) {
   assert(props.accountId, "accountId is required");
   assert(props.apiToken, "apiToken is required");
-  const token = useWorker({
+  const previewToken = useWorker({
     name: props.name,
     bundle: props.bundle,
     format: props.format,
@@ -187,100 +206,194 @@ function Remote(props: {
     accountId: props.accountId,
     apiToken: props.apiToken,
     bindings: props.bindings,
-    sitesFolder: props.site,
+    assetPaths: props.assetPaths,
     port: props.port,
     compatibilityDate: props.compatibilityDate,
     compatibilityFlags: props.compatibilityFlags,
     usageModel: props.usageModel,
+    env: props.env,
+    legacyEnv: props.legacyEnv,
+    zone: props.zone,
   });
 
-  useProxy({ token, publicRoot: props.public, port: props.port });
+  usePreviewServer({
+    previewToken,
+    publicRoot: props.public,
+    port: props.port,
+  });
 
-  useInspector(token ? token.inspectorUrl.href : undefined);
+  useInspector({
+    inspectorUrl: previewToken ? previewToken.inspectorUrl.href : undefined,
+    port: props.inspectorPort,
+    logToTerminal: true,
+  });
   return null;
 }
 function Local(props: {
-  name: void | string;
-  bundle: EsbuildBundle | void;
-  format: CfScriptFormat;
+  name: undefined | string;
+  bundle: EsbuildBundle | undefined;
+  format: CfScriptFormat | undefined;
   bindings: CfWorkerInit["bindings"];
-  public: void | string;
-  site: void | string;
+  assetPaths: undefined | AssetPaths;
+  public: undefined | string;
   port: number;
+  rules: Config["rules"];
+  inspectorPort: number;
+  enableLocalPersistence: boolean;
 }) {
   const { inspectorUrl } = useLocalWorker({
     name: props.name,
     bundle: props.bundle,
     format: props.format,
     bindings: props.bindings,
+    assetPaths: props.assetPaths,
+    public: props.public,
     port: props.port,
+    rules: props.rules,
+    inspectorPort: props.port,
+    enableLocalPersistence: props.enableLocalPersistence,
+  });
+  useInspector({
+    inspectorUrl,
+    port: props.inspectorPort,
+    logToTerminal: false,
   });
-  useInspector(inspectorUrl);
   return null;
 }
 
 function useLocalWorker(props: {
-  name: void | string;
-  bundle: EsbuildBundle | void;
-  format: CfScriptFormat;
+  name: undefined | string;
+  bundle: EsbuildBundle | undefined;
+  rules: Config["rules"];
+  format: CfScriptFormat | undefined;
   bindings: CfWorkerInit["bindings"];
+  assetPaths: undefined | AssetPaths;
+  public: undefined | string;
   port: number;
+  inspectorPort: number;
+  enableLocalPersistence: boolean;
 }) {
   // TODO: pass vars via command line
-  const { bundle, format, bindings, port } = props;
+  const { bundle, format, bindings, port, assetPaths, inspectorPort } = props;
   const local = useRef<ReturnType<typeof spawn>>();
   const removeSignalExitListener = useRef<() => void>();
-  const [inspectorUrl, setInspectorUrl] = useState<string | void>();
+  const [inspectorUrl, setInspectorUrl] = useState<string | undefined>();
   useEffect(() => {
     async function startLocalWorker() {
-      if (!bundle) return;
-      if (format === "modules" && bundle.type === "commonjs") {
-        console.error("⎔ Cannot use modules with a commonjs bundle.");
-        // TODO: a much better error message here, with what to do next
-        return;
+      if (!bundle || !format) return;
+
+      // port for the worker
+      await waitForPortToBeAvailable(port, { retryPeriod: 200, timeout: 2000 });
+      // port for inspector
+      await waitForPortToBeAvailable(inspectorPort, {
+        retryPeriod: 200,
+        timeout: 2000,
+      });
+
+      if (props.public) {
+        throw new Error(
+          '⎔ A "public" folder is not yet supported in local mode.'
+        );
       }
-      if (format === "service-worker" && bundle.type !== "esm") {
-        console.error("⎔ Cannot use service-worker with a esm bundle.");
-        // TODO: a much better error message here, with what to do next
-        return;
+
+      // In local mode, we want to copy all referenced modules into
+      // the output bundle directory before starting up
+      for (const module of bundle.modules) {
+        await writeFile(
+          path.join(path.dirname(bundle.path), module.name),
+          module.content
+        );
       }
 
       console.log("⎔ Starting a local server...");
       // TODO: just use execa for this
-      local.current = spawn("node", [
-        "--experimental-vm-modules",
-        "--inspect",
-        require.resolve("miniflare/cli"),
-        bundle.path,
-        "--watch",
-        "--wrangler-config",
-        path.join(__dirname, "../miniflare-config-stubs/wrangler.empty.toml"),
-        "--env",
-        path.join(__dirname, "../miniflare-config-stubs/.env.empty"),
-        "--package",
-        path.join(__dirname, "../miniflare-config-stubs/package.empty.json"),
-        "--port",
-        port.toString(),
-        "--kv-persist",
-        "--cache-persist",
-        "--do-persist",
-        ...Object.entries(bindings.vars || {}).flatMap(([key, value]) => {
-          return ["--binding", `${key}=${value}`];
-        }),
-        ...(bindings.kv_namespaces || []).flatMap(({ binding }) => {
-          return ["--kv", binding];
-        }),
-        ...(bindings.durable_objects?.bindings || []).flatMap(
-          ({ name, class_name }) => {
-            return ["--do", `${name}=${class_name}`];
-          }
-        ),
-        "--modules",
-        format ||
-        (bundle.type === "esm" ? "modules" : "service-worker") === "modules"
-          ? "true"
-          : "false",
-      ]);
+      local.current = spawn(
+        "node",
+        [
+          "--experimental-vm-modules",
+          "--inspect",
+          require.resolve("miniflare/cli"),
+          bundle.path,
+          "--watch",
+          "--wrangler-config",
+          path.join(__dirname, "../miniflare-config-stubs/wrangler.empty.toml"),
+          "--env",
+          path.join(__dirname, "../miniflare-config-stubs/.env.empty"),
+          "--package",
+          path.join(__dirname, "../miniflare-config-stubs/package.empty.json"),
+          "--port",
+          port.toString(),
+          ...(assetPaths
+            ? [
+                "--site",
+                path.join(process.cwd(), assetPaths.baseDirectory),
+                ...assetPaths.includePatterns.map((pattern) => [
+                  "--site-include",
+                  pattern,
+                ]),
+                ...assetPaths.excludePatterns.map((pattern) => [
+                  "--site-exclude",
+                  pattern,
+                ]),
+              ].flatMap((x) => x)
+            : []),
+          ...(props.enableLocalPersistence
+            ? ["--kv-persist", "--cache-persist", "--do-persist"]
+            : []),
+          ...Object.entries(bindings.vars || {}).flatMap(([key, value]) => {
+            return ["--binding", `${key}=${value}`];
+          }),
+          ...(bindings.kv_namespaces || []).flatMap(({ binding }) => {
+            return ["--kv", binding];
+          }),
+          ...(bindings.durable_objects?.bindings || []).flatMap(
+            ({ name, class_name }) => {
+              return ["--do", `${name}=${class_name}`];
+            }
+          ),
+          ...Object.entries(bindings.wasm_modules || {}).flatMap(
+            ([name, filePath]) => {
+              return [
+                "--wasm",
+                `${name}=${path.join(process.cwd(), filePath)}`,
+              ];
+            }
+          ),
+          ...bundle.modules.reduce<string[]>((cmd, { name, type }) => {
+            if (format === "service-worker") {
+              if (type === "compiled-wasm") {
+                // In service-worker format, .wasm modules are referenced
+                // by global identifiers, so we convert it here.
+                // This identifier has to be a valid JS identifier,
+                // so we replace all non alphanumeric characters
+                // with an underscore.
+                const identifier = name.replace(/[^a-zA-Z0-9_$]/g, "_");
+                return cmd.concat([`--wasm`, `${identifier}=${name}`]);
+              } else {
+                // TODO: we should actually support this
+                throw new Error(
+                  `⎔ Unsupported module type ${type} for file ${name} in service-worker format`
+                );
+              }
+            }
+            return cmd;
+          }, []),
+          "--modules",
+          String(format === "modules"),
+          ...(props.rules || [])
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            .concat(DEFAULT_MODULE_RULES!)
+            .flatMap((rule) =>
+              rule.globs.flatMap((glob) => [
+                "--modules-rule",
+                `${rule.type}=${glob}`,
+              ])
+            ),
+        ],
+        {
+          cwd: path.dirname(bundle.path),
+        }
+      );
       console.log(`⬣ Listening at http://localhost:${port}`);
 
       local.current.on("close", (code) => {
@@ -289,14 +402,14 @@ function useLocalWorker(props: {
         }
       });
 
-      local.current.stdout.on("data", (data: Buffer) => {
+      local.current.stdout?.on("data", (data: Buffer) => {
         console.log(`${data.toString()}`);
       });
 
-      local.current.stderr.on("data", (data: Buffer) => {
+      local.current.stderr?.on("data", (data: Buffer) => {
         console.error(`${data.toString()}`);
         const matches =
-          /Debugger listening on (ws:\/\/127\.0\.0\.1:9229\/[A-Za-z0-9-]+)/.exec(
+          /Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)/.exec(
             data.toString()
           );
         if (matches) {
@@ -339,14 +452,20 @@ function useLocalWorker(props: {
     bundle,
     format,
     port,
+    inspectorPort,
     bindings.durable_objects?.bindings,
     bindings.kv_namespaces,
     bindings.vars,
+    props.enableLocalPersistence,
+    assetPaths,
+    props.public,
+    props.rules,
+    bindings.wasm_modules,
   ]);
   return { inspectorUrl };
 }
 
-function useTmpDir(): string | void {
+function useTmpDir(): string | undefined {
   const [directory, setDirectory] = useState<DirectoryResult>();
   const handleError = useErrorHandler();
   useEffect(() => {
@@ -369,7 +488,7 @@ function useTmpDir(): string | void {
     return () => {
       dir.cleanup().catch(() => {
         // extremely unlikely,
-        // but it's 2021 after all
+        // but it's 2022 after all
         console.error("failed to cleanup tmp dir");
       });
     };
@@ -378,36 +497,38 @@ function useTmpDir(): string | void {
 }
 
 function useCustomBuild(
-  expectedEntry: string,
+  expectedEntry: Entry,
   props: {
     command?: undefined | string;
     cwd?: undefined | string;
     watch_dir?: undefined | string;
   }
-): void | string {
-  const [entry, setEntry] = useState<string | void>(
+): undefined | Entry {
+  const [entry, setEntry] = useState<Entry | undefined>(
     // if there's no build command, just return the expected entry
-    props.command ? null : expectedEntry
+    !props.command ? expectedEntry : undefined
   );
   const { command, cwd, watch_dir } = props;
   useEffect(() => {
     if (!command) return;
-    let cmd, interval;
+    let cmd: ExecaChildProcess<string> | undefined,
+      interval: NodeJS.Timeout | undefined;
     console.log("running:", command);
-    const commandPieces = command.split(" ");
-    cmd = execa(commandPieces[0], commandPieces.slice(1), {
+    cmd = execaCommand(command, {
       ...(cwd && { cwd }),
+      shell: true,
       stderr: "inherit",
       stdout: "inherit",
     });
     if (watch_dir) {
       watch(watch_dir, { persistent: true, ignoreInitial: true }).on(
         "all",
-        (_event, _path) => {
-          console.log(`The file ${path} changed, restarting build...`);
-          cmd.kill();
-          cmd = execa(commandPieces[0], commandPieces.slice(1), {
+        (_event, filePath) => {
+          console.log(`The file ${filePath} changed, restarting build...`);
+          cmd?.kill();
+          cmd = execaCommand(command, {
             ...(cwd && { cwd }),
+            shell: true,
             stderr: "inherit",
             stdout: "inherit",
           });
@@ -419,27 +540,39 @@ function useCustomBuild(
     // if it does, we're done
     const startedAt = Date.now();
     interval = setInterval(() => {
-      if (existsSync(expectedEntry)) {
-        clearInterval(interval);
+      let fileExists = false;
+      try {
+        // Use require.resolve to use node's resolution algorithm,
+        // this lets us use paths without explicit .js extension
+        // TODO: we should probably remove this, because it doesn't
+        // take into consideration other extensions like .tsx, .ts, .jsx, etc
+        fileExists = existsSync(require.resolve(expectedEntry.file));
+      } catch (e) {
+        // fail silently, usually means require.resolve threw MODULE_NOT_FOUND
+      }
+
+      if (fileExists === true) {
+        interval && clearInterval(interval);
         setEntry(expectedEntry);
       } else {
         const elapsed = Date.now() - startedAt;
         // timeout after 30 seconds of waiting
-        if (elapsed > 1000 * 60 * 30) {
-          console.error("⎔ Build timed out.");
-          clearInterval(interval);
-          cmd.kill();
+        if (elapsed > 1000 * 30) {
+          console.error(
+            `⎔ Build timed out, Could not resolve ${expectedEntry.file}`
+          );
+          interval && clearInterval(interval);
+          cmd?.kill();
         }
       }
     }, 200);
-    // TODO: we could probably timeout here after a while
 
     return () => {
       if (cmd) {
         cmd.kill();
         cmd = undefined;
       }
-      clearInterval(interval);
+      interval && clearInterval(interval);
       interval = undefined;
     };
   }, [command, cwd, expectedEntry, watch_dir]);
@@ -449,97 +582,115 @@ function useCustomBuild(
 type EsbuildBundle = {
   id: number;
   path: string;
-  entry: string;
+  entry: Entry;
   type: "esm" | "commonjs";
-  exports: string[];
   modules: CfModule[];
+  serveAssetsFromWorker: boolean;
 };
 
-function useEsbuild(props: {
-  entry: void | string;
-  destination: string | void;
-  staticRoot: void | string;
-  jsxFactory: string | void;
-  jsxFragment: string | void;
-}): EsbuildBundle | void {
-  const { entry, destination, staticRoot, jsxFactory, jsxFragment } = props;
+function useEsbuild({
+  entry,
+  destination,
+  staticRoot,
+  jsxFactory,
+  jsxFragment,
+  format,
+  rules,
+  serveAssetsFromWorker,
+}: {
+  entry: undefined | Entry;
+  destination: string | undefined;
+  format: CfScriptFormat | undefined;
+  staticRoot: undefined | string;
+  jsxFactory: string | undefined;
+  jsxFragment: string | undefined;
+  rules: Config["rules"];
+  serveAssetsFromWorker: boolean;
+}): EsbuildBundle | undefined {
   const [bundle, setBundle] = useState<EsbuildBundle>();
   useEffect(() => {
-    let result: esbuild.BuildResult;
+    let stopWatching: (() => void) | undefined = undefined;
+
+    const watchMode: WatchMode = {
+      async onRebuild(error) {
+        if (error) console.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 };
+          });
+        }
+      },
+    };
+
     async function build() {
-      if (!destination || !entry) return;
-      const moduleCollector = makeModuleCollector();
-      result = await esbuild.build({
-        entryPoints: [entry],
-        bundle: true,
-        outdir: destination,
-        metafile: true,
-        format: "esm",
-        sourcemap: true,
-        loader: {
-          ".js": "jsx",
-        },
-        ...(jsxFactory && { jsxFactory }),
-        ...(jsxFragment && { jsxFragment }),
-        external: ["__STATIC_CONTENT_MANIFEST"],
-        conditions: ["worker", "browser"],
-        plugins: [moduleCollector.plugin],
-        // TODO: import.meta.url
-        watch: {
-          async onRebuild(error) {
-            if (error) console.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) => ({
-                ...previousBundle,
-                id: previousBundle.id + 1,
-              }));
-            }
-          },
-        },
-      });
+      if (!destination || !entry || !format) return;
+
+      const { resolvedEntryPointPath, bundleType, modules, stop } =
+        await bundleWorker(entry, destination, {
+          // In dev, we serve assets from the local proxy before we send the request to the worker.
+          serveAssetsFromWorker: false,
+          jsxFactory,
+          jsxFragment,
+          format,
+          rules,
+          watch: watchMode,
+        });
 
-      const chunks = Object.entries(result.metafile.outputs).find(
-        ([_path, { entryPoint }]) => entryPoint === entry
-      ); // assumedly only one entry point
+      // Capture the `stop()` method to use as the `useEffect()` destructor.
+      stopWatching = stop;
 
       setBundle({
         id: 0,
         entry,
-        path: chunks[0],
-        type: chunks[1].exports.length > 0 ? "esm" : "commonjs",
-        exports: chunks[1].exports,
-        modules: moduleCollector.modules,
+        path: resolvedEntryPointPath,
+        type: bundleType,
+        modules,
+        serveAssetsFromWorker,
       });
     }
-    build().catch((_err) => {
-      // esbuild already logs errors to stderr
-      // and we don't want to end the process
-      // on build errors anyway
-      // so this is a no-op error handler
+
+    build().catch(() => {
+      // esbuild already logs errors to stderr and we don't want to end the process
+      // on build errors anyway so this is a no-op error handler
     });
-    return () => {
-      result?.stop();
-    };
-  }, [entry, destination, staticRoot, jsxFactory, jsxFragment]);
+
+    return stopWatching;
+  }, [
+    entry,
+    destination,
+    staticRoot,
+    jsxFactory,
+    jsxFragment,
+    format,
+    serveAssetsFromWorker,
+    rules,
+  ]);
   return bundle;
 }
 
 function useWorker(props: {
-  name: void | string;
-  bundle: EsbuildBundle | void;
-  format: CfScriptFormat;
+  name: undefined | string;
+  bundle: EsbuildBundle | undefined;
+  format: CfScriptFormat | undefined;
   modules: CfModule[];
   accountId: string;
   apiToken: string;
   bindings: CfWorkerInit["bindings"];
-  sitesFolder: void | string;
+  assetPaths: undefined | AssetPaths;
   port: number;
-  compatibilityDate: string | void;
-  compatibilityFlags: string[] | void;
-  usageModel: void | "bundled" | "unbound";
-}): CfPreviewToken | void {
+  compatibilityDate: string | undefined;
+  compatibilityFlags: string[] | undefined;
+  usageModel: undefined | "bundled" | "unbound";
+  env: string | undefined;
+  legacyEnv: boolean | undefined;
+  zone: string | undefined;
+}): CfPreviewToken | undefined {
   const {
     name,
     bundle,
@@ -548,13 +699,13 @@ function useWorker(props: {
     accountId,
     apiToken,
     bindings,
-    sitesFolder,
+    assetPaths,
     compatibilityDate,
     compatibilityFlags,
     usageModel,
     port,
   } = props;
-  const [token, setToken] = useState<CfPreviewToken>();
+  const [token, setToken] = useState<CfPreviewToken | undefined>();
 
   // This is the most reliable way to detect whether
   // something's "happened" in our system; We make a ref and
@@ -563,44 +714,34 @@ function useWorker(props: {
 
   useEffect(() => {
     async function start() {
-      if (!bundle) return;
-      if (format === "modules" && bundle.type === "commonjs") {
-        console.error("⎔ Cannot use modules with a commonjs bundle.");
-        // TODO: a much better error message here, with what to do next
-        return;
-      }
-      if (format === "service-worker" && bundle.type !== "esm") {
-        console.error("⎔ Cannot use service-worker with a esm bundle.");
-        // TODO: a much better error message here, with what to do next
-        return;
-      }
+      setToken(undefined); // reset token in case we're re-running
+
+      if (!bundle || !format) return;
 
       if (!startedRef.current) {
-        console.log("⎔ Starting server...");
         startedRef.current = true;
       } else {
-        console.log("⎔ Detected changes, restarting server...");
+        console.log("⎔ Detected changes, restarted server.");
       }
 
-      const assets = sitesFolder
-        ? await syncAssets(
-            accountId,
-            path.basename(bundle.path),
-            sitesFolder,
-            true,
-            undefined // TODO: env
-          )
-        : {
-            manifest: undefined,
-            namespace: undefined,
-          }; // TODO: cancellable?
+      const assets = await syncAssets(
+        accountId,
+        // When we're using the newer service environments, we wouldn't
+        // have added the env name on to the script name. However, we must
+        // include it in the kv namespace name regardless (since there's no
+        // concept of service environments for kv namespaces yet).
+        name + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
+        assetPaths,
+        true
+      ); // TODO: cancellable?
 
       const content = await readFile(bundle.path, "utf-8");
+
       const init: CfWorkerInit = {
         name,
         main: {
           name: path.basename(bundle.path),
-          type: format || bundle.type === "esm" ? "esm" : "commonjs",
+          type: format === "modules" ? "esm" : "commonjs",
           content,
         },
         modules: modules.concat(
@@ -619,6 +760,13 @@ function useWorker(props: {
               ? { binding: "__STATIC_CONTENT", id: assets.namespace }
               : []
           ),
+          text_blobs: {
+            ...bindings.text_blobs,
+            ...(assets.manifest &&
+              format === "service-worker" && {
+                __STATIC_CONTENT_MANIFEST: "__STATIC_CONTENT_MANIFEST",
+              }),
+          },
         },
         migrations: undefined, // no migrations in dev
         compatibility_date: compatibilityDate,
@@ -626,10 +774,14 @@ function useWorker(props: {
         usage_model: usageModel,
       };
       setToken(
-        await createWorker(init, {
-          accountId,
-          apiToken,
-        })
+        await createWorker(
+          init,
+          {
+            accountId,
+            apiToken,
+          },
+          { env: props.env, legacyEnv: props.legacyEnv, zone: props.zone }
+        )
       );
     }
     start().catch((err) => {
@@ -644,95 +796,19 @@ function useWorker(props: {
     accountId,
     apiToken,
     port,
-    sitesFolder,
+    assetPaths,
     compatibilityDate,
     compatibilityFlags,
     usageModel,
     bindings,
     modules,
+    props.env,
+    props.legacyEnv,
+    props.zone,
   ]);
   return token;
 }
 
-function useProxy({
-  token,
-  publicRoot,
-  port,
-}: {
-  token: CfPreviewToken | void;
-  publicRoot: void | string;
-  port: number;
-}) {
-  useEffect(() => {
-    if (!token) return;
-    // TODO(soon): since headers are added in callbacks, the server
-    // does not need to restart when changes are made.
-    const host = token.host;
-    const proxy = createHttpProxy({
-      host,
-      assetPath: typeof publicRoot === "string" ? publicRoot : null,
-      onRequest: (headers) => {
-        headers["cf-workers-preview-token"] = token.value;
-      },
-      onResponse: (headers) => {
-        for (const [name, value] of Object.entries(headers)) {
-          // Rewrite the remote host to the local host.
-          if (typeof value === "string" && value.includes(host)) {
-            headers[name] = value
-              .replaceAll(`https://${host}`, `http://localhost:${port}`)
-              .replaceAll(host, `localhost:${port}`);
-          }
-        }
-      },
-    });
-
-    console.log(`⬣ Listening at http://localhost:${port}`);
-
-    const server = proxy.listen(port);
-
-    // TODO(soon): refactor logging format into its own function
-    proxy.on("request", function (req, res) {
-      // log all requests
-      console.log(
-        new Date().toLocaleTimeString(),
-        req.method,
-        req.url,
-        res.statusCode
-      );
-    });
-    proxy.on("upgrade", (req) => {
-      console.log(
-        new Date().toLocaleTimeString(),
-        req.method,
-        req.url,
-        101,
-        "(WebSocket)"
-      );
-    });
-    proxy.on("error", (err) => {
-      console.error(new Date().toLocaleTimeString(), err);
-    });
-
-    return () => {
-      proxy.close();
-      server.close();
-    };
-  }, [token, publicRoot, port]);
-}
-
-function useInspector(inspectorUrl: string | void) {
-  useEffect(() => {
-    if (!inspectorUrl) return;
-
-    const inspector = new DtInspector(inspectorUrl);
-    const abortController = inspector.proxyTo(9229);
-    return () => {
-      inspector.close();
-      abortController.abort();
-    };
-  }, [inspectorUrl]);
-}
-
 function sleep(period: number) {
   return new Promise((resolve) => setTimeout(resolve, period));
 }
@@ -740,7 +816,7 @@ const SLEEP_DURATION = 2000;
 // really need a first class api for this
 const hostNameRegex = /userHostname="(.*)"/g;
 async function findTunnelHostname() {
-  let hostName: string;
+  let hostName: string | undefined;
   while (!hostName) {
     try {
       const resp = await fetch("http://localhost:8789/metrics");
@@ -766,7 +842,7 @@ function useTunnel(toggle: boolean) {
           await commandExists("cloudflared");
         } catch (e) {
           console.error(
-            "To share your worker on the internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
+            "To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
           );
           return;
         }
@@ -817,38 +893,49 @@ type useHotkeysInitialState = {
   local: boolean;
   tunnel: boolean;
 };
-function useHotkeys(initial: useHotkeysInitialState, port: number) {
+function useHotkeys(
+  initial: useHotkeysInitialState,
+  port: number,
+  inspectorPort: number
+) {
   // UGH, we should put port in context instead
   const [toggles, setToggles] = useState(initial);
   useInput(
     async (
       input,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      // eslint-disable-next-line unused-imports/no-unused-vars
       key
     ) => {
-      switch (input) {
-        case "b": // open browser
-          await open(`http://localhost:${port}/`);
+      switch (input.toLowerCase()) {
+        // open browser
+        case "b": {
+          await openInBrowser(`http://localhost:${port}`);
           break;
-        case "d": // toggle inspector
-          await open(
-            `https://built-devtools.pages.dev/js_app?experiments=true&v8only=true&ws=localhost:9229/ws`
+        }
+        // toggle inspector
+        case "d": {
+          await openInBrowser(
+            `https://built-devtools.pages.dev/js_app?experiments=true&v8only=true&ws=localhost:${inspectorPort}/ws`
           );
           break;
-        case "s": // toggle tunnel
+        }
+        // toggle tunnel
+        case "s":
           setToggles((previousToggles) => ({
             ...previousToggles,
             tunnel: !previousToggles.tunnel,
           }));
           break;
-        case "l": // toggle local
+        // toggle local
+        case "l":
           setToggles((previousToggles) => ({
             ...previousToggles,
             local: !previousToggles.local,
           }));
           break;
-        case "q": // shut down
-        case "x": // shut down
+        // shut down
+        case "q":
+        case "x":
           process.exit(0);
           break;
         default:
@@ -866,7 +953,7 @@ function ErrorFallback(props: { error: Error }) {
   return (
     <>
       <Text>Something went wrong:</Text>
-      <Text>{props.error.message}</Text>
+      <Text>{props.error.stack}</Text>
     </>
   );
 }