alchemy 0.12.9 → 0.12.11

package/lib/os/exec.js

@@ -1,16 +1,21 @@
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
+import { spawn } from "node:child_process";
 import { Resource } from "../resource.js";
-const execAsync = promisify(exec);
 /**
  * Execute a shell command
  *
  * @example
- * // Run a simple command
+ * // Run a simple command with inherited stdio (default)
  * const result = await Exec("list-files", {
  *   command: "ls -la"
  * });
  *
+ * @example
+ * // Run a command and capture output instead of inheriting stdio
+ * const result = await Exec("list-files", {
+ *   command: "ls -la",
+ *   inheritStdio: false
+ * });
+ *
  * console.log(result.stdout);
  *
  * @example
@@ -22,13 +27,6 @@ const execAsync = promisify(exec);
  * });
  *
  * @example
- * // Run a command with a larger buffer for output
- * const logs = await Exec("get-logs", {
- *   command: "cat large-log-file.log",
- *   maxBuffer: 10 * 1024 * 1024 // 10MB
- * });
- *
- * @example
  * // Run a memoized command that only re-executes when the command changes
  * const memoizedCmd = await Exec("status-check", {
  *   command: "git status",
@@ -59,30 +57,53 @@ export const Exec = Resource("os::Exec", {
         let stdout = "";
         let stderr = "";
         let exitCode = 0;
+        // Default to inheriting stdio unless explicitly set to false
+        const inheritStdio = props.inheritStdio !== false;
         try {
-            console.log(props.command);
-            // Execute the command
-            const result = await execAsync(props.command, {
+            // Parse the command into command and args
+            const [cmd, ...args] = props.command.split(/\s+/);
+            // Use spawn for better stdio control
+            const childProcess = spawn(cmd, args, {
                 cwd: props.cwd || process.cwd(),
                 env: { ...process.env, ...props.env },
-                maxBuffer: props.maxBuffer || 1024 * 1024, // Default 1MB
+                shell: true, // Use shell to handle complex commands
+                stdio: inheritStdio ? "inherit" : "pipe", // Inherit stdio when requested
             });
-            stdout = result.stdout;
-            console.log(stdout);
-            stderr = result.stderr;
-            exitCode = 0; // Success
+            if (!inheritStdio) {
+                // If not inheriting stdio, collect output manually
+                childProcess.stdout?.on("data", (data) => {
+                    stdout += data.toString();
+                });
+                childProcess.stderr?.on("data", (data) => {
+                    stderr += data.toString();
+                });
+            }
+            // Wait for the process to complete
+            exitCode = await new Promise((resolve, reject) => {
+                childProcess.on("close", (code) => {
+                    resolve(code || 0);
+                });
+                childProcess.on("error", (err) => {
+                    if (props.throwOnError) {
+                        reject(err);
+                    }
+                    else {
+                        stderr += err.toString();
+                        resolve(1);
+                    }
+                });
+            });
+            if (exitCode !== 0 && props.throwOnError) {
+                throw new Error(`Command failed with exit code ${exitCode}: ${props.command}`);
+            }
         }
         catch (error) {
-            console.log("error", error);
             if (props.throwOnError) {
                 throw error;
             }
             // If not throwing, capture the error information
-            exitCode = error.code || 1;
-            stdout = error.stdout || "";
-            stderr = error.stderr || String(error);
-            console.log(stdout);
-            console.error(stderr);
+            exitCode = 1;
+            stderr += String(error);
         }
         // Return the execution result
         return this({
@@ -90,9 +111,9 @@ export const Exec = Resource("os::Exec", {
             command: props.command,
             cwd: props.cwd,
             env: props.env,
-            maxBuffer: props.maxBuffer,
             throwOnError: props.throwOnError,
             memoize: props.memoize,
+            inheritStdio,
             exitCode,
             stdout,
             stderr,

package/lib/os/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AA2ElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAC1B,UAAU,EACV;IACE,YAAY,EAAE,IAAI;CACnB,EACD,KAAK,WAEH,EAAU,EACV,KAAgB;IAEhB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,iDAAiD;QACjD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,IACL,IAAI,CAAC,KAAK,KAAK,QAAQ;QACvB,KAAK,CAAC,OAAO;QACb,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO,EACtC,CAAC;QACD,mFAAmF;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,iBAAiB;QACjB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,sBAAsB;YACtB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE;gBAC5C,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;gBAC/B,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE;gBACrC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,GAAG,IAAI,EAAE,cAAc;aAC1D,CAAC,CAAC;YAEH,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YACvB,QAAQ,GAAG,CAAC,CAAC,CAAC,UAAU;QAC1B,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,KAAK,CAAC;YACd,CAAC;YAED,iDAAiD;YACjD,QAAQ,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;YAC3B,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;YAC5B,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;QAED,8BAA8B;QAC9B,OAAO,IAAI,CAAC;YACV,EAAE;YACF,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,QAAQ;YACR,MAAM;YACN,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CACF,CAAC"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/os/exec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.12.9",
+  "version": "0.12.11",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {

package/src/cloudflare/api.ts

@@ -117,22 +117,18 @@ export class CloudflareApi {
 
     // Use withExponentialBackoff for automatic retry on network errors
     return withExponentialBackoff(
-      () =>
-        fetch(`${this.baseUrl}${path}`, {
+      async () => {
+        const response = await fetch(`${this.baseUrl}${path}`, {
           ...init,
           headers,
-        }),
-      (error) => {
-        // Only retry on network-related errors
-        const errorMsg = (error as Error).message || "";
-        const isNetworkError =
-          errorMsg.includes("socket connection was closed") ||
-          errorMsg.includes("ECONNRESET") ||
-          errorMsg.includes("ETIMEDOUT") ||
-          errorMsg.includes("ECONNREFUSED");
-
-        return isNetworkError || error.status?.toString().startsWith("5");
+        });
+        if (response.status.toString().startsWith("5")) {
+          throw new InternalError("5xx error");
+        }
+        return response;
       },
+      // transient errors should be retried aggressively
+      (error) => error instanceof InternalError,
       5, // Maximum 5 attempts (1 initial + 4 retries)
       1000 // Start with 1s delay, will exponentially increase
     );
@@ -202,3 +198,9 @@ export class CloudflareApi {
     return this.fetch(path, { ...init, method: "DELETE" });
   }
 }
+
+class InternalError extends Error {
+  constructor(message: string) {
+    super(message);
+  }
+}

package/src/cloudflare/bucket.ts

@@ -79,6 +79,11 @@ export interface BucketProps {
    * Secret Access Key to use for the bucket
    */
   secretAccessKey?: Secret;
