@opennextjs/cloudflare 0.0.3 → 0.1.0

package/dist/cli/constants/incremental-cache.ts

@@ -0,0 +1,8 @@
+export const RSC_PREFETCH_SUFFIX = ".prefetch.rsc";
+export const RSC_SUFFIX = ".rsc";
+export const NEXT_DATA_SUFFIX = ".json";
+export const NEXT_META_SUFFIX = ".meta";
+export const NEXT_BODY_SUFFIX = ".body";
+export const NEXT_HTML_SUFFIX = ".html";
+
+export const SEED_DATA_DIR = "cdn-cgi/_cf_seed_data";

package/dist/cli/index.mjs

@@ -1,10 +1,29 @@
 #!/usr/bin/env node
-import {
-  NEXT_META_SUFFIX,
-  SEED_DATA_DIR,
-  __commonJS,
-  __toESM
-} from "./chunk-F7LECSR5.mjs";
+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
+));
 
 // ../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
@@ -219,11 +238,6 @@ var require_brace_expansion = __commonJS({
 import path, { relative } from "node:path";
 import { readdirSync, statSync } from "node:fs";
 var PACKAGE_NAME = "@opennextjs/cloudflare";
-var UserConfig = {
-  cache: {
-    bindingName: "NEXT_CACHE_WORKERS_KV"
-  }
-};
 function getConfig(appDir, outputDir2) {
   const dotNext = path.join(outputDir2, ".next");
   const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
@@ -233,6 +247,8 @@ function getConfig(appDir, outputDir2) {
   const standaloneAppServer = path.join(standaloneAppDotNext, "server");
   const nodeModules = path.join(standaloneApp, "node_modules");
   const internalPackage = path.join(nodeModules, ...PACKAGE_NAME.split("/"));
+  const internalTemplates = path.join(internalPackage, "cli", "templates");
+  process.env.__OPENNEXT_KV_BINDING_NAME ??= "NEXT_CACHE_WORKERS_KV";
   return {
     buildTimestamp: Date.now(),
     paths: {
@@ -243,10 +259,11 @@ function getConfig(appDir, outputDir2) {
       standaloneApp,
       standaloneAppDotNext,
       standaloneAppServer,
-      internalPackage
+      internalPackage,
+      internalTemplates
     },
     cache: {
-      kvBindingName: UserConfig.cache.bindingName
+      kvBindingName: process.env.__OPENNEXT_KV_BINDING_NAME
     },
     internalPackageName: PACKAGE_NAME
   };
@@ -394,7 +411,7 @@ function runNextBuildCommand(packager, nextAppDir2) {
 }
 
 // src/cli/build/build-worker.ts
-import { build } from "esbuild";
+import { build as build2 } from "esbuild";
 import { cp, readFile, writeFile } from "node:fs/promises";
 import { existsSync as existsSync5, readFileSync as readFileSync7 } from "node:fs";
 
@@ -416,6 +433,10 @@ function tsParseFile(fileContent) {
   return sourceFile;
 }
 
+// src/cli/constants/incremental-cache.ts
+var NEXT_META_SUFFIX = ".meta";
+var SEED_DATA_DIR = "cdn-cgi/_cf_seed_data";
+
 // src/cli/build/utils/copy-prerendered-routes.ts
 import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join as join2 } from "node:path";
@@ -4313,12 +4334,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path15) {
-    if (!path15) {
+  resolve(path14) {
+    if (!path14) {
       return this;
     }
-    const rootPath = this.getRootString(path15);
-    const dir = path15.substring(rootPath.length);
+    const rootPath = this.getRootString(path14);
+    const dir = path14.substring(rootPath.length);
     const dirParts = dir.split(this.splitSep);
     const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
     return result;
@@ -5070,8 +5091,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path15) {
-    return win32.parse(path15).root;
+  getRootString(path14) {
+    return win32.parse(path14).root;
   }
   /**
    * @internal
@@ -5117,8 +5138,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path15) {
-    return path15.startsWith("/") ? "/" : "";
+  getRootString(path14) {
+    return path14.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5207,11 +5228,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path15 = this.cwd) {
-    if (typeof path15 === "string") {
-      path15 = this.cwd.resolve(path15);
+  depth(path14 = this.cwd) {
+    if (typeof path14 === "string") {
+      path14 = this.cwd.resolve(path14);
     }
-    return path15.depth();
+    return path14.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5698,9 +5719,9 @@ var PathScurryBase = class {
     process3();
     return results;
   }
-  chdir(path15 = this.cwd) {
+  chdir(path14 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path15 === "string" ? this.cwd.resolve(path15) : path15;
+    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -6056,8 +6077,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path15, n]) => [
-      path15,
+    return [...this.store.entries()].map(([path14, n]) => [
+      path14,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6262,9 +6283,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path15, opts) {
+  constructor(patterns, path14, opts) {
     this.patterns = patterns;
-    this.path = path15;
+    this.path = path14;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6283,11 +6304,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path15) {
-    return this.seen.has(path15) || !!this.#ignore?.ignored?.(path15);
+  #ignored(path14) {
+    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
   }
-  #childrenIgnored(path15) {
-    return !!this.#ignore?.childrenIgnored?.(path15);
+  #childrenIgnored(path14) {
+    return !!this.#ignore?.childrenIgnored?.(path14);
   }
   // backpressure mechanism
   pause() {
@@ -6502,8 +6523,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path15, opts) {
-    super(patterns, path15, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6540,8 +6561,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path15, opts) {
-    super(patterns, path15, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6839,15 +6860,17 @@ import path5 from "node:path";
 function inlineEvalManifest(code, config) {
   console.log("# inlineEvalManifest");
   const manifestJss = globSync(
-    path5.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
-  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
+    path5.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js").replaceAll(path5.sep, path5.posix.sep)
+  ).map(
+    (file) => file.replaceAll(path5.sep, path5.posix.sep).replace(config.paths.standaloneApp.replaceAll(path5.sep, path5.posix.sep) + path5.posix.sep, "")
+  );
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,
     `$&
 		${manifestJss.map(
       (manifestJs) => `
 			  if ($1.endsWith("${manifestJs}")) {
-				require("${path5.join(config.paths.standaloneApp, manifestJs)}");
+				require(${JSON.stringify(path5.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", "")}"],
@@ -6907,7 +6930,7 @@ function inlineNextRequire(code, config) {
     ${pageModules.map(
       (module) => `
           if (pagePath.endsWith("${module}")) {
-            return require("${path7.join(config.paths.standaloneApp, module)}");
+            return require(${JSON.stringify(path7.join(config.paths.standaloneApp, module))});
           }
         `
     ).join("\n")}
@@ -6917,19 +6940,32 @@ function inlineNextRequire(code, config) {
 }
 
 // src/cli/build/patches/investigated/patch-cache.ts
-import path8 from "node:path";
-function patchCache(code, config) {
+import { build } from "esbuild";
+import { join as join3 } from "node:path";
+async function patchCache(code, config) {
   console.log("# patchCache");
-  const cacheHandler = path8.join(config.paths.internalPackage, "cli", "cache-handler", "index.mjs");
+  const cacheHandlerFileName = "cache-handler.mjs";
+  const cacheHandlerEntrypoint = join3(config.paths.internalTemplates, "cache-handler", "index.ts");
+  const cacheHandlerOutputFile = join3(config.paths.builderOutput, cacheHandlerFileName);
+  await build({
+    entryPoints: [cacheHandlerEntrypoint],
+    bundle: true,
+    outfile: cacheHandlerOutputFile,
+    format: "esm",
+    target: "esnext",
+    minify: true,
+    define: {
+      "process.env.__OPENNEXT_KV_BINDING_NAME": `"${config.cache.kvBindingName}"`
+    }
+  });
   const patchedCode = code.replace(
     "const { cacheHandler } = this.nextConfig;",
     `const cacheHandler = null;
-CacheHandler = (await import('${cacheHandler}')).OpenNextCacheHandler;
-CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
+CacheHandler = (await import('./${cacheHandlerFileName}')).OpenNextCacheHandler;
 `
   );
   if (patchedCode === code) {
-    throw new Error("Cache patch not applied");
+    throw new Error("Patch `patchCache` not applied");
   }
   return patchedCode;
 }
@@ -6946,7 +6982,7 @@ function patchExceptionBubbling(code) {
 
 // src/cli/build/patches/to-investigate/patch-find-dir.ts
 import { existsSync as existsSync4 } from "node:fs";
-import path9 from "node:path";
+import path8 from "node:path";
 function patchFindDir(code, config) {
   console.log("# patchFindDir");
   return code.replace(
@@ -6954,10 +6990,10 @@ function patchFindDir(code, config) {
     `function findDir(dir, name) {
 			if (dir.endsWith(".next/server")) {
 			if (name === "app") {
-			  return ${existsSync4(`${path9.join(config.paths.standaloneAppServer, "app")}`)};
+			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "app")}`)};
 	    }
 			if (name === "pages") {
-			  return ${existsSync4(`${path9.join(config.paths.standaloneAppServer, "pages")}`)};
+			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "pages")}`)};
 	    }
 		}
 		throw new Error("Unknown findDir call: " + dir + " " + name);
@@ -6966,18 +7002,20 @@ function patchFindDir(code, config) {
 }
 
 // src/cli/build/patches/to-investigate/patch-read-file.ts
-import path10 from "node:path";
+import path9 from "node:path";
 import { readFileSync as readFileSync4 } from "node:fs";
 function patchReadFile(code, config) {
   console.log("# patchReadFile");
   code = code.replace(
     "getBuildId() {",
     `getBuildId() {
-      return ${JSON.stringify(readFileSync4(path10.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+      return ${JSON.stringify(readFileSync4(path9.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
     `
   );
-  const manifestJsons = globSync(path10.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
-    (file) => file.replace(config.paths.standaloneApp + "/", "")
+  const manifestJsons = globSync(
+    path9.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json").replaceAll(path9.sep, path9.posix.sep)
+  ).map(
+    (file) => file.replaceAll(path9.sep, path9.posix.sep).replace(config.paths.standaloneApp.replaceAll(path9.sep, path9.posix.sep) + path9.posix.sep, "")
   );
   code = code.replace(
     /function loadManifest\((.+?), .+?\) {/,
@@ -6985,7 +7023,7 @@ function patchReadFile(code, config) {
     ${manifestJsons.map(
       (manifestJson) => `
           if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync4(path10.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+            return ${readFileSync4(path9.join(config.paths.standaloneApp, manifestJson), "utf-8")};
           }
         `
     ).join("\n")}
@@ -7003,17 +7041,17 @@ function patchRequire(code) {
 
 // src/cli/build/patches/to-investigate/wrangler-deps.ts
 import { readFileSync as readFileSync5, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import path11 from "node:path";
+import path10 from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
   const distPath = getDistPath(config);
-  const pagesRuntimeFile = path11.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
+  const pagesRuntimeFile = path10.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
   const patchedPagesRuntime = readFileSync5(pagesRuntimeFile, "utf-8").replace(
     `e.exports=require("critters")`,
     `e.exports={}`
   );
   writeFileSync2(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path11.join(distPath, "server", "lib", "trace", "tracer.js");
+  const tracerFile = path10.join(distPath, "server", "lib", "trace", "tracer.js");
   const patchedTracer = readFileSync5(tracerFile, "utf-8").replaceAll(
     /\w+\s*=\s*require\([^/]*opentelemetry.*\)/g,
     `throw new Error("@opentelemetry/api")`
@@ -7023,7 +7061,7 @@ function patchWranglerDeps(config) {
 function getDistPath(config) {
   for (const root of [config.paths.standaloneApp, config.paths.standaloneRoot]) {
     try {
-      const distPath = path11.join(root, "node_modules", "next", "dist");
+      const distPath = path10.join(root, "node_modules", "next", "dist");
       if (statSync2(distPath).isDirectory()) return distPath;
     } catch {
     }
@@ -7032,7 +7070,7 @@ function getDistPath(config) {
 }
 
 // src/cli/build/build-worker.ts
-import path13 from "node:path";
+import path12 from "node:path";
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
 import { readFileSync as readFileSync6, readdirSync as readdirSync4, writeFileSync as writeFileSync3 } from "node:fs";
@@ -7140,12 +7178,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
 }
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
-import path12 from "node:path";
+import path11 from "node:path";
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path12.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const webpackRuntimeFile = path11.join(config.paths.standaloneAppServer, "webpack-runtime.js");
   const fileContent = readFileSync6(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync4(path12.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+  const chunks = readdirSync4(path11.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
     console.log(` - chunk ${chunk}`);
     return chunk.replace(/\.js$/, "");
   });
@@ -7154,56 +7192,55 @@ async function updateWebpackChunksFile(config) {
 }
 
 // src/cli/build/build-worker.ts
-var packageDistDir = path13.join(path13.dirname(fileURLToPath3(import.meta.url)), "..");
+var packageDistDir = path12.join(path12.dirname(fileURLToPath3(import.meta.url)), "..");
 async function buildWorker(config) {
   console.log(`\x1B[35m\u2699\uFE0F Copying files...
 \x1B[0m`);
   await cp(
-    path13.join(config.paths.dotNext, "static"),
-    path13.join(config.paths.builderOutput, "assets", "_next", "static"),
+    path12.join(config.paths.dotNext, "static"),
+    path12.join(config.paths.builderOutput, "assets", "_next", "static"),
     {
       recursive: true
     }
   );
-  const publicDir = path13.join(config.paths.nextApp, "public");
+  const publicDir = path12.join(config.paths.nextApp, "public");
   if (existsSync5(publicDir)) {
-    await cp(publicDir, path13.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path12.join(config.paths.builderOutput, "assets"), {
       recursive: true
     });
   }
   copyPrerenderedRoutes(config);
   copyPackageCliFiles(packageDistDir, config);
-  const templateDir = path13.join(config.paths.internalPackage, "cli", "templates");
-  const workerEntrypoint = path13.join(templateDir, "worker.ts");
-  const workerOutputFile = path13.join(config.paths.builderOutput, "index.mjs");
-  const nextConfigStr = readFileSync7(path13.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
+  const workerEntrypoint = path12.join(config.paths.internalTemplates, "worker.ts");
+  const workerOutputFile = path12.join(config.paths.builderOutput, "index.mjs");
+  const nextConfigStr = readFileSync7(path12.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(config);
   updateWebpackChunksFile(config);
-  await build({
+  await build2({
     entryPoints: [workerEntrypoint],
     bundle: true,
     outfile: workerOutputFile,
     format: "esm",
     target: "esnext",
     minify: false,
-    plugins: [createFixRequiresESBuildPlugin(templateDir)],
+    plugins: [createFixRequiresESBuildPlugin(config)],
     alias: {
       // 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": path13.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/ws": path12.join(config.paths.internalTemplates, "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": path13.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/edge-runtime": path12.join(config.paths.internalTemplates, "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": path13.join(templateDir, "shims", "env.ts")
+      "@next/env": path12.join(config.paths.internalTemplates, "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
@@ -7271,20 +7308,20 @@ async function updateWorkerBundledCode(workerOutputFile, config) {
   patchedCode = inlineNextRequire(patchedCode, config);
   patchedCode = patchFindDir(patchedCode, config);
   patchedCode = inlineEvalManifest(patchedCode, config);
-  patchedCode = patchCache(patchedCode, config);
+  patchedCode = await patchCache(patchedCode, config);
   patchedCode = inlineMiddlewareManifestRequire(patchedCode, config);
   patchedCode = patchExceptionBubbling(patchedCode);
   await writeFile(workerOutputFile, patchedCode);
 }
-function createFixRequiresESBuildPlugin(templateDir) {
+function createFixRequiresESBuildPlugin(config) {
   return {
     name: "replaceRelative",
-    setup(build3) {
-      build3.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
-        path: path13.join(templateDir, "shims", "empty.ts")
+    setup(build4) {
+      build4.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
+        path: path12.join(config.paths.internalTemplates, "shims", "empty.ts")
       }));
-      build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
-        path: path13.join(templateDir, "shims", "empty.ts")
+      build4.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
+        path: path12.join(config.paths.internalTemplates, "shims", "empty.ts")
       }));
     }
   };
@@ -7292,23 +7329,23 @@ function createFixRequiresESBuildPlugin(templateDir) {
 
 // src/cli/build/index.ts
 import { cpSync as cpSync2 } from "node:fs";
-import path14 from "node:path";
+import path13 from "node:path";
 import { rm } from "node:fs/promises";
-async function build2(appDir, opts) {
+async function build3(appDir, opts) {
   if (!opts.skipBuild) {
     await buildNextjsApp(appDir);
   }
   if (!containsDotNextDir(appDir)) {
     throw new Error(`.next folder not found in ${appDir}`);
   }
-  const outputDir2 = path14.resolve(opts.outputDir ?? appDir, ".worker-next");
+  const outputDir2 = path13.resolve(opts.outputDir ?? appDir, ".worker-next");
   await cleanDirectory(outputDir2);
-  cpSync2(path14.join(appDir, ".next"), path14.join(outputDir2, ".next"), { recursive: true });
+  cpSync2(path13.join(appDir, ".next"), path13.join(outputDir2, ".next"), { recursive: true });
   const config = getConfig(appDir, outputDir2);
   await buildWorker(config);
 }
-async function cleanDirectory(path15) {
-  return await rm(path15, { recursive: true, force: true });
+async function cleanDirectory(path14) {
+  return await rm(path14, { recursive: true, force: true });
 }
 
 // src/cli/index.ts
@@ -7344,15 +7381,15 @@ function getArgs() {
     skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
   };
 }
-function assertDirArg(path15, argName, make) {
+function assertDirArg(path14, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync3(path15);
+    dirStats = statSync3(path14);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync2(path15);
+    mkdirSync2(path14);
     return;
   }
   if (!dirStats.isDirectory()) {
@@ -7368,7 +7405,7 @@ if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync6(`./next.config.${ext2
   throw new Error("Error: Not in a Next.js app project");
 }
 var { skipBuild, outputDir } = getArgs();
-await build2(nextAppDir, {
+await build3(nextAppDir, {
   outputDir,
   skipBuild: !!skipBuild
 });

package/dist/cli/templates/cache-handler/index.ts

@@ -0,0 +1 @@
+export * from "./open-next-cache-handler";

package/dist/cli/templates/cache-handler/open-next-cache-handler.ts

@@ -0,0 +1,148 @@
+import type {
+  CacheHandler,
+  CacheHandlerContext,
+  CacheHandlerValue,
+} from "next/dist/server/lib/incremental-cache";
+import {
+  NEXT_BODY_SUFFIX,
+  NEXT_DATA_SUFFIX,
+  NEXT_HTML_SUFFIX,
+  RSC_PREFETCH_SUFFIX,
+  RSC_SUFFIX,
+  SEED_DATA_DIR,
+} from "../../constants/incremental-cache";
+import { getSeedBodyFile, getSeedMetaFile, getSeedTextFile, parseCtx } from "./utils";
+import type { IncrementalCacheValue } from "next/dist/server/response-cache";
+import type { KVNamespace } from "@cloudflare/workers-types";
+
+type CacheEntry = {
+  lastModified: number;
+  value: IncrementalCacheValue | null;
+};
+
+export class OpenNextCacheHandler implements CacheHandler {
+  protected kv: KVNamespace | undefined;
+
+  protected debug: boolean = !!process.env.NEXT_PRIVATE_DEBUG_CACHE;
+
+  constructor(protected ctx: CacheHandlerContext) {
+    this.kv = process.env[process.env.__OPENNEXT_KV_BINDING_NAME] as KVNamespace | undefined;
+  }
+
+  async get(...args: Parameters<CacheHandler["get"]>): Promise<CacheHandlerValue | null> {
+    const [key, _ctx] = args;
+    const ctx = parseCtx(_ctx);
+
+    if (this.debug) console.log(`cache - get: ${key}, ${ctx?.kind}`);
+
+    if (this.kv !== undefined) {
+      try {
+        const value = await this.kv.get<CacheEntry>(key, "json");
+        if (value) return value;
+      } catch (e) {
+        console.error(`Failed to get value for key = ${key}: ${e}`);
+      }
+    }
+
+    // Check for seed data from the file-system.
+
+    // we don't check for seed data for fetch or image cache entries
+    if (ctx?.kind === "FETCH" || ctx?.kind === "IMAGE") return null;
+
+    const seedKey = `http://assets.local/${SEED_DATA_DIR}/${key}`.replace(/\/\//g, "/");
+
+    if (ctx?.kind === "APP" || ctx?.kind === "APP_ROUTE") {
+      const fallbackBody = await getSeedBodyFile(seedKey, NEXT_BODY_SUFFIX);
+      if (fallbackBody) {
+        const meta = await getSeedMetaFile(seedKey);
+        return {
+          lastModified: meta?.lastModified,
+          value: {
+            kind: (ctx.kind === "APP_ROUTE" ? ctx.kind : "ROUTE") as Extract<
+              IncrementalCacheValue["kind"],
+              "ROUTE"
+            >,
+            body: fallbackBody,
+            status: meta?.status ?? 200,
+            headers: meta?.headers ?? {},
+          },
+        };
+      }
+
+      if (ctx.kind === "APP_ROUTE") {
+        return null;
+      }
+    }
+
+    const seedHtml = await getSeedTextFile(seedKey, NEXT_HTML_SUFFIX);
+    if (!seedHtml) return null; // we're only checking for prerendered routes at the moment
+
+    if (ctx?.kind === "PAGES" || ctx?.kind === "APP" || ctx?.kind === "APP_PAGE") {
+      const metaPromise = getSeedMetaFile(seedKey);
+
+      let pageDataPromise: Promise<Buffer | string | undefined> = Promise.resolve(undefined);
+      if (!ctx.isFallback) {
+        const rscSuffix = ctx.isRoutePPREnabled ? RSC_PREFETCH_SUFFIX : RSC_SUFFIX;
+
+        if (ctx.kind === "APP_PAGE") {
+          pageDataPromise = getSeedBodyFile(seedKey, rscSuffix);
+        } else {
+          pageDataPromise = getSeedTextFile(seedKey, ctx.kind === "APP" ? rscSuffix : NEXT_DATA_SUFFIX);
+        }
+      }
+
+      const [meta, pageData] = await Promise.all([metaPromise, pageDataPromise]);
+
+      return {
+        lastModified: meta?.lastModified,
+        value: {
+          kind: (ctx.kind === "APP_PAGE" ? "APP_PAGE" : "PAGE") as Extract<
+            IncrementalCacheValue["kind"],
+            "PAGE"
+          >,
+          html: seedHtml,
+          pageData: pageData ?? "",
+          ...(ctx.kind === "APP_PAGE" && { rscData: pageData }),
+          postponed: meta?.postponed,
+          status: meta?.status,
+          headers: meta?.headers,
+        },
+      };
+    }
+
+    return null;
+  }
+
+  async set(...args: Parameters<CacheHandler["set"]>) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const [key, entry, _ctx] = args;
+
+    if (this.kv === undefined) {
+      return;
+    }
+
+    if (this.debug) console.log(`cache - set: ${key}`);
+
+    const data: CacheEntry = {
+      lastModified: Date.now(),
+      value: entry,
+    };
+
+    try {
+      await this.kv.put(key, JSON.stringify(data));
+    } catch (e) {
+      console.error(`Failed to set value for key = ${key}: ${e}`);
+    }
+  }
+
+  async revalidateTag(...args: Parameters<CacheHandler["revalidateTag"]>) {
+    const [tags] = args;
+    if (this.kv === undefined) {
+      return;
+    }
+
+    if (this.debug) console.log(`cache - revalidateTag: ${JSON.stringify([tags].flat())}`);
+  }
+
+  resetRequestCache(): void {}
+}

package/dist/cli/templates/cache-handler/utils.ts

@@ -0,0 +1,41 @@
+import type { IncrementalCache } from "next/dist/server/lib/incremental-cache";
+import { NEXT_META_SUFFIX } from "../../constants/incremental-cache";
+
+type PrerenderedRouteMeta = {
+  lastModified: number;
+  status?: number;
+  headers?: Record<string, string>;
+  postponed?: string;
+};
+
+type EntryKind =
+  | "APP" // .body, .html - backwards compat
+  | "PAGES"
+  | "FETCH"
+  | "APP_ROUTE" // .body
+  | "APP_PAGE" // .html
+  | "IMAGE"
+  | undefined;
+
+async function getAsset<T>(key: string, cb: (resp: Response) => T): Promise<Awaited<T> | undefined> {
+  const resp = await process.env.ASSETS.fetch(key);
+  return resp.status === 200 ? await cb(resp) : undefined;
+}
+
+export function getSeedBodyFile(key: string, suffix: string) {
+  return getAsset(key + suffix, (resp) => resp.arrayBuffer() as Promise<Buffer>);
+}
+
+export function getSeedTextFile(key: string, suffix: string) {
+  return getAsset(key + suffix, (resp) => resp.text());
+}
+
+export function getSeedMetaFile(key: string) {
+  return getAsset(key + NEXT_META_SUFFIX, (resp) => resp.json<PrerenderedRouteMeta>());
+}
+
+export function parseCtx(ctx: Parameters<IncrementalCache["get"]>[1] = {}) {
+  return { ...ctx, kind: ctx?.kindHint?.toUpperCase() } as
+    | (typeof ctx & { kind?: EntryKind; isFallback?: boolean; isRoutePPREnabled?: boolean })
+    | undefined;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "bin": "dist/cli/index.mjs",
   "main": "./dist/api/index.mjs",
   "types": "./dist/api/index.d.mts",

package/dist/cli/cache-handler/index.mjs

@@ -1,20 +0,0 @@
-import {
-  NEXT_BODY_SUFFIX,
-  NEXT_DATA_SUFFIX,
-  NEXT_HTML_SUFFIX,
-  NEXT_META_SUFFIX,
-  OpenNextCacheHandler,
-  RSC_PREFETCH_SUFFIX,
-  RSC_SUFFIX,
-  SEED_DATA_DIR
-} from "../chunk-F7LECSR5.mjs";
-export {
-  NEXT_BODY_SUFFIX,
-  NEXT_DATA_SUFFIX,
-  NEXT_HTML_SUFFIX,
-  NEXT_META_SUFFIX,
-  OpenNextCacheHandler,
-  RSC_PREFETCH_SUFFIX,
-  RSC_SUFFIX,
-  SEED_DATA_DIR
-};

package/dist/cli/chunk-F7LECSR5.mjs

@@ -1,160 +0,0 @@
-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
-));
-
-// src/cli/cache-handler/constants.ts
-var RSC_PREFETCH_SUFFIX = ".prefetch.rsc";
-var RSC_SUFFIX = ".rsc";
-var NEXT_DATA_SUFFIX = ".json";
-var NEXT_META_SUFFIX = ".meta";
-var NEXT_BODY_SUFFIX = ".body";
-var NEXT_HTML_SUFFIX = ".html";
-var SEED_DATA_DIR = "cdn-cgi/_cf_seed_data";
-
-// src/cli/cache-handler/utils.ts
-async function getAsset(key, cb) {
-  const resp = await process.env.ASSETS.fetch(key);
-  return resp.status === 200 ? await cb(resp) : void 0;
-}
-function getSeedBodyFile(key, suffix) {
-  return getAsset(key + suffix, (resp) => resp.arrayBuffer());
-}
-function getSeedTextFile(key, suffix) {
-  return getAsset(key + suffix, (resp) => resp.text());
-}
-function getSeedMetaFile(key) {
-  return getAsset(key + NEXT_META_SUFFIX, (resp) => resp.json());
-}
-function parseCtx(ctx = {}) {
-  return { ...ctx, kind: ctx?.kindHint?.toUpperCase() };
-}
-
-// src/cli/cache-handler/open-next-cache-handler.ts
-var OpenNextCacheHandler = class _OpenNextCacheHandler {
-  constructor(ctx) {
-    this.ctx = ctx;
-  }
-  static maybeKVNamespace = void 0;
-  debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE;
-  async get(...args) {
-    const [key, _ctx] = args;
-    const ctx = parseCtx(_ctx);
-    if (this.debug) console.log(`cache - get: ${key}, ${ctx?.kind}`);
-    if (_OpenNextCacheHandler.maybeKVNamespace !== void 0) {
-      try {
-        const value = await _OpenNextCacheHandler.maybeKVNamespace.get(key, "json");
-        if (value) return value;
-      } catch (e) {
-        console.error(`Failed to get value for key = ${key}: ${e}`);
-      }
-    }
-    if (ctx?.kind === "FETCH" || ctx?.kind === "IMAGE") return null;
-    const seedKey = `http://assets.local/${SEED_DATA_DIR}/${key}`.replace(/\/\//g, "/");
-    if (ctx?.kind === "APP" || ctx?.kind === "APP_ROUTE") {
-      const fallbackBody = await getSeedBodyFile(seedKey, NEXT_BODY_SUFFIX);
-      if (fallbackBody) {
-        const meta = await getSeedMetaFile(seedKey);
-        return {
-          lastModified: meta?.lastModified,
-          value: {
-            kind: ctx.kind === "APP_ROUTE" ? ctx.kind : "ROUTE",
-            body: fallbackBody,
-            status: meta?.status ?? 200,
-            headers: meta?.headers ?? {}
-          }
-        };
-      }
-      if (ctx.kind === "APP_ROUTE") {
-        return null;
-      }
-    }
-    const seedHtml = await getSeedTextFile(seedKey, NEXT_HTML_SUFFIX);
-    if (!seedHtml) return null;
-    if (ctx?.kind === "PAGES" || ctx?.kind === "APP" || ctx?.kind === "APP_PAGE") {
-      const metaPromise = getSeedMetaFile(seedKey);
-      let pageDataPromise = Promise.resolve(void 0);
-      if (!ctx.isFallback) {
-        const rscSuffix = ctx.isRoutePPREnabled ? RSC_PREFETCH_SUFFIX : RSC_SUFFIX;
-        if (ctx.kind === "APP_PAGE") {
-          pageDataPromise = getSeedBodyFile(seedKey, rscSuffix);
-        } else {
-          pageDataPromise = getSeedTextFile(seedKey, ctx.kind === "APP" ? rscSuffix : NEXT_DATA_SUFFIX);
-        }
-      }
-      const [meta, pageData] = await Promise.all([metaPromise, pageDataPromise]);
-      return {
-        lastModified: meta?.lastModified,
-        value: {
-          kind: ctx.kind === "APP_PAGE" ? "APP_PAGE" : "PAGE",
-          html: seedHtml,
-          pageData: pageData ?? "",
-          ...ctx.kind === "APP_PAGE" && { rscData: pageData },
-          postponed: meta?.postponed,
-          status: meta?.status,
-          headers: meta?.headers
-        }
-      };
-    }
-    return null;
-  }
-  async set(...args) {
-    const [key, entry, _ctx] = args;
-    if (_OpenNextCacheHandler.maybeKVNamespace === void 0) {
-      return;
-    }
-    if (this.debug) console.log(`cache - set: ${key}`);
-    const data = {
-      lastModified: Date.now(),
-      value: entry
-    };
-    try {
-      await _OpenNextCacheHandler.maybeKVNamespace.put(key, JSON.stringify(data));
-    } catch (e) {
-      console.error(`Failed to set value for key = ${key}: ${e}`);
-    }
-  }
-  async revalidateTag(...args) {
-    const [tags] = args;
-    if (_OpenNextCacheHandler.maybeKVNamespace === void 0) {
-      return;
-    }
-    if (this.debug) console.log(`cache - revalidateTag: ${JSON.stringify([tags].flat())}`);
-  }
-  resetRequestCache() {
-  }
-};
-
-export {
-  __commonJS,
-  __toESM,
-  RSC_PREFETCH_SUFFIX,
-  RSC_SUFFIX,
-  NEXT_DATA_SUFFIX,
-  NEXT_META_SUFFIX,
-  NEXT_BODY_SUFFIX,
-  NEXT_HTML_SUFFIX,
-  SEED_DATA_DIR,
-  OpenNextCacheHandler
-};