@opennextjs/cloudflare 0.6.4 → 0.6.6

package/dist/api/cloudflare-context.d.ts

@@ -1,3 +1,4 @@
+import type { GetPlatformProxyOptions } from "wrangler";
 import type { DurableObjectQueueHandler } from "./durable-objects/queue";
 import { DOShardedTagCache } from "./durable-objects/sharded-tag-cache";
 declare global {
@@ -49,5 +50,6 @@ export declare function getCloudflareContext<CfProperties extends Record<string,
  * with the open-next Cloudflare adapter
  *
  * Note: this function should only be called inside the Next.js config file, and although async it doesn't need to be `await`ed
+ * @param options options on how the function should operate and if/where to persist the platform data
  */
-export declare function initOpenNextCloudflareForDev(): Promise<void>;
+export declare function initOpenNextCloudflareForDev(options?: GetPlatformProxyOptions): Promise<void>;

package/dist/api/cloudflare-context.js

@@ -71,12 +71,17 @@ async function getCloudflareContextAsync() {
  * with the open-next Cloudflare adapter
  *
  * Note: this function should only be called inside the Next.js config file, and although async it doesn't need to be `await`ed
+ * @param options options on how the function should operate and if/where to persist the platform data
  */
-export async function initOpenNextCloudflareForDev() {
+export async function initOpenNextCloudflareForDev(options) {
     const shouldInitializationRun = shouldContextInitializationRun();
     if (!shouldInitializationRun)
         return;
-    const context = await getCloudflareContextFromWrangler();
+    if (options?.environment && process.env.NEXT_DEV_WRANGLER_ENV) {
+        console.warn(`'initOpenNextCloudflareForDev' has been called with an environment option while NEXT_DEV_WRANGLER_ENV is set.` +
+            ` NEXT_DEV_WRANGLER_ENV will be ignored and the environment will be set to: '${options.environment}'`);
+    }
+    const context = await getCloudflareContextFromWrangler(options);
     addCloudflareContextToNodejsGlobal(context);
     await monkeyPatchVmModuleEdgeContext(context);
 }
@@ -131,12 +136,14 @@ async function monkeyPatchVmModuleEdgeContext(cloudflareContext) {
  *
  * @returns the cloudflare context ready for use
  */
-async function getCloudflareContextFromWrangler() {
+async function getCloudflareContextFromWrangler(options) {
     // Note: we never want wrangler to be bundled in the Next.js app, that's why the import below looks like it does
     const { getPlatformProxy } = await import(/* webpackIgnore: true */ `${"__wrangler".replaceAll("_", "")}`);
+    // This allows the selection of a wrangler environment while running in next dev mode
+    const environment = options?.environment ?? process.env.NEXT_DEV_WRANGLER_ENV;
     const { env, cf, ctx } = await getPlatformProxy({
-        // This allows the selection of a wrangler environment while running in next dev mode
-        environment: process.env.NEXT_DEV_WRANGLER_ENV,
+        ...options,
+        environment,
     });
     return {
         env,

package/dist/api/durable-objects/queue.js

@@ -221,13 +221,11 @@ export class DurableObjectQueueHandler extends DurableObject {
         try {
             if (this.disableSQLite)
                 return false;
-            const numNewer = this.sql
-                .exec("SELECT COUNT(*) as numNewer FROM sync WHERE id = ? AND lastSuccess > ? LIMIT 1", `${msg.MessageBody.host}${msg.MessageBody.url}`, Math.round(msg.MessageBody.lastModified / 1000))
-                .one().numNewer;
-            return numNewer > 0;
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            return (this.sql
+                .exec("SELECT 1 FROM sync WHERE id = ? AND lastSuccess > ? LIMIT 1", `${msg.MessageBody.host}${msg.MessageBody.url}`, Math.round(msg.MessageBody.lastModified / 1000))
+                .toArray().length > 0);
         }
-        catch (e) {
+        catch {
             return false;
         }
     }

package/dist/api/durable-objects/sharded-tag-cache.js

@@ -9,10 +9,9 @@ export class DOShardedTagCache extends DurableObject {
         });
     }
     async hasBeenRevalidated(tags, lastModified) {
-        const result = this.sql
-            .exec(`SELECT COUNT(*) as cnt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?`, ...tags, lastModified ?? Date.now())
-            .one();
-        return result.cnt > 0;
+        return (this.sql
+            .exec(`SELECT 1 FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`, ...tags, lastModified ?? Date.now())
+            .toArray().length > 0);
     }
     async writeTags(tags, lastModified) {
         tags.forEach((tag) => {

package/dist/api/overrides/tag-cache/d1-next-tag-cache.js

@@ -10,12 +10,10 @@ export class D1NextModeTagCache {
             return false;
         try {
             const result = await db
-                .prepare(`SELECT COUNT(*) as cnt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`)
+                .prepare(`SELECT 1 FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`)
                 .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now())
-                .first();
-            if (!result)
-                throw new RecoverableError(`D1 select failed for ${tags}`);
-            return result.cnt > 0;
+                .raw();
+            return result.length > 0;
         }
         catch (e) {
             error(e);

package/dist/cli/build/bundle-server.js

@@ -87,7 +87,7 @@ export async function bundleServer(buildOpts) {
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
-        external: ["./middleware/handler.mjs"],
+        external: ["./middleware/handler.mjs", "*.wasm"],
         alias: {
             // Note: it looks like node-fetch is actually not necessary for us, so we could replace it with an empty shim
             //       but just to be safe we replace it with a module that re-exports the native fetch

package/dist/cli/build/open-next/createServerBundle.js

@@ -2,10 +2,11 @@
 // Adapted for cloudflare workers
 import fs from "node:fs";
 import path from "node:path";
+import { loadMiddlewareManifest } from "@opennextjs/aws/adapters/config/util.js";
 import { bundleNextServer } from "@opennextjs/aws/build/bundleNextServer.js";
 import { compileCache } from "@opennextjs/aws/build/compileCache.js";
 import { copyTracedFiles } from "@opennextjs/aws/build/copyTracedFiles.js";
-import { generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
+import { copyMiddlewareResources, generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { installDependencies } from "@opennextjs/aws/build/installDeps.js";
 import { applyCodePatches } from "@opennextjs/aws/build/patch/codePatcher.js";
@@ -86,25 +87,28 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
     //       `.next/standalone/package/path` (ie. `.next`, `server.js`).
     //       We need to output the handler file inside the package path.
     const packagePath = buildHelper.getPackagePath(options);
-    fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });
+    const outPackagePath = path.join(outputPath, packagePath);
+    fs.mkdirSync(outPackagePath, { recursive: true });
     const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
-    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outputPath, packagePath, "cache.cjs"));
+    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outPackagePath, "cache.cjs"));
     if (fnOptions.runtime === "deno") {
         addDenoJson(outputPath, packagePath);
     }
     // Bundle next server if necessary
     const isBundled = fnOptions.experimentalBundledNextServer ?? false;
     if (isBundled) {
-        await bundleNextServer(path.join(outputPath, packagePath), appPath, {
+        await bundleNextServer(outPackagePath, appPath, {
             minify: options.minify,
         });
     }
     // Copy middleware
     if (!config.middleware?.external) {
-        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outputPath, packagePath, "middleware.mjs"));
+        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outPackagePath, "middleware.mjs"));
+        const middlewareManifest = loadMiddlewareManifest(path.join(options.appBuildOutputPath, ".next"));
+        copyMiddlewareResources(options, middlewareManifest.middleware["/"], outPackagePath);
     }
     // Copy open-next.config.mjs
-    buildHelper.copyOpenNextConfig(options.buildDir, path.join(outputPath, packagePath), true);
+    buildHelper.copyOpenNextConfig(options.buildDir, outPackagePath, true);
     // Copy env files
     buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
     // Copy all necessary traced files
@@ -164,7 +168,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
             : []),
         openNextEdgePlugins({
             nextDir: path.join(options.appBuildOutputPath, ".next"),
-            isInCloudfare: true,
+            isInCloudflare: true,
         }),
     ];
     const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";
@@ -228,7 +232,7 @@ function addMonorepoEntrypoint(outputPath, packagePath) {
     //       the Lambda function to be able to find the handler at
     //       the root of the bundle. We will create a dummy `index.mjs`
     //       that re-exports the real handler.
-    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export * from "./${normalizePath(packagePath)}/index.mjs";`);
+    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export { handler } from "./${normalizePath(packagePath)}/index.mjs";`);
 }
 async function minifyServerBundle(outputDir) {
     logger.info("Minimizing server function...");

package/dist/cli/build/patches/plugins/dynamic-requires.js

@@ -82,7 +82,14 @@ rule:
       regex: ^NodeModuleLoader$
 fix: |
   async load($ID) {
-    ${getRequires("$ID", files, serverDir)}
+    ${buildOpts.debug
+        ? `   try {
+      ${getRequires("$ID", files, serverDir)}
+    } catch (e) {
+      console.error('Exception in NodeModuleLoader', e);
+      throw e;
+    }`
+        : getRequires("$ID", files, serverDir)}
   }`;
 }
 async function getRequirePageRule(buildOpts) {
@@ -112,7 +119,14 @@ function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
     process.env.__NEXT_PRIVATE_RUNTIME_TYPE = $IS_APP_PATH ? 'app' : 'pages';
   try {
     ${getRequires("pagePath", jsFiles, serverDir)}
-  } finally {
+  } ${buildOpts.debug
+            ? `
+  catch (e) {
+    console.error("Exception in requirePage", e);
+    throw e;
+  }`
+            : ``}
+  finally {
     process.env.__NEXT_PRIVATE_RUNTIME_TYPE = '';
   }
 }`,

package/dist/cli/build/patches/plugins/next-minimal.js

@@ -1,8 +1,15 @@
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+// Remove an instantiation of `AbortController` from the runtime.
+//
+//  Solves https://github.com/cloudflare/workerd/issues/3657:
+// - The `AbortController` is meant for the client side, but ends in the server code somehow.
+//   That's why we can get ride of it. See https://github.com/vercel/next.js/pull/73975/files.
+// - Top level instantiation of `AbortController` are not supported by workerd as of March, 2025.
+//   See https://github.com/cloudflare/workerd/issues/3657
+// - As Next code is not more executed at top level, we do not need to apply this patch
+//   See https://github.com/opennextjs/opennextjs-cloudflare/pull/497
+//
 // We try to be as specific as possible to avoid patching the wrong thing here
-// It seems that there is a bug in the worker runtime. When the AbortController is created outside of the request context it throws an error (not sure if it's expected or not) except in this case. https://github.com/cloudflare/workerd/issues/3657
-// It fails while requiring the `app-page.runtime.prod.js` file, but instead of throwing an error, it just return an empty object for the `require('app-page.runtime.prod.js')` call which makes every request to an app router page fail.
-// If it's a bug in workerd and it's not expected to throw an error, we can remove this patch.
 export const abortControllerRule = `
 rule:
   all:
@@ -65,18 +72,7 @@ fix:
   'true'
 `;
 export function patchNextMinimal(updater) {
-    updater.updateContent("patch-abortController-next15.2", [
-        {
-            field: {
-                filter: /app-page(-experimental)?\.runtime\.prod\.js$/,
-                contentFilter: /new AbortController/,
-                callback: ({ contents }) => {
-                    return patchCode(contents, abortControllerRule);
-                },
-            },
-        },
-    ]);
-    updater.updateContent("patch-next-minimal", [
+    return updater.updateContent("patch-next-minimal", [
         {
             field: {
                 filter: /next-server\.(js)$/,
@@ -87,8 +83,4 @@ export function patchNextMinimal(updater) {
             },
         },
     ]);
-    return {
-        name: "patch-abortController",
-        setup() { },
-    };
 }

package/dist/cli/templates/worker.js

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+import process from "node:process";
 // @ts-expect-error: resolved by wrangler build
 import * as nextEnvVars from "./env/next-env.mjs";
 const cloudflareContextALS = new AsyncLocalStorage();
@@ -54,6 +55,11 @@ function populateProcessEnv(url, env) {
     if (processEnvPopulated) {
         return;
     }
+    // Some packages rely on `process.version` and `process.versions.node` (i.e. Jose@4)
+    // TODO: Remove when https://github.com/unjs/unenv/pull/493 is merged
+    Object.assign(process, { version: process.version || "v22.14.0" });
+    // @ts-expect-error Node type does not match workerd
+    Object.assign(process.versions, { node: "22.14.0", ...process.versions });
     processEnvPopulated = true;
     for (const [key, value] of Object.entries(env)) {
         if (typeof value === "string") {
@@ -63,7 +69,7 @@ function populateProcessEnv(url, env) {
     const mode = env.NEXTJS_ENV ?? "production";
     if (nextEnvVars[mode]) {
         for (const key in nextEnvVars[mode]) {
-            process.env[key] = nextEnvVars[mode][key];
+            process.env[key] ??= nextEnvVars[mode][key];
         }
     }
     // Set the default Origin for the origin resolver.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@798",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@802",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0"
   },
@@ -67,7 +67,7 @@
     "vitest": "^2.1.1"
   },
   "peerDependencies": {
-    "wrangler": "^3.114.1 || ^4.0.0"
+    "wrangler": "^3.114.1 || ^4.6.0"
   },
   "scripts": {
     "clean": "rimraf dist",