alchemy 0.20.1 → 0.22.0

package/src/cloudflare/kv-namespace.ts

@@ -1,14 +1,14 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { withExponentialBackoff } from "../util/retry.js";
-import { handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { withExponentialBackoff } from "../util/retry.ts";
+import { handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Properties for creating or updating a KV Namespace

package/src/cloudflare/nuxt.ts

@@ -1,7 +1,8 @@
-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";
+import path from "node:path";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 /**
  * Properties for creating a Nuxt resource.
@@ -57,7 +58,7 @@ export async function Nuxt<B extends Bindings>(
     // Default entry point for cloudflare-module preset
     main: props?.main ?? "./index.ts",
     // Default static assets directory for cloudflare-module preset
-    assets: props?.assets ?? "./.output/public",
+    assets: props?.assets ?? path.join(".output", "public"),
     // Ensure nodejs_compat flag is included for Nuxt compatibility
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
     // Enable wrangler by default, common for Nuxt/Cloudflare deployments

package/src/cloudflare/permission-groups.ts

@@ -1,6 +1,6 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
 
 /**
  * Cloudflare permission group as returned by the API

package/src/cloudflare/pipeline.ts

@@ -1,14 +1,14 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import type { Secret } from "../secret.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import type { Secret } from "../secret.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Settings for compression of pipeline output

package/src/cloudflare/queue-consumer.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { QueueResource } from "./queue.js";
+} from "./api.ts";
+import type { QueueResource } from "./queue.ts";
 
 /**
  * Settings for configuring a Queue Consumer

package/src/cloudflare/queue.ts

@@ -1,13 +1,13 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Settings for a Cloudflare Queue

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

@@ -1,15 +1,15 @@
-import { ResourceScope } from "../resource.js";
-import type { Scope } from "../scope.js";
-import { serialize } from "../serde.js";
-import { deserializeState, type State, type StateStore } from "../state.js";
-import { withExponentialBackoff } from "../util/retry.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import { ResourceScope } from "../resource.ts";
+import type { Scope } from "../scope.ts";
+import { serialize } from "../serde.ts";
+import { deserializeState, type State, type StateStore } from "../state.ts";
+import { withExponentialBackoff } from "../util/retry.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   type CloudflareApi,
   type CloudflareApiOptions,
   createCloudflareApi,
-} from "./api.js";
-import { createBucket, getBucket } from "./bucket.js";
+} from "./api.ts";
+import { createBucket, getBucket } from "./bucket.ts";
 
 /**
  * Options for CloudflareR2StateStore

package/src/cloudflare/react-router.ts

@@ -0,0 +1,45 @@
+import path from "node:path";
+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 ReactRouterProps<B extends Bindings> extends WebsiteProps<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 async function ReactRouter<B extends Bindings>(
+  id: string,
+  props: ReactRouterProps<B>,
+): Promise<ReactRouter<B>> {
+  const defaultAssets = path.join("build", "client");
+  return Website(id, {
+    ...props,
+    // Alchemy should bundle the result of `vite built`, not the user's main
+    // TODO: we probably need bundling to properly handle WASM/rules
+    main: path.join(props.cwd ?? process.cwd(), "build", "server", "index.js"),
+    wrangler: {
+      // wrangler should point to the user's main (e.g. `worker.ts`), unless overridden
+      main:
+        typeof props.wrangler === "object"
+          ? (props.wrangler.main ?? props.main)
+          : props.main,
+      // write to wrangler.json by default but respect overrides
+      path:
+        typeof props.wrangler === "string"
+          ? props.wrangler
+          : typeof props.wrangler === "object"
+            ? props.wrangler.path
+            : undefined,
+    },
+    assets:
+      typeof props.assets === "object"
+        ? {
+            dist: props.assets.dist ?? defaultAssets,
+          }
+        : (props.assets ?? defaultAssets),
+  });
+}

package/src/cloudflare/redwood.ts

@@ -1,8 +1,8 @@
 import path from "node:path";
-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";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface RedwoodProps<B extends Bindings> extends WebsiteProps<B> {}
 

package/src/cloudflare/route.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Worker } from "./worker.js";
+} from "./api.ts";
+import type { Worker } from "./worker.ts";
 
 /**
  * Properties for creating or updating a Route

package/src/cloudflare/tanstack-start.ts

@@ -1,7 +1,7 @@
-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";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface TanStackStartProps<B extends Bindings>
   extends WebsiteProps<B> {}

package/src/cloudflare/user.ts

@@ -1,9 +1,9 @@
-import type { Secret } from "../secret.js";
-import { CloudflareApiError } from "./api-error.js";
+import type { Secret } from "../secret.ts";
+import { CloudflareApiError } from "./api-error.ts";
 import {
   getCloudflareAuthHeaders,
   type CloudflareAuthOptions,
-} from "./auth.js";
+} from "./auth.ts";
 
 export interface CloudflareAccount {
   name: string;

package/src/cloudflare/vectorize-index.ts

@@ -1,13 +1,13 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { bind } from "../runtime/bind.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { bind } from "../runtime/bind.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { Bound } from "./bound.js";
+} from "./api.ts";
+import type { Bound } from "./bound.ts";
 
 /**
  * Properties for creating or updating a Vectorize Index

package/src/cloudflare/vectorize-metadata-index.ts

@@ -1,12 +1,12 @@
-import type { Context } from "../context.js";
-import { Resource, ResourceKind } from "../resource.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import type { Context } from "../context.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
-} from "./api.js";
-import type { VectorizeIndexResource } from "./vectorize-index.js";
+} from "./api.ts";
+import type { VectorizeIndexResource } from "./vectorize-index.ts";
 
 /**
  * Properties for creating or deleting a Vectorize Metadata Index

package/src/cloudflare/vite.ts

@@ -1,8 +1,8 @@
 import path from "node:path";
-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";
+import type { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import { Website, type WebsiteProps } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 export interface ViteProps<B extends Bindings> extends WebsiteProps<B> {}
 

package/src/cloudflare/website.ts

@@ -1,11 +1,15 @@
-import fs from "node:fs/promises";
 import path from "node:path";
-import { alchemy } from "../alchemy.js";
-import { Exec } from "../os/exec.js";
-import { Assets } from "./assets.js";
-import type { Bindings } from "./bindings.js";
-import { Worker, type AssetsConfig, type WorkerProps } from "./worker.js";
-import { WranglerJson } from "./wrangler.json.js";
+import { alchemy } from "../alchemy.ts";
+import { Exec } from "../os/exec.ts";
+import { Assets } from "./assets.ts";
+import type { Bindings } from "./bindings.ts";
+import {
+  DEFAULT_COMPATIBILITY_DATE,
+  Worker,
+  type AssetsConfig,
+  type WorkerProps,
+} from "./worker.ts";
+import { WranglerJson } from "./wrangler.json.ts";
 
 export interface WebsiteProps<B extends Bindings>
   extends Omit<WorkerProps<B>, "name" | "assets" | "entrypoint"> {
@@ -69,9 +73,6 @@ export async function Website<B extends Bindings>(
   const wrangler = props.wrangler ?? true;
 
   return alchemy.run(id, async () => {
-    // building the site requires a wrangler.jsonc file to start
-    // - so initialize an empty one if it doesn't exist
-
     const cwd = path.resolve(props.cwd || process.cwd());
     const fileName =
       typeof wrangler === "boolean"
@@ -84,35 +85,17 @@ export async function Website<B extends Bindings>(
     const wranglerMain =
       typeof wrangler === "object" ? (wrangler.main ?? props.main) : props.main;
 
-    if (wrangler) {
-      try {
-        await fs.access(wranglerPath!);
-      } catch {
-        await fs.writeFile(
-          wranglerPath!,
-          JSON.stringify(
-            {
-              name: id,
-              main: wranglerMain,
-              compatibility_date: new Date().toISOString().split("T")[0],
-              compatibility_flags: props.compatibilityFlags ?? [],
-            },
-            null,
-            2,
-          ),
-        );
-      }
-    }
+    const workerName = props.name ?? id;
 
-    await Exec("build", {
-      cwd,
-      command: props.command,
-    });
+    const assetDir =
+      typeof props.assets === "string"
+        ? props.assets
+        : (props.assets?.dist ?? "dist");
 
-    // @ts-expect-error - the WorkerProps union type not happy
-    const worker = await Worker("worker", {
+    const workerProps = {
       ...props,
-      name: props.name ?? id,
+      compatibilityDate: props.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE,
+      name: workerName,
       entrypoint: props.main,
       assets: {
         html_handling: "auto-trailing-slash",
@@ -130,25 +113,36 @@ export default {
 };`,
       url: true,
       adopt: true,
-      bindings: {
-        ...props.bindings,
-        ASSETS: await Assets("assets", {
-          path:
-            typeof props.assets === "string"
-              ? props.assets
-              : (props.assets?.dist ?? "dist"),
-        }),
-      },
-    });
+    } as WorkerProps<any> & { name: string };
 
     if (wrangler) {
       await WranglerJson("wrangler.jsonc", {
         path: wranglerPath,
-        worker,
+        worker: workerProps,
         main: wranglerMain,
+        // hard-code the assets directory because we haven't yet included the assets binding
+        assets: {
+          binding: "ASSETS",
+          directory: assetDir,
+        },
       });
     }
 
-    return worker as Website<B>;
+    await Exec("build", {
+      cwd,
+      command: props.command,
+    });
+
+    return (await Worker("worker", {
+      ...workerProps,
+      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: await Assets("assets", {
+          path: assetDir,
+        }),
+      },
+    } as WorkerProps<any> & { name: string })) as Website<B>;
   });
 }

package/src/cloudflare/worker-assets.ts

@@ -1,10 +1,10 @@
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { getContentType } from "../util/content-type.js";
-import type { CloudflareApi } from "./api.js";
-import type { Assets } from "./assets.js";
-import type { AssetsConfig, WorkerProps } from "./worker.js";
+import { getContentType } from "../util/content-type.ts";
+import type { CloudflareApi } from "./api.ts";
+import type { Assets } from "./assets.ts";
+import type { AssetsConfig, WorkerProps } from "./worker.ts";
 
 export interface AssetUploadResult {
   completionToken: string;