alchemy 0.64.0 → 0.65.0

package/lib/util/dedent.js

@@ -1,4 +1,3 @@
-import assert from "node:assert";
 /**
  * Tagged template literal for removing indentation from a block of text.
  *
@@ -9,29 +8,42 @@ export function dedent(strings, ...values) {
     const raw = String.raw({ raw: strings }, ...values);
     // Split the string by lines
     let lines = raw.split("\n");
-    assert(lines.length > 0);
-    // If the last line is just whitespace, remove it
-    if (lines[lines.length - 1].trim() === "") {
+    // Remove leading blank lines
+    while (lines.length > 0 && lines[0].trim() === "") {
+        lines = lines.slice(1);
+    }
+    // Remove trailing blank lines
+    while (lines.length > 0 && lines[lines.length - 1].trim() === "") {
         lines = lines.slice(0, lines.length - 1);
     }
-    // Find the minimum-length indent, excluding the first line
-    let minIndent = "";
-    // (Could use `minIndent.length` for this, but then would need to start with
-    // infinitely long string)
+    // If no content lines remain, return empty string
+    if (lines.length === 0) {
+        return "";
+    }
+    // Find the minimum-length indent from content lines (non-blank lines)
     let minIndentLength = Number.POSITIVE_INFINITY;
-    for (const line of lines.slice(1)) {
-        const indent = line.match(/^[ \t]*/)?.[0];
-        if (indent != null && indent.length < minIndentLength) {
-            minIndent = indent;
-            minIndentLength = indent.length;
+    for (const line of lines) {
+        if (line.trim() !== "") {
+            const indent = line.match(/^[ \t]*/)?.[0];
+            if (indent != null && indent.length < minIndentLength) {
+                minIndentLength = indent.length;
+            }
         }
     }
-    // If the first line is just whitespace, remove it
-    if (lines.length > 0 && lines[0].trim() === "") {
-        lines = lines.slice(1);
+    // If no indentation found, return lines as-is
+    if (minIndentLength === Number.POSITIVE_INFINITY) {
+        return lines.join("\n");
     }
-    // Remove indent from all lines, and return them all joined together
-    lines = lines.map((line) => line.startsWith(minIndent) ? line.substring(minIndent.length) : line);
+    // Remove indent from all lines, preserving blank lines
+    lines = lines.map((line) => {
+        if (line.trim() === "") {
+            return line; // Preserve blank lines
+        }
+        return line.startsWith(" ".repeat(minIndentLength)) ||
+            line.startsWith("\t".repeat(minIndentLength))
+            ? line.substring(minIndentLength)
+            : line;
+    });
     return lines.join("\n");
 }
 //# sourceMappingURL=dedent.js.map

package/lib/util/dedent.js.map

@@ -1 +1 @@
-{"version":3,"file":"dedent.js","sourceRoot":"","sources":["../../src/util/dedent.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,OAA6B,EAAE,GAAG,MAAiB;IACxE,8DAA8D;IAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,4BAA4B;IAC5B,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEzB,iDAAiD;IACjD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1C,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,2DAA2D;IAC3D,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,4EAA4E;IAC5E,0BAA0B;IAC1B,IAAI,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;YACtD,SAAS,GAAG,MAAM,CAAC;YACnB,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;QAClC,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/C,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,oEAAoE;IACpE,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACzB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CACrE,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"dedent.js","sourceRoot":"","sources":["../../src/util/dedent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,OAA6B,EAAE,GAAG,MAAiB;IACxE,8DAA8D;IAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,4BAA4B;IAC5B,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE5B,6BAA6B;IAC7B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAClD,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,8BAA8B;IAC9B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACjE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,kDAAkD;IAClD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,sEAAsE;IACtE,IAAI,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;gBACtD,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,IAAI,eAAe,KAAK,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,uDAAuD;IACvD,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,CAAC,uBAAuB;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;YACjC,CAAC,CAAC,IAAI,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}

package/lib/util/memoize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memoize.d.ts","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GACpE,CAAC,GACD,CAAC,CAAC;AAEN,wBAAgB,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EAChE,EAAE,EAAE,CAAC,EACL,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,MAAqB,IAG1C,GAAG,MAAM,UAAU,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAanE;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,GAAG,EAAE,WAE1C,CAAC"}
+{"version":3,"file":"memoize.d.ts","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":"AAGA,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GACpE,CAAC,GACD,CAAC,CAAC;AAEN,wBAAgB,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EAChE,EAAE,EAAE,CAAC,EACL,KAAK,GAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,MAAqB,IAG1C,GAAG,MAAM,UAAU,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAanE;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,GAAG,EAAE,WAa1C,CAAC"}

package/lib/util/memoize.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { isSecret } from "../secret.js";
 export function memoize(fn, keyFn = defaultKeyFn) {
     const cache = new Map();
     return async (...args) => {
@@ -16,6 +17,15 @@ export function memoize(fn, keyFn = defaultKeyFn) {
     };
 }
 export const defaultKeyFn = (...args) => {
-    return createHash("sha256").update(JSON.stringify(args)).digest("hex");
+    return createHash("sha256")
+        .update(JSON.stringify(args, (_, value) => {
+        // Secret names may differ between instantiations,
+        // so we unwrap it to make the key deterministic.
+        if (isSecret(value)) {
+            return value.unencrypted;
+        }
+        return value;
+    }))
+        .digest("hex");
 };
 //# sourceMappingURL=memoize.js.map

package/lib/util/memoize.js.map

@@ -1 +1 @@
-{"version":3,"file":"memoize.js","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzC,MAAM,UAAU,OAAO,CACrB,EAAK,EACL,QAA4C,YAAY;IAExD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuC,CAAC;IAC7D,OAAO,KAAK,EAAE,GAAG,IAAmB,EAA+B,EAAE;QACnE,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,MAAM,CAAC;QACtB,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxB,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IAC7C,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACzE,CAAC,CAAC"}
+{"version":3,"file":"memoize.js","sourceRoot":"","sources":["../../src/util/memoize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMxC,MAAM,UAAU,OAAO,CACrB,EAAK,EACL,QAA4C,YAAY;IAExD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuC,CAAC;IAC7D,OAAO,KAAK,EAAE,GAAG,IAAmB,EAA+B,EAAE;QACnE,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,MAAM,CAAC;QACtB,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxB,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;IAC7C,OAAO,UAAU,CAAC,QAAQ,CAAC;SACxB,MAAM,CACL,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAChC,kDAAkD;QAClD,iDAAiD;QACjD,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC,WAAW,CAAC;QAC3B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CACH;SACA,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.64.0",
+  "version": "0.65.0",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
   "homepage": "https://alchemy.run",
@@ -185,6 +185,7 @@
     "@cloudflare/workers-types": "^4.20250805.0",
     "@libsql/client": "^0.15.12",
     "@octokit/rest": "^21.1.1",
+    "@opennextjs/cloudflare": "^1.6.5",
     "astro": "^5.13.2",
     "drizzle-orm": "^0.44.2",
     "rwsdk": "^0.1.36",
@@ -224,6 +225,9 @@
     "@cloudflare/workers-types": {
       "optional": true
     },
+    "@opennextjs/cloudflare": {
+      "optional": true
+    },
     "@octokit/rest": {
       "optional": true
     },

package/src/cloudflare/bundle/plugin-wasm.ts

@@ -12,21 +12,41 @@ export function createWasmPlugin() {
       build.onStart(() => {
         modules.clear();
       });
-      build.onResolve({ filter: /\.wasm$/ }, async (args) => {
-        if (!modules.has(args.path)) {
-          const name = path.normalize(args.path);
-          assert(build.initialOptions.outdir, "outdir is required");
-          await fs.mkdir(build.initialOptions.outdir, { recursive: true });
-          await fs.copyFile(
-            path.join(args.resolveDir, name),
-            path.join(build.initialOptions.outdir, name),
-          );
-          modules.set(args.path, {
-            type: "wasm",
-            path: name,
-          });
+
+      // Handle imports like `import "./foo.wasm"` and `import "./foo.wasm?module"`
+      // TODO(john): Figure out why this suddenly became necessary
+      build.onResolve({ filter: /\.wasm(\?.*)?$/ }, async (args) => {
+        const resolved = modules.get(args.path);
+        if (resolved) {
+          return { path: resolved.path, external: true };
         }
-        return { external: true };
+
+        // Normalize path and remove the `?module` query param so we have the actual file name to copy
+        const name = path.normalize(args.path).replace(/\?.*$/, "");
+
+        // Resolve path to outdir (required for monorepos if the workdir is not the same as process.cwd())
+        assert(
+          build.initialOptions.absWorkingDir && build.initialOptions.outdir,
+          "Missing absWorkingDir or outdir from esbuild options",
+        );
+        const outdir = path.resolve(
+          build.initialOptions.absWorkingDir,
+          build.initialOptions.outdir,
+        );
+
+        // Copy to outdir so it's included in the upload
+        await fs.mkdir(outdir, { recursive: true });
+        await fs.copyFile(
+          path.join(args.resolveDir, name),
+          path.join(outdir, name),
+        );
+        modules.set(args.path, {
+          type: "wasm",
+          path: name,
+        });
+
+        // Resolve to the normalized file name (the `?module` query param is not needed in workerd)
+        return { path: name, external: true };
       });
     },
   };

package/src/cloudflare/compatibility-date.gen.ts

@@ -4,4 +4,4 @@
 /**
  * The default Cloudflare Workers compatibility date, set based on the latest workerd release at the time of build.
  */
-export const DEFAULT_COMPATIBILITY_DATE = "2025-08-26";
+export const DEFAULT_COMPATIBILITY_DATE = "2025-09-06";

package/src/cloudflare/hyperdrive.ts

@@ -4,8 +4,16 @@ import { Resource } from "../resource.ts";
 import { Scope } from "../scope.ts";
 import { Secret } from "../secret.ts";
 import { logger } from "../util/logger.ts";
-import { handleApiError } from "./api-error.ts";
-import { createCloudflareApi, type CloudflareApiOptions } from "./api.ts";
+import { CloudflareApiError, handleApiError } from "./api-error.ts";
+import {
+  extractCloudflareResult,
+  type CloudflareApiErrorPayload,
+} from "./api-response.ts";
+import {
+  createCloudflareApi,
+  type CloudflareApi,
+  type CloudflareApiOptions,
+} from "./api.ts";
 
 /**
  * Origin configuration for a PostgreSQL or MySQL database connection
@@ -163,6 +171,12 @@ export interface HyperdriveProps extends CloudflareApiOptions {
    */
   hyperdriveId?: string;
 
+  /**
+   * Whether to adopt an existing hyperdrive config
+   * @default false
+   */
+  adopt?: boolean;
+
   dev?: {
     /**
      * The database connection origin configuration for local development
@@ -176,46 +190,45 @@ export interface HyperdriveProps extends CloudflareApiOptions {
  * Output returned after Cloudflare Hyperdrive creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export interface Hyperdrive
-  extends Resource<"cloudflare::Hyperdrive">,
-    Omit<HyperdriveProps, "origin" | "dev"> {
-  /**
-   * The ID of the resource
-   */
-  id: string;
+export type Hyperdrive = Resource<"cloudflare::Hyperdrive"> &
+  Omit<HyperdriveProps, "origin" | "dev"> & {
+    /**
+     * The ID of the resource
+     */
+    id: string;
 
-  /**
-   * Name of the Hyperdrive configuration
-   */
-  name: string;
+    /**
+     * Name of the Hyperdrive configuration
+     */
+    name: string;
 
-  /**
-   * The Cloudflare-generated UUID of the hyperdrive
-   */
-  hyperdriveId: string;
+    /**
+     * The Cloudflare-generated UUID of the hyperdrive
+     */
+    hyperdriveId: string;
 
-  /**
-   * Database connection origin configuration
-   */
-  origin: HyperdrivePublicOrigin | HyperdriveOriginWithAccess;
+    /**
+     * Database connection origin configuration
+     */
+    origin: HyperdrivePublicOrigin | HyperdriveOriginWithAccess;
 
-  /**
-   * Local development configuration
-   * @internal
-   */
-  dev: {
     /**
-     * The connection string to use for local development
+     * Local development configuration
+     * @internal
      */
-    origin: Secret;
-  };
+    dev: {
+      /**
+       * The connection string to use for local development
+       */
+      origin: Secret;
+    };
 
-  /**
-   * Resource type identifier for binding.
-   * @internal
-   */
-  type: "hyperdrive";
-}
+    /**
+     * Resource type identifier for binding.
+     * @internal
+     */
+    type: "hyperdrive";
+  };
 
 /**
  * Represents a Cloudflare Hyperdrive configuration.
@@ -327,6 +340,7 @@ interface InternalHyperdriveProps extends CloudflareApiOptions {
     origin: Secret;
     force?: boolean;
   };
+  adopt?: boolean;
 }
 
 const _Hyperdrive = Resource(
@@ -337,7 +351,7 @@ const _Hyperdrive = Resource(
     props: InternalHyperdriveProps,
   ): Promise<Hyperdrive> {
     const hyperdriveId = props.hyperdriveId || this.output?.hyperdriveId;
-
+    const adopt = props.adopt || this.scope.adopt;
     const name =
       props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
@@ -354,13 +368,6 @@ const _Hyperdrive = Resource(
       });
     }
     const api = await createCloudflareApi(props);
-    const configsPath = `/accounts/${api.accountId}/hyperdrive/configs`;
-
-    // For create operations, we don't have a hyperdriveId yet
-    // For update/delete operations, we need to use the hyperdriveId from props or output
-    const configPath = hyperdriveId
-      ? `${configsPath}/${hyperdriveId}`
-      : `${configsPath}`;
 
     if (this.phase === "delete") {
       if (!hyperdriveId) {
@@ -369,7 +376,9 @@ const _Hyperdrive = Resource(
       }
 
       try {
-        const deleteResponse = await api.delete(configPath);
+        const deleteResponse = await api.delete(
+          `/accounts/${api.accountId}/hyperdrive/configs/${hyperdriveId}`,
+        );
         // Only swallow 404 Not Found errors, all other errors should be handled
         if (!deleteResponse.ok && deleteResponse.status !== 404) {
           await handleApiError(deleteResponse, "delete", "hyperdrive", id);
@@ -381,75 +390,107 @@ const _Hyperdrive = Resource(
       return this.destroy();
     }
 
-    let response: Response | undefined;
-    let apiResource: any;
-
     // Prepare request body with unwrapped secrets
-    const requestBody = prepareRequestBody(props);
-
-    try {
-      if (this.phase === "update" && hyperdriveId) {
-        // Update existing hyperdrive
-        response = await api.put(configPath, requestBody);
-      } else {
-        // Create new hyperdrive
-        if (hyperdriveId) {
-          // If we have a hyperdriveId but we're in create phase, it could be because
-          // the resource exists but wasn't in state. Do a GET to check.
-          const getResponse = await api.get(configPath);
-          if (getResponse.status === 200) {
-            // Hyperdrive exists, update it
-            logger.log(
-              `Hyperdrive '${id}' already exists. Updating existing resource.`,
+    const requestBody = prepareRequestBody({ ...props, name });
+    let result: HyperdriveResponse;
+
+    if (hyperdriveId) {
+      result = await extractCloudflareResult<HyperdriveResponse>(
+        `update hyperdrive config "${hyperdriveId}"`,
+        api.put(
+          `/accounts/${api.accountId}/hyperdrive/configs/${hyperdriveId}`,
+          requestBody,
+        ),
+      );
+    } else {
+      try {
+        result = await extractCloudflareResult<HyperdriveResponse>(
+          `create hyperdrive config "${name}"`,
+          api.post(
+            `/accounts/${api.accountId}/hyperdrive/configs`,
+            requestBody,
+          ),
+        );
+      } catch (error) {
+        if (
+          error instanceof CloudflareApiError &&
+          (error.errorData as CloudflareApiErrorPayload[]).some(
+            (e) => e.code === 2017, // 2017 is the error code for name conflict
+          )
+        ) {
+          if (!adopt) {
+            throw new Error(
+              `Hyperdrive config "${name}" already exists. Use adopt: true to adopt it.`,
+              { cause: error },
+            );
+          }
+          const existing = await findHyperdriveConfigByName(api, name);
+          if (!existing) {
+            throw new Error(
+              `Hyperdrive config "${name}" failed to create due to name conflict and could not be found for adoption.`,
+              { cause: error },
             );
-            response = await api.put(configPath, requestBody);
-          } else if (getResponse.status === 404) {
-            // Hyperdrive doesn't exist, create new
-            response = await api.post(configsPath, {
-              ...requestBody,
-              // Ensure name is set correctly if not already set
-              name: props.name || id,
-            });
-          } else {
-            // Unexpected error during GET check
-            await handleApiError(getResponse, "get", "hyperdrive", id);
           }
+          result = await extractCloudflareResult<HyperdriveResponse>(
+            `adopt hyperdrive config "${name}"`,
+            api.put(
+              `/accounts/${api.accountId}/hyperdrive/configs/${existing.id}`,
+              requestBody,
+            ),
+          );
         } else {
-          // No hyperdriveId, create new
-          response = await api.post(configsPath, {
-            ...requestBody,
-            // Ensure name is set correctly if not already set
-            name: props.name || id,
-          });
+          throw error;
         }
       }
-
-      if (!response?.ok) {
-        const action = this.phase === "update" ? "update" : "create";
-        await handleApiError(response!, action, "hyperdrive", id);
-      }
-
-      const data: { result: Record<string, any> } = await response!.json();
-      apiResource = data.result;
-    } catch (error) {
-      logger.error(`Error ${this.phase} Hyperdrive '${id}':`, error);
-      throw error;
     }
 
     // Construct the output object from API response and props
     return this({
       id,
-      hyperdriveId: apiResource.id, // Store the Cloudflare-assigned UUID
-      name: apiResource.name,
+      hyperdriveId: result.id, // Store the Cloudflare-assigned UUID
+      name: result.name,
       origin: props.origin,
-      caching: apiResource.caching,
-      mtls: apiResource.mtls,
+      caching: result.caching,
+      mtls: result.mtls,
       dev: props.dev,
       type: "hyperdrive",
     });
   },
 );
 
+interface HyperdriveResponse {
+  id: string;
+  name: string;
+  origin: HyperdriveOrigin;
+  caching?: HyperdriveCaching;
+  created_on?: string;
+  modified_on?: string;
+  mtls?: HyperdriveMtls;
+  origin_connection_limit?: number;
+}
+
+async function findHyperdriveConfigByName(
+  api: CloudflareApi,
+  name: string,
+  page = 1,
+) {
+  const response = await api.get(
+    `/accounts/${api.accountId}/hyperdrive/configs?page=${page}`,
+  );
+  const data: {
+    result: HyperdriveResponse[];
+    result_info?: { total_pages?: number };
+  } = await response.json();
+  const found = data.result.find((config) => config.name === name);
+  if (found) {
+    return found;
+  }
+  if (data.result_info?.total_pages && page < data.result_info.total_pages) {
+    return await findHyperdriveConfigByName(api, name, page + 1);
+  }
+  return null;
+}
+
 /**
  * Prepare the request body by unwrapping secret values
  */

package/src/cloudflare/index.ts

@@ -33,6 +33,7 @@ export * from "./email-rule.ts";
 export * from "./hyperdrive.ts";
 export * from "./images.ts";
 export * from "./kv-namespace.ts";
+export * from "./next.ts";
 export * from "./nuxt/nuxt.ts";
 export * from "./orange.ts";
 export * from "./permission-groups.ts";

package/src/cloudflare/next.ts

@@ -0,0 +1,123 @@
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import { bold, cyan } from "picocolors";
+import { getPackageManagerRunner } from "../util/detect-package-manager.ts";
+import { exists } from "../util/exists.ts";
+import ignore from "../util/ignore-matcher.ts";
+import { logger } from "../util/logger.ts";
+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 NextjsProps<B extends Bindings> extends WebsiteProps<B> {}
+
+export type Nextjs<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+export async function Nextjs<const B extends Bindings>(
+  id: string,
+  props: NextjsProps<B> = {},
+): Promise<Nextjs<B>> {
+  const runner = await getPackageManagerRunner();
+  const isIgnored = await isFileIgnored("wrangler.jsonc", props.cwd);
+  if (!isIgnored) {
+    logger.warn(
+      [
+        bold(
+          `The ${cyan("wrangler.jsonc")} file for Next.js ${cyan(`"${id}"`)} is not ignored.`,
+        ),
+        "This may cause unexpected behavior. Please add the file to your .gitignore.",
+      ].join(" "),
+    );
+  }
+  return await Website(id, {
+    ...props,
+    entrypoint: props.entrypoint ?? ".open-next/worker.js",
+    wrangler: {
+      path: "wrangler.jsonc",
+      secrets: isIgnored,
+      ...(props.wrangler ?? {}),
+    },
+    build: normalizeCommand(props.build, {
+      command: `${runner} opennextjs-cloudflare build`,
+      env: {
+        NEXTJS_ENV: "production",
+      },
+    }),
+    dev: normalizeCommand(props.dev, {
+      command: `${runner} next dev`,
+      env: {
+        NEXTJS_ENV: "development",
+      },
+    }),
+
+    // OpenNext generates the files, but relies on us to bundle them.
+    noBundle: props.noBundle ?? false,
+
+    spa: false,
+    compatibilityFlags: [
+      "nodejs_compat",
+      "global_fetch_strictly_public",
+      ...(props.compatibilityFlags ?? []),
+    ],
+    assets: props.assets ?? ".open-next/assets",
+  });
+}
+
+/**
+ * Check if a file is ignored by .gitignore.
+ *
+ * @param filename - The name of the file to check.
+ * @param cwd - The current working directory.
+ * @returns True if the file is ignored, false otherwise.
+ */
+const isFileIgnored = async (filename: string, cwd?: string) => {
+  const matcher = ignore();
+
+  // Read .gitignore from current directory and walk up the directory tree
+  let currentDir = path.resolve(cwd ?? process.cwd());
+  const gitignorePatterns: string[] = [];
+
+  while (currentDir !== path.dirname(currentDir)) {
+    const gitignorePath = path.join(currentDir, ".gitignore");
+    try {
+      const gitignoreContent = await fs.readFile(gitignorePath, "utf8");
+      // unshift to prioritize local .gitignore
+      gitignorePatterns.unshift(
+        ...gitignoreContent
+          .split("\n")
+          .filter((line) => line.trim() && !line.startsWith("#")),
+      );
+    } catch {
+      // .gitignore doesn't exist in this directory, continue up
+    }
+    if (await exists(path.join(currentDir, ".git"))) {
+      break;
+    }
+    currentDir = path.dirname(currentDir);
+  }
+
+  matcher.add(gitignorePatterns);
+
+  return matcher.ignores(filename);
+};
+
+const normalizeCommand = (
+  input: WebsiteProps<any>["build"],
+  defaults: {
+    command: string;
+    env: Record<string, string>;
+  },
+): WebsiteProps<any>["build"] => {
+  return {
+    command:
+      typeof input === "string" ? input : (input?.command ?? defaults.command),
+    env: {
+      ...defaults.env,
+      ...(typeof input === "object" ? (input?.env ?? {}) : {}),
+    },
+    memoize: typeof input === "object" ? input?.memoize : undefined,
+  };
+};