alchemy 0.41.1 → 0.42.0

package/src/cloudflare/container.ts

@@ -1,6 +1,7 @@
 import type { Context } from "../context.ts";
-import { Image, type ImageProps, type ImageRegistry } from "../docker/image.ts";
+import { Image, type ImageProps } from "../docker/image.ts";
 import { Resource } from "../resource.ts";
+import { Scope } from "../scope.ts";
 import { secret } from "../secret.ts";
 import {
   type CloudflareApi,
@@ -17,6 +18,9 @@ export interface ContainerProps
   instanceType?: InstanceType;
   observability?: DeploymentObservability;
   schedulingPolicy?: SchedulingPolicy;
+  dev?: {
+    remote?: boolean;
+  };
 }
 
 /**
@@ -40,6 +44,9 @@ export type Container<T = any> = {
   instanceType?: InstanceType;
   observability?: DeploymentObservability;
   schedulingPolicy?: SchedulingPolicy;
+  dev?: {
+    remote?: boolean;
+  };
   /**
    * @internal
    */
@@ -50,48 +57,55 @@ export async function Container<T>(
   id: string,
   props: ContainerProps,
 ): Promise<Container<T>> {
-  // Otherwise, obtain Cloudflare registry credentials automatically
-  const api = await createCloudflareApi(props);
-  const creds = await getContainerCredentials(api);
-
-  const registry: ImageRegistry = {
-    server: "registry.cloudflare.com",
-    username: creds.username || creds.user!,
-    password: secret(creds.password),
-  };
-
-  // Ensure repository name is namespaced with accountId
-  const repoBase = props.name ?? id;
-  const repoName = repoBase.includes("/")
-    ? repoBase
-    : `${api.accountId}/${repoBase}`;
-
-  // Replace disallowed "latest" tag with timestamp
-  const finalTag =
+  const name = props.name ?? id;
+  const tag =
     props.tag === undefined || props.tag === "latest"
       ? `latest-${Date.now()}`
       : props.tag;
 
-  const image = await Image(id, {
-    build: props.build,
-    name: repoName,
-    tag: finalTag,
-    skipPush: false,
-    registry,
-  });
-
-  return {
+  const output: Omit<Container<T>, "image"> = {
     type: "container",
     id,
-    name: props.name ?? id,
+    name,
     className: props.className,
-    image,
     maxInstances: props.maxInstances,
     scriptName: props.scriptName,
     instanceType: props.instanceType,
     observability: props.observability,
     schedulingPolicy: props.schedulingPolicy,
     sqlite: true,
+    dev: props.dev,
+  };
+
+  if (Scope.current.dev && !props.dev?.remote) {
+    const image = await Image(id, {
+      name: `cloudflare-dev/${name}`, // prefix used by Miniflare
+      tag,
+      build: props.build,
+    });
+
+    return {
+      ...output,
+      image,
+    };
+  }
+
+  const api = await createCloudflareApi(props);
+  const credentials = await getContainerCredentials(api);
+
+  const image = await Image(id, {
+    name: `${api.accountId}/${name}`,
+    tag,
+    registry: {
+      server: "registry.cloudflare.com",
+      username: credentials.username || credentials.user!,
+      password: secret(credentials.password),
+    },
+  });
+
+  return {
+    ...output,
+    image,
   };
 }
 

package/src/cloudflare/index.ts

@@ -13,6 +13,7 @@ export * from "./browser-rendering.ts";
 export * from "./bucket.ts";
 export * from "./bundle/external.ts";
 export * from "./bundle/local-dev-cloudflare-shim.ts";
+export * from "./certificate-pack.ts";
 export * from "./container.ts";
 export * from "./custom-domain.ts";
 export * from "./d1-clone.ts";
@@ -31,12 +32,14 @@ export * from "./hyperdrive.ts";
 export * from "./images.ts";
 export * from "./kv-namespace.ts";
 export * from "./nuxt.ts";
+export * from "./orange.ts";
 export * from "./permission-groups.ts";
 export * from "./pipeline.ts";
 export * from "./queue-consumer.ts";
 export * from "./queue.ts";
 export * from "./r2-rest-state-store.ts";
 export * from "./react-router.ts";
+export * from "./redirect-rule.ts";
 export * from "./redwood.ts";
 export * from "./route.ts";
 export * from "./secret-key.ts";

package/src/cloudflare/orange.ts

@@ -0,0 +1,61 @@
+import type { Assets } from "./assets.js";
+import type { Bindings } from "./bindings.js";
+import { Website, type WebsiteProps } from "./website.js";
+import type { Worker } from "./worker.js";
+
+export interface OrangeProps<B extends Bindings> extends WebsiteProps<B> {}
+
+// don't allow the ASSETS to be overriden
+export type Orange<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+/**
+ * Deploys an Orange application to Cloudflare Workers.
+ *
+ * This resource simplifies deploying Orange applications by assuming the build
+ * command, main entrypoint, and assets directory based on the `create-orange`
+ * template CLI.
+ *
+ * It wraps the underlying `Website` resource.
+ *
+ * @example
+ * // Deploy a basic Orange application with default settings
+ * const orangeApp = await Orange("my-orange-app");
+ *
+ * @example
+ * // Deploy with a database binding
+ * const database = await D1Database("orange-db");
+ * const orangeApp = await Orange("orange-with-db", {
+ *   bindings: { DB: database }
+ * });
+ *
+ * @param id - Unique identifier for the Orange resource
+ * @param props - Configuration properties for the Orange resource
+ * @returns A Cloudflare Worker resource representing the deployed Orange application
+ */
+export async function Orange<B extends Bindings>(
+  id: string,
+  props?: Partial<OrangeProps<B>>,
+): Promise<Orange<B>> {
+  return Website(id, {
+    ...props,
+    command: props?.command ?? "bun run build",
+    // The entrypoint and the Wrangler main must differ for the Cloudflare vite plugin
+    // to bundle the application correctly, and alchemy must run our bundler on the Vite
+    // output since we don't resolve vite imports.
+    wrangler: props?.wrangler ?? {
+      main: "app/entry.server.ts",
+    },
+    // Since we've already bundled the application with the build command, we can just
+    // upload the modules in the `dist/srr` directory. With `noBundle: true`, any files
+    // that match `**/*.js`, `**/*.mjs`, and `**/*.wasm` under the entrypoint's directory
+    // (which is `dist/ssr`) will be uploaded to the worker so we don't need any explicit
+    // module rules.
+    noBundle: true,
+    // `main` is used as the entrypoint in the Worker resource.
+    main: props?.main ?? "dist/ssr/entry.server.js",
+    assets: props?.assets ?? "dist/client",
+    compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
+  });
+}