alchemy 0.67.0 → 0.69.0

package/src/cloudflare/kv-namespace.ts

@@ -95,47 +95,46 @@ export interface KVPair {
   metadata?: any;
 }
 
-export function isKVNamespace(resource: Resource): resource is KVNamespace {
-  return resource[ResourceKind] === "cloudflare::KVNamespace";
+export function isKVNamespace(resource: any): resource is KVNamespace {
+  return resource?.[ResourceKind] === "cloudflare::KVNamespace";
 }
 
 /**
  * Output returned after KV Namespace creation/update
  */
-export type KVNamespace = Resource<"cloudflare::KVNamespace"> &
-  Omit<KVNamespaceProps, "delete" | "dev"> & {
-    type: "kv_namespace";
-    /**
-     * The ID of the namespace
-     */
-    namespaceId: string;
+export type KVNamespace = Omit<KVNamespaceProps, "delete" | "dev"> & {
+  type: "kv_namespace";
+  /**
+   * The ID of the namespace
+   */
+  namespaceId: string;
 
-    /**
-     * Time at which the namespace was created
-     */
-    createdAt: number;
+  /**
+   * Time at which the namespace was created
+   */
+  createdAt: number;
+
+  /**
+   * Time at which the namespace was last modified
+   */
+  modifiedAt: number;
 
+  /**
+   * Development mode properties
+   * @internal
+   */
+  dev: {
     /**
-     * Time at which the namespace was last modified
+     * The ID of the KV namespace in development mode
      */
-    modifiedAt: number;
+    id: string;
 
     /**
-     * Development mode properties
-     * @internal
+     * Whether the KV namespace is running remotely
      */
-    dev: {
-      /**
-       * The ID of the KV namespace in development mode
-       */
-      id: string;
-
-      /**
-       * Whether the KV namespace is running remotely
-       */
-      remote: boolean;
-    };
+    remote: boolean;
   };
+};
 
 /**
  * A Cloudflare KV Namespace is a key-value store that can be used to store data for your application.
@@ -221,7 +220,7 @@ const _KVNamespace = Resource(
     };
 
     if (local) {
-      return this({
+      return {
         type: "kv_namespace",
         namespaceId: this.output?.namespaceId ?? "",
         title,
@@ -229,7 +228,7 @@ const _KVNamespace = Resource(
         dev,
         createdAt: this.output?.createdAt ?? Date.now(),
         modifiedAt: Date.now(),
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -260,7 +259,7 @@ const _KVNamespace = Resource(
 
     await insertKVRecords(api, result.namespaceId, props);
 
-    return this({
+    return {
       type: "kv_namespace",
       namespaceId: result.namespaceId,
       title,
@@ -268,7 +267,7 @@ const _KVNamespace = Resource(
       dev,
       createdAt: result.createdAt,
       modifiedAt: Date.now(),
-    });
+    };
   },
 );
 

package/src/cloudflare/miniflare/delete.ts

@@ -113,7 +113,7 @@ async function cleanMiniflareDirectory(dotAlchemy: string) {
 
 const removeDirectory = async (path: string, options?: RmDirOptions) => {
   try {
-    await fs.rmdir(path, options);
+    await fs.rm(path, options);
   } catch (error) {
     if (!isENOENT(error)) {
       throw error;

package/src/cloudflare/miniflare/miniflare-worker-proxy.ts

@@ -3,6 +3,7 @@ import { once } from "node:events";
 import http from "node:http";
 import { Readable } from "node:stream";
 import { WebSocket, WebSocketServer } from "ws";
+import { coupleWebSocket } from "../../util/http.ts";
 
 export interface MiniflareWorkerProxy {
   url: URL;
@@ -22,13 +23,7 @@ export async function createMiniflareWorkerProxy(options: {
   server.on("upgrade", async (req, socket, head) => {
     try {
       const server = await createServerWebSocket(req);
-      wss.handleUpgrade(req, socket, head, (client) => {
-        client.on("message", (event, binary) => server.send(event, { binary }));
-        client.on("close", (code, reason) => server.close(code, reason));
-        server.on("message", (event, binary) => client.send(event, { binary }));
-        server.on("close", (code, reason) => client.close(code, reason));
-        wss.emit("connection", client, req);
-      });
+      coupleWebSocket(wss, req, socket, head, server);
     } catch (error) {
       console.error(error);
       socket.destroy();

package/src/cloudflare/miniflare/remote-binding-proxy.ts

@@ -1,4 +1,5 @@
 import type { RemoteProxyConnectionString } from "miniflare";
+import { WebSocket } from "ws";
 import { HTTPServer } from "../../util/http.ts";
 import { extractCloudflareResult } from "../api-response.ts";
 import type { CloudflareApi } from "../api.ts";
@@ -54,18 +55,29 @@ export async function createRemoteProxyWorker(input: {
     getAccountSubdomain(input.api),
   ]);
 
-  const proxyURL = `https://${input.name}.${subdomain}.workers.dev`;
+  const host = `${input.name}.${subdomain}.workers.dev`;
+
   const server = new HTTPServer({
+    websocket: async (req) => {
+      const input = new URL(req.url);
+      const proxied = new URL(input.pathname + input.search, `https://${host}`);
+      return new WebSocket(proxied, {
+        headers: {
+          "cf-workers-preview-token": token,
+          host,
+        },
+      });
+    },
     fetch: async (req) => {
       const url = new URL(req.url);
-      const targetUrl = new URL(url.pathname + url.search, proxyURL);
+      const proxied = new URL(url.pathname + url.search, `https://${host}`);
 
       const headers = new Headers(req.headers);
       headers.set("cf-workers-preview-token", token);
-      headers.set("host", new URL(proxyURL).hostname);
+      headers.set("host", host);
       headers.delete("cf-connecting-ip");
 
-      const res = await fetch(targetUrl, {
+      const res = await fetch(proxied, {
         method: req.method,
         headers,
         body: req.body,

package/src/cloudflare/next.ts

@@ -113,7 +113,7 @@ const normalizeCommand = (
     command: string;
     env: Record<string, string>;
   },
-): WebsiteProps<any>["build"] => {
+) => {
   return {
     command:
       typeof input === "string" ? input : (input?.command ?? defaults.command),
@@ -122,5 +122,5 @@ const normalizeCommand = (
       ...(typeof input === "object" ? (input?.env ?? {}) : {}),
     },
     memoize: typeof input === "object" ? input?.memoize : undefined,
-  };
+  } satisfies WebsiteProps<any>["build"];
 };

package/src/cloudflare/nuxt/nuxt.ts

@@ -2,7 +2,12 @@ import path from "node:path";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
-import { Website, type WebsiteProps } from "../website.ts";
+import {
+  spreadBuildProps,
+  spreadDevProps,
+  Website,
+  type WebsiteProps,
+} from "../website.ts";
 import type { Worker } from "../worker.ts";
 
 /**
@@ -55,8 +60,8 @@ export async function Nuxt<B extends Bindings>(
   return await Website(id, {
     ...props,
     noBundle: props?.noBundle ?? true,
-    build: props?.build ?? `${runner} nuxt build`,
-    dev: props?.dev ?? `${runner} nuxt dev`,
+    build: spreadBuildProps(props, `${runner} nuxt build`),
+    dev: spreadDevProps(props, `${runner} nuxt dev`),
     compatibility: "node",
     // Default entry point for cloudflare-module preset
     entrypoint: props?.entrypoint ?? "./.output/server/index.mjs",

package/src/cloudflare/permission-groups.ts

@@ -45,7 +45,7 @@ export type R2PermissionGroups =
  *
  * @see https://developers.cloudflare.com/r2/api/tokens/#permissions
  */
-export type PermissionGroups = Resource<"cloudflare::PermissionGroups"> & {
+export type PermissionGroups = {
   /**
    * Admin Read & Write - Allows create, list, delete buckets and edit bucket configurations
    * plus list, write, and read object access
@@ -140,10 +140,8 @@ export const PermissionGroups = Resource(
       );
     }
 
-    return this(
-      Object.fromEntries(
-        data.result.map((group) => [group.name, group]),
-      ) as PermissionGroups,
-    );
+    return Object.fromEntries(
+      data.result.map((group) => [group.name, group]),
+    ) as PermissionGroups;
   },
 );

package/src/cloudflare/pipeline.ts

@@ -229,41 +229,40 @@ export interface PipelineRecord {
   [key: string]: any;
 }
 
-export function isPipeline(resource: Resource): resource is Pipeline {
-  return resource[ResourceKind] === "cloudflare::Pipeline";
+export function isPipeline(resource: any): resource is Pipeline {
+  return resource?.[ResourceKind] === "cloudflare::Pipeline";
 }
 
 /**
  * Output returned after Pipeline creation/update
  */
 export type Pipeline<_T extends PipelineRecord = PipelineRecord> =
-  Resource<"cloudflare::Pipeline"> &
-    PipelineProps & {
-      /**
-       * Type identifier for the Pipeline resource
-       */
-      type: "pipeline";
-
-      /**
-       * The unique ID of the pipeline
-       */
-      id: string;
+  PipelineProps & {
+    /**
+     * Type identifier for the Pipeline resource
+     */
+    type: "pipeline";
 
-      /**
-       * The name of the pipeline
-       */
-      name: string;
+    /**
+     * The unique ID of the pipeline
+     */
+    id: string;
 
-      /**
-       * HTTP endpoint URL for the pipeline
-       */
-      endpoint: string;
+    /**
+     * The name of the pipeline
+     */
+    name: string;
 
-      /**
-       * Version of the pipeline
-       */
-      version: number;
-    };
+    /**
+     * HTTP endpoint URL for the pipeline
+     */
+    endpoint: string;
+
+    /**
+     * Version of the pipeline
+     */
+    version: number;
+  };
 
 /**
  * Creates and manages Cloudflare Pipelines.
@@ -341,7 +340,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
   if (this.scope.local && !props.dev?.remote) {
-    return this({
+    return {
       type: "pipeline",
       id: this.output?.id ?? "",
       name: this.output?.name ?? pipelineName,
@@ -351,7 +350,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
       destination: props.destination,
       compression: props.compression,
       accountId: this.output?.accountId ?? "",
-    });
+    };
   }
 
   if (this.phase === "update" && this.output?.name !== pipelineName) {
@@ -418,7 +417,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     }
   }
 
-  return this({
+  return {
     type: "pipeline",
     id: pipelineData.result.id,
     name: pipelineName,
@@ -433,7 +432,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     destination: props.destination, // Use the input destination, not the API response
     compression: props.compression,
     accountId: api.accountId,
-  });
+  };
 });
 
 interface CloudflarePipelineResponse {

package/src/cloudflare/queue-consumer.ts

@@ -96,9 +96,7 @@ export interface QueueConsumerProps extends CloudflareApiOptions {
 /**
  * Output returned after Queue Consumer creation/update
  */
-export interface QueueConsumer
-  extends Resource<"cloudflare::QueueConsumer">,
-    QueueConsumerProps {
+export interface QueueConsumer extends QueueConsumerProps {
   /**
    * Unique ID for the consumer
    */
@@ -162,7 +160,7 @@ export const QueueConsumer = Resource(
       typeof props.queue === "string" ? props.queue : props.queue.id;
 
     if (this.scope.local && props.dev) {
-      return this({
+      return {
         id: this.output?.id ?? "",
         queueId,
         queue: props.queue,
@@ -170,7 +168,7 @@ export const QueueConsumer = Resource(
         scriptName: props.scriptName,
         settings: props.settings,
         accountId: this.output?.accountId ?? "",
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -231,7 +229,7 @@ export const QueueConsumer = Resource(
       );
     }
 
-    return this({
+    return {
       id: consumerData.result.consumer_id,
       queueId,
       queue: props.queue,
@@ -249,7 +247,7 @@ export const QueueConsumer = Resource(
         : undefined,
       createdOn: consumerData.result.created_on,
       accountId: api.accountId,
-    });
+    };
   },
 );
 

package/src/cloudflare/queue.ts

@@ -100,56 +100,55 @@ export function isQueue(eventSource: any): eventSource is Queue {
 /**
  * Output returned after Cloudflare Queue creation/update
  */
-export type Queue<Body = unknown> = Resource<"cloudflare::Queue"> &
-  Omit<QueueProps, "dev"> & {
-    /**
-     * Type identifier for Cloudflare Queue
-     */
-    type: "queue";
+export type Queue<Body = unknown> = Omit<QueueProps, "dev"> & {
+  /**
+   * Type identifier for Cloudflare Queue
+   */
+  type: "queue";
 
-    /**
-     * The unique ID of the queue
-     */
-    id: string;
+  /**
+   * The unique ID of the queue
+   */
+  id: string;
 
-    /**
-     * The name of the queue
-     */
-    name: string;
+  /**
+   * The name of the queue
+   */
+  name: string;
 
-    /**
-     * Time when the queue was created
-     */
-    createdOn: string;
+  /**
+   * Time when the queue was created
+   */
+  createdOn: string;
 
-    /**
-     * Modified timestamp
-     */
-    modifiedOn: string;
+  /**
+   * Modified timestamp
+   */
+  modifiedOn: string;
 
+  /**
+   * Phantom property to allow type inference
+   */
+  Body: Body;
+
+  Batch: MessageBatch<Body>;
+
+  /**
+   * Development mode properties
+   * @internal
+   */
+  dev: {
     /**
-     * Phantom property to allow type inference
+     * The ID of the queue in development mode
      */
-    Body: Body;
-
-    Batch: MessageBatch<Body>;
+    id: string;
 
     /**
-     * Development mode properties
-     * @internal
+     * Whether the queue is running remotely
      */
-    dev: {
-      /**
-       * The ID of the queue in development mode
-       */
-      id: string;
-
-      /**
-       * Whether the queue is running remotely
-       */
-      remote: boolean;
-    };
+    remote: boolean;
   };
+};
 
 /**
  * Creates and manages Cloudflare Queues.
@@ -256,7 +255,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     remote: props.dev?.remote ?? false,
   };
   if (this.scope.local && !props.dev?.remote) {
-    return this({
+    return {
       type: "queue",
       id: this.output?.id ?? "",
       name: queueName,
@@ -265,7 +264,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
       modifiedOn: this.output?.modifiedOn ?? new Date().toISOString(),
       Body: undefined as T,
       Batch: undefined! as MessageBatch<T>,
-    });
+    };
   }
 
   const api = await createCloudflareApi(props);
@@ -320,7 +319,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     }
   }
 
-  return this({
+  return {
     type: "queue",
     id: queueData.result.queue_id || "",
     name: queueName,
@@ -340,7 +339,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     // phantom properties
     Body: undefined as T,
     Batch: undefined! as MessageBatch<T>,
-  });
+  };
 });
 
 interface CloudflareQueueResponse {

package/src/cloudflare/react-router/plugin.ts

@@ -1,7 +1,27 @@
 import type { PluginConfig } from "@cloudflare/vite-plugin";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { getDefaultConfigPath } from "../miniflare/paths.ts";
 import alchemyVite from "../vite/plugin.ts";
 
 const alchemy = (config?: PluginConfig) => {
+  const configPath = config?.configPath ?? getDefaultConfigPath();
+  // react-router type generation requries a wrangler.json and creates a chicken and egg problem
+  // we create a dummy wrangler.json file so that clean builds can be performed
+  if (!existsSync(configPath)) {
+    mkdirSync(dirname(configPath), { recursive: true });
+    writeFileSync(
+      configPath,
+      JSON.stringify(
+        {
+          name: "dummy",
+          compatibility_date: "2025-09-23",
+        },
+        null,
+        2,
+      ),
+    );
+  }
   return alchemyVite({
     ...config,
     viteEnvironment: {

package/src/cloudflare/redirect-rule.ts

@@ -94,7 +94,7 @@ interface CloudflareRule {
 /**
  * Output returned after RedirectRule creation/update
  */
-export interface RedirectRule extends Resource<"cloudflare::RedirectRule"> {
+export interface RedirectRule {
   /**
    * The ID of the redirect rule
    */
@@ -263,7 +263,7 @@ export const RedirectRule = Resource(
         },
       );
 
-      return this({
+      return {
         ruleId: updatedRule.id,
         rulesetId: this.output.rulesetId,
         zoneId,
@@ -274,7 +274,7 @@ export const RedirectRule = Resource(
         preserveQueryString,
         enabled: updatedRule.enabled ?? true,
         lastUpdated: updatedRule.last_updated,
-      });
+      };
     }
 
     // Get or create the redirect ruleset for this zone
@@ -288,7 +288,7 @@ export const RedirectRule = Resource(
       preserveQueryString,
     });
 
-    return this({
+    return {
       ruleId: createdRule.id,
       rulesetId,
       zoneId,
@@ -299,7 +299,7 @@ export const RedirectRule = Resource(
       preserveQueryString,
       enabled: createdRule.enabled ?? true,
       lastUpdated: createdRule.last_updated,
-    });
+    };
   },
 );
 

package/src/cloudflare/route.ts

@@ -62,7 +62,7 @@ export interface RouteProps extends CloudflareApiOptions {
 /**
  * Output returned after Route creation/update
  */
-export interface Route extends Resource<"cloudflare::Route">, RouteProps {
+export interface Route extends RouteProps {
   /**
    * The unique ID of the route
    */
@@ -166,12 +166,12 @@ export const Route = Resource(
         zoneId = this.output?.zoneId ?? "noop-zone";
       }
 
-      return this({
+      return {
         id: this.output?.id ?? "noop-route",
         pattern: props.pattern,
         script: scriptName,
         zoneId: zoneId,
-      });
+      };
     }
 
     // Get or infer zone ID (only needed for create/update phases)
@@ -247,12 +247,12 @@ export const Route = Resource(
     }
 
     // Return the route resource
-    return this({
+    return {
       id: routeData.result.id,
       pattern: routeData.result.pattern,
       script: routeData.result.script,
       zoneId,
-    });
+    };
   },
 );
 

package/src/cloudflare/ruleset.ts

@@ -46,8 +46,7 @@ export interface RulesetProps<Phase extends RulePhase>
 /**
  * Output returned after Ruleset creation/update
  */
-export interface Ruleset<Phase extends RulePhase>
-  extends Resource<"cloudflare::Ruleset"> {
+export interface Ruleset<Phase extends RulePhase> {
   /**
    * The ID of the ruleset
    */
@@ -185,7 +184,7 @@ export const Ruleset = Resource("cloudflare::Ruleset", async function <
   });
 
   // Transform response back to our format
-  return this({
+  return {
     id: result.id,
     zoneId,
     phase: props.phase,
@@ -194,7 +193,7 @@ export const Ruleset = Resource("cloudflare::Ruleset", async function <
     rules: (result.rules as Array<Rule> | undefined) ?? [],
     lastUpdated: result.last_updated,
     version: result.version,
-  });
+  };
 });
 
 interface CloudflareApiRuleset {