alchemy 0.90.1 → 0.91.2

package/src/cloudflare/container.ts

@@ -410,6 +410,14 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
    */
   adopt?: boolean;
 
+  /**
+   * Whether to delete the container application when removed from Alchemy.
+   * If set to false, the container application will remain but the resource will be removed from state.
+   *
+   * @default true
+   */
+  delete?: boolean;
+
   /**
    * If true, the container application will not be created, but will be retained if it already exists.
    * This is used for local development.
@@ -557,7 +565,7 @@ export const ContainerApplication = Resource(
 
     const api = await createCloudflareApi(props);
     if (this.phase === "delete") {
-      if (this.output?.id) {
+      if (props.delete !== false && this.output?.id) {
         // Delete the container application
         await deleteContainerApplication(api, this.output.id);
       }

package/src/cloudflare/custom-domain.ts

@@ -44,6 +44,14 @@ export interface CustomDomainProps extends CloudflareApiOptions {
    */
   adopt?: boolean;
 
+  /**
+   * Whether to delete the custom domain when removed from Alchemy.
+   * If set to false, the custom domain will remain but the resource will be removed from state.
+   *
+   * @default true
+   */
+  delete?: boolean;
+
   /**
    * If true, the custom domain will not be created, but will be retained if it already exists.
    * This is used for local development.
@@ -137,7 +145,9 @@ export const CustomDomain = Resource(
     const api = await createCloudflareApi(props);
 
     if (this.phase === "delete") {
-      await deleteCustomDomain(this, api, logicalId, props);
+      if (props.delete !== false) {
+        await deleteCustomDomain(this, api, logicalId, props);
+      }
       return this.destroy();
     }
 

package/src/cloudflare/nuxt/nuxt.ts

@@ -14,16 +14,20 @@ import type { Worker } from "../worker.ts";
  * Properties for creating a Nuxt resource.
  * Extends WebsiteProps, allowing customization of the underlying Website.
  */
-export interface NuxtProps<B extends Bindings> extends WebsiteProps<B> {}
+export interface NuxtProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends WebsiteProps<B, RPC> {}
 
 /**
  * Represents the output of a Nuxt resource deployment.
  * It resolves to the underlying Cloudflare Worker type, ensuring type safety.
  * Prevents overriding the internal ASSETS binding.
  */
-export type Nuxt<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type Nuxt<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
 /**
  * Creates and deploys a Nuxt application using the Cloudflare Workers preset.
@@ -52,10 +56,10 @@ export type Nuxt<B extends Bindings> = B extends { ASSETS: any }
  *   },
  * });
  */
