@opennextjs/cloudflare 0.0.0-9758666 → 0.0.0-af15fd1

package/dist/api/chunk-LA734VUG.mjs

@@ -0,0 +1,14 @@
+// src/api/get-cloudflare-context.ts
+import "server-only";
+var cloudflareContextSymbol = Symbol.for("__cloudflare-context__");
+async function getCloudflareContext() {
+  const cloudflareContext = globalThis[cloudflareContextSymbol];
+  if (!cloudflareContext) {
+    throw new Error("Cloudflare context is not defined!");
+  }
+  return cloudflareContext;
+}
+
+export {
+  getCloudflareContext
+};

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

@@ -0,0 +1,28 @@
+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
+ *
+ * Throws an error if the context could not be retrieved
+ *
+ * @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-LA734VUG.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-LA734VUG.mjs";
+export {
+  getCloudflareContext
+};

package/dist/{cache-handler.mjs → cli/cache-handler.mjs}

@@ -1,6 +1,6 @@
 import "./chunk-UJCSKKID.mjs";
 
-// src/cache-handler.ts
+// src/cli/cache-handler.ts
 var CfWorkersKvCacheHandler = class _CfWorkersKvCacheHandler {
   constructor(ctx) {
     this.ctx = ctx;

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

@@ -213,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";
@@ -246,15 +246,15 @@ function getArgs() {
     skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
   };
 }
-function assertDirArg(path12, argName, make) {
+function assertDirArg(path13, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync(path12);
+    dirStats = statSync(path13);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync(path12);
+    mkdirSync(path13);
     return;
   }
   if (!dirStats.isDirectory()) {
@@ -262,13 +262,13 @@ function assertDirArg(path12, 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);
@@ -287,27 +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 path9 from "node:path";
+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-package.ts
+// src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-function copyPackage(srcDir, config) {
-  console.log("# copyPackage");
-  cpSync(srcDir, config.paths.internalPackage, { recursive: true });
+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
@@ -981,11 +984,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path = {
+var path2 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
+var sep = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -4162,12 +4165,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path12) {
-    if (!path12) {
+  resolve(path13) {
+    if (!path13) {
       return this;
     }
-    const rootPath = this.getRootString(path12);
-    const dir = path12.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;
@@ -4919,8 +4922,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path12) {
-    return win32.parse(path12).root;
+  getRootString(path13) {
+    return win32.parse(path13).root;
   }
   /**
    * @internal
@@ -4966,8 +4969,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path12) {
-    return path12.startsWith("/") ? "/" : "";
+  getRootString(path13) {
+    return path13.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5056,11 +5059,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path12 = this.cwd) {
-    if (typeof path12 === "string") {
-      path12 = this.cwd.resolve(path12);
+  depth(path13 = this.cwd) {
+    if (typeof path13 === "string") {
+      path13 = this.cwd.resolve(path13);
     }
-    return path12.depth();
+    return path13.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5547,9 +5550,9 @@ var PathScurryBase = class {
     process2();
     return results;
   }
-  chdir(path12 = this.cwd) {
+  chdir(path13 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path12 === "string" ? this.cwd.resolve(path12) : path12;
+    this.cwd = typeof path13 === "string" ? this.cwd.resolve(path13) : path13;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5905,8 +5908,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path12, n]) => [
-      path12,
+    return [...this.store.entries()].map(([path13, n]) => [
+      path13,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6111,9 +6114,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path12, opts) {
+  constructor(patterns, path13, opts) {
     this.patterns = patterns;
-    this.path = path12;
+    this.path = path13;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6132,11 +6135,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path12) {
-    return this.seen.has(path12) || !!this.#ignore?.ignored?.(path12);
+  #ignored(path13) {
+    return this.seen.has(path13) || !!this.#ignore?.ignored?.(path13);
   }
-  #childrenIgnored(path12) {
-    return !!this.#ignore?.childrenIgnored?.(path12);
+  #childrenIgnored(path13) {
+    return !!this.#ignore?.childrenIgnored?.(path13);
   }
   // backpressure mechanism
   pause() {
@@ -6351,8 +6354,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path12, opts) {
-    super(patterns, path12, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6389,8 +6392,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path12, opts) {
-    super(patterns, path12, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6683,17 +6686,17 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/build/patches/to-investigate/patch-read-file.ts
-import path2 from "node:path";
+// 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(path2.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+      return ${JSON.stringify(readFileSync(path3.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
     `
   );
-  const manifestJsons = globSync(path2.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
+  const manifestJsons = globSync(path3.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
     (file) => file.replace(config.paths.standaloneApp + "/", "")
   );
   code = code.replace(
@@ -6702,7 +6705,7 @@ function patchReadFile(code, config) {
     ${manifestJsons.map(
       (manifestJson) => `
           if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(path2.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+            return ${readFileSync(path3.join(config.paths.standaloneApp, manifestJson), "utf-8")};
           }
         `
     ).join("\n")}
@@ -6712,8 +6715,8 @@ function patchReadFile(code, config) {
   return code;
 }
 
-// src/build/patches/to-investigate/patch-find-dir.ts
-import path3 from "node:path";
+// src/cli/build/patches/to-investigate/patch-find-dir.ts
+import path4 from "node:path";
 import { existsSync } from "node:fs";
 function patchFindDir(code, config) {
   console.log("# patchFindDir");
@@ -6722,10 +6725,10 @@ function patchFindDir(code, config) {
     `function findDir(dir, name) {
 			if (dir.endsWith(".next/server")) {
 			if (name === "app") {
-			  return ${existsSync(`${path3.join(config.paths.standaloneAppServer, "app")}`)};
+			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "app")}`)};
 	    }
 			if (name === "pages") {
-			  return ${existsSync(`${path3.join(config.paths.standaloneAppServer, "pages")}`)};
+			  return ${existsSync(`${path4.join(config.paths.standaloneAppServer, "pages")}`)};
 	    }
 		}
 		throw new Error("Unknown findDir call: " + dir + " " + name);
@@ -6733,13 +6736,13 @@ function patchFindDir(code, config) {
   );
 }
 
-// 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";
-import path4 from "node:path";
+import path5 from "node:path";
 function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
-  const pagesManifestFile = path4.join(config.paths.standaloneAppServer, "pages-manifest.json");
-  const appPathsManifestFile = path4.join(config.paths.standaloneAppServer, "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
   ) : [];
@@ -6755,14 +6758,14 @@ function inlineNextRequire(code, config) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync2(path4.join(config.paths.standaloneApp, 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("${path4.join(config.paths.standaloneApp, module)}");
+            return require("${path5.join(config.paths.standaloneApp, module)}");
           }
         `
     ).join("\n")}
@@ -6771,12 +6774,12 @@ function inlineNextRequire(code, config) {
   );
 }
 
-// src/build/patches/to-investigate/inline-eval-manifest.ts
-import path5 from "node:path";
+// 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(
-    path5.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
+    path6.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
   ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,
@@ -6784,7 +6787,7 @@ function inlineEvalManifest(code, config) {
 		${manifestJss.map(
       (manifestJs) => `
 			  if ($1.endsWith("${manifestJs}")) {
-				require("${path5.join(config.paths.standaloneApp, 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", "")}"],
@@ -6798,12 +6801,12 @@ function inlineEvalManifest(code, config) {
   );
 }
 
-// src/build/patches/to-investigate/wrangler-deps.ts
-import path6 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(config) {
   console.log("# patchWranglerDeps");
-  const pagesRuntimeFile = path6.join(
+  const pagesRuntimeFile = path7.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6814,7 +6817,7 @@ function patchWranglerDeps(config) {
   );
   const patchedPagesRuntime = fs.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
   fs.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path6.join(
+  const tracerFile = path7.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6828,11 +6831,11 @@ function patchWranglerDeps(config) {
   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 path7 from "node:path";
+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);
@@ -6878,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) => {
@@ -6922,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();
@@ -6930,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);
@@ -6942,12 +6945,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
   return updatedFileContent;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/index.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path7.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const webpackRuntimeFile = path8.join(config.paths.standaloneAppServer, "webpack-runtime.js");
   const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(path7.join(config.paths.standaloneAppServer, "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$/, "");
   });
@@ -6955,11 +6958,11 @@ async function updateWebpackChunksFile(config) {
   writeFileSync2(webpackRuntimeFile, updatedFileContent);
 }
 
-// src/build/patches/investigated/patch-cache.ts
-import path8 from "node:path";
+// src/cli/build/patches/investigated/patch-cache.ts
+import path9 from "node:path";
 function patchCache(code, config) {
   console.log("# patchCached");
-  const cacheHandler = path8.join(config.paths.internalPackage, "cache-handler.mjs");
+  const cacheHandler = path9.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
   const patchedCode = code.replace(
     "const { cacheHandler } = this.nextConfig;",
     `const cacheHandler = null;
@@ -6973,29 +6976,29 @@ CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
   return patchedCode;
 }
 
-// src/build/build-worker.ts
-var packageDir = path9.dirname(fileURLToPath3(import.meta.url));
+// 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(
-    path9.join(config.paths.dotNext, "static"),
-    path9.join(config.paths.builderOutput, "assets", "_next", "static"),
+    path10.join(config.paths.dotNext, "static"),
+    path10.join(config.paths.builderOutput, "assets", "_next", "static"),
     {
       recursive: true
     }
   );
-  const publicDir = path9.join(config.paths.nextApp, "public");
+  const publicDir = path10.join(config.paths.nextApp, "public");
   if (existsSync3(publicDir)) {
-    await cp(publicDir, path9.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path10.join(config.paths.builderOutput, "assets"), {
       recursive: true
     });
   }
-  copyPackage(packageDir, config);
-  const templateDir = path9.join(config.paths.internalPackage, "templates");
-  const workerEntrypoint = path9.join(templateDir, "worker.ts");
-  const workerOutputFile = path9.join(config.paths.builderOutput, "index.mjs");
-  const nextConfigStr = readFileSync4(path9.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
+  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...
@@ -7014,15 +7017,15 @@ async function buildWorker(config) {
       // 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": path9.join(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": path9.join(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": path9.join(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
@@ -7102,18 +7105,18 @@ function createFixRequiresESBuildPlugin(templateDir) {
     name: "replaceRelative",
     setup(build3) {
       build3.onResolve({ filter: /^\.\/require-hook$/ }, (args) => ({
-        path: path9.join(templateDir, "shims", "empty.ts")
+        path: path10.join(templateDir, "shims", "empty.ts")
       }));
       build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, (args) => ({
-        path: path9.join(templateDir, "shims", "empty.ts")
+        path: path10.join(templateDir, "shims", "empty.ts")
       }));
     }
   };
 }
 
-// src/config.ts
+// src/cli/config.ts
 import { readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
-import path10, { relative } from "node:path";
+import path11, { relative } from "node:path";
 var PACKAGE_NAME = "@opennextjs/cloudflare";
 var UserConfig = {
   cache: {
@@ -7121,13 +7124,13 @@ var UserConfig = {
   }
 };
 function getConfig(appDir, outputDir2) {
-  const dotNext = path10.join(outputDir2, ".next");
+  const dotNext = path11.join(outputDir2, ".next");
   const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
-  const standaloneApp = path10.join(dotNext, "standalone", appPath);
-  const standaloneAppDotNext = path10.join(standaloneApp, ".next");
-  const standaloneAppServer = path10.join(standaloneAppDotNext, "server");
-  const nodeModules = path10.join(standaloneApp, "node_modules");
-  const internalPackage = path10.join(nodeModules, ...PACKAGE_NAME.split("/"));
+  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 {
     paths: {
       nextApp: appDir,
@@ -7146,7 +7149,7 @@ function getConfig(appDir, outputDir2) {
 }
 function containsDotNextDir(folder) {
   try {
-    return statSync2(path10.join(folder, ".next")).isDirectory();
+    return statSync2(path11.join(folder, ".next")).isDirectory();
   } catch (e) {
     return false;
   }
@@ -7156,19 +7159,19 @@ function getNextjsApplicationPath(dotNextDir) {
   if (!serverPath) {
     throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
   }
-  return relative(path10.join(dotNextDir, "standalone"), serverPath);
+  return relative(path11.join(dotNextDir, "standalone"), serverPath);
 }
 function findServerParentPath(parentPath) {
   try {
-    if (statSync2(path10.join(parentPath, ".next", "server")).isDirectory()) {
+    if (statSync2(path11.join(parentPath, ".next", "server")).isDirectory()) {
       return parentPath;
     }
   } catch {
   }
   const folders = readdirSync3(parentPath);
   for (const folder of folders) {
-    const subFolder = path10.join(parentPath, folder);
-    if (statSync2(path10.join(parentPath, folder)).isDirectory()) {
+    const subFolder = path11.join(parentPath, folder);
+    if (statSync2(path11.join(parentPath, folder)).isDirectory()) {
       const dirServerPath = findServerParentPath(subFolder);
       if (dirServerPath) {
         return dirServerPath;
@@ -7177,9 +7180,9 @@ function findServerParentPath(parentPath) {
   }
 }
 
-// src/build/build.ts
-import { cpSync as cpSync3 } from "node:fs";
-import path11 from "node:path";
+// 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(appDir);
@@ -7187,17 +7190,17 @@ async function build2(appDir, opts) {
   if (!containsDotNextDir(appDir)) {
     throw new Error(`.next folder not found in ${appDir}`);
   }
-  const outputDir2 = path11.resolve(opts.outputDir ?? appDir, ".worker-next");
+  const outputDir2 = path12.resolve(opts.outputDir ?? appDir, ".worker-next");
   await cleanDirectory(outputDir2);
-  cpSync3(path11.join(appDir, ".next"), path11.join(outputDir2, ".next"), { recursive: true });
+  cpSync2(path12.join(appDir, ".next"), path12.join(outputDir2, ".next"), { recursive: true });
   const config = getConfig(appDir, outputDir2);
   await buildWorker(config);
 }
-async function cleanDirectory(path12) {
-  return await rm(path12, { 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();
+    });
   },
 };
 

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-9758666",
-  "bin": "dist/index.mjs",
+  "version": "0.0.0-af15fd1",
+  "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"