@opennextjs/cloudflare 1.0.0-beta.2 → 1.0.0-beta.4

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

@@ -14,8 +14,8 @@ import { inlineEvalManifest } from "./patches/plugins/eval-manifest.js";
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
-import { patchNextMinimal } from "./patches/plugins/next-minimal.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
+import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
@@ -78,12 +78,12 @@ export async function bundleServer(buildOpts) {
             fixRequire(updater),
             handleOptionalDependencies(optionalDependencies),
             patchInstrumentation(updater, buildOpts),
+            patchPagesRouterContext(buildOpts),
             inlineEvalManifest(updater, buildOpts),
             inlineFindDir(updater, buildOpts),
             inlineLoadManifest(updater, buildOpts),
             inlineBuildId(updater),
             patchDepdDeprecations(updater),
-            patchNextMinimal(updater),
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
@@ -125,46 +125,6 @@ export async function bundleServer(buildOpts) {
             "process.env.__NEXT_EXPERIMENTAL_REACT": `${needsExperimentalReact(nextConfig)}`,
         },
         platform: "node",
-        banner: {
-            js: `
-// Used by unbundled js files (which don't inherit the __dirname present in the define field)
-// so we also need to set it on the global scope
-// Note: this was hit in the next/dist/compiled/@opentelemetry/api module
-globalThis.__dirname ??= "";
-globalThis.__filename ??= "";
-
-// Do not crash on cache not supported
-// https://github.com/cloudflare/workerd/pull/2434
-// compatibility flag "cache_option_enabled" -> does not support "force-cache"
-const curFetch = globalThis.fetch;
-globalThis.fetch = (input, init) => {
-  if (init) {
-    delete init.cache;
-  }
-  return curFetch(input, init);
-};
-import __cf_stream from 'node:stream';
-fetch = globalThis.fetch;
-const CustomRequest = class extends globalThis.Request {
-  constructor(input, init) {
-    if (init) {
-      delete init.cache;
-      // https://github.com/cloudflare/workerd/issues/2746
-      // https://github.com/cloudflare/workerd/issues/3245
-      Object.defineProperty(init, "body", {
-        value: init.body instanceof __cf_stream.Readable ? ReadableStream.from(init.body) : init.body
-      });
-    }
-    super(input, init);
-  }
-};
-globalThis.Request = CustomRequest;
-Request = globalThis.Request;
-// Makes the edge converter returns either a Response or a Request.
-globalThis.__dangerous_ON_edge_converter_returns_request = true;
-globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
-`,
-        },
     });
     fs.writeFileSync(openNextServerBundle + ".meta.json", JSON.stringify(result.metafile, null, 2));
     await updateWorkerBundledCode(openNextServerBundle, buildOpts);
