@opennextjs/cloudflare 0.0.0-e2c4535 → 0.0.0-e62af72

package/README.md

@@ -1,39 +1,65 @@
-# Next.js builder for Cloudflare
+# OpenNext for Cloudflare
 
-How to update a Next.js application to run on Cloudflare.
+Deploy Next.js apps to Cloudflare!
 
-## Configure your app
+OpenNext for Cloudflare is Cloudflare specific adapter that enables deployment of Next.js applications to Cloudflare.
 
-- add the following `devDependencies` to the `package.json`:
+## Getting started
 
-  ```bash
-  pnpm add -D wrangler@latest @opennextjs/cloudflare
-  ```
+You can use [`create-next-app`](https://nextjs.org/docs/pages/api-reference/cli/create-next-app) to start a new application or take an existing Next.js application and deploy it to Cloudflare using the following few steps:
 
-## Serve your app
+## Configure your app
 
-- build the app and adapt it for Cloudflare
+- add the following `devDependencies` to the `package.json`:
 
   ```bash
-  pnpx cloudflare
+  pnpm add -D wrangler@latest @opennextjs/cloudflare
   ```
 
 - add a `wrangler.toml` at the root of your project
 
   ```toml
   #:schema node_modules/wrangler/config-schema.json
-  name = "<app-name>"
+  name = "<your-app-name>"
   main = ".worker-next/index.mjs"
 
-  compatibility_date = "2024-08-29"
-  compatibility_flags = ["nodejs_compat_v2"]
+  compatibility_date = "2024-09-23"
+  compatibility_flags = ["nodejs_compat"]
 
   # Use the new Workers + Assets to host the static frontend files
   experimental_assets = { directory = ".worker-next/assets", binding = "ASSETS" }
   ```
 
+## Local development
+
+- you can use the regular `next` CLI to start the Next.js dev server:
+
+## Local preview
+
+Run the following commands to preview the production build of your application locally:
+
+- build the app and adapt it for Cloudflare
+
+  ```bash
+  pnpx cloudflare
+  ```
+
 - Preview the app in Wrangler
 
   ```bash
   pnpm wrangler dev
   ```
+
+## Deploy your app
+
+Deploy your application to production with the following:
+
+- build the app and adapt it for Cloudflare
+
+  ```bash
+  pnpx cloudflare
+  ```
+
+  ```bash
+  pnpm wrangler deploy
+  ```

package/dist/api/chunk-VTBEIZPQ.mjs

@@ -0,0 +1,32 @@
+// src/api/get-cloudflare-context.ts
+import "server-only";
+var cloudflareContextSymbol = Symbol.for("__cloudflare-context__");
+async function getCloudflareContext() {
+  const global = globalThis;
+  const cloudflareContext = global[cloudflareContextSymbol];
+  if (!cloudflareContext) {
+    return getCloudflareContextInNextDev();
+  }
+  return cloudflareContext;
+}
+var cloudflareContextInNextDevSymbol = Symbol.for("__next-dev/cloudflare-context__");
+async function getCloudflareContextInNextDev() {
+  const global = globalThis;
+  if (!global[cloudflareContextInNextDevSymbol]) {
+    const { getPlatformProxy } = await import(
+      /* webpackIgnore: true */
+      `${"__wrangler".replaceAll("_", "")}`
+    );
+    const { env, cf, ctx } = await getPlatformProxy();
+    global[cloudflareContextInNextDevSymbol] = {
+      env,
+      cf,
+      ctx
+    };
+  }
+  return global[cloudflareContextInNextDevSymbol];
+}
+
+export {
+  getCloudflareContext
+};

package/dist/api/get-cloudflare-context.d.mts

@@ -0,0 +1,26 @@
+declare global {
+    interface CloudflareEnv {
+    }
+}
+type CloudflareContext<CfProperties extends Record<string, unknown> = IncomingRequestCfProperties, Context = ExecutionContext> = {
+    /**
+     * the worker's [bindings](https://developers.cloudflare.com/workers/runtime-apis/bindings/)
+     */
+    env: CloudflareEnv;
+    /**
+     * the request's [cf properties](https://developers.cloudflare.com/workers/runtime-apis/request/#the-cf-property-requestinitcfproperties)
+     */
+    cf: CfProperties;
+    /**
+     * the current [execution context](https://developers.cloudflare.com/workers/runtime-apis/context)
+     */
+    ctx: Context;
+};
+/**
+ * Utility to get the current Cloudflare context
+ *
+ * @returns the cloudflare context
+ */
+declare function getCloudflareContext<CfProperties extends Record<string, unknown> = IncomingRequestCfProperties, Context = ExecutionContext>(): Promise<CloudflareContext<CfProperties, Context>>;
+
+export { type CloudflareContext, getCloudflareContext };

package/dist/api/get-cloudflare-context.mjs

@@ -0,0 +1,6 @@
+import {
+  getCloudflareContext
+} from "./chunk-VTBEIZPQ.mjs";
+export {
+  getCloudflareContext
+};

package/dist/api/index.d.mts

@@ -0,0 +1 @@
+export { CloudflareContext, getCloudflareContext } from './get-cloudflare-context.mjs';

package/dist/api/index.mjs

@@ -0,0 +1,6 @@
+import {
+  getCloudflareContext
+} from "./chunk-VTBEIZPQ.mjs";
+export {
+  getCloudflareContext
+};

package/dist/cli/cache-handler.mjs

@@ -0,0 +1,48 @@
+import "./chunk-UJCSKKID.mjs";
+
+// src/cli/cache-handler.ts
+var CfWorkersKvCacheHandler = class _CfWorkersKvCacheHandler {
+  constructor(ctx) {
+    this.ctx = ctx;
+  }
+  static maybeKVNamespace = void 0;
+  async get(key) {
+    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
+      return null;
+    }
+    console.log(`[Cf] Getting cache[${key}]`);
+    try {
+      return await _CfWorkersKvCacheHandler.maybeKVNamespace.get(key, "json") ?? null;
+    } catch (e) {
+      console.error(`Failed to get value for key = ${key}: ${e}`);
+      return null;
+    }
+  }
+  async set(key, entry, ctx) {
+    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
+      return;
+    }
+    console.log(`[Cf] Setting cache[${key}]`);
+    try {
+      const data = {
+        lastModified: Date.now(),
+        value: entry
+      };
+      await _CfWorkersKvCacheHandler.maybeKVNamespace.put(key, JSON.stringify(data));
+    } catch (e) {
+      console.error(`Failed to set value for key = ${key}: ${e}`);
+    }
+  }
+  async revalidateTag(tags) {
+    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
+      return;
+    }
+    tags = [tags].flat();
+    console.log(`[Cf] revalidateTag ${JSON.stringify(tags)}}`);
+  }
+  resetRequestCache() {
+  }
+};
+export {
+  CfWorkersKvCacheHandler as default
+};