-export async function Nuxt<B extends Bindings>(
-  id: string,
-  props?: Partial<NuxtProps<B>>,
-): Promise<Nuxt<B>> {
+export async function Nuxt<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(id: string, props?: Partial<NuxtProps<B, RPC>>): Promise<Nuxt<B, RPC>> {
   const runner = await getPackageManagerRunner();
   return await Website(id, {
     ...props,

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

@@ -5,7 +5,10 @@ import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";
 import type { Worker } from "../worker.ts";
 
-export interface ReactRouterProps<B extends Bindings> extends ViteProps<B> {
+export interface ReactRouterProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends ViteProps<B, RPC> {
   /**
    * @default workers/app.ts
    */
@@ -13,14 +16,18 @@ export interface ReactRouterProps<B extends Bindings> extends ViteProps<B> {
 }
 
 // don't allow the ASSETS to be overriden
-export type ReactRouter<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type ReactRouter<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
-export async function ReactRouter<B extends Bindings>(
+export async function ReactRouter<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(
   id: string,
-  props: ReactRouterProps<B> = {},
-): Promise<ReactRouter<B>> {
+  props: ReactRouterProps<B, RPC> = {},
+): Promise<ReactRouter<B, RPC>> {
   const runner = await getPackageManagerRunner();
   const cwd = path.resolve(props.cwd ?? process.cwd());
   const ssr = await detectSSREnabled(cwd);

package/src/cloudflare/redwood/redwood.ts

@@ -4,12 +4,16 @@ import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";
 import type { Worker } from "../worker.ts";
 
-export interface RedwoodProps<B extends Bindings> extends ViteProps<B> {}
+export interface RedwoodProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends ViteProps<B, RPC> {}
 
 // don't allow the ASSETS to be overridden
-export type Redwood<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type Redwood<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
 /**
  * Deploy a RedwoodJS application to Cloudflare Workers with automatically configured defaults.
@@ -37,10 +41,10 @@ export type Redwood<B extends Bindings> = B extends { ASSETS: any }
  * @param props - Configuration properties for the RedwoodJS deployment
  * @returns A Cloudflare Worker resource representing the deployed RedwoodJS application
  */
-export async function Redwood<B extends Bindings>(
-  id: string,
-  props?: Partial<RedwoodProps<B>>,
-): Promise<Redwood<B>> {
+export async function Redwood<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(id: string, props?: Partial<RedwoodProps<B, RPC>>): Promise<Redwood<B, RPC>> {
   return await Vite(id, {
     ...props,
     build: props?.build ?? {

package/src/cloudflare/route.ts

@@ -49,6 +49,14 @@ export interface RouteProps extends CloudflareApiOptions {
    */
   adopt?: boolean;
 
+  /**
+   * Whether to delete the route when removed from Alchemy.
+   * If set to false, the route will remain but the resource will be removed from state.
+   *
+   * @default true
+   */
+  delete?: boolean;
+
   /**
    * If true, the route will not be created, but will be retained if it already exists.
    * This is used for local development.
@@ -151,7 +159,7 @@ export const Route = Resource(
 
       // Only delete if we have complete output data (both ID and zoneId)
       // If creation failed, we won't have proper output, so just skip deletion
-      if (this.output?.id && this.output?.zoneId) {
+      if (props.delete !== false && this.output?.id && this.output?.zoneId) {
         await deleteRoute(api, this.output.zoneId, this.output.id);
       }
 

package/src/cloudflare/sveltekit/sveltekit.ts

@@ -4,12 +4,16 @@ import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";
 import type { Worker } from "../worker.ts";
 
-export interface SvelteKitProps<B extends Bindings> extends ViteProps<B> {}
+export interface SvelteKitProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends ViteProps<B, RPC> {}
 
 // don't allow the ASSETS to be overriden
-export type SvelteKit<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type SvelteKit<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
 /**
  * Deploy a SvelteKit application to Cloudflare Workers with automatically configured defaults.
@@ -47,10 +51,13 @@ export type SvelteKit<B extends Bindings> = B extends { ASSETS: any }
  * @param props - Configuration properties for the SvelteKit deployment
  * @returns A Cloudflare Worker resource representing the deployed SvelteKit application
  */
-export async function SvelteKit<B extends Bindings>(
+export async function SvelteKit<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(
   id: string,
-  props?: Partial<SvelteKitProps<B>>,
-): Promise<SvelteKit<B>> {
+  props?: Partial<SvelteKitProps<B, RPC>>,
+): Promise<SvelteKit<B, RPC>> {
   if (props?.compatibilityDate) {
     const providedDate = new Date(props.compatibilityDate);
     const minDate = new Date("2024-09-23");

package/src/cloudflare/tanstack-start/tanstack-start.ts

@@ -5,17 +5,24 @@ import type { Bindings } from "../bindings.ts";
 import { Vite, type ViteProps } from "../vite/vite.ts";
 import type { Worker } from "../worker.ts";
 
-export interface TanStackStartProps<B extends Bindings> extends ViteProps<B> {}
+export interface TanStackStartProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends ViteProps<B, RPC> {}
 
 // don't allow the ASSETS to be overriden
-export type TanStackStart<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type TanStackStart<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
-export async function TanStackStart<B extends Bindings>(
+export async function TanStackStart<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(
   id: string,
-  props?: Partial<TanStackStartProps<B>>,
-): Promise<TanStackStart<B>> {
+  props?: Partial<TanStackStartProps<B, RPC>>,
+): Promise<TanStackStart<B, RPC>> {
   const main =
     props?.wrangler?.main ??
     ((await exists(path.resolve(props?.cwd ?? process.cwd(), "src/server.ts")))

package/src/cloudflare/vite/vite.ts

@@ -11,16 +11,20 @@ import {
 } from "../website.ts";
 import type { Worker } from "../worker.ts";
 
-export interface ViteProps<B extends Bindings> extends WebsiteProps<B> {}
+export interface ViteProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends WebsiteProps<B, RPC> {}
 
-export type Vite<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type Vite<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
-export async function Vite<B extends Bindings>(
-  id: string,
-  props: ViteProps<B>,
-): Promise<Vite<B>> {
+export async function Vite<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(id: string, props: ViteProps<B, RPC>): Promise<Vite<B, RPC>> {
   const runner = await getPackageManagerRunner();
   let dev = spreadDevProps(props, `${runner} vite dev`);
   let domain = typeof dev === "object" ? dev.domain : undefined;

package/src/cloudflare/website.ts

@@ -18,10 +18,10 @@ import { computeWorkerDevDomain } from "./worker-subdomain.ts";
 import { type AssetsConfig, Worker, type WorkerProps } from "./worker.ts";
 import { WranglerJson, type WranglerJsonSpec } from "./wrangler.json.ts";
 
-export interface WebsiteProps<B extends Bindings> extends Omit<
-  WorkerProps<B>,
-  "assets" | "dev"
-> {
+export interface WebsiteProps<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> extends Omit<WorkerProps<B, RPC>, "assets" | "dev"> {
   /**
    * Configuration for the build command
    *
@@ -149,14 +149,15 @@ export interface WebsiteProps<B extends Bindings> extends Omit<
   memoize?: boolean | { patterns: string[] };
 }
 
-export type Website<B extends Bindings> = B extends { ASSETS: any }
-  ? never
-  : Worker<B & { ASSETS: Assets }>;
+export type Website<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = B extends { ASSETS: any } ? never : Worker<B & { ASSETS: Assets }, RPC>;
 
-export async function Website<B extends Bindings>(
-  id: string,
-  props: WebsiteProps<B>,
-) {
+export async function Website<
+  B extends Bindings,
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(id: string, props: WebsiteProps<B, RPC>) {
   const {
     name = Scope.current.createPhysicalName(id).toLowerCase(),
     build: buildProps,
@@ -377,7 +378,7 @@ export async function Website<B extends Bindings>(
         : {}),
     },
     dev: url ? { url } : undefined,
-  })) as Website<B>;
+  })) as Website<B, RPC>;
 }
 
 export const spreadBuildProps = (

package/src/cloudflare/worker.ts

@@ -6,7 +6,11 @@ import type { type } from "../type.ts";
 import { DeferredPromise } from "../util/deferred-promise.ts";
 import { logger } from "../util/logger.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
-import { CloudflareApiError, handleApiError } from "./api-error.ts";
+import {
+  CloudflareApiError,
+  handleApiError,
+  isCloudflareApiError,
+} from "./api-error.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
@@ -207,6 +211,14 @@ export interface BaseWorkerProps<
    */
   logpush?: boolean;
 
+  /**
+   * Whether to delete the worker when removed from Alchemy.
+   * If set to false, the worker will remain but the resource will be removed from state.
+   *
+   * @default true
+   */
+  delete?: boolean;
+
   /**
    * Whether to adopt the Worker if it already exists when creating
    */
@@ -939,6 +951,14 @@ export type Worker<
  * // The worker will have a preview URL for testing:
  * console.log(`Preview URL: ${previewWorker.url}`);
  * // Output: Preview URL: https://pr-123-my-worker.subdomain.workers.dev
+ *
+ * @example
+ * // Prevent deletion of the worker when removed from Alchemy:
+ * const worker = await Worker("critical-api", {
+ *   name: "critical-api",
+ *   entrypoint: "./src/api.ts",
+ *   delete: false
+ * });
  */
 export function Worker<
   const B extends Bindings,
@@ -1104,7 +1124,7 @@ const _Worker = Resource(
         durableObjects: options.durableObjects,
         workflows: options.workflows,
       });
-      if (this.output?.dev?.hasRemote !== false) {
+      if (props.delete !== false && this.output?.dev?.hasRemote !== false) {
         const api = await createCloudflareApi(props);
         if (props.version) {
           //* if the worker exists we deploy an empty version so we can destroy
@@ -1544,6 +1564,7 @@ async function provisionResources<B extends Bindings>(
               durableObjects: {
                 namespaceId: await getContainerNamespaceId(container),
               },
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1557,6 +1578,7 @@ async function provisionResources<B extends Bindings>(
               name: domain.name,
               zoneId: domain.zoneId,
               adopt: domain.adopt,
+              delete: props.delete,
               workerName: options.name,
               dev: options.local,
               ...input.api,
@@ -1579,6 +1601,7 @@ async function provisionResources<B extends Bindings>(
               scriptName: options.name,
               settings: eventSource.settings,
               adopt: props.adopt,
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1593,6 +1616,7 @@ async function provisionResources<B extends Bindings>(
               script: options.name,
               zoneId: route.zoneId,
               adopt: route.adopt,
+              delete: props.delete,
               dev: options.local,
               ...input.api,
             });
@@ -1843,6 +1867,16 @@ export async function putWorker(
             });
           }
         }
+        if (
+          isCloudflareApiError(error, { code: 11001 }) &&
+          !props.eventSources?.length
+        ) {
+          // Error code 11001 means that the worker has event sources, but no `queue` handler is defined.
+          // Normally, queue consumers are removed automatically since we're using the `QueueConsumer` resource,
+          // but if no `queue` handler is defined, we need to remove them for Cloudflare to let us deploy.
+          await deleteQueueConsumers(api, workerName);
+          return await putWorker(api, props);
+        }
         throw error;
       }
     },

package/workers/tunnel-proxy.js

@@ -83,7 +83,7 @@ const renderErrorHtml = (props) => `
             Alchemy</a>.</p>
       </div>
       <div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
-        <p class="text-sm text-slate-500">Alchemy 0.90.1</p>
+        <p class="text-sm text-slate-500">Alchemy 0.91.2</p>
       </div>
     </div>
   </body>