alchemy 0.55.3 → 0.57.0

package/lib/cloudflare/website.d.ts

@@ -1,78 +1,71 @@
 import { Assets } from "./assets.ts";
 import type { Bindings } from "./bindings.ts";
-import { Worker, type AssetsConfig, type WorkerProps } from "./worker.ts";
+import { type AssetsConfig, Worker, type WorkerProps } from "./worker.ts";
 import { type WranglerJsonSpec } from "./wrangler.json.ts";
-export interface WebsiteProps<B extends Bindings> extends Omit<WorkerProps<B>, "name" | "assets" | "entrypoint"> {
+export interface WebsiteProps<B extends Bindings> extends Omit<WorkerProps<B>, "assets" | "dev"> {
     /**
-     * The command to run to build the site
+     * Configuration for the build command
      *
-     * If one is not provided, the build is assumed to have already happened.
+     * If not provided, the build is assumed to have already happened.
      */
-    command?: string;
-    /**
-     * Additional environment variables to set when running the command
-     */
-    commandEnv?: Record<string, string>;
-    /**
-     * Whether to memoize the command (only re-run if the command changes)
-     *
-     * When set to `true`, the command will only be re-executed if the command string changes.
-     *
-     * When set to an object with `patterns`, the command will be re-executed if either:
-     * 1. The command string changes, or
-     * 2. The contents of any files matching the glob patterns change
-     *
-     * ⚠️ **Important Note**: When using memoization with build commands, the build outputs
-     * will not be produced if the command is memoized. This is because the command is not
-     * actually executed when memoized. Consider disabling memoization in CI environments:
-     *
-     * @example
-     * // Disable memoization in CI to ensure build outputs are always produced
-     * await Website("my-website", {
-     *   command: "vite build",
-     *   memoize: process.env.CI ? false : {
-     *     patterns: ["./src/**"]
-     *   }
-     * });
-     *
-     * @default false
-     */
-    memoize?: boolean | {
-        patterns: string[];
+    build?: string | {
+        /**
+         * The command to run to build the site
+         */
+        command: string;
+        /**
+         * Additional environment variables to set when running the build command
+         */
+        env?: Record<string, string>;
+        /**
+         * Whether to memoize the command (only re-run if the command changes)
+         *
+         * When set to `true`, the command will only be re-executed if the command string changes.
+         *
+         * When set to an object with `patterns`, the command will be re-executed if either:
+         * 1. The command string changes, or
+         * 2. The contents of any files matching the glob patterns change
+         *
+         * ⚠️ **Important Note**: When using memoization with build commands, the build outputs
+         * will not be produced if the command is memoized. This is because the command is not
+         * actually executed when memoized. Consider disabling memoization in CI environments:
+         *
+         * @example
+         * // Disable memoization in CI to ensure build outputs are always produced
+         * await Website("my-website", {
+         *   command: "vite build",
+         *   memoize: process.env.CI ? false : {
+         *     patterns: ["./src/**"]
+         *   }
+         * });
+         *
+         * @default false
+         */
+        memoize?: boolean | {
+            patterns: string[];
+        };
     };
     /**
-     * The name of the worker
-     *
-     * @default id
+     * Configuration for the dev command
      */
-    name?: string;
-    /**
-     * The entrypoint to your server
-     *
-     * @default - a simple server that serves static assets is generated
-     */
-    main?: string;
+    dev?: string | {
+        /**
+         * The command to run to start the dev server
+         */
+        command: string;
+        /**
+         * Additional environment variables to set when running the dev command
+         */
+        env?: Record<string, string>;
+    };
     /**
-     * The directory containing your static assets
+     * The directory containing static assets
      *
-     * @default "./dist"
+     * @default dist
      */
     assets?: string | ({
-        dist?: string;
+        directory?: string;
     } & AssetsConfig);
-    /**
-     * @default process.cwd()
-     */
-    cwd?: string;
-    /**
-     * Write a wrangler.jsonc file
-     *
-     * @default - no wrangler.jsonc file is written
-     */
-    wrangler?: boolean | string | {
-        path?: string;
-        main?: string;
-    };
     /**
      * Configures default routing to support client-side routing for Single Page Applications (SPA)
      *
@@ -80,15 +73,21 @@ export interface WebsiteProps<B extends Bindings> extends Omit<WorkerProps<B>, "
      */
     spa?: boolean;
     /**
-     * Configure the command to use in development mode
+     * Configuration for the wrangler.json file
      */
-    dev?: {
-        command: string;
-    };
-    /**
-     * Transform hooks to modify generated configuration files
-     */
-    transform?: {
+    wrangler?: {
+        /**
+         * Path to the wrangler.json file
+         *
+         * @default .alchemy/local/wrangler.jsonc
+         */
+        path?: string;
+        /**
+         * The main entry point for the worker
+         *
+         * @default worker.entrypoint
+         */
+        main?: string;
         /**
          * Hook to modify the wrangler.json object before it's written
          *
@@ -99,7 +98,30 @@ export interface WebsiteProps<B extends Bindings> extends Omit<WorkerProps<B>, "
          * @param spec - The generated wrangler.json specification
          * @returns The modified wrangler.json specification
          */
-        wrangler?: (spec: WranglerJsonSpec) => WranglerJsonSpec | Promise<WranglerJsonSpec>;
+        transform?: (spec: WranglerJsonSpec) => WranglerJsonSpec | Promise<WranglerJsonSpec>;
+        /**
+         * Whether to include secrets in the wrangler.json file
+         *
+         * @default true if no path is specified, false otherwise
+         */
+        secrets?: boolean;
+    };
+    /**
+     * The command to run to build the site.
+     * @deprecated Use `build` or `build.command` instead
+     */
+    command?: string;
+    /**
+     * Additional environment variables to set when running the build command.
+     * @deprecated Use `build.env` instead
+     */
+    commandEnv?: Record<string, string>;
+    /**
+     * Whether to memoize the command (only re-run if the command changes)
+     * @deprecated Use `build.memoize` instead
+     */
+    memoize?: boolean | {
+        patterns: string[];
     };
 }
 export type Website<B extends Bindings> = B extends {

package/lib/cloudflare/website.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"website.d.ts","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,QAAQ,CAC9C,SAAQ,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAC;IAC9D;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAE3C;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,MAAM,CAAC,EACH,MAAM,GACN,CAAC;QACC,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,YAAY,CAAC,CAAC;IACtB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,QAAQ,CAAC,EACL,OAAO,GACP,MAAM,GACN;QACE,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IAEN;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd;;OAEG;IACH,GAAG,CAAC,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;;;;;;;;WASG;QACH,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,gBAAgB,KACnB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACnD,CAAC;CACH;AAWD,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC/D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,OAAO,CAAC,CAAC,SAAS,QAAQ,EAC9C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GACrB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CA4HrB"}
+{"version":3,"file":"website.d.ts","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,QAAQ,CAC9C,SAAQ,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC9C;;;;OAIG;IACH,KAAK,CAAC,EACF,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,OAAO,GAAG;YAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;KAC5C,CAAC;IACN;;OAEG;IACH,GAAG,CAAC,EACA,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;IACN;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAC1D;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;;;;;;WASG;QACH,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,gBAAgB,KACnB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAClD;;;;WAIG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC/D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,OAAO,CAAC,CAAC,SAAS,QAAQ,EAC9C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,uBAgLvB"}

package/lib/cloudflare/website.js

@@ -1,122 +1,253 @@
+import assert from "node:assert";
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import fs from "node:fs/promises";
 import path from "node:path";
 import { alchemy } from "../alchemy.js";
-import { Exec } from "../os/exec.js";
+import { Exec } from "../os/index.js";
 import { Scope } from "../scope.js";
 import { isSecret } from "../secret.js";
-import { detectPackageManager } from "../util/detect-package-manager.js";
+import { dedent } from "../util/dedent.js";
+import { DeferredPromise } from "../util/deferred-promise.js";
+import { exists } from "../util/exists.js";
+import { logger } from "../util/logger.js";
 import { Assets } from "./assets.js";
 import { DEFAULT_COMPATIBILITY_DATE } from "./compatibility-date.gen.js";
+import { DEFAULT_PERSIST_PATH } from "./miniflare/paths.js";
 import { Worker } from "./worker.js";
 import { WranglerJson } from "./wrangler.json.js";
-const packageManager = await detectPackageManager();
-const devCommand = {
-    npm: "npx vite dev",
-    bun: "bun vite dev",
-    pnpm: "pnpm vite dev",
-    yarn: "yarn vite dev",
-    deno: "deno task dev",
-}[packageManager];
 export async function Website(id, props) {
-    if (props.bindings?.ASSETS) {
-        throw new Error("ASSETS binding is reserved for internal use");
+    const { name = id, build: buildProps, assets, dev, script, spa = true, command, commandEnv, memoize, ...workerProps } = props;
+    assert(!workerProps.bindings?.ASSETS, "ASSETS binding is reserved for internal use");
+    if (command) {
+        logger.warnOnce("[website] The `command` prop is deprecated. Use `build.command` instead.");
     }
-    const wrangler = props.wrangler ?? true;
-    return alchemy.run(id, {
-        parent: Scope.current,
-    }, async (scope) => {
-        const cwd = path.resolve(props.cwd || process.cwd());
-        function resolveAbsPath(f) {
-            return (f ? (path.isAbsolute(f) ? f : path.resolve(cwd, f)) : undefined);
+    if (commandEnv) {
+        logger.warnOnce("[website] The `commandEnv` prop is deprecated. Use `build.env` instead.");
+    }
+    if (memoize) {
+        logger.warnOnce("[website] The `memoize` prop is deprecated. Use `build.memoize` instead.");
+    }
+    const build = (() => {
+        if (typeof buildProps === "string") {
+            return { command: buildProps, env: commandEnv, memoize };
+        }
+        if (buildProps) {
+            return buildProps;
+        }
+        if (command) {
+            return {
+                command,
+                env: commandEnv,
+                memoize,
+            };
+        }
+        return undefined;
+    })();
+    const paths = (() => {
+        const cwd = props.cwd ?? process.cwd();
+        return {
+            cwd,
+            assets: path.resolve(cwd, typeof assets === "string" ? assets : (assets?.directory ?? "dist")),
+            local: path.resolve(cwd, ".alchemy/local"),
+            entrypoint: path.resolve(cwd, props.entrypoint ?? ".alchemy/local/worker.js"),
+            get wrangler() {
+                return {
+                    path: path.resolve(cwd, props.wrangler?.path ?? ".alchemy/local/wrangler.jsonc"),
+                    main: props.wrangler?.main
+                        ? path.resolve(cwd, props.wrangler.main)
+                        : this.entrypoint,
+                };
+            },
+        };
+    })();
+    const secrets = props.wrangler?.secrets ?? !props.wrangler?.path;
+    const env = {
+        ...(process.env ?? {}),
+        ...(props.env ?? {}),
+        ...Object.fromEntries(Object.entries(props.bindings ?? {}).flatMap(([key, value]) => {
+            if (typeof value === "string" || (isSecret(value) && secrets)) {
+                return [[key, value]];
+            }
+            return [];
+        })),
+    };
+    const worker = {
+        ...workerProps,
+        name,
+        cwd: path.relative(process.cwd(), paths.cwd),
+        compatibilityDate: workerProps.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE,
+        assets: {
+            html_handling: "auto-trailing-slash",
+            not_found_handling: spa ? "single-page-application" : "none",
+            run_worker_first: false,
+            ...(typeof props.assets === "string" ? {} : props.assets),
+        },
+        entrypoint: path.relative(paths.cwd, paths.entrypoint),
+    };
+    return await alchemy.run(id, { parent: Scope.current }, async (scope) => {
+        if (!workerProps.entrypoint) {
+            await fs.mkdir(path.dirname(paths.entrypoint), { recursive: true });
+            const content = script ??
+                dedent `
+        export default {
+            async fetch(request, env) {
+                return new Response("Not Found", { status: 404 });
+            },
+        };`;
+            await fs.writeFile(paths.entrypoint, content);
         }
-        const mainPath = resolveAbsPath(props.main);
-        const assetsDirPath = resolveAbsPath(typeof props.assets === "string"
-            ? props.assets
-            : (props.assets?.dist ?? "dist"));
-        const wranglerJsonPath = resolveAbsPath(typeof wrangler === "boolean"
-            ? "wrangler.jsonc"
-            : typeof wrangler === "string"
-                ? wrangler
-                : (wrangler?.path ?? "wrangler.jsonc"));
-        const workerName = props.name ?? id;
-        const workerProps = {
-            ...props,
-            compatibilityDate: props.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE,
-            name: workerName,
-            cwd: path.relative(process.cwd(), cwd),
-            entrypoint: mainPath,
+        await writeMiniflareSymlink(paths.cwd);
+        await WranglerJson("wrangler.jsonc", {
+            path: path.relative(paths.cwd, paths.wrangler.path),
+            worker,
             assets: {
-                html_handling: "auto-trailing-slash",
-                not_found_handling: props.spa ? "single-page-application" : "none",
-                run_worker_first: false,
-                ...(typeof props.assets === "string" ? {} : props.assets),
+                binding: "ASSETS",
+                directory: path.relative(paths.cwd, paths.assets),
             },
-            script: props.main
-                ? undefined
-                : `
-export default {
-  async fetch(request, env) {
-    return new Response("Not Found", { status: 404 });
-  },
-};`,
-            url: props.url ?? true,
-            adopt: props.adopt ?? true,
-            dev: {
-                command: props.dev?.command ?? devCommand,
+            main: path.relative(paths.cwd, paths.wrangler.main),
+            secrets,
+            transform: {
+                wrangler: props.wrangler?.transform,
             },
-        };
-        if (wrangler) {
-            const wranglerPath = path.relative(cwd, wranglerJsonPath);
-            const wranglerDir = path.dirname(wranglerPath);
-            await WranglerJson("wrangler.jsonc", {
-                path: wranglerPath,
-                worker: workerProps,
-                // @ts-expect-error - props.wrangler can be string | object, this is fine
-                main: props.wrangler?.main ?? props.main,
-                // hard-code the assets directory because we haven't yet included the assets binding
-                assets: {
-                    binding: "ASSETS",
-                    // path must be relative to the wrangler.jsonc file
-                    directory: path.relative(wranglerDir, assetsDirPath),
+        });
+        if (build && !scope.local) {
+            await Exec("build", {
+                cwd: path.relative(process.cwd(), paths.cwd),
+                command: build.command,
+                env: {
+                    ...env,
+                    ...(typeof build === "object" ? build.env : {}),
+                    NODE_ENV: "production",
                 },
-                transform: props.transform,
+                memoize: typeof build === "object" ? build.memoize : undefined,
             });
         }
-        const isDev = scope.local;
-        if (props.command && !isDev) {
-            await Exec("build", {
-                cwd,
-                command: props.command,
+        let url;
+        if (dev && scope.local) {
+            url = await runDevCommand(scope, {
+                id,
+                command: typeof dev === "string" ? dev : dev.command,
                 env: {
-                    ...(process.env ?? {}),
-                    ...(props.env ?? {}),
-                    ...(props.commandEnv ?? {}),
-                    ...Object.fromEntries(Object.entries(props.bindings ?? {}).flatMap(([key, value]) => {
-                        if (isSecret(value)) {
-                            return [[key, value.unencrypted]];
-                        }
-                        else if (typeof value === "string") {
-                            return [[key, value]];
-                        }
-                        return [];
-                    })),
+                    ...env,
+                    ...(typeof dev === "object" ? dev.env : {}),
                 },
-                memoize: props.memoize,
+                cwd: paths.cwd,
             });
         }
         return (await Worker("worker", {
-            ...workerProps,
+            ...worker,
             bindings: {
-                ...workerProps.bindings,
-                // we don't include the Assets binding until after build to make sure the asset manifest is correct
-                // we generate the wrangler.json using all the bind
-                ASSETS: isDev
-                    ? undefined
-                    : await Assets("assets", {
-                        // Assets are discovered from proces.cwd(), not Website.cwd or wrangler.jsonc
-                        path: path.relative(process.cwd(), assetsDirPath),
-                    }),
+                ...worker.bindings,
+                ...(!scope.local
+                    ? {
+                        ASSETS: await Assets("assets", {
+                            path: path.relative(process.cwd(), paths.assets),
+                        }),
+                    }
+                    : {}),
             },
+            dev: url ? { url } : undefined,
         }));
     });
 }
+async function writeMiniflareSymlink(cwd) {
+    const target = path.resolve(DEFAULT_PERSIST_PATH);
+    await fs.mkdir(target, { recursive: true });
+    if (cwd === process.cwd()) {
+        return;
+    }
+    const persistPath = path.resolve(cwd, DEFAULT_PERSIST_PATH);
+    await fs.mkdir(path.dirname(persistPath), { recursive: true });
+    await fs.symlink(target, persistPath).catch((e) => {
+        if (e.code !== "EEXIST") {
+            throw e;
+        }
+    });
+}
+async function runDevCommand(scope, props) {
+    const persistFile = path.join(process.cwd(), ".alchemy", `${props.id}.pid`);
+    if (await exists(persistFile)) {
+        const pid = Number.parseInt(await fs.readFile(persistFile, "utf8"));
+        try {
+            // Actually kill the process if it's alive
+            process.kill(pid, "SIGTERM");
+        }
+        catch {
+            // ignore
+        }
+        try {
+            await fs.unlink(persistFile);
+        }
+        catch {
+            // ignore
+        }
+    }
+    const command = props.command.split(" ");
+    const [cmd, ...args] = command;
+    const childProcess = spawn(cmd, args, {
+        cwd: props.cwd,
+        shell: true,
+        env: {
+            FORCE_COLOR: "1",
+            ...process.env,
+            ...Object.fromEntries(Object.entries(props.env ?? {}).flatMap(([key, value]) => {
+                if (isSecret(value)) {
+                    return [[key, value.unencrypted]];
+                }
+                if (typeof value === "string") {
+                    return [[key, value]];
+                }
+                return [];
+            })),
+        },
+        stdio: "pipe",
+    });
+    await once(childProcess, "spawn");
+    scope.onCleanup(async () => {
+        if (childProcess.exitCode === null && !childProcess.killed) {
+            childProcess.kill("SIGTERM");
+            await Promise.any([
+                once(childProcess, "exit"),
+                new Promise((resolve) => setTimeout(resolve, 5000)),
+            ]);
+            if (!childProcess.killed) {
+                childProcess.kill("SIGKILL");
+            }
+        }
+        try {
+            await fs.unlink(persistFile);
+        }
+        catch {
+            // ignore
+        }
+    });
+    if (childProcess.pid) {
+        await fs.mkdir(path.dirname(persistFile), { recursive: true });
+        await fs.writeFile(persistFile, childProcess.pid.toString());
+    }
+    const URL_REGEX = /http:\/\/(?:(?:localhost|0\.0\.0\.0|127\.0\.0\.1)|(?:\d{1,3}\.){3}\d{1,3}):\d+(?:\/)?/;
+    const promise = new DeferredPromise();
+    childProcess.stdout.on("data", (data) => {
+        if (promise.status === "pending") {
+            const match = data
+                .toString()
+                .replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "")
+                .match(URL_REGEX);
+            if (match) {
+                promise.resolve(match[0]);
+            }
+        }
+        process.stdout.write(data);
+    });
+    childProcess.stderr.on("data", (data) => {
+        process.stderr.write(data);
+    });
+    return await Promise.race([
+        promise.value,
+        once(childProcess, "exit").then(([code, signal]) => {
+            throw new Error(`Dev command "${props.command}" for "${props.id}" failed to start (code: ${code}, signal: ${signal})`);
+        }),
+    ]);
+}
 //# sourceMappingURL=website.js.map

package/lib/cloudflare/website.js.map

@@ -1 +1 @@
-{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/worker-bundle.d.ts

@@ -6,6 +6,7 @@ export interface WorkerBundle {
     modules: WorkerBundle.Module[];
 }
 export declare function normalizeWorkerBundle(props: {
+    id: string;
     script: string | undefined;
     entrypoint: string | undefined;
     noBundle: boolean | undefined;
@@ -63,6 +64,7 @@ export declare namespace WorkerBundleSource {
         private readFiles;
     }
     interface ESBuildProps extends WorkerBundleSource.BaseProps, Omit<esbuild.BuildOptions, "entryPoints" | "format" | "absWorkingDir" | "outdir"> {
+        id: string;
         entrypoint: string;
         cwd: string;
         outdir: string;
@@ -74,7 +76,7 @@ export declare namespace WorkerBundleSource {
         watch(signal: AbortSignal): AsyncIterable<WorkerBundle>;
         delete(): Promise<void>;
         private buildOptions;
-        private resolveBuildOutput;
+        private formatBuildOutput;
     }
 }
 //# sourceMappingURL=worker-bundle.d.ts.map

package/lib/cloudflare/worker-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}