package/dist/cli/chunk-UJCSKKID.mjs

@@ -0,0 +1,30 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+export {
+  __commonJS,
+  __toESM
+};

package/dist/{index.mjs → cli/index.mjs}

@@ -1,29 +1,8 @@
 #!/usr/bin/env node
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
+import {
+  __commonJS,
+  __toESM
+} from "./chunk-UJCSKKID.mjs";
 
 // ../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
@@ -234,10 +213,10 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// src/index.ts
+// src/cli/index.ts
 import { resolve as resolve2 } from "node:path";
 
-// src/args.ts
+// src/cli/args.ts
 import { mkdirSync, statSync } from "node:fs";
 import { parseArgs } from "node:util";
 import { resolve } from "node:path";
@@ -267,15 +246,15 @@ function getArgs() {
     skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
   };
 }
-function assertDirArg(path6, argName, make) {
+function assertDirArg(path13, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync(path6);
+    dirStats = statSync(path13);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync(path6);
+    mkdirSync(path13);
     return;
   }
   if (!dirStats.isDirectory()) {
@@ -283,13 +262,13 @@ function assertDirArg(path6, argName, make) {
   }
 }
 
-// src/index.ts
+// src/cli/index.ts
 import { existsSync as existsSync4 } from "node:fs";
 
-// src/build/build.ts
+// src/cli/build/index.ts
 import { rm } from "node:fs/promises";
 
-// src/build/build-next-app.ts
+// src/cli/build/build-next-app.ts
 import { execSync } from "node:child_process";
 function buildNextjsApp(nextAppDir2) {
   runNextBuildCommand("pnpm", nextAppDir2);
@@ -308,28 +287,30 @@ function runNextBuildCommand(packager, nextAppDir2) {
   });
 }
 
-// src/build/build-worker.ts
+// src/cli/build/build-worker.ts
 import { build } from "esbuild";
 import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
 import { cp, readFile, writeFile } from "node:fs/promises";
+import path10 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
-// src/build/patches/investigated/patch-require.ts
+// src/cli/build/patches/investigated/patch-require.ts
 function patchRequire(code) {
   console.log("# patchRequire");
   return code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
 }
 
-// src/build/patches/investigated/copy-templates.ts
-import path from "node:path";
+// src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-function copyTemplates(srcDir, nextjsAppPaths) {
-  console.log("# copyTemplates");
-  const destDir = path.join(nextjsAppPaths.standaloneAppDir, "node_modules/cf/templates");
-  cpSync(srcDir, destDir, { recursive: true });
-  return destDir;
+import path from "node:path";
+function copyPackageCliFiles(packageDistDir2, config) {
+  console.log("# copyPackageTemplateFiles");
+  const sourceDir = path.join(packageDistDir2, "cli");
+  const destinationDir = path.join(config.paths.internalPackage, "cli");
+  cpSync(sourceDir, destinationDir, { recursive: true });
 }
 
