@opennextjs/cloudflare 0.0.0-698638 → 0.0.0-953d0b1

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

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