+
+  /**
+   * Whether to adopt an existing bucket
+   */
+  adopt?: boolean;
 }
 
 /**
@@ -163,7 +168,6 @@ export const R2Bucket = Resource(
     const bucketName = props.name || this.id;
 
     if (this.phase === "delete") {
-      console.log("Deleting R2 bucket:", bucketName);
       if (props.delete !== false) {
         if (props.empty) {
           console.log("Emptying R2 bucket:", bucketName);
@@ -175,8 +179,6 @@ export const R2Bucket = Resource(
           await emptyBucket(r2Client, bucketName, props.jurisdiction);
         }
 
-        // Delete R2 bucket
-        console.log("Deleting R2 bucket:", bucketName);
         await deleteBucket(api, bucketName, props);
       }
 
@@ -184,8 +186,17 @@ export const R2Bucket = Resource(
       return this.destroy();
     } else {
       if (this.phase === "create") {
-        console.log("Creating R2 bucket:", bucketName);
-        await createBucket(api, bucketName, props);
+        try {
+          await createBucket(api, bucketName, props);
+        } catch (err) {
+          if (err instanceof CloudflareApiError && err.status === 409) {
+            if (!props.adopt) {
+              throw err;
+            }
+          } else {
+            throw err;
+          }
+        }
       }
 
       await updatePublicAccess(
@@ -253,10 +264,15 @@ export function createR2Client(config?: R2ClientConfig): Promise<R2Client> {
 }
 
 interface CloudflareBucketResponse {
+  /**
+   * The bucket information returned from the Cloudflare REST API
+   * @see https://developers.cloudflare.com/api/node/resources/r2/subresources/buckets/models/bucket/#(schema)
+   */
   result: {
-    name: string;
-    location?: string;
     creation_date: string;
+    location?: "apac" | "eeur" | "enam" | "weur" | "wnam" | "oc";
+    name: string;
+    storage_class?: "Standard" | "InfrequentAccess";
   };
   success: boolean;
   errors: Array<{ code: number; message: string }>;
@@ -291,13 +307,45 @@ export function withJurisdiction(
   return result;
 }
 