-// src/build/patches/to-investigate/patch-read-file.ts
+// src/cli/build/patches/to-investigate/patch-read-file.ts
 import { readFileSync } from "node:fs";
 
 // ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
@@ -4184,12 +4165,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path6) {
-    if (!path6) {
+  resolve(path13) {
+    if (!path13) {
       return this;
     }
-    const rootPath = this.getRootString(path6);
-    const dir = path6.substring(rootPath.length);
+    const rootPath = this.getRootString(path13);
+    const dir = path13.substring(rootPath.length);
     const dirParts = dir.split(this.splitSep);
     const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
     return result;
@@ -4941,8 +4922,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path6) {
-    return win32.parse(path6).root;
+  getRootString(path13) {
+    return win32.parse(path13).root;
   }
   /**
    * @internal
@@ -4988,8 +4969,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path6) {
-    return path6.startsWith("/") ? "/" : "";
+  getRootString(path13) {
+    return path13.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5078,11 +5059,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path6 = this.cwd) {
-    if (typeof path6 === "string") {
-      path6 = this.cwd.resolve(path6);
+  depth(path13 = this.cwd) {
+    if (typeof path13 === "string") {
+      path13 = this.cwd.resolve(path13);
     }
-    return path6.depth();
+    return path13.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5569,9 +5550,9 @@ var PathScurryBase = class {
     process2();
     return results;
   }
-  chdir(path6 = this.cwd) {
+  chdir(path13 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path6 === "string" ? this.cwd.resolve(path6) : path6;
+    this.cwd = typeof path13 === "string" ? this.cwd.resolve(path13) : path13;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5927,8 +5908,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path6, n]) => [
-      path6,
+    return [...this.store.entries()].map(([path13, n]) => [
+      path13,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6133,9 +6114,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path6, opts) {
+  constructor(patterns, path13, opts) {
     this.patterns = patterns;
-    this.path = path6;
+    this.path = path13;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6154,11 +6135,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path6) {
-    return this.seen.has(path6) || !!this.#ignore?.ignored?.(path6);
+  #ignored(path13) {
+    return this.seen.has(path13) || !!this.#ignore?.ignored?.(path13);
   }
-  #childrenIgnored(path6) {
-    return !!this.#ignore?.childrenIgnored?.(path6);
+  #childrenIgnored(path13) {
+    return !!this.#ignore?.childrenIgnored?.(path13);
   }
   // backpressure mechanism
   pause() {
@@ -6373,8 +6354,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path6, opts) {
-    super(patterns, path6, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6411,8 +6392,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path6, opts) {
-    super(patterns, path6, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6705,17 +6686,18 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/build/patches/to-investigate/patch-read-file.ts
-function patchReadFile(code, nextjsAppPaths) {
+// src/cli/build/patches/to-investigate/patch-read-file.ts
+import path3 from "node:path";
+function patchReadFile(code, config) {
   console.log("# patchReadFile");
   code = code.replace(
     "getBuildId() {",
     `getBuildId() {
-      return ${JSON.stringify(readFileSync(`${nextjsAppPaths.standaloneAppDotNextDir}/BUILD_ID`, "utf-8"))};
+      return ${JSON.stringify(readFileSync(path3.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
     `
   );
-  const manifestJsons = globSync(`${nextjsAppPaths.standaloneAppDotNextDir}/**/*-manifest.json`).map(
-    (file) => file.replace(nextjsAppPaths.standaloneAppDir + "/", "")
+  const manifestJsons = globSync(path3.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
+    (file) => file.replace(config.paths.standaloneApp + "/", "")
   );
   code = code.replace(
     /function loadManifest\((.+?), .+?\) {/,
@@ -6723,7 +6705,7 @@ function patchReadFile(code, nextjsAppPaths) {
     ${manifestJsons.map(
       (manifestJson) => `
           if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(`${nextjsAppPaths.standaloneAppDir}/${manifestJson}`, "utf-8")};
+            return ${readFileSync(path3.join(config.paths.standaloneApp, manifestJson), "utf-8")};
           }
         `
     ).join("\n")}
@@ -6733,28 +6715,34 @@ function patchReadFile(code, nextjsAppPaths) {
   return code;
 }
 
-// src/build/patches/to-investigate/patch-find-dir.ts
+// src/cli/build/patches/to-investigate/patch-find-dir.ts
+import path4 from "node:path";
 import { existsSync } from "node:fs";
-function patchFindDir(code, nextjsAppPaths) {
+function patchFindDir(code, config) {
   console.log("# patchFindDir");
   return code.replace(
     "function findDir(dir, name) {",
     `function findDir(dir, name) {
 			if (dir.endsWith(".next/server")) {
-			if (name === "app") return ${existsSync(`${nextjsAppPaths.standaloneAppServerDir}/app`)};
-			if (name === "pages") return ${existsSync(`${nextjsAppPaths.standaloneAppServerDir}/pages`)};
+			if (name === "app") {
+			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "app")}`)};
+	    }
+			if (name === "pages") {
+			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "pages")}`)};
+	    }
 		}
 		throw new Error("Unknown findDir call: " + dir + " " + name);
 		`
   );
 }
 
-// src/build/patches/to-investigate/inline-next-require.ts
+// src/cli/build/patches/to-investigate/inline-next-require.ts
 import { readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
-function inlineNextRequire(code, nextjsAppPaths) {
+import path5 from "node:path";
+function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
-  const pagesManifestFile = `${nextjsAppPaths.standaloneAppServerDir}/pages-manifest.json`;
-  const appPathsManifestFile = `${nextjsAppPaths.standaloneAppServerDir}/app-paths-manifest.json`;
+  const pagesManifestFile = path5.join(config.paths.standaloneAppServer, "pages-manifest.json");
+  const appPathsManifestFile = path5.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
   const pagesManifestFiles = existsSync2(pagesManifestFile) ? Object.values(JSON.parse(readFileSync2(pagesManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
@@ -6770,14 +6758,14 @@ function inlineNextRequire(code, nextjsAppPaths) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync2(`${nextjsAppPaths.standaloneAppDir}/${htmlPage}`, "utf-8"))};
+            return ${JSON.stringify(readFileSync2(path5.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
           }
         `
     ).join("\n")}
     ${pageModules.map(
       (module) => `
           if (pagePath.endsWith("${module}")) {
-            return require("${nextjsAppPaths.standaloneAppDir}/${module}");
+            return require("${path5.join(config.paths.standaloneApp, module)}");
           }
         `
     ).join("\n")}