@@ -185,6 +145,7 @@ export async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
         [
             "'require(this.middlewareManifestPath)'",
             (code) => patches.inlineMiddlewareManifestRequire(code, buildOpts),
+            { isOptional: true },
         ],
         [
             "`require.resolve` call",

package/dist/cli/build/open-next/compile-env-files.js

@@ -5,7 +5,7 @@ import { extractProjectEnvVars } from "../utils/index.js";
  * Compiles the values extracted from the project's env files to the output directory for use in the worker.
  */
 export function compileEnvFiles(buildOpts) {
-    const envDir = path.join(buildOpts.outputDir, "env");
+    const envDir = path.join(buildOpts.outputDir, "cloudflare");
     fs.mkdirSync(envDir, { recursive: true });
     ["production", "development", "test"].forEach((mode) => fs.appendFileSync(path.join(envDir, `next-env.mjs`), `export const ${mode} = ${JSON.stringify(extractProjectEnvVars(mode, buildOpts))};\n`));
 }

package/dist/cli/build/open-next/compile-init.d.ts

@@ -0,0 +1,5 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export declare function compileInit(options: BuildOptions): Promise<void>;

package/dist/cli/build/open-next/compile-init.js

@@ -0,0 +1,27 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { loadConfig } from "@opennextjs/aws/adapters/config/util.js";
+import { build } from "esbuild";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export async function compileInit(options) {
+    const currentDir = path.join(path.dirname(fileURLToPath(import.meta.url)));
+    const templatesDir = path.join(currentDir, "../../templates");
+    const initPath = path.join(templatesDir, "init.js");
+    const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next"));
+    const basePath = nextConfig.basePath ?? "";
+    await build({
+        entryPoints: [initPath],
+        outdir: path.join(options.outputDir, "cloudflare"),
+        bundle: false,
+        minify: false,
+        format: "esm",
+        target: "esnext",
+        platform: "node",
+        define: {
+            __BUILD_TIMESTAMP_MS__: JSON.stringify(Date.now()),
+            __NEXT_BASE_PATH__: JSON.stringify(basePath),
+        },
+    });
+}

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

@@ -10,8 +10,9 @@ import { copyMiddlewareResources, generateEdgeBundle } from "@opennextjs/aws/bui
 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";
-import { patchFetchCacheForISR, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patchFetchCacheISR.js";
-import { patchFetchCacheSetMissingWaitUntil } from "@opennextjs/aws/build/patch/patchFetchCacheWaitUntil.js";
+import { patchEnvVars, patchFetchCacheForISR, patchFetchCacheSetMissingWaitUntil, patchNextServer, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patches/index.js";
+// TODO: import from patches/index.js when https://github.com/opennextjs/opennextjs-aws/pull/827 is released
+import { patchBackgroundRevalidation } from "@opennextjs/aws/build/patch/patches/patchBackgroundRevalidation.js";
 import logger from "@opennextjs/aws/logger.js";
 import { minifyAll } from "@opennextjs/aws/minimize-js.js";
 import { openNextEdgePlugins } from "@opennextjs/aws/plugins/edge.js";
@@ -124,6 +125,9 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         patchFetchCacheSetMissingWaitUntil,
         patchFetchCacheForISR,
         patchUnstableCacheForISR,
+        patchNextServer,
+        patchEnvVars,
+        patchBackgroundRevalidation,
         // Cloudflare specific patches
         patchResRevalidate,
         ...additionalCodePatches,
@@ -147,6 +151,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
                 ...(disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : []),
                 ...(disableRouting ? ["withRouting"] : []),
                 ...(isAfter142 ? ["patchAsyncStorage"] : []),
+                ...(isAfter141 ? ["appendPrefetch"] : []),
             ],
         }),
         openNextReplacementPlugin({

package/dist/cli/build/patches/plugins/pages-router-context.d.ts

@@ -0,0 +1,11 @@
+/**
+ * ESBuild plugin to handle pages router context.
+ *
+ * We need to change the import path for the pages router context to use the one provided in `pages-runtime.prod.js`
+ */
+import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { PluginBuild } from "esbuild";
+export declare function patchPagesRouterContext(buildOpts: BuildOptions): {
+    name: string;
+    setup: (build: PluginBuild) => void;
+};

package/dist/cli/build/patches/plugins/pages-router-context.js

@@ -0,0 +1,32 @@
+/**
+ * ESBuild plugin to handle pages router context.
+ *
+ * We need to change the import path for the pages router context to use the one provided in `pages-runtime.prod.js`
+ */
+import { compareSemver } from "@opennextjs/aws/build/helper.js";
+export function patchPagesRouterContext(buildOpts) {
+    const pathRegex = /^.*\/(?<CONTEXT>.*)\.shared-runtime$/;
+    const isAfter15 = compareSemver(buildOpts.nextVersion, ">=", "15.0.0");
+    const isAfter153 = compareSemver(buildOpts.nextVersion, ">=", "15.3.0");
+    const basePath = `next/dist/server/${isAfter15 ? "" : "future/"}route-modules/pages/vendored/contexts/`;
+    return {
+        name: "pages-router-context",
+        setup: (build) => {
+            // If we are after 15.3, we don't need to patch the context anymore
+            if (isAfter153) {
+                return;
+            }
+            // We need to modify some imports (i.e. https://github.com/vercel/next.js/blob/48540b836642525b38a2cba40a92b4532c553a52/packages/next/src/server/require-hook.ts#L59-L68)
+            build.onResolve({ filter: /.*shared-runtime/ }, async ({ path, resolveDir, ...options }) => {
+                const match = path.match(pathRegex);
+                if (match && match.groups?.CONTEXT) {
+                    const newPath = `${basePath}${match.groups.CONTEXT}.js`;
+                    return await build.resolve(newPath, {
+                        resolveDir,
+                        ...options,
+                    });
+                }
+            });
+        },
+    };
+}

package/dist/cli/build/utils/ensure-cf-config.js

@@ -17,6 +17,7 @@ export function ensureCloudflareConfig(config) {
             config.default?.override?.queue === "direct" ||
             typeof config.default?.override?.queue === "function",
         mwIsMiddlewareIntegrated: config.middleware === undefined,
+        hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
     };
     if (config.default?.override?.queue === "direct") {
         logger.warn("The direct mode queue is not recommended for use in production.");
@@ -34,6 +35,7 @@ export function ensureCloudflareConfig(config) {
               queue: "dummy" | "direct" | function,
             },
           },
+          edgeExternals: ["node:crypto"],
         }\n\n`.replace(/^ {8}/gm, ""));
     }
 }

package/dist/cli/commands/populate-cache.d.ts

@@ -1,6 +1,13 @@
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 import type { WranglerTarget } from "../utils/run-wrangler.js";
+export type CacheAsset = {
+    isFetch: boolean;
+    fullPath: string;
+    key: string;
+    buildId: string;
+};
+export declare function getCacheAssets(opts: BuildOptions): CacheAsset[];
 export declare function populateCache(options: BuildOptions, config: OpenNextConfig, populateCacheOptions: {
     target: WranglerTarget;
     environment?: string;

package/dist/cli/commands/populate-cache.js

@@ -4,29 +4,49 @@ import logger from "@opennextjs/aws/logger.js";
 import { globSync } from "glob";
 import { tqdm } from "ts-tqdm";
 import { unstable_readConfig } from "wrangler";
-import { BINDING_NAME as KV_CACHE_BINDING_NAME, NAME as KV_CACHE_NAME, } from "../../api/overrides/incremental-cache/kv-incremental-cache.js";
-import { BINDING_NAME as R2_CACHE_BINDING_NAME, DEFAULT_PREFIX as R2_CACHE_DEFAULT_PREFIX, NAME as R2_CACHE_NAME, PREFIX_ENV_NAME as R2_CACHE_PREFIX_ENV_NAME, } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
+import { BINDING_NAME as KV_CACHE_BINDING_NAME, computeCacheKey as computeKVCacheKey, NAME as KV_CACHE_NAME, } from "../../api/overrides/incremental-cache/kv-incremental-cache.js";
+import { BINDING_NAME as R2_CACHE_BINDING_NAME, computeCacheKey as computeR2CacheKey, NAME as R2_CACHE_NAME, PREFIX_ENV_NAME as R2_CACHE_PREFIX_ENV_NAME, } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
 import { CACHE_DIR as STATIC_ASSETS_CACHE_DIR, NAME as STATIC_ASSETS_CACHE_NAME, } from "../../api/overrides/incremental-cache/static-assets-incremental-cache.js";
 import { BINDING_NAME as D1_TAG_BINDING_NAME, NAME as D1_TAG_NAME, } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
 import { runWrangler } from "../utils/run-wrangler.js";
 async function resolveCacheName(value) {
     return typeof value === "function" ? (await value()).name : value;
 }
-function getCacheAssetPaths(opts) {
-    return globSync(path.join(opts.outputDir, "cache/**/*"), {
+export function getCacheAssets(opts) {
+    const allFiles = globSync(path.join(opts.outputDir, "cache/**/*"), {
         withFileTypes: true,
         windowsPathsNoEscape: true,
-    })
-        .filter((f) => f.isFile())
-        .map((f) => {
-        const relativePath = path.relative(path.join(opts.outputDir, "cache"), f.fullpathPosix());
-        return {
-            fsPath: f.fullpathPosix(),
-            destPath: relativePath.startsWith("__fetch")
-                ? `${relativePath.replace("__fetch/", "")}.fetch`
-                : relativePath,
-        };
-    });
+    }).filter((f) => f.isFile());
+    const assets = [];
+    for (const file of allFiles) {
+        const fullPath = file.fullpathPosix();
+        const relativePath = path.relative(path.join(opts.outputDir, "cache"), fullPath);
+        if (relativePath.startsWith("__fetch")) {
+            const [__fetch, buildId, ...keyParts] = relativePath.split("/");
+            if (__fetch !== "__fetch" || buildId === undefined || keyParts.length === 0) {
+                throw new Error(`Invalid path for a Cache Asset file: ${relativePath}`);
+            }
+            assets.push({
+                isFetch: true,
+                fullPath,
+                key: `/${keyParts.join("/")}`,
+                buildId,
+            });
+        }
+        else {
+            const [buildId, ...keyParts] = relativePath.slice(0, -".cache".length).split("/");
+            if (!relativePath.endsWith(".cache") || buildId === undefined || keyParts.length === 0) {
+                throw new Error(`Invalid path for a Cache Asset file: ${relativePath}`);
+            }
+            assets.push({
+                isFetch: false,
+                fullPath,
+                key: `/${keyParts.join("/")}`,
+                buildId,
+            });
+        }
+    }
+    return assets;
 }
 function populateR2IncrementalCache(options, populateCacheOptions) {
     logger.info("\nPopulating R2 incremental cache...");
@@ -39,10 +59,14 @@ function populateR2IncrementalCache(options, populateCacheOptions) {
     if (!bucket) {
         throw new Error(`R2 binding ${JSON.stringify(R2_CACHE_BINDING_NAME)} should have a 'bucket_name'`);
     }
-    const assets = getCacheAssetPaths(options);
-    for (const { fsPath, destPath } of tqdm(assets)) {
-        const fullDestPath = path.join(bucket, process.env[R2_CACHE_PREFIX_ENV_NAME] ?? R2_CACHE_DEFAULT_PREFIX, destPath);
-        runWrangler(options, ["r2 object put", JSON.stringify(fullDestPath), `--file ${JSON.stringify(fsPath)}`], 
+    const assets = getCacheAssets(options);
+    for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
+        const cacheKey = computeR2CacheKey(key, {
+            directory: process.env[R2_CACHE_PREFIX_ENV_NAME],
+            buildId,
+            isFetch,
+        });
+        runWrangler(options, ["r2 object put", JSON.stringify(path.join(bucket, cacheKey)), `--file ${JSON.stringify(fullPath)}`], 
         // NOTE: R2 does not support the environment flag and results in the following error:
         // Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
         { target: populateCacheOptions.target, excludeRemoteFlag: true, logging: "error" });
@@ -56,13 +80,17 @@ function populateKVIncrementalCache(options, populateCacheOptions) {
     if (!binding) {
         throw new Error(`No KV binding ${JSON.stringify(KV_CACHE_BINDING_NAME)} found!`);
     }
-    const assets = getCacheAssetPaths(options);
-    for (const { fsPath, destPath } of tqdm(assets)) {
+    const assets = getCacheAssets(options);
+    for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
+        const cacheKey = computeKVCacheKey(key, {
+            buildId,
+            isFetch,
+        });
         runWrangler(options, [
             "kv key put",
-            JSON.stringify(destPath),
+            JSON.stringify(cacheKey),
             `--binding ${JSON.stringify(KV_CACHE_BINDING_NAME)}`,
-            `--path ${JSON.stringify(fsPath)}`,
+            `--path ${JSON.stringify(fullPath)}`,
         ], { ...populateCacheOptions, logging: "error" });
     }
     logger.info(`Successfully populated cache with ${assets.length} assets`);

package/dist/cli/commands/populate-cache.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli/commands/populate-cache.spec.js

@@ -0,0 +1,61 @@
+import { mkdirSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import mockFs from "mock-fs";
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { getCacheAssets } from "./populate-cache";
+describe("getCacheAssets", () => {
+    beforeAll(() => {
+        mockFs();
+        const fetchBaseDir = "/base/path/cache/__fetch/buildID";
+        const cacheDir = "/base/path/cache/buildID/path/to";
+        mkdirSync(fetchBaseDir, { recursive: true });
+        mkdirSync(cacheDir, { recursive: true });
+        for (let i = 0; i < 3; i++) {
+            writeFileSync(path.join(fetchBaseDir, `${i}`), "", { encoding: "utf-8" });
+            writeFileSync(path.join(cacheDir, `${i}.cache`), "", { encoding: "utf-8" });
+        }
+    });
+    afterAll(() => mockFs.restore());
+    test("list cache assets", () => {
+        expect(getCacheAssets({ outputDir: "/base/path" })).toMatchInlineSnapshot(`
+      [
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/2.cache",
+          "isFetch": false,
+          "key": "/path/to/2",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/1.cache",
+          "isFetch": false,
+          "key": "/path/to/1",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/0.cache",
+          "isFetch": false,
+          "key": "/path/to/0",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/2",
+          "isFetch": true,
+          "key": "/2",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/1",
+          "isFetch": true,
+          "key": "/1",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/0",
+          "isFetch": true,
+          "key": "/0",
+        },
+      ]
+    `);
+    });
+});

package/dist/cli/commands/upload.d.ts

@@ -0,0 +1,5 @@
+import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
+export declare function upload(options: BuildOptions, config: OpenNextConfig, uploadOptions: {
+    passthroughArgs: string[];
+}): Promise<void>;

package/dist/cli/commands/upload.js

@@ -0,0 +1,9 @@
+import { getWranglerEnvironmentFlag, runWrangler } from "../utils/run-wrangler.js";
+import { populateCache } from "./populate-cache.js";
+export async function upload(options, config, uploadOptions) {
+    await populateCache(options, config, {
+        target: "remote",
+        environment: getWranglerEnvironmentFlag(uploadOptions.passthroughArgs),
+    });
+    runWrangler(options, ["versions upload", ...uploadOptions.passthroughArgs], { logging: "all" });
+}

package/dist/cli/index.js

@@ -11,6 +11,7 @@ import { createOpenNextConfigIfNotExistent, ensureCloudflareConfig } from "./bui
 import { deploy } from "./commands/deploy.js";
 import { populateCache } from "./commands/populate-cache.js";
 import { preview } from "./commands/preview.js";
+import { upload } from "./commands/upload.js";
 const nextAppDir = process.cwd();
 async function runCommand(args) {
     printHeader(`Cloudflare ${args.command}`);
@@ -33,6 +34,8 @@ async function runCommand(args) {
             return preview(options, config, args);
         case "deploy":
             return deploy(options, config, args);
+        case "upload":
+            return upload(options, config, args);
         case "populateCache":
             return populateCache(options, config, args);
     }

package/dist/cli/templates/init.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Initialization for the workerd runtime.
+ *
+ * The file must be imported at the top level the worker.
+ */
+/**
+ * Executes the handler with the Cloudflare context.
+ */
+export declare function runWithCloudflareRequestContext(request: Request, env: CloudflareEnv, ctx: ExecutionContext, handler: () => Promise<Response>): Promise<Response>;
+declare global {
+    var __BUILD_TIMESTAMP_MS__: number;
+    var __NEXT_BASE_PATH__: string;
+}

package/dist/cli/templates/init.js

@@ -0,0 +1,105 @@
+/**
+ * Initialization for the workerd runtime.
+ *
+ * The file must be imported at the top level the worker.
+ */
+import { AsyncLocalStorage } from "node:async_hooks";
+import process from "node:process";
+import stream from "node:stream";
+// @ts-expect-error: resolved by wrangler build
+import * as nextEnvVars from "./next-env.mjs";
+const cloudflareContextALS = new AsyncLocalStorage();
+// Note: this symbol needs to be kept in sync with `src/api/get-cloudflare-context.ts`
+Object.defineProperty(globalThis, Symbol.for("__cloudflare-context__"), {
+    get() {
+        return cloudflareContextALS.getStore();
+    },
+});
+/**
+ * Executes the handler with the Cloudflare context.
+ */
+export async function runWithCloudflareRequestContext(request, env, ctx, handler) {
+    init(request, env);
+    return cloudflareContextALS.run({ env, ctx, cf: request.cf }, handler);
+}
+let initialized = false;
+/**
+ * Initializes the runtime on the first call,
+ * no-op on subsequent invocations.
+ */
+function init(request, env) {
+    if (initialized) {
+        return;
+    }
+    initialized = true;
+    const url = new URL(request.url);
+    initRuntime();
+    populateProcessEnv(url, env);
+}
+function initRuntime() {
+    // 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 });
+    globalThis.__dirname ??= "";
+    globalThis.__filename ??= "";
+    // Do not crash on cache not supported
+    // https://github.com/cloudflare/workerd/pull/2434
+    // compatibility flag "cache_option_enabled" -> does not support "force-cache"
+    const __original_fetch = globalThis.fetch;
+    globalThis.fetch = (input, init) => {
+        if (init) {
+            delete init.cache;
+        }
+        return __original_fetch(input, init);
+    };
+    const CustomRequest = class extends globalThis.Request {
+        constructor(input, init) {
+            if (init) {
+                delete init.cache;
+                // https://github.com/cloudflare/workerd/issues/2746
+                // https://github.com/cloudflare/workerd/issues/3245
+                Object.defineProperty(init, "body", {
+                    // @ts-ignore
+                    value: init.body instanceof stream.Readable ? ReadableStream.from(init.body) : init.body,
+                });
+            }
+            super(input, init);
+        }
+    };
+    Object.assign(globalThis, {
+        Request: CustomRequest,
+        __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
+        __NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+    });
+}
+/**
+ * Populate process.env with:
+ * - the environment variables and secrets from the cloudflare platform
+ * - the variables from Next .env* files
+ * - the origin resolver information
+ */
+function populateProcessEnv(url, env) {
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === "string") {
+            process.env[key] = value;
+        }
+    }
+    const mode = env.NEXTJS_ENV ?? "production";
+    if (nextEnvVars[mode]) {
+        for (const key in nextEnvVars[mode]) {
+            process.env[key] ??= nextEnvVars[mode][key];
+        }
+    }
+    // Set the default Origin for the origin resolver.
+    // This is only needed for an external middleware bundle
+    process.env.OPEN_NEXT_ORIGIN = JSON.stringify({
+        default: {
+            host: url.hostname,
+            protocol: url.protocol.slice(0, -1),
+            port: url.port,
+        },
+    });
+}
+/* eslint-enable no-var */

package/dist/cli/templates/worker.d.ts

@@ -1,4 +1,6 @@
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
 export { DOShardedTagCache } from "./.build/durable-objects/sharded-tag-cache.js";
-declare const _default: ExportedHandler<CloudflareEnv>;
+declare const _default: {
+    fetch(request: Request<unknown, IncomingRequestCfProperties<unknown>>, env: CloudflareEnv, ctx: ExecutionContext): Promise<any>;
+};
 export default _default;

package/dist/cli/templates/worker.js

@@ -1,25 +1,13 @@
-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();
-// Note: this symbol needs to be kept in sync with `src/api/get-cloudflare-context.ts`
-Object.defineProperty(globalThis, Symbol.for("__cloudflare-context__"), {
-    get() {
-        return cloudflareContextALS.getStore();
-    },
-});
+//@ts-expect-error: Will be resolved by wrangler build
+import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOShardedTagCache } from "./.build/durable-objects/sharded-tag-cache.js";
-// Populate process.env on the first request
-let processEnvPopulated = false;
 export default {
     async fetch(request, env, ctx) {
-        return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
+        return runWithCloudflareRequestContext(request, env, ctx, async () => {
             const url = new URL(request.url);
-            populateProcessEnv(url, env);
             // Serve images in development.
             // Note: "/cdn-cgi/image/..." requests do not reach production workers.
             if (url.pathname.startsWith("/cdn-cgi/image/")) {
@@ -33,10 +21,10 @@ export default {
                     : env.ASSETS?.fetch(new URL(`/${imageUrl}`, url));
             }
             // Fallback for the Next default image loader.
-            if (url.pathname === "/_next/image") {
+            if (url.pathname === `${globalThis.__NEXT_BASE_PATH__}/_next/image`) {
                 const imageUrl = url.searchParams.get("url") ?? "";
                 return imageUrl.startsWith("/")
-                    ? env.ASSETS?.fetch(new URL(imageUrl, request.url))
+                    ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`)
                     : fetch(imageUrl, { cf: { cacheEverything: true } });
             }
             // @ts-expect-error: resolved by wrangler build
@@ -45,39 +33,3 @@ export default {
         });
     },
 };
-/**
- * Populate process.env with:
- * - the environment variables and secrets from the cloudflare platform
- * - the variables from Next .env* files
- * - the origin resolver information
- */
-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") {
-            process.env[key] = value;
-        }
-    }
-    const mode = env.NEXTJS_ENV ?? "production";
-    if (nextEnvVars[mode]) {
-        for (const key in nextEnvVars[mode]) {
-            process.env[key] ??= nextEnvVars[mode][key];
-        }
-    }
-    // Set the default Origin for the origin resolver.
-    process.env.OPEN_NEXT_ORIGIN = JSON.stringify({
-        default: {
-            host: url.hostname,
-            protocol: url.protocol.slice(0, -1),
-            port: url.port,
-        },
-    });
-}