@opennextjs/cloudflare 0.0.0-fd3c2b9 → 0.1.0

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

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -24,9 +25,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
+// ../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
-  "../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js"(exports, module) {
+  "../../node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js"(exports, module) {
     "use strict";
     module.exports = balanced;
     function balanced(a, b, str) {
@@ -82,9 +83,9 @@ var require_balanced_match = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js
+// ../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js
 var require_brace_expansion = __commonJS({
-  "../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js"(exports, module) {
+  "../../node_modules/.pnpm/brace-expansion@2.0.1/node_modules/brace-expansion/index.js"(exports, module) {
     "use strict";
     var balanced = require_balanced_match();
     module.exports = expandTop;
@@ -233,68 +234,170 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// src/index.ts
-import { resolve as resolve2 } from "node:path";
-
-// src/args.ts
-import { mkdirSync, statSync } from "node:fs";
-import { parseArgs } from "node:util";
-import { resolve } from "node:path";
-function getArgs() {
-  const {
-    values: { skipBuild: skipBuild2, output }
-  } = parseArgs({
-    options: {
-      skipBuild: {
-        type: "boolean",
-        short: "s",
-        default: false
-      },
-      output: {
-        type: "string",
-        short: "o"
-      }
-    },
-    allowPositionals: false
-  });
-  const outputDir2 = output ? resolve(output) : void 0;
-  if (outputDir2) {
-    assertDirArg(outputDir2, "output", true);
-  }
+// src/cli/config.ts
+import path, { relative } from "node:path";
+import { readdirSync, statSync } from "node:fs";
+var PACKAGE_NAME = "@opennextjs/cloudflare";
+function getConfig(appDir, outputDir2) {
+  const dotNext = path.join(outputDir2, ".next");
+  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
+  const standaloneRoot = path.join(dotNext, "standalone");
+  const standaloneApp = path.join(standaloneRoot, appPath);
+  const standaloneAppDotNext = path.join(standaloneApp, ".next");
+  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 {
-    outputDir: outputDir2,
-    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+    buildTimestamp: Date.now(),
+    paths: {
+      nextApp: appDir,
+      builderOutput: outputDir2,
+      dotNext,
+      standaloneRoot,
+      standaloneApp,
+      standaloneAppDotNext,
+      standaloneAppServer,
+      internalPackage,
+      internalTemplates
+    },
+    cache: {
+      kvBindingName: process.env.__OPENNEXT_KV_BINDING_NAME
+    },
+    internalPackageName: PACKAGE_NAME
   };
 }
-function assertDirArg(path6, argName, make) {
-  let dirStats;
+function containsDotNextDir(folder) {
   try {
-    dirStats = statSync(path6);
+    return statSync(path.join(folder, ".next")).isDirectory();
   } catch {
-    if (!make) {
-      throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
+    return false;
+  }
+}
+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(path.join(dotNextDir, "standalone"), serverPath);
+}
+function findServerParentPath(parentPath) {
+  try {
+    if (statSync(path.join(parentPath, ".next", "server")).isDirectory()) {
+      return parentPath;
     }
-    mkdirSync(path6);
-    return;
+  } catch {
   }
-  if (!dirStats.isDirectory()) {
-    throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a directory`);
+  const folders = readdirSync(parentPath);
+  for (const folder of folders) {
+    const subFolder = path.join(parentPath, folder);
+    if (statSync(path.join(parentPath, folder)).isDirectory()) {
+      const dirServerPath = findServerParentPath(subFolder);
+      if (dirServerPath) {
+        return dirServerPath;
+      }
+    }
   }
 }
 
-// src/index.ts
-import { existsSync as existsSync3 } from "node:fs";
+// ../../node_modules/.pnpm/package-manager-detector@0.2.0/node_modules/package-manager-detector/dist/constants.mjs
+var AGENTS = [
+  "npm",
+  "yarn",
+  "yarn@berry",
+  "pnpm",
+  "pnpm@6",
+  "bun"
+];
+var LOCKS = {
+  "bun.lockb": "bun",
+  "pnpm-lock.yaml": "pnpm",
+  "yarn.lock": "yarn",
+  "package-lock.json": "npm",
+  "npm-shrinkwrap.json": "npm"
+};
 
-// src/build/build.ts
-import { rm } from "node:fs/promises";
+// ../../node_modules/.pnpm/package-manager-detector@0.2.0/node_modules/package-manager-detector/dist/detect.mjs
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import path2 from "node:path";
+import process2 from "node:process";
+async function detect({ cwd, onUnknown } = {}) {
+  for (const directory of lookup(cwd)) {
+    for (const lock of Object.keys(LOCKS)) {
+      if (await fileExists(path2.join(directory, lock))) {
+        const name = LOCKS[lock];
+        const result2 = await parsePackageJson(path2.join(directory, "package.json"), onUnknown);
+        if (result2)
+          return result2;
+        else
+          return { name, agent: name };
+      }
+    }
+    const result = await parsePackageJson(path2.join(directory, "package.json"), onUnknown);
+    if (result)
+      return result;
+  }
+  return null;
+}
+function* lookup(cwd = process2.cwd()) {
+  let directory = path2.resolve(cwd);
+  const { root } = path2.parse(directory);
+  while (directory && directory !== root) {
+    yield directory;
+    directory = path2.dirname(directory);
+  }
+}
+async function parsePackageJson(filepath, onUnknown) {
+  if (!filepath || !await fileExists(filepath))
+    return null;
+  try {
+    const pkg = JSON.parse(fs.readFileSync(filepath, "utf8"));
+    let agent;
+    if (typeof pkg.packageManager === "string") {
+      const [name, ver] = pkg.packageManager.replace(/^\^/, "").split("@");
+      let version = ver;
+      if (name === "yarn" && Number.parseInt(ver) > 1) {
+        agent = "yarn@berry";
+        version = "berry";
+        return { name, agent, version };
+      } else if (name === "pnpm" && Number.parseInt(ver) < 7) {
+        agent = "pnpm@6";
+        return { name, agent, version };
+      } else if (AGENTS.includes(name)) {
+        agent = name;
+        return { name, agent, version };
+      } else {
+        return onUnknown?.(pkg.packageManager) ?? null;
+      }
+    }
+  } catch {
+  }
+  return null;
+}
+async function fileExists(filePath) {
+  try {
+    const stats = await fsPromises.stat(filePath);
+    if (stats.isFile()) {
+      return true;
+    }
+  } catch {
+  }
+  return false;
+}
 
-// 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);
+async function buildNextjsApp(nextAppDir2) {
+  const pm = await detect();
+  if (!pm) {
+    throw new Error("Fatal Error: package manager detection failed, aborting");
+  }
+  runNextBuildCommand(pm.name, nextAppDir2);
 }
 function runNextBuildCommand(packager, nextAppDir2) {
-  const command = ["bun", "npm"].includes(packager) ? `${packager} next build` : `${packager} next build`;
+  const command = `${packager === "npm" ? "npx" : packager} next build`;
   execSync(command, {
     stdio: "inherit",
     cwd: nextAppDir2,
@@ -307,34 +410,82 @@ function runNextBuildCommand(packager, nextAppDir2) {
   });
 }
 
-// src/build/build-worker.ts
-import { build } from "esbuild";
-import { readFileSync as readFileSync4 } from "node:fs";
+// src/cli/build/build-worker.ts
+import { build as build2 } from "esbuild";
 import { cp, readFile, writeFile } from "node:fs/promises";
+import { existsSync as existsSync5, readFileSync as readFileSync7 } from "node:fs";
 
-// src/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/cli/build/patches/investigated/copy-package-cli-files.ts
+import { cpSync } from "node:fs";
+import path3 from "node:path";
+function copyPackageCliFiles(packageDistDir2, config) {
+  console.log("# copyPackageTemplateFiles");
+  const sourceDir = path3.join(packageDistDir2, "cli");
+  const destinationDir = path3.join(config.paths.internalPackage, "cli");
+  cpSync(sourceDir, destinationDir, { recursive: true });
 }
 
-// src/build/patches/investigated/copy-templates.ts
-import path from "node:path";
-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;
+// src/cli/build/utils/ts-parse-file.ts
+import * as ts from "ts-morph";
+function tsParseFile(fileContent) {
+  const project = new ts.Project();
+  const sourceFile = project.createSourceFile("file.js", 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";
+
+// src/cli/build/utils/read-paths-recursively.ts
+import { join } from "node:path";
+import { readdirSync as readdirSync2 } from "node:fs";
+function readPathsRecursively(dir) {
+  try {
+    const files = readdirSync2(dir, { withFileTypes: true });
+    return files.flatMap((file) => {
+      const filePath = join(dir, file.name);
+      return file.isDirectory() ? readPathsRecursively(filePath) : filePath;
+    });
+  } catch {
+    return [];
+  }
+}
+
+// src/cli/build/utils/copy-prerendered-routes.ts
+function copyPrerenderedRoutes(config) {
+  console.log("# copyPrerenderedRoutes");
+  const serverAppDirPath = join2(config.paths.standaloneAppServer, "app");
+  const prerenderManifestPath = join2(config.paths.standaloneAppDotNext, "prerender-manifest.json");
+  const outputPath = join2(config.paths.builderOutput, "assets", SEED_DATA_DIR);
+  const prerenderManifest = existsSync(prerenderManifestPath) ? JSON.parse(readFileSync(prerenderManifestPath, "utf8")) : {};
+  const prerenderedRoutes = Object.keys(prerenderManifest.routes);
+  const prerenderedAssets = readPathsRecursively(serverAppDirPath).map((fullPath) => ({ fullPath, relativePath: fullPath.replace(serverAppDirPath, "") })).filter(
+    ({ relativePath }) => prerenderedRoutes.includes(relativePath.replace(/\.\w+$/, "").replace(/^\/index$/, "/"))
+  );
+  prerenderedAssets.forEach(({ fullPath, relativePath }) => {
+    const destPath = join2(outputPath, relativePath);
+    mkdirSync(dirname(destPath), { recursive: true });
+    if (fullPath.endsWith(NEXT_META_SUFFIX)) {
+      const data = JSON.parse(readFileSync(fullPath, "utf8"));
+      writeFileSync(destPath, JSON.stringify({ ...data, lastModified: config.buildTimestamp }));
+    } else {
+      copyFileSync(fullPath, destPath);
+    }
+  });
 }
 
-// src/build/patches/to-investigate/patch-read-file.ts
-import { readFileSync } from "node:fs";
+// src/cli/build/build-worker.ts
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/assert-valid-pattern.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/assert-valid-pattern.js
 var MAX_PATTERN_LENGTH = 1024 * 64;
 var assertValidPattern = (pattern) => {
   if (typeof pattern !== "string") {
@@ -345,7 +496,7 @@ var assertValidPattern = (pattern) => {
   }
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/brace-expressions.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/brace-expressions.js
 var posixClasses = {
   "[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
   "[:alpha:]": ["\\p{L}\\p{Nl}", true],
@@ -454,12 +605,12 @@ var parseClass = (glob2, position) => {
   return [comb, uflag, endPos - pos, true];
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/unescape.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/unescape.js
 var unescape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/ast.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/ast.js
 var types = /* @__PURE__ */ new Set(["!", "?", "+", "*", "@"]);
 var isExtglobType = (c) => types.has(c);
 var startNoTraversal = "(?!(?:^|/)\\.\\.?(?:$|/))";
@@ -938,12 +1089,12 @@ var AST = class _AST {
   }
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/escape.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/escape.js
 var escape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
 };
 
-// ../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
+// ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var minimatch = (p, pattern, options = {}) => {
   assertValidPattern(pattern);
   if (!options.nocomment && pattern.charAt(0) === "#") {
@@ -1002,11 +1153,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 path2 = {
+var path4 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
+var sep = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -1661,10 +1812,10 @@ minimatch.Minimatch = Minimatch;
 minimatch.escape = escape;
 minimatch.unescape = unescape;
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
-// ../node_modules/.pnpm/lru-cache@11.0.0/node_modules/lru-cache/dist/esm/index.js
+// ../../node_modules/.pnpm/lru-cache@11.0.0/node_modules/lru-cache/dist/esm/index.js
 var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
 var warned = /* @__PURE__ */ new Set();
 var PROCESS = typeof process === "object" && !!process ? process : {};
@@ -3033,14 +3184,14 @@ var LRUCache = class _LRUCache {
   }
 };
 
-// ../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
+// ../../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
 import { posix, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { lstatSync, readdir as readdirCB, readdirSync, readlinkSync, realpathSync as rps } from "fs";
+import { lstatSync, readdir as readdirCB, readdirSync as readdirSync3, readlinkSync, realpathSync as rps } from "fs";
 import * as actualFS from "node:fs";
 import { lstat, readdir, readlink, realpath } from "node:fs/promises";
 
-// ../node_modules/.pnpm/minipass@7.1.2/node_modules/minipass/dist/esm/index.js
+// ../../node_modules/.pnpm/minipass@7.1.2/node_modules/minipass/dist/esm/index.js
 import { EventEmitter } from "node:events";
 import Stream from "node:stream";
 import { StringDecoder } from "node:string_decoder";
@@ -3918,12 +4069,12 @@ var Minipass = class extends EventEmitter {
   }
 };
 
-// ../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
+// ../../node_modules/.pnpm/path-scurry@2.0.0/node_modules/path-scurry/dist/esm/index.js
 var realpathSync = rps.native;
 var defaultFS = {
   lstatSync,
   readdir: readdirCB,
-  readdirSync,
+  readdirSync: readdirSync3,
   readlinkSync,
   realpathSync,
   promises: {
@@ -4183,12 +4334,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path6) {
-    if (!path6) {
+  resolve(path14) {
+    if (!path14) {
       return this;
     }
-    const rootPath = this.getRootString(path6);
-    const dir = path6.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;
@@ -4940,8 +5091,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path6) {
-    return win32.parse(path6).root;
+  getRootString(path14) {
+    return win32.parse(path14).root;
   }
   /**
    * @internal
@@ -4987,8 +5138,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path6) {
-    return path6.startsWith("/") ? "/" : "";
+  getRootString(path14) {
+    return path14.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5077,11 +5228,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(path14 = this.cwd) {
+    if (typeof path14 === "string") {
+      path14 = this.cwd.resolve(path14);
     }
-    return path6.depth();
+    return path14.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5460,7 +5611,7 @@ var PathScurryBase = class {
     const dirs = /* @__PURE__ */ new Set();
     const queue = [entry];
     let processing = 0;
-    const process2 = () => {
+    const process3 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -5501,9 +5652,9 @@ var PathScurryBase = class {
             }
           }
           if (paused && !results.flowing) {
-            results.once("drain", process2);
+            results.once("drain", process3);
           } else if (!sync2) {
-            process2();
+            process3();
           }
         };
         let sync2 = true;
@@ -5511,7 +5662,7 @@ var PathScurryBase = class {
         sync2 = false;
       }
     };
-    process2();
+    process3();
     return results;
   }
   streamSync(entry = this.cwd, opts = {}) {
@@ -5529,7 +5680,7 @@ var PathScurryBase = class {
     }
     const queue = [entry];
     let processing = 0;
-    const process2 = () => {
+    const process3 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -5563,14 +5714,14 @@ var PathScurryBase = class {
         }
       }
       if (paused && !results.flowing)
-        results.once("drain", process2);
+        results.once("drain", process3);
     };
-    process2();
+    process3();
     return results;
   }
-  chdir(path6 = this.cwd) {
+  chdir(path14 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path6 === "string" ? this.cwd.resolve(path6) : path6;
+    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5644,7 +5795,7 @@ var PathScurryDarwin = class extends PathScurryPosix {
 var Path = process.platform === "win32" ? PathWin32 : PathPosix;
 var PathScurry = process.platform === "win32" ? PathScurryWin32 : process.platform === "darwin" ? PathScurryDarwin : PathScurryPosix;
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/pattern.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/pattern.js
 var isPatternList = (pl) => pl.length >= 1;
 var isGlobList = (gl) => gl.length >= 1;
 var Pattern = class _Pattern {
@@ -5809,7 +5960,7 @@ var Pattern = class _Pattern {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/ignore.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/ignore.js
 var defaultPlatform2 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Ignore = class {
   relative;
@@ -5896,7 +6047,7 @@ var Ignore = class {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/processor.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/processor.js
 var HasWalkedCache = class _HasWalkedCache {
   store;
   constructor(store = /* @__PURE__ */ new Map()) {
@@ -5926,8 +6077,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path6, n]) => [
-      path6,
+    return [...this.store.entries()].map(([path14, n]) => [
+      path14,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6117,7 +6268,7 @@ var Processor = class _Processor {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/walker.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/walker.js
 var makeIgnore = (ignore, opts) => typeof ignore === "string" ? new Ignore([ignore], opts) : Array.isArray(ignore) ? new Ignore(ignore, opts) : ignore;
 var GlobUtil = class {
   path;
@@ -6132,9 +6283,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path6, opts) {
+  constructor(patterns, path14, opts) {
     this.patterns = patterns;
-    this.path = path6;
+    this.path = path14;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6153,11 +6304,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path6) {
-    return this.seen.has(path6) || !!this.#ignore?.ignored?.(path6);
+  #ignored(path14) {
+    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
   }
-  #childrenIgnored(path6) {
-    return !!this.#ignore?.childrenIgnored?.(path6);
+  #childrenIgnored(path14) {
+    return !!this.#ignore?.childrenIgnored?.(path14);
   }
   // backpressure mechanism
   pause() {
@@ -6372,8 +6523,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path6, opts) {
-    super(patterns, path6, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6410,8 +6561,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path6, opts) {
-    super(patterns, path6, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6444,7 +6595,7 @@ var GlobStream = class extends GlobUtil {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/glob.js
 var defaultPlatform3 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Glob = class {
   absolute;
@@ -6644,7 +6795,7 @@ var Glob = class {
   }
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/has-magic.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/has-magic.js
 var hasMagic = (pattern, options = {}) => {
   if (!Array.isArray(pattern)) {
     pattern = [pattern];
@@ -6656,7 +6807,7 @@ var hasMagic = (pattern, options = {}) => {
   return false;
 };
 
-// ../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/index.js
+// ../../node_modules/.pnpm/glob@11.0.0/node_modules/glob/dist/esm/index.js
 function globStreamSync(pattern, options = {}) {
   return new Glob(pattern, options).streamSync();
 }
@@ -6704,60 +6855,63 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/build/patches/to-investigate/patch-read-file.ts
-function patchReadFile(code, nextjsAppPaths) {
-  console.log("# patchReadFile");
-  code = code.replace(
-    "getBuildId() {",
-    `getBuildId() {
-      return ${JSON.stringify(readFileSync(`${nextjsAppPaths.standaloneAppDotNextDir}/BUILD_ID`, "utf-8"))};
-    `
-  );
-  const manifestJsons = globSync(`${nextjsAppPaths.standaloneAppDotNextDir}/**/*-manifest.json`).map(
-    (file) => file.replace(nextjsAppPaths.standaloneAppDir + "/", "")
+// src/cli/build/patches/to-investigate/inline-eval-manifest.ts
+import path5 from "node:path";
+function inlineEvalManifest(code, config) {
+  console.log("# inlineEvalManifest");
+  const manifestJss = globSync(
+    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, "")
   );
-  code = code.replace(
-    /function loadManifest\((.+?), .+?\) {/,
+  return code.replace(
+    /function evalManifest\((.+?), .+?\) {/,
     `$&
-    ${manifestJsons.map(
-      (manifestJson) => `
-          if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(`${nextjsAppPaths.standaloneAppDir}/${manifestJson}`, "utf-8")};
-          }
-        `
+		${manifestJss.map(
+      (manifestJs) => `
+			  if ($1.endsWith("${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", "")}"],
+				  },
+				};
+			  }
+			`
     ).join("\n")}
-    throw new Error("Unknown loadManifest: " + $1);
-    `
+		throw new Error("Unknown evalManifest: " + $1);
+		`
   );
-  return code;
 }
 
-// src/build/patches/to-investigate/patch-find-dir.ts
-import { existsSync } from "node:fs";
-function patchFindDir(code, nextjsAppPaths) {
-  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`)};
-		}
-		throw new Error("Unknown findDir call: " + dir + " " + name);
-		`
+// src/cli/build/patches/to-investigate/inline-middleware-manifest-require.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import path6 from "node:path";
+function inlineMiddlewareManifestRequire(code, config) {
+  console.log("# inlineMiddlewareManifestRequire");
+  const middlewareManifestPath = path6.join(config.paths.standaloneAppServer, "middleware-manifest.json");
+  const middlewareManifest = existsSync2(middlewareManifestPath) ? JSON.parse(readFileSync2(middlewareManifestPath, "utf-8")) : {};
+  const patchedCode = code.replace(
+    "require(this.middlewareManifestPath)",
+    JSON.stringify(middlewareManifest)
   );
+  if (patchedCode === code) {
+    throw new Error("Patch `inlineMiddlewareManifestRequire` not applied");
+  }
+  return patchedCode;
 }
 
-// src/build/patches/to-investigate/inline-next-require.ts
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
-function inlineNextRequire(code, nextjsAppPaths) {
+// src/cli/build/patches/to-investigate/inline-next-require.ts
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
+import path7 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 pagesManifestFiles = existsSync2(pagesManifestFile) ? Object.values(JSON.parse(readFileSync2(pagesManifestFile, "utf-8"))).map(
+  const pagesManifestFile = path7.join(config.paths.standaloneAppServer, "pages-manifest.json");
+  const appPathsManifestFile = path7.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
+  const pagesManifestFiles = existsSync3(pagesManifestFile) ? Object.values(JSON.parse(readFileSync3(pagesManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
-  const appPathsManifestFiles = existsSync2(appPathsManifestFile) ? Object.values(JSON.parse(readFileSync2(appPathsManifestFile, "utf-8"))).map(
+  const appPathsManifestFiles = existsSync3(appPathsManifestFile) ? Object.values(JSON.parse(readFileSync3(appPathsManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
   const allManifestFiles = pagesManifestFiles.concat(appPathsManifestFiles);
@@ -6769,14 +6923,14 @@ function inlineNextRequire(code, nextjsAppPaths) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync2(`${nextjsAppPaths.standaloneAppDir}/${htmlPage}`, "utf-8"))};
+            return ${JSON.stringify(readFileSync3(path7.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
           }
         `
     ).join("\n")}
     ${pageModules.map(
       (module) => `
           if (pagePath.endsWith("${module}")) {
-            return require("${nextjsAppPaths.standaloneAppDir}/${module}");
+            return require(${JSON.stringify(path7.join(config.paths.standaloneApp, module))});
           }
         `
     ).join("\n")}
@@ -6785,68 +6939,144 @@ function inlineNextRequire(code, nextjsAppPaths) {
   );
 }
 
-// src/build/patches/to-investigate/inline-eval-manifest.ts
-function inlineEvalManifest(code, nextjsAppPaths) {
-  console.log("# inlineEvalManifest");
-  const manifestJss = globSync(
-    `${nextjsAppPaths.standaloneAppDotNextDir}/**/*_client-reference-manifest.js`
-  ).map((file) => file.replace(`${nextjsAppPaths.standaloneAppDir}/`, ""));
+// src/cli/build/patches/investigated/patch-cache.ts
+import { build } from "esbuild";
+import { join as join3 } from "node:path";
+async function patchCache(code, config) {
+  console.log("# patchCache");
+  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('./${cacheHandlerFileName}')).OpenNextCacheHandler;
+`
+  );
+  if (patchedCode === code) {
+    throw new Error("Patch `patchCache` not applied");
+  }
+  return patchedCode;
+}
+
+// src/cli/build/patches/to-investigate/patch-exception-bubbling.ts
+function patchExceptionBubbling(code) {
+  console.log("# patchExceptionBubbling");
+  const patchedCode = code.replace('_nextBubbleNoFallback = "1"', "_nextBubbleNoFallback = undefined");
+  if (patchedCode === code) {
+    throw new Error("Patch `patchExceptionBubbling` not applied");
+  }
+  return patchedCode;
+}
+
+// src/cli/build/patches/to-investigate/patch-find-dir.ts
+import { existsSync as existsSync4 } from "node:fs";
+import path8 from "node:path";
+function patchFindDir(code, config) {
+  console.log("# patchFindDir");
   return code.replace(
-    /function evalManifest\((.+?), .+?\) {/,
+    "function findDir(dir, name) {",
+    `function findDir(dir, name) {
+			if (dir.endsWith(".next/server")) {
+			if (name === "app") {
+			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "app")}`)};
+	    }
+			if (name === "pages") {
+			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "pages")}`)};
+	    }
+		}
+		throw new Error("Unknown findDir call: " + dir + " " + name);
+		`
+  );
+}
+
+// src/cli/build/patches/to-investigate/patch-read-file.ts
+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(path9.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+    `
+  );
+  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\((.+?), .+?\) {/,
     `$&
-		${manifestJss.map(
-      (manifestJs) => `
-			  if ($1.endsWith("${manifestJs}")) {
-				require("${nextjsAppPaths.standaloneAppDir}/${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", "")}"],
-				  },
-				};
-			  }
-			`
+    ${manifestJsons.map(
+      (manifestJson) => `
+          if ($1.endsWith("${manifestJson}")) {
+            return ${readFileSync4(path9.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+          }
+        `
     ).join("\n")}
-		throw new Error("Unknown evalManifest: " + $1);
-		`
+    throw new Error("Unknown loadManifest: " + $1);
+    `
   );
+  return code;
 }
 
-// src/build/patches/to-investigate/wrangler-deps.ts
-import path3 from "node:path";
-import fs, { writeFileSync } from "node:fs";
-function patchWranglerDeps(paths) {
+// 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/cli/build/patches/to-investigate/wrangler-deps.ts
+import { readFileSync as readFileSync5, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import path10 from "node:path";
+function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  console.log({ base: paths.standaloneAppDotNextDir });
-  const pagesRuntimeFile = path3.join(
-    paths.standaloneAppDir,
-    "node_modules",
-    "next",
-    "dist",
-    "compiled",
-    "next-server",
-    "pages.runtime.prod.js"
+  const distPath = getDistPath(config);
+  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={}`
   );
-  const patchedPagesRuntime = fs.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
-  fs.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path3.join(
-    paths.standaloneAppDir,
-    "node_modules",
-    "next",
-    "dist",
-    "server",
-    "lib",
-    "trace",
-    "tracer.js"
+  writeFileSync2(pagesRuntimeFile, patchedPagesRuntime);
+  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")`
   );
-  const pacthedTracer = fs.readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
-  writeFileSync(tracerFile, pacthedTracer);
+  writeFileSync2(tracerFile, patchedTracer);
+}
+function getDistPath(config) {
+  for (const root of [config.paths.standaloneApp, config.paths.standaloneRoot]) {
+    try {
+      const distPath = path10.join(root, "node_modules", "next", "dist");
+      if (statSync2(distPath).isDirectory()) return distPath;
+    } catch {
+    }
+  }
+  throw new Error("Unexpected error: unable to detect the node_modules/next/dist directory");
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/index.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+// src/cli/build/build-worker.ts
+import path12 from "node:path";
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
-import * as ts from "ts-morph";
+// src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
+import { readFileSync as readFileSync6, readdirSync as readdirSync4, writeFileSync as writeFileSync3 } from "node:fs";
+
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.ts
+import * as ts2 from "ts-morph";
 async function getChunkInstallationIdentifiers(sourceFile) {
   const installChunkDeclaration = getInstallChunkDeclaration(sourceFile);
   const installedChunksDeclaration = getInstalledChunksDeclaration(sourceFile, installChunkDeclaration);
@@ -6856,19 +7086,19 @@ async function getChunkInstallationIdentifiers(sourceFile) {
   };
 }
 function getInstallChunkDeclaration(sourceFile) {
-  const installChunkDeclaration = sourceFile.getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration).find((declaration) => {
-    const arrowFunction = declaration.getInitializerIfKind(ts.SyntaxKind.ArrowFunction);
+  const installChunkDeclaration = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.VariableDeclaration).find((declaration) => {
+    const arrowFunction = declaration.getInitializerIfKind(ts2.SyntaxKind.ArrowFunction);
     if (!arrowFunction) return false;
     const functionParameters = arrowFunction.getParameters();
     if (functionParameters.length !== 1) return false;
-    const arrowFunctionBodyBlock = arrowFunction.getFirstChildByKind(ts.SyntaxKind.Block);
+    const arrowFunctionBodyBlock = arrowFunction.getFirstChildByKind(ts2.SyntaxKind.Block);
     if (!arrowFunctionBodyBlock) return false;
     const statementKinds = arrowFunctionBodyBlock.getStatements().map((statement) => statement.getKind());
-    const forInStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForInStatement);
-    const forStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForStatement);
+    const forInStatements = statementKinds.filter((s) => s === ts2.SyntaxKind.ForInStatement);
+    const forStatements = statementKinds.filter((s) => s === ts2.SyntaxKind.ForStatement);
     if (forInStatements.length !== 1 || forStatements.length !== 1) return false;
     const parameterName = functionParameters[0].getText();
-    const functionParameterAccessedProperties = arrowFunctionBodyBlock.getDescendantsOfKind(ts.SyntaxKind.PropertyAccessExpression).filter(
+    const functionParameterAccessedProperties = arrowFunctionBodyBlock.getDescendantsOfKind(ts2.SyntaxKind.PropertyAccessExpression).filter(
       (propertyAccessExpression) => propertyAccessExpression.getExpression().getText() === parameterName
     ).map((propertyAccessExpression) => propertyAccessExpression.getName());
     if (functionParameterAccessedProperties.join(", ") !== "modules, ids, runtime") return false;
@@ -6880,22 +7110,22 @@ function getInstallChunkDeclaration(sourceFile) {
   return installChunkDeclaration;
 }
 function getInstalledChunksDeclaration(sourceFile, installChunkDeclaration) {
-  const allVariableDeclarations = sourceFile.getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration);
+  const allVariableDeclarations = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.VariableDeclaration);
   const installChunkDeclarationIdx = allVariableDeclarations.findIndex(
     (declaration) => declaration === installChunkDeclaration
   );
   const installedChunksDeclaration = allVariableDeclarations[installChunkDeclarationIdx - 1];
-  if (!installedChunksDeclaration?.getInitializer()?.isKind(ts.SyntaxKind.ObjectLiteralExpression)) {
+  if (!installedChunksDeclaration?.getInitializer()?.isKind(ts2.SyntaxKind.ObjectLiteralExpression)) {
     throw new Error("ERROR: unable to find the installedChunks declaration");
   }
   return installedChunksDeclaration;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
-import * as ts2 from "ts-morph";
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
+import * as ts3 from "ts-morph";
 async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { installedChunks, installChunk }, chunks) {
-  const webpackFRequireFunction = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.ArrowFunction).find((arrowFunction) => {
-    const binaryExpression = arrowFunction.getFirstAncestorByKind(ts2.SyntaxKind.BinaryExpression);
+  const webpackFRequireFunction = sourceFile.getDescendantsOfKind(ts3.SyntaxKind.ArrowFunction).find((arrowFunction) => {
+    const binaryExpression = arrowFunction.getFirstAncestorByKind(ts3.SyntaxKind.BinaryExpression);
     if (!binaryExpression) return false;
     const binaryExpressionLeft = binaryExpression.getLeft();
     if (!binaryExpressionLeft.getText().endsWith(".f.require")) return false;
@@ -6904,16 +7134,16 @@ async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { instal
     const binaryExpressionRight = binaryExpression.getRight();
     if (binaryExpressionRight !== arrowFunction) return false;
     const arrowFunctionBody = arrowFunction.getBody();
-    if (!arrowFunctionBody.isKind(ts2.SyntaxKind.Block)) return false;
+    if (!arrowFunctionBody.isKind(ts3.SyntaxKind.Block)) return false;
     const arrowFunctionBodyText = arrowFunctionBody.getText();
     const functionUsesChunkInstallationVariables = arrowFunctionBodyText.includes(installChunk) && arrowFunctionBodyText.includes(installedChunks);
     if (!functionUsesChunkInstallationVariables) return false;
     const functionParameters = arrowFunction.getParameters();
     if (functionParameters.length !== 2) return false;
-    const callsInstallChunk = arrowFunctionBody.getDescendantsOfKind(ts2.SyntaxKind.CallExpression).some((callExpression) => callExpression.getExpression().getText() === installChunk);
+    const callsInstallChunk = arrowFunctionBody.getDescendantsOfKind(ts3.SyntaxKind.CallExpression).some((callExpression) => callExpression.getExpression().getText() === installChunk);
     if (!callsInstallChunk) return false;
     const functionFirstParameterName = functionParameters[0]?.getName();
-    const accessesInstalledChunksUsingItsFirstParameter = arrowFunctionBody.getDescendantsOfKind(ts2.SyntaxKind.ElementAccessExpression).some((elementAccess) => {
+    const accessesInstalledChunksUsingItsFirstParameter = arrowFunctionBody.getDescendantsOfKind(ts3.SyntaxKind.ElementAccessExpression).some((elementAccess) => {
       return elementAccess.getExpression().getText() === installedChunks && elementAccess.getArgumentExpression()?.getText() === functionFirstParameterName;
     });
     if (!accessesInstalledChunksUsingItsFirstParameter) return false;
@@ -6935,15 +7165,7 @@ if(${chunkId} === ${chunk}) return ${installChunk}(require("./chunks/${chunk}.js
   return sourceFile.print();
 }
 
-// src/build/utils/ts-parse-file.ts
-import * as ts3 from "ts-morph";
-function tsParseFile(fileContent) {
-  const project = new ts3.Project();
-  const sourceFile = project.createSourceFile("file.js", 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);
@@ -6955,52 +7177,70 @@ 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
+import path11 from "node:path";
+async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`;
-  const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(`${nextjsAppPaths.standaloneAppServerDir}/chunks`).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+  const webpackRuntimeFile = path11.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const fileContent = readFileSync6(webpackRuntimeFile, "utf-8");
+  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$/, "");
   });
   const updatedFileContent = await getUpdatedWebpackChunksFileContent(fileContent, chunks);
-  writeFileSync2(webpackRuntimeFile, updatedFileContent);
+  writeFileSync3(webpackRuntimeFile, updatedFileContent);
 }
 
-// src/build/build-worker.ts
-async function buildWorker(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/build-worker.ts
+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(
+    path12.join(config.paths.dotNext, "static"),
+    path12.join(config.paths.builderOutput, "assets", "_next", "static"),
+    {
+      recursive: true
+    }
+  );
+  const publicDir = path12.join(config.paths.nextApp, "public");
+  if (existsSync5(publicDir)) {
+    await cp(publicDir, path12.join(config.paths.builderOutput, "assets"), {
+      recursive: true
+    });
+  }
+  copyPrerenderedRoutes(config);
+  copyPackageCliFiles(packageDistDir, config);
+  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(nextjsAppPaths);
-  updateWebpackChunksFile(nextjsAppPaths);
-  await build({
+  patchWranglerDeps(config);
+  updateWebpackChunksFile(config);
+  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": `${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": `${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": `${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
@@ -7010,10 +7250,6 @@ async function buildWorker(outputDir2, nextjsAppPaths, templateSrcDir) {
       // Note: we need the __non_webpack_require__ variable declared as it is used by next-server:
       // https://github.com/vercel/next.js/blob/be0c3283/packages/next/src/server/next-server.ts#L116-L119
       __non_webpack_require__: "require",
-      // The next.js server can run in minimal mode: https://github.com/vercel/next.js/blob/aa90fe9bb/packages/next/src/server/base-server.ts#L510-L511
-      // this avoids some extra (/problematic) `require` calls, such as here: https://github.com/vercel/next.js/blob/aa90fe9bb/packages/next/src/server/next-server.ts#L1259
-      // that's wht we enable it
-      "process.env.NEXT_PRIVATE_MINIMAL_MODE": "true",
       // Ask mhart if he can explain why the `define`s below are necessary
       "process.env.NEXT_RUNTIME": '"nodejs"',
       "process.env.NODE_ENV": '"production"',
@@ -7034,22 +7270,21 @@ async function buildWorker(outputDir2, nextjsAppPaths, templateSrcDir) {
 // 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);
       }
     }
@@ -7058,131 +7293,119 @@ 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
-  });
+  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 = 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$/ }, (args) => ({
-        path: `${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$/ }, (args) => ({
-        path: `${templateDir}/shims/node-fs.ts`
+      build4.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
+        path: path12.join(config.paths.internalTemplates, "shims", "empty.ts")
       }));
     }
   };
 }
 
-// src/nextjs-paths.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);
+// src/cli/build/index.ts
+import { cpSync as cpSync2 } from "node:fs";
+import path13 from "node:path";
+import { rm } from "node:fs/promises";
+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 = path13.resolve(opts.outputDir ?? appDir, ".worker-next");
+  await cleanDirectory(outputDir2);
+  cpSync2(path13.join(appDir, ".next"), path13.join(outputDir2, ".next"), { recursive: true });
+  const config = getConfig(appDir, outputDir2);
+  await buildWorker(config);
+}
+async function cleanDirectory(path14) {
+  return await rm(path14, { recursive: true, force: true });
+}
+
+// src/cli/index.ts
+import { existsSync as existsSync6 } from "node:fs";
+
+// src/cli/args.ts
+import { mkdirSync as mkdirSync2, statSync as statSync3 } from "node:fs";
+import { parseArgs } from "node:util";
+import { resolve } from "node:path";
+function getArgs() {
+  const {
+    values: { skipBuild: skipBuild2, output }
+  } = parseArgs({
+    options: {
+      skipBuild: {
+        type: "boolean",
+        short: "s",
+        default: false
+      },
+      output: {
+        type: "string",
+        short: "o"
+      }
+    },
+    allowPositionals: false
+  });
+  const outputDir2 = output ? resolve(output) : void 0;
+  if (outputDir2) {
+    assertDirArg(outputDir2, "output", true);
+  }
   return {
-    appDir: nextAppDir2,
-    dotNextDir,
-    standaloneAppDir,
-    standaloneAppDotNextDir: path4.join(standaloneAppDir, ".next"),
-    standaloneAppServerDir: path4.join(standaloneAppDir, ".next", "server")
+    outputDir: outputDir2,
+    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
   };
 }
-function getDotNextDirPath(nextAppDir2) {
-  const dotNextDirPath = `${nextAppDir2}/.next`;
+function assertDirArg(path14, argName, make) {
+  let dirStats;
   try {
-    const dirStats = statSync2(dotNextDirPath);
-    if (!dirStats.isDirectory()) throw new Error();
+    dirStats = statSync3(path14);
   } catch {
-    throw new Error(`Error: \`.next\` directory not found!`);
-  }
-  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 {
-    }
-    const files = readdirSync3(path6);
-    for (const file of files) {
-      if (statSync2(`${path6}/${file}`).isDirectory()) {
-        const dirServerPath = findServerParentPath(`${path6}/${file}`);
-        if (dirServerPath) {
-          return dirServerPath;
-        }
-      }
+    if (!make) {
+      throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
+    mkdirSync2(path14);
+    return;
   }
-}
-
-// 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) {
-  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
-    });
+  if (!dirStats.isDirectory()) {
+    throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a directory`);
   }
-  const outputDir2 = `${opts.outputDir ?? inputNextAppDir}/.worker-next`;
-  await cleanDirectory(outputDir2);
-  const nextjsAppPaths = getNextjsAppPaths(inputNextAppDir);
-  const templateDir = path5.join(path5.dirname(fileURLToPath3(import.meta.url)), "templates");
-  await buildWorker(outputDir2, nextjsAppPaths, templateDir);
-}
-async function cleanDirectory(path6) {
-  return await rm(path6, { recursive: true, force: true });
 }
 
-// src/index.ts
+// src/cli/index.ts
+import { resolve as resolve2 } from "node:path";
 var nextAppDir = resolve2(".");
 console.log(`Building the Next.js app in the current folder (${nextAppDir})`);
-if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync3(`./next.config.${ext2}`))) {
+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
 });