@@ -6786,19 +6774,20 @@ function inlineNextRequire(code, nextjsAppPaths) {
   );
 }
 
-// src/build/patches/to-investigate/inline-eval-manifest.ts
-function inlineEvalManifest(code, nextjsAppPaths) {
+// src/cli/build/patches/to-investigate/inline-eval-manifest.ts
+import path6 from "node:path";
+function inlineEvalManifest(code, config) {
   console.log("# inlineEvalManifest");
   const manifestJss = globSync(
-    `${nextjsAppPaths.standaloneAppDotNextDir}/**/*_client-reference-manifest.js`
-  ).map((file) => file.replace(`${nextjsAppPaths.standaloneAppDir}/`, ""));
+    path6.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
+  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,
     `$&
 		${manifestJss.map(
       (manifestJs) => `
 			  if ($1.endsWith("${manifestJs}")) {
-				require("${nextjsAppPaths.standaloneAppDir}/${manifestJs}");
+				require("${path6.join(config.paths.standaloneApp, manifestJs)}");
 				return {
 				  __RSC_MANIFEST: {
 					"${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}": globalThis.__RSC_MANIFEST["${manifestJs.replace(".next/server/app", "").replace("_client-reference-manifest.js", "")}"],
@@ -6812,14 +6801,13 @@ function inlineEvalManifest(code, nextjsAppPaths) {
   );
 }
 
-// src/build/patches/to-investigate/wrangler-deps.ts
-import path3 from "node:path";
+// src/cli/build/patches/to-investigate/wrangler-deps.ts
+import path7 from "node:path";
 import fs, { writeFileSync } from "node:fs";
-function patchWranglerDeps(paths) {
+function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  console.log({ base: paths.standaloneAppDotNextDir });
-  const pagesRuntimeFile = path3.join(
-    paths.standaloneAppDir,
+  const pagesRuntimeFile = path7.join(
+    config.paths.standaloneApp,
     "node_modules",
     "next",
     "dist",
@@ -6829,8 +6817,8 @@ function patchWranglerDeps(paths) {
   );
   const patchedPagesRuntime = fs.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
   fs.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path3.join(
-    paths.standaloneAppDir,
+  const tracerFile = path7.join(
+    config.paths.standaloneApp,
     "node_modules",
     "next",
     "dist",
@@ -6843,10 +6831,11 @@ function patchWranglerDeps(paths) {
   writeFileSync(tracerFile, pacthedTracer);
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/index.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import path8 from "node:path";
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
 import * as ts from "ts-morph";
 async function getChunkInstallationIdentifiers(sourceFile) {
   const installChunkDeclaration = getInstallChunkDeclaration(sourceFile);
@@ -6892,7 +6881,7 @@ function getInstalledChunksDeclaration(sourceFile, installChunkDeclaration) {
   return installedChunksDeclaration;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
 import * as ts2 from "ts-morph";
 async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { installedChunks, installChunk }, chunks) {
   const webpackFRequireFunction = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.ArrowFunction).find((arrowFunction) => {
@@ -6936,7 +6925,7 @@ if(${chunkId} === ${chunk}) return ${installChunk}(require("./chunks/${chunk}.js
   return sourceFile.print();
 }
 
-// src/build/utils/ts-parse-file.ts
+// src/cli/build/utils/ts-parse-file.ts
 import * as ts3 from "ts-morph";
 function tsParseFile(fileContent) {
   const project = new ts3.Project();
@@ -6944,7 +6933,7 @@ function tsParseFile(fileContent) {
   return sourceFile;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
 async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
   const tsSourceFile = tsParseFile(fileContent);
   const chunkInstallationIdentifiers = await getChunkInstallationIdentifiers(tsSourceFile);
@@ -6956,12 +6945,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
   return updatedFileContent;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/index.ts
-async function updateWebpackChunksFile(nextjsAppPaths) {
+// src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
+async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`;
+  const webpackRuntimeFile = path8.join(config.paths.standaloneAppServer, "webpack-runtime.js");
   const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(`${nextjsAppPaths.standaloneAppServerDir}/chunks`).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+  const chunks = readdirSync2(path8.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
     console.log(` - chunk ${chunk}`);
     return chunk.replace(/\.js$/, "");
   });
@@ -6969,18 +6958,53 @@ async function updateWebpackChunksFile(nextjsAppPaths) {
   writeFileSync2(webpackRuntimeFile, updatedFileContent);
 }
 
-// src/build/build-worker.ts
-async function buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, templateSrcDir) {
-  const templateDir = copyTemplates(templateSrcDir, nextjsAppPaths);
-  const workerEntrypoint = `${templateDir}/worker.ts`;
-  const workerOutputFile = `${outputDir2}/index.mjs`;
-  const nextConfigStr = readFileSync4(nextjsAppPaths.standaloneAppDir + "/server.js", "utf8")?.match(
+// src/cli/build/patches/investigated/patch-cache.ts
+import path9 from "node:path";
+function patchCache(code, config) {
+  console.log("# patchCached");
+  const cacheHandler = path9.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
+  const patchedCode = code.replace(
+    "const { cacheHandler } = this.nextConfig;",
+    `const cacheHandler = null;
+CacheHandler = (await import('${cacheHandler}')).default;
+CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
+`
+  );
+  if (patchedCode === code) {
+    throw new Error("Cache patch not applied");
+  }
+  return patchedCode;
+}
+
+// src/cli/build/build-worker.ts
+var packageDistDir = path10.join(path10.dirname(fileURLToPath3(import.meta.url)), "..");
+async function buildWorker(config) {
+  console.log(`\x1B[35m\u2699\uFE0F Copying files...
+\x1B[0m`);
+  await cp(
+    path10.join(config.paths.dotNext, "static"),
+    path10.join(config.paths.builderOutput, "assets", "_next", "static"),
+    {
+      recursive: true
+    }
+  );
+  const publicDir = path10.join(config.paths.nextApp, "public");
+  if (existsSync3(publicDir)) {
+    await cp(publicDir, path10.join(config.paths.builderOutput, "assets"), {
+      recursive: true
+    });
+  }
+  copyPackageCliFiles(packageDistDir, config);
+  const templateDir = path10.join(config.paths.internalPackage, "cli", "templates");
+  const workerEntrypoint = path10.join(templateDir, "worker.ts");
+  const workerOutputFile = path10.join(config.paths.builderOutput, "index.mjs");
+  const nextConfigStr = readFileSync4(path10.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
   console.log(`\x1B[35m\u2699\uFE0F Bundling the worker file...
 \x1B[0m`);
-  patchWranglerDeps(nextjsAppPaths);
-  updateWebpackChunksFile(nextjsAppPaths);
+  patchWranglerDeps(config);
+  updateWebpackChunksFile(config);
   await build({
     entryPoints: [workerEntrypoint],
     bundle: true,
@@ -6993,15 +7017,15 @@ async function buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, template
       // Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:
       //   eval("require")("bufferutil");
       //   eval("require")("utf-8-validate");
-      "next/dist/compiled/ws": `${templateDir}/shims/empty.ts`,
+      "next/dist/compiled/ws": path10.join(templateDir, "shims", "empty.ts"),
       // Note: we apply an empty shim to next/dist/compiled/edge-runtime since (amongst others) it generated the following `eval`:
       //   eval(getModuleCode)(module, module.exports, throwingRequire, params.context, ...Object.values(params.scopedContext));
       //   which comes from https://github.com/vercel/edge-runtime/blob/6e96b55f/packages/primitives/src/primitives/load.js#L57-L63
       // QUESTION: Why did I encountered this but mhart didn't?
-      "next/dist/compiled/edge-runtime": `${templateDir}/shims/empty.ts`,
+      "next/dist/compiled/edge-runtime": path10.join(templateDir, "shims", "empty.ts"),
       // `@next/env` is a library Next.js uses for loading dotenv files, for obvious reasons we need to stub it here
       // source: https://github.com/vercel/next.js/tree/0ac10d79720/packages/next-env
-      "@next/env": `${templateDir}/shims/env.ts`
+      "@next/env": path10.join(templateDir, "shims", "env.ts")
     },
     define: {
       // config file used by Next.js, see: https://github.com/vercel/next.js/blob/68a7128/packages/next/src/build/utils.ts#L2137-L2139
@@ -7035,22 +7059,21 @@ async function buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, template
 // Do not crash on cache not supported
 // https://github.com/cloudflare/workerd/pull/2434
 // compatibility flag "cache_option_enabled" -> does not support "force-cache"
-let isPatchedAlready = globalThis.fetch.__nextPatched;
 const curFetch = globalThis.fetch;
 globalThis.fetch = (input, init) => {
-  console.log("globalThis.fetch", input);
-  if (init) delete init.cache;
+  if (init) {
+    delete init.cache;
+  }
   return curFetch(input, init);
 };
 import { Readable } from 'node:stream';
-globalThis.fetch.__nextPatched = isPatchedAlready;
 fetch = globalThis.fetch;
 const CustomRequest = class extends globalThis.Request {
   constructor(input, init) {
-    console.log("CustomRequest", input);
     if (init) {
       delete init.cache;
       if (init.body?.__node_stream__ === true) {
+        // https://github.com/cloudflare/workerd/issues/2746
         init.body = Readable.toWeb(init.body);
       }
     }
@@ -7059,31 +7082,22 @@ const CustomRequest = class extends globalThis.Request {
 };
 globalThis.Request = CustomRequest;
 Request = globalThis.Request;
-			`
+`
     }
   });
-  await updateWorkerBundledCode(workerOutputFile, nextjsAppPaths);
-  console.log(`\x1B[35m\u2699\uFE0F Copying asset files...
-\x1B[0m`);
-  await cp(`${nextjsAppPaths.dotNextDir}/static`, `${outputDir2}/assets/_next/static`, {
-    recursive: true
-  });
-  if (existsSync3(`${inputNextAppDir}/public`)) {
-    await cp(`${inputNextAppDir}/public`, `${outputDir2}/assets`, {
-      recursive: true
-    });
-  }
+  await updateWorkerBundledCode(workerOutputFile, config);
   console.log(`\x1B[35mWorker saved in \`${workerOutputFile}\` \u{1F680}
 \x1B[0m`);
 }
-async function updateWorkerBundledCode(workerOutputFile, nextjsAppPaths) {
+async function updateWorkerBundledCode(workerOutputFile, config) {
   const originalCode = await readFile(workerOutputFile, "utf8");
   let patchedCode = originalCode;
   patchedCode = patchRequire(patchedCode);
-  patchedCode = patchReadFile(patchedCode, nextjsAppPaths);
-  patchedCode = inlineNextRequire(patchedCode, nextjsAppPaths);
-  patchedCode = patchFindDir(patchedCode, nextjsAppPaths);
-  patchedCode = inlineEvalManifest(patchedCode, nextjsAppPaths);
+  patchedCode = patchReadFile(patchedCode, config);
+  patchedCode = inlineNextRequire(patchedCode, config);
+  patchedCode = patchFindDir(patchedCode, config);
+  patchedCode = inlineEvalManifest(patchedCode, config);
+  patchedCode = patchCache(patchedCode, config);
   await writeFile(workerOutputFile, patchedCode);
 }
 function createFixRequiresESBuildPlugin(templateDir) {
@@ -7091,97 +7105,102 @@ function createFixRequiresESBuildPlugin(templateDir) {
     name: "replaceRelative",
     setup(build3) {
       build3.onResolve({ filter: /^\.\/require-hook$/ }, (args) => ({
-        path: `${templateDir}/shims/empty.ts`
+        path: path10.join(templateDir, "shims", "empty.ts")
       }));
       build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, (args) => ({
-        path: `${templateDir}/shims/node-fs.ts`
+        path: path10.join(templateDir, "shims", "empty.ts")
       }));
     }
   };
 }
 
-// src/nextjs-paths.ts
+// src/cli/config.ts
 import { readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
-import path4, { relative } from "node:path";
-function getNextjsAppPaths(nextAppDir2) {
-  const dotNextDir = getDotNextDirPath(nextAppDir2);
-  const appPath = getNextjsApplicationPath(dotNextDir).replace(/\/$/, "");
-  const standaloneAppDir = path4.join(dotNextDir, "standalone", appPath);
+import path11, { relative } from "node:path";
+var PACKAGE_NAME = "@opennextjs/cloudflare";
+var UserConfig = {
+  cache: {
+    bindingName: "NEXT_CACHE_WORKERS_KV"
+  }
+};
+function getConfig(appDir, outputDir2) {
+  const dotNext = path11.join(outputDir2, ".next");
+  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
+  const standaloneApp = path11.join(dotNext, "standalone", appPath);
+  const standaloneAppDotNext = path11.join(standaloneApp, ".next");
+  const standaloneAppServer = path11.join(standaloneAppDotNext, "server");
+  const nodeModules = path11.join(standaloneApp, "node_modules");
+  const internalPackage = path11.join(nodeModules, ...PACKAGE_NAME.split("/"));
   return {
-    appDir: nextAppDir2,
-    dotNextDir,
-    standaloneAppDir,
-    standaloneAppDotNextDir: path4.join(standaloneAppDir, ".next"),
-    standaloneAppServerDir: path4.join(standaloneAppDir, ".next", "server")
+    paths: {
+      nextApp: appDir,
+      builderOutput: outputDir2,
+      dotNext,
+      standaloneApp,
+      standaloneAppDotNext,
+      standaloneAppServer,
+      internalPackage
+    },
+    cache: {
+      kvBindingName: UserConfig.cache.bindingName
+    },
+    internalPackageName: PACKAGE_NAME
   };
 }
-function getDotNextDirPath(nextAppDir2) {
-  const dotNextDirPath = `${nextAppDir2}/.next`;
+function containsDotNextDir(folder) {
   try {
-    const dirStats = statSync2(dotNextDirPath);
-    if (!dirStats.isDirectory()) throw new Error();
-  } catch {
-    throw new Error(`Error: \`.next\` directory not found!`);
+    return statSync2(path11.join(folder, ".next")).isDirectory();
+  } catch (e) {
+    return false;
   }
-  return dotNextDirPath;
 }
 function getNextjsApplicationPath(dotNextDir) {
   const serverPath = findServerParentPath(dotNextDir);
   if (!serverPath) {
     throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
   }
-  return relative(`${dotNextDir}/standalone`, serverPath);
-  function findServerParentPath(path6) {
-    try {
-      if (statSync2(`${path6}/.next/server`).isDirectory()) {
-        return path6;
-      }
-    } catch {
+  return relative(path11.join(dotNextDir, "standalone"), serverPath);
+}
+function findServerParentPath(parentPath) {
+  try {
+    if (statSync2(path11.join(parentPath, ".next", "server")).isDirectory()) {
+      return parentPath;
     }
-    const files = readdirSync3(path6);
-    for (const file of files) {
-      if (statSync2(`${path6}/${file}`).isDirectory()) {
-        const dirServerPath = findServerParentPath(`${path6}/${file}`);
-        if (dirServerPath) {
-          return dirServerPath;
-        }
+  } catch {
+  }
+  const folders = readdirSync3(parentPath);
+  for (const folder of folders) {
+    const subFolder = path11.join(parentPath, folder);
+    if (statSync2(path11.join(parentPath, folder)).isDirectory()) {
+      const dirServerPath = findServerParentPath(subFolder);
+      if (dirServerPath) {
+        return dirServerPath;
       }
     }
   }
 }
 
-// src/build/build.ts
-import path5 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { cpSync as cpSync2, rmSync } from "node:fs";
-var SAVE_DIR = ".save.next";
-async function build2(inputNextAppDir, opts) {
+// src/cli/build/index.ts
+import { cpSync as cpSync2 } from "node:fs";
+import path12 from "node:path";
+async function build2(appDir, opts) {
   if (!opts.skipBuild) {
-    buildNextjsApp(inputNextAppDir);
-    rmSync(`${inputNextAppDir}/${SAVE_DIR}`, {
-      recursive: true,
-      force: true
-    });
-    cpSync2(`${inputNextAppDir}/.next`, `${inputNextAppDir}/${SAVE_DIR}`, {
-      recursive: true
-    });
-  } else {
-    rmSync(`${inputNextAppDir}/.next`, { recursive: true, force: true });
-    cpSync2(`${inputNextAppDir}/${SAVE_DIR}`, `${inputNextAppDir}/.next`, {
-      recursive: true
-    });
+    buildNextjsApp(appDir);
+  }
+  if (!containsDotNextDir(appDir)) {
+    throw new Error(`.next folder not found in ${appDir}`);
   }
-  const outputDir2 = `${opts.outputDir ?? inputNextAppDir}/.worker-next`;
+  const outputDir2 = path12.resolve(opts.outputDir ?? appDir, ".worker-next");
   await cleanDirectory(outputDir2);
-  const nextjsAppPaths = getNextjsAppPaths(inputNextAppDir);
-  const templateDir = path5.join(path5.dirname(fileURLToPath3(import.meta.url)), "templates");
-  await buildWorker(inputNextAppDir, outputDir2, nextjsAppPaths, templateDir);
+  cpSync2(path12.join(appDir, ".next"), path12.join(outputDir2, ".next"), { recursive: true });
+  const config = getConfig(appDir, outputDir2);
+  await buildWorker(config);
 }
-async function cleanDirectory(path6) {
-  return await rm(path6, { recursive: true, force: true });
+async function cleanDirectory(path13) {
+  return await rm(path13, { recursive: true, force: true });
 }
 
-// src/index.ts
+// src/cli/index.ts
 var nextAppDir = resolve2(".");
 console.log(`Building the Next.js app in the current folder (${nextAppDir})`);
 if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync4(`./next.config.${ext2}`))) {

package/dist/{templates → cli/templates}/worker.ts

@@ -1,46 +1,64 @@
+import { AsyncLocalStorage } from "node:async_hooks";
 import Stream from "node:stream";
 import type { NextConfig } from "next";
 import { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
 import { MockedResponse } from "next/dist/server/lib/mock-request";
 import NextNodeServer, { NodeRequestHandler } from "next/dist/server/next-server";
 import type { IncomingMessage } from "node:http";
+import { type CloudflareContext } from "../../api";
 
 const NON_BODY_RESPONSES = new Set([101, 204, 205, 304]);
 
+const cloudflareContextALS = new AsyncLocalStorage<CloudflareContext>();
+
+// Note: this symbol needs to be kept in sync with the one defined in `src/api/get-cloudflare-context.ts`
+(globalThis as any)[Symbol.for("__cloudflare-context__")] = new Proxy(
+  {},
+  {
+    ownKeys: () => Reflect.ownKeys(cloudflareContextALS.getStore()!),
+    getOwnPropertyDescriptor: (_, ...args) =>
+      Reflect.getOwnPropertyDescriptor(cloudflareContextALS.getStore()!, ...args),
+    get: (_, property) => Reflect.get(cloudflareContextALS.getStore()!, property),
+    set: (_, property, value) => Reflect.set(cloudflareContextALS.getStore()!, property, value),
+  }
+);
+
 // Injected at build time
 const nextConfig: NextConfig = JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_CONFIG ?? "{}");
 
 let requestHandler: NodeRequestHandler | null = null;
 
 export default {
-  async fetch(request: Request, env: any, ctx: any) {
-    if (requestHandler == null) {
-      globalThis.process.env = { ...globalThis.process.env, ...env };
-      requestHandler = new NextNodeServer({
-        conf: { ...nextConfig, env },
-        customServer: false,
-        dev: false,
-        dir: "",
-        minimalMode: false,
-      }).getRequestHandler();
-    }
-
-    const url = new URL(request.url);
-
-    if (url.pathname === "/_next/image") {
-      let imageUrl =
-        url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
-      if (imageUrl.startsWith("/")) {
-        return env.ASSETS.fetch(new URL(imageUrl, request.url));
+  async fetch(request: Request & { cf: IncomingRequestCfProperties }, env: any, ctx: any) {
+    return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
+      if (requestHandler == null) {
+        globalThis.process.env = { ...globalThis.process.env, ...env };
+        requestHandler = new NextNodeServer({
+          conf: { ...nextConfig, env },
+          customServer: false,
+          dev: false,
+          dir: "",
+          minimalMode: false,
+        }).getRequestHandler();
+      }
+
+      const url = new URL(request.url);
+
+      if (url.pathname === "/_next/image") {
+        let imageUrl =
+          url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
+        if (imageUrl.startsWith("/")) {
+          return env.ASSETS.fetch(new URL(imageUrl, request.url));
+        }
+        return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
       }
-      return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
-    }
 
-    const { req, res, webResponse } = getWrappedStreams(request, ctx);
+      const { req, res, webResponse } = getWrappedStreams(request, ctx);
 
-    ctx.waitUntil(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res)));
+      ctx.waitUntil(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res)));
 
-    return await webResponse();
+      return await webResponse();
+    });
   },
 };
 
@@ -102,7 +120,6 @@ function getWrappedStreams(request: Request, ctx: any) {
     },
     set: function (val) {
       if (this.finished || this.headersSent) {
-        console.error("headers already sent");
         return;
       }
       statusCode = val;

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-e2c4535",
-  "bin": "dist/index.mjs",
+  "version": "0.0.0-e62af72",
+  "bin": "dist/cli/index.mjs",
+  "main": "./dist/api/index.mjs",
+  "types": "./dist/api/index.d.mts",
+  "exports": {
+    ".": {
+      "import": "./dist/api/index.mjs",
+      "types": "./dist/api/index.d.mts"
+    }
+  },
   "files": [
     "README.md",
     "dist"
@@ -23,9 +31,11 @@
   },
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240919.0",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
     "glob": "^11.0.0",
+    "next": "14.2.11",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
     "vitest": "^2.1.1"
@@ -33,6 +43,9 @@
   "dependencies": {
     "ts-morph": "^23.0.0"
   },
+  "peerDependencies": {
+    "wrangler": "^3.78.6"
+  },
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch src",