+/**
+ * Get a bucket
+ */
+export async function getBucket(
+  api: CloudflareApi,
+  bucketName: string,
+  props: BucketProps = {}
+): Promise<CloudflareBucketResponse> {
+  const headers = withJurisdiction({}, props);
+  const getResponse = await api.get(
+    `/accounts/${api.accountId}/r2/buckets/${bucketName}`,
+    { headers }
+  );
+
+  if (!getResponse.ok) {
+    return await handleApiError(getResponse, "get", "R2 bucket", bucketName);
+  }
+
+  if (getResponse.status === 200) {
+    return (await getResponse.json()) as CloudflareBucketResponse;
+  }
+
+  const errorData: any = await getResponse.json().catch(() => ({
+    errors: [{ message: getResponse.statusText }],
+  }));
+
+  throw new CloudflareApiError(
+    `Error getting R2 bucket '${bucketName}': ${errorData.errors?.[0]?.message || getResponse.statusText}`,
+    getResponse
+  );
+}
+
 /**
  * Create a new bucket
  */
 export async function createBucket(
   api: CloudflareApi,
   bucketName: string,
-  props: BucketProps
+  props: BucketProps = {}
 ): Promise<CloudflareBucketResponse> {
   // Create new R2 bucket
   const createPayload: any = {

package/src/cloudflare/external.ts

@@ -0,0 +1,30 @@
+// https://developers.cloudflare.com/workers/runtime-apis/nodejs/#supported-nodejs-apis
+const nodejs_compat = [
+  "node:async_hooks",
+  "node:assert",
+  "node:buffer",
+  "node:console",
+  "node:crypto",
+  "node:diagnostics_channel",
+  "node:dns",
+  "node:events",
+  "node:inspector",
+  "node:net",
+  "node:path",
+  "node:perf_hooks",
+  "node:process",
+  "node:querystring",
+  "node:stream",
+  "node:string_decoder",
+  "node:timers",
+  "node:tls", // partially supported
+  "node:url",
+  "node:util",
+  "node:zlib",
+];
+
+export const external = [
+  ...nodejs_compat,
+  ...nodejs_compat.map((p) => p.split(":")[1]),
+  "cloudflare:workers",
+];

package/src/cloudflare/index.ts

@@ -9,6 +9,7 @@ export * from "./custom-domain.js";
 export * from "./d1-database.js";
 export * from "./dns-records.js";
 export * from "./durable-object-namespace.js";
+export * from "./external.js";
 export * from "./hyperdrive.js";
 export * from "./kv-namespace.js";
 export * from "./local-dev-cloudflare-shim.js";

package/src/cloudflare/pipeline.ts

@@ -181,8 +181,10 @@ export type PipelineDestination = R2DestinationConfig;
 export interface PipelineProps extends CloudflareApiOptions {
   /**
    * Name of the pipeline
+   *
+   * @default id
    */
-  name: string;
+  name?: string;
 
   /**
    * Source configuration for the pipeline
@@ -232,6 +234,11 @@ export interface Pipeline<T extends PipelineRecord = PipelineRecord>
    */
   id: string;
 
+  /**
+   * The name of the pipeline
+   */
+  name: string;
+
   /**
    * HTTP endpoint URL for the pipeline
    */
@@ -315,7 +322,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
   Pipeline<T>
 > {
   const api = await createCloudflareApi(props);
-  const pipelineName = props.name || id;
+  const pipelineName = props.name ?? id;
 
   if (this.phase === "delete") {
     if (props.delete !== false) {

package/src/cloudflare/r2-rest-state-store.ts

@@ -8,6 +8,7 @@ import {
   type CloudflareApiOptions,
   createCloudflareApi,
 } from "./api.js";
+import { createBucket, getBucket } from "./bucket.js";
 
 /**
  * Options for CloudflareR2StateStore
@@ -23,7 +24,7 @@ export interface CloudflareR2StateStoreOptions extends CloudflareApiOptions {
    * The R2 bucket name to use
    * Required - the bucket must already exist
    */
-  bucketName: string;
+  bucketName?: string;
 }
 
 /**
@@ -44,7 +45,7 @@ export class R2RestStateStore implements StateStore {
    */
   constructor(
     public readonly scope: Scope,
-    private readonly options: CloudflareR2StateStoreOptions
+    private readonly options: CloudflareR2StateStoreOptions = {}
   ) {
     // Use the scope's chain to build the prefix, similar to how FileSystemStateStore builds its directory
     const scopePath = scope.chain.join("/");
@@ -52,10 +53,7 @@ export class R2RestStateStore implements StateStore {
       ? `${options.prefix}${scopePath}/`
       : `alchemy/${scopePath}/`;
 
-    if (!options.bucketName) {
-      throw new Error("bucketName is required for CloudflareR2StateStore");
-    }
-    this.bucketName = options.bucketName;
+    this.bucketName = options.bucketName ?? "alchemy-state";
 
     // We'll initialize the API in init() to allow for async creation
     this.api = null as any;
@@ -70,6 +68,26 @@ export class R2RestStateStore implements StateStore {
     // Create Cloudflare API client with automatic account discovery
     this.api = await createCloudflareApi(this.options);
 
+    // Check if the alchemy state bucket exists
+    try {
+      await withExponentialBackoff(
+        () => getBucket(this.api, this.bucketName),
+        isRetryableError,
+        5,
+        1000
+      );
+    } catch (error) {
+      // If not, create the alchemy state bucket
+      if (error instanceof CloudflareApiError && error.status === 404) {
+        await withExponentialBackoff(
+          () => createBucket(this.api, this.bucketName),
+          isRetryableError,
+          5,
+          1000
+        );
+      }
+    }
+
     this.initialized = true;
   }
 

package/src/cloudflare/redwood.ts

@@ -23,7 +23,7 @@ export type Redwood<B extends Bindings> = B extends { ASSETS: any }
  *
  * @example
  * // Deploy with a database binding
- * import { D1Database } from "../cloudflare/d1-database";
+ * import { D1Database } from alchemy/cloudflare";
  *
  * const database = await D1Database("redwood-db");
  *
@@ -33,38 +33,6 @@ export type Redwood<B extends Bindings> = B extends { ASSETS: any }
  *   }
  * });
  *
- * @example
- * // Deploy with custom build command and environment variables
- * const redwoodApp = await Redwood("custom-redwood", {
- *   command: "bun run test && RWSDK_DEPLOY=1 bun run build:production",
- *   bindings: {
- *     API_KEY: alchemy.secret("api-key-secret")
- *   },
- *   vars: {
- *     NODE_ENV: "production",
- *     APP_ENV: "staging"
- *   }
- * });
- *
- * @example
- * // Deploy with custom paths and additional compatibility flags
- * const redwoodApp = await Redwood("redwood-custom-paths", {
- *   main: "custom/worker.js",
- *   assets: "custom/static",
- *   compatibilityFlags: ["nodejs_compat", "fetch_refused_to_set_cookies"]
- * });
- *
- * @example
- * // Deploy with custom bundle configuration
- * const redwoodApp = await Redwood("redwood-custom-bundle", {
- *   bundle: {
- *     options: {
- *       external: ["node:events", "node:stream", "node:crypto"],
- *       format: "esm"
- *     }
- *   }
- * });
- *
  * @param id - Unique identifier for the RedwoodJS application
  * @param props - Configuration properties for the RedwoodJS deployment
  * @returns A Cloudflare Worker resource representing the deployed RedwoodJS application
@@ -76,21 +44,15 @@ export async function Redwood<B extends Bindings>(
   return Website(id, {
     ...props,
     command: props?.command ?? "bun run clean && RWSDK_DEPLOY=1 bun run build",
-    wrangler: props?.wrangler ?? true,
-    main: props?.main ?? path.join("src", "worker.tsx"),
+    wrangler:
+      props?.wrangler === false
+        ? false
+        : {
+            main: props?.main ?? path.join("src", "worker.tsx"),
+          },
+    main: props?.main ?? path.join("dist", "worker", "worker.js"),
     assets: props?.assets ?? path.join("dist", "client"),
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
     compatibilityDate: props?.compatibilityDate ?? "2025-04-02",
-    bundle: {
-      ...props?.bundle,
-      options: {
-        ...props?.bundle?.options,
-        external: [
-          "node:events",
-          "node:stream",
-          ...(props?.bundle?.options?.external ?? []),
-        ],
-      },
-    },
   });
 }

package/src/cloudflare/website.ts

@@ -45,7 +45,14 @@ export interface WebsiteProps<B extends Bindings>
    *
    * @default - no wrangler.jsonc file is written
    */
-  wrangler?: boolean | string;
+  wrangler?:
+    | boolean
+    | string
+    | {
+        path?: string;
+        // override main
+        main?: string;
+      };
 }
 
 export type Website<B extends Bindings> = B extends { ASSETS: any }
@@ -66,9 +73,17 @@ export async function Website<B extends Bindings>(
 
     const cwd = path.resolve(props.cwd || process.cwd());
     const fileName =
-      typeof props.wrangler === "boolean" ? "wrangler.jsonc" : props.wrangler;
+      typeof props.wrangler === "boolean"
+        ? "wrangler.jsonc"
+        : typeof props.wrangler === "string"
+          ? props.wrangler
+          : (props.wrangler?.path ?? "wrangler.jsonc");
     const wranglerPath =
       fileName && path.relative(cwd, path.join(cwd, fileName));
+    const wranglerMain =
+      typeof props.wrangler === "object"
+        ? (props.wrangler.main ?? props.main)
+        : props.main;
 
     if (props.wrangler) {
       try {
@@ -79,7 +94,7 @@ export async function Website<B extends Bindings>(
           JSON.stringify(
             {
               name: id,
-              main: props.main,
+              main: wranglerMain,
               compatibility_date: new Date().toISOString().split("T")[0],
             },
             null,
@@ -128,6 +143,7 @@ export default {
       await WranglerJson("wrangler.jsonc", {
         path: wranglerPath,
         worker,
+        main: wranglerMain,
       });
     }
 

package/src/cloudflare/worker.ts

@@ -17,6 +17,7 @@ import type { Bindings, WorkerBindingSpec } from "./bindings.js";
 import type { Bound } from "./bound.js";
 import type { DurableObjectNamespace } from "./durable-object-namespace.js";
 import { type EventSource, isQueueEventSource } from "./event-source.js";
+import { external } from "./external.js";
 import {
   QueueConsumer,
   deleteQueueConsumer,
@@ -576,8 +577,6 @@ async function putWorker(
         })
       );
 
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-
       // Upload worker script with bindings
       const uploadResponse = await api.put(
         `/accounts/${api.accountId}/workers/scripts/${workerName}`,
@@ -591,36 +590,22 @@ async function putWorker(
 
       // Check if the upload was successful
       if (!uploadResponse.ok) {
-        const errorData: any = await uploadResponse
-          .json()
-          .catch(() => ({ errors: [{ message: uploadResponse.statusText }] }));
-
-        const errorMessage = `Error (HTTP ${uploadResponse.status}) uploading worker script '${workerName}': ${errorData.errors?.[0]?.message || uploadResponse.statusText}`;
-
-        if (
-          uploadResponse.status === 400 &&
-          errorMessage.includes("not found")
-        ) {
-          throw new NotFoundError(errorMessage);
-        }
-        throw new Error(errorMessage);
+        await handleApiError(
+          uploadResponse,
+          "uploading worker script",
+          "worker",
+          workerName
+        );
       }
 
       return formData;
     },
-    (err) => err instanceof NotFoundError,
+    (err) => err.status === 404 || err.status === 500 || err.status === 503,
     10,
     100
   );
 }
 
-class NotFoundError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "NotFoundError";
-  }
-}
-
 interface WorkerMetadata {
   compatibility_date: string;
   compatibility_flags?: string[];
@@ -889,6 +874,9 @@ async function prepareWorkerMetadata<B extends Bindings>(
     // For service worker format (CJS)
     meta.body_part = scriptName;
   }
+  if (process.env.DEBUG) {
+    console.log(meta);
+  }
   return meta;
 }
 
@@ -931,34 +919,26 @@ async function assertWorkerDoesNotExist<B extends Bindings>(
 }
 
 async function bundleWorkerScript<B extends Bindings>(props: WorkerProps) {
-  // Get the script content - either from props.script, or by bundling
-
-  // Create and use a Bundle resource with worker-optimized configuration
-  const defaultBundleOptions: Omit<BundleProps, "entryPoint"> = {
+  const bundle = await Bundle("bundle", {
+    entryPoint: props.entrypoint!,
     format: props.format === "cjs" ? "cjs" : "esm", // Use the specified format or default to ESM
-    target: "es2020",
-    platform: "browser",
+    target: "esnext",
+    platform: "neutral",
     minify: true,
+    ...(props.bundle || {}),
     options: {
+      ...(props.bundle?.options || {}),
       keepNames: true, // Important for Durable Object classes
       loader: {
         ".sql": "text",
         ".json": "json",
       },
     },
-  };
-
-  // Merge with user-provided options
-  const bundleOptions = {
-    ...defaultBundleOptions,
-    ...(props.bundle || {}),
-  };
-
-  // Create the bundle
-  const bundle = await Bundle("bundle", {
-    entryPoint: props.entrypoint!,
-    ...bundleOptions,
-    external: [...(bundleOptions.external ?? []), "cloudflare:workers"],
+    external: [
+      ...external,
+      ...(props.bundle?.external ?? []),
+      ...(props.bundle?.options?.external ?? []),
+    ],
   });
 
   try {