@opennextjs/cloudflare 0.0.0-42bf0ff → 0.0.0-5105d31

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

@@ -213,68 +213,171 @@ 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 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("/"));
   return {
-    outputDir: outputDir2,
-    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+    paths: {
+      nextApp: appDir,
+      builderOutput: outputDir2,
+      dotNext,
+      standaloneRoot,
+      standaloneApp,
+      standaloneAppDotNext,
+      standaloneAppServer,
+      internalPackage
+    },
+    cache: {
+      kvBindingName: UserConfig.cache.bindingName
+    },
+    internalPackageName: PACKAGE_NAME
   };
 }
-function assertDirArg(path12, argName, make) {
-  let dirStats;
+function containsDotNextDir(folder) {
   try {
-    dirStats = statSync(path12);
+    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(path12);
-    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";
+// ../../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,
@@ -287,28 +390,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 path9 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-
-// 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.");
-}
+import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
 
-// src/build/patches/investigated/copy-package.ts
+// src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-function copyPackage(srcDir, config) {
-  console.log("# copyPackage");
-  cpSync(srcDir, config.paths.internalPackage, { recursive: true });
+import 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/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);
@@ -981,11 +1079,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path = {
+var path4 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
+var sep = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -3015,7 +3113,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";
 
@@ -3902,7 +4000,7 @@ var realpathSync = rps.native;
 var defaultFS = {
   lstatSync,
   readdir: readdirCB,
-  readdirSync,
+  readdirSync: readdirSync2,
   readlinkSync,
   realpathSync,
   promises: {
@@ -4162,12 +4260,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path12) {
-    if (!path12) {
+  resolve(path14) {
+    if (!path14) {
       return this;
     }
-    const rootPath = this.getRootString(path12);
-    const dir = path12.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;
@@ -4919,8 +5017,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path12) {
-    return win32.parse(path12).root;
+  getRootString(path14) {
+    return win32.parse(path14).root;
   }
   /**
    * @internal
@@ -4966,8 +5064,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path12) {
-    return path12.startsWith("/") ? "/" : "";
+  getRootString(path14) {
+    return path14.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5016,8 +5114,8 @@ var PathScurryBase = class {
    *
    * @internal
    */
-  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs2 = defaultFS } = {}) {
-    this.#fs = fsFromOption(fs2);
+  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs3 = defaultFS } = {}) {
+    this.#fs = fsFromOption(fs3);
     if (cwd instanceof URL || cwd.startsWith("file://")) {
       cwd = fileURLToPath(cwd);
     }
@@ -5056,11 +5154,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path12 = this.cwd) {
-    if (typeof path12 === "string") {
-      path12 = this.cwd.resolve(path12);
+  depth(path14 = this.cwd) {
+    if (typeof path14 === "string") {
+      path14 = this.cwd.resolve(path14);
     }
-    return path12.depth();
+    return path14.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5439,7 +5537,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();
@@ -5480,9 +5578,9 @@ var PathScurryBase = class {
             }
           }
           if (paused && !results.flowing) {
-            results.once("drain", process2);
+            results.once("drain", process3);
           } else if (!sync2) {
-            process2();
+            process3();
           }
         };
         let sync2 = true;
@@ -5490,7 +5588,7 @@ var PathScurryBase = class {
         sync2 = false;
       }
     };
-    process2();
+    process3();
     return results;
   }
   streamSync(entry = this.cwd, opts = {}) {
@@ -5508,7 +5606,7 @@ var PathScurryBase = class {
     }
     const queue = [entry];
     let processing = 0;
-    const process2 = () => {
+    const process3 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -5542,14 +5640,14 @@ var PathScurryBase = class {
         }
       }
       if (paused && !results.flowing)
-        results.once("drain", process2);
+        results.once("drain", process3);
     };
-    process2();
+    process3();
     return results;
   }
-  chdir(path12 = this.cwd) {
+  chdir(path14 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path12 === "string" ? this.cwd.resolve(path12) : path12;
+    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5575,8 +5673,8 @@ var PathScurryWin32 = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs2) {
-    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs2 });
+  newRoot(fs3) {
+    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs3 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -5604,8 +5702,8 @@ var PathScurryPosix = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs2) {
-    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs2 });
+  newRoot(fs3) {
+    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs3 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -5905,8 +6003,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path12, n]) => [
-      path12,
+    return [...this.store.entries()].map(([path14, n]) => [
+      path14,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6111,9 +6209,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path12, opts) {
+  constructor(patterns, path14, opts) {
     this.patterns = patterns;
-    this.path = path12;
+    this.path = path14;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6132,11 +6230,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path12) {
-    return this.seen.has(path12) || !!this.#ignore?.ignored?.(path12);
+  #ignored(path14) {
+    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
   }
-  #childrenIgnored(path12) {
-    return !!this.#ignore?.childrenIgnored?.(path12);
+  #childrenIgnored(path14) {
+    return !!this.#ignore?.childrenIgnored?.(path14);
   }
   // backpressure mechanism
   pause() {
@@ -6351,8 +6449,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path12, opts) {
-    super(patterns, path12, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6389,8 +6487,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path12, opts) {
-    super(patterns, path12, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6683,67 +6781,44 @@ var glob = Object.assign(glob_, {
 });
 glob.glob = glob;
 
-// src/build/patches/to-investigate/patch-read-file.ts
-import path2 from "node:path";
-function patchReadFile(code, config) {
-  console.log("# patchReadFile");
-  code = code.replace(
-    "getBuildId() {",
-    `getBuildId() {
-      return ${JSON.stringify(readFileSync(path2.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
-    `
-  );
-  const manifestJsons = globSync(path2.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
-    (file) => file.replace(config.paths.standaloneApp + "/", "")
-  );
-  code = code.replace(
-    /function loadManifest\((.+?), .+?\) {/,
+// 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")
+  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
+  return code.replace(
+    /function evalManifest\((.+?), .+?\) {/,
     `$&
-    ${manifestJsons.map(
-      (manifestJson) => `
-          if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(path2.join(config.paths.standaloneApp, manifestJson), "utf-8")};
-          }
-        `
+		${manifestJss.map(
+      (manifestJs) => `
+			  if ($1.endsWith("${manifestJs}")) {
+				require("${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);
-    `
-  );
-  return code;
-}
-
-// src/build/patches/to-investigate/patch-find-dir.ts
-import path3 from "node:path";
-import { existsSync } from "node:fs";
-function patchFindDir(code, config) {
-  console.log("# patchFindDir");
-  return code.replace(
-    "function findDir(dir, name) {",
-    `function findDir(dir, name) {
-			if (dir.endsWith(".next/server")) {
-			if (name === "app") {
-			  return ${existsSync(`${path3.join(config.paths.standaloneAppServer, "app")}`)};
-	    }
-			if (name === "pages") {
-			  return ${existsSync(`${path3.join(config.paths.standaloneAppServer, "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";
-import path4 from "node:path";
+// src/cli/build/patches/to-investigate/inline-next-require.ts
+import { existsSync, readFileSync } from "node:fs";
+import path6 from "node:path";
 function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
-  const pagesManifestFile = path4.join(config.paths.standaloneAppServer, "pages-manifest.json");
-  const appPathsManifestFile = path4.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
-  const pagesManifestFiles = existsSync2(pagesManifestFile) ? Object.values(JSON.parse(readFileSync2(pagesManifestFile, "utf-8"))).map(
+  const pagesManifestFile = path6.join(config.paths.standaloneAppServer, "pages-manifest.json");
+  const appPathsManifestFile = path6.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);
@@ -6755,14 +6830,14 @@ function inlineNextRequire(code, config) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync2(path4.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
+            return ${JSON.stringify(readFileSync(path6.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
           }
         `
     ).join("\n")}
     ${pageModules.map(
       (module) => `
           if (pagePath.endsWith("${module}")) {
-            return require("${path4.join(config.paths.standaloneApp, module)}");
+            return require("${path6.join(config.paths.standaloneApp, module)}");
           }
         `
     ).join("\n")}
@@ -6771,68 +6846,112 @@ function inlineNextRequire(code, config) {
   );
 }
 
-// src/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")
-  ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
+// src/cli/build/patches/investigated/patch-cache.ts
+import path7 from "node:path";
+function patchCache(code, config) {
+  console.log("# patchCached");
+  const cacheHandler = path7.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 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 ${existsSync2(`${path8.join(config.paths.standaloneAppServer, "app")}`)};
+	    }
+			if (name === "pages") {
+			  return ${existsSync2(`${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 readFileSync2 } from "node:fs";
+function patchReadFile(code, config) {
+  console.log("# patchReadFile");
+  code = code.replace(
+    "getBuildId() {",
+    `getBuildId() {
+      return ${JSON.stringify(readFileSync2(path9.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+    `
+  );
+  const manifestJsons = globSync(path9.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("${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", "")}"],
-				  },
-				};
-			  }
-			`
+    ${manifestJsons.map(
+      (manifestJson) => `
+          if ($1.endsWith("${manifestJson}")) {
+            return ${readFileSync2(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 path6 from "node:path";
-import fs, { writeFileSync } from "node:fs";
+// 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 fs2, { writeFileSync } from "node:fs";
+import path10 from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  const pagesRuntimeFile = path6.join(
-    config.paths.standaloneApp,
-    "node_modules",
-    "next",
-    "dist",
-    "compiled",
-    "next-server",
-    "pages.runtime.prod.js"
-  );
-  const patchedPagesRuntime = fs.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
-  fs.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path6.join(
-    config.paths.standaloneApp,
-    "node_modules",
-    "next",
-    "dist",
-    "server",
-    "lib",
-    "trace",
-    "tracer.js"
-  );
-  const pacthedTracer = fs.readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
+  const distPath = getDistPath(config);
+  const pagesRuntimeFile = path10.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
+  const patchedPagesRuntime = fs2.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
+  fs2.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
+  const tracerFile = path10.join(distPath, "server", "lib", "trace", "tracer.js");
+  const pacthedTracer = fs2.readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
   writeFileSync(tracerFile, pacthedTracer);
 }
+function getDistPath(config) {
+  for (const root of [config.paths.standaloneApp, config.paths.standaloneRoot]) {
+    try {
+      const distPath = path10.join(root, "node_modules", "next", "dist");
+      if (fs2.statSync(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";
-import path7 from "node:path";
+// src/cli/build/build-worker.ts
+import path12 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);
@@ -6878,7 +6997,7 @@ function getInstalledChunksDeclaration(sourceFile, installChunkDeclaration) {
   return installedChunksDeclaration;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.ts
 import * as ts2 from "ts-morph";
 async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { installedChunks, installChunk }, chunks) {
   const webpackFRequireFunction = sourceFile.getDescendantsOfKind(ts2.SyntaxKind.ArrowFunction).find((arrowFunction) => {
@@ -6922,7 +7041,7 @@ if(${chunkId} === ${chunk}) return ${installChunk}(require("./chunks/${chunk}.js
   return sourceFile.print();
 }
 
-// src/build/utils/ts-parse-file.ts
+// src/cli/build/utils/ts-parse-file.ts
 import * as ts3 from "ts-morph";
 function tsParseFile(fileContent) {
   const project = new ts3.Project();
@@ -6930,7 +7049,7 @@ function tsParseFile(fileContent) {
   return sourceFile;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.ts
 async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
   const tsSourceFile = tsParseFile(fileContent);
   const chunkInstallationIdentifiers = await getChunkInstallationIdentifiers(tsSourceFile);
@@ -6942,12 +7061,13 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
   return updatedFileContent;
 }
 
-// src/build/patches/investigated/update-webpack-chunks-file/index.ts
+// src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
+import path11 from "node:path";
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path7.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const webpackRuntimeFile = path11.join(config.paths.standaloneAppServer, "webpack-runtime.js");
   const fileContent = readFileSync3(webpackRuntimeFile, "utf-8");
-  const chunks = readdirSync2(path7.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
+  const chunks = readdirSync3(path11.join(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
     console.log(` - chunk ${chunk}`);
     return chunk.replace(/\.js$/, "");
   });
@@ -6955,47 +7075,29 @@ async function updateWebpackChunksFile(config) {
   writeFileSync2(webpackRuntimeFile, updatedFileContent);
 }
 
-// src/build/patches/investigated/patch-cache.ts
-import path8 from "node:path";
-function patchCache(code, config) {
-  console.log("# patchCached");
-  const cacheHandler = path8.join(config.paths.internalPackage, "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/build/build-worker.ts
-var packageDir = path9.dirname(fileURLToPath3(import.meta.url));
+// 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(
-    path9.join(config.paths.dotNext, "static"),
-    path9.join(config.paths.builderOutput, "assets", "_next", "static"),
+    path12.join(config.paths.dotNext, "static"),
+    path12.join(config.paths.builderOutput, "assets", "_next", "static"),
     {
       recursive: true
     }
   );
-  const publicDir = path9.join(config.paths.nextApp, "public");
+  const publicDir = path12.join(config.paths.nextApp, "public");
   if (existsSync3(publicDir)) {
-    await cp(publicDir, path9.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path12.join(config.paths.builderOutput, "assets"), {
       recursive: true
     });
   }
-  copyPackage(packageDir, config);
-  const templateDir = path9.join(config.paths.internalPackage, "templates");
-  const workerEntrypoint = path9.join(templateDir, "worker.ts");
-  const workerOutputFile = path9.join(config.paths.builderOutput, "index.mjs");
-  const nextConfigStr = readFileSync4(path9.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
+  copyPackageCliFiles(packageDistDir, config);
+  const templateDir = path12.join(config.paths.internalPackage, "cli", "templates");
+  const workerEntrypoint = path12.join(templateDir, "worker.ts");
+  const workerOutputFile = path12.join(config.paths.builderOutput, "index.mjs");
+  const nextConfigStr = readFileSync4(path12.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
   console.log(`\x1B[35m\u2699\uFE0F Bundling the worker file...
@@ -7014,15 +7116,15 @@ async function buildWorker(config) {
       // Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:
       //   eval("require")("bufferutil");
       //   eval("require")("utf-8-validate");
-      "next/dist/compiled/ws": path9.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/ws": path12.join(templateDir, "shims", "empty.ts"),
       // Note: we apply an empty shim to next/dist/compiled/edge-runtime since (amongst others) it generated the following `eval`:
       //   eval(getModuleCode)(module, module.exports, throwingRequire, params.context, ...Object.values(params.scopedContext));
       //   which comes from https://github.com/vercel/edge-runtime/blob/6e96b55f/packages/primitives/src/primitives/load.js#L57-L63
       // QUESTION: Why did I encountered this but mhart didn't?
-      "next/dist/compiled/edge-runtime": path9.join(templateDir, "shims", "empty.ts"),
+      "next/dist/compiled/edge-runtime": path12.join(templateDir, "shims", "empty.ts"),
       // `@next/env` is a library Next.js uses for loading dotenv files, for obvious reasons we need to stub it here
       // source: https://github.com/vercel/next.js/tree/0ac10d79720/packages/next-env
-      "@next/env": path9.join(templateDir, "shims", "env.ts")
+      "@next/env": path12.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
@@ -7101,103 +7203,88 @@ function createFixRequiresESBuildPlugin(templateDir) {
   return {
     name: "replaceRelative",
     setup(build3) {
-      build3.onResolve({ filter: /^\.\/require-hook$/ }, (args) => ({
-        path: path9.join(templateDir, "shims", "empty.ts")
+      build3.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
+        path: path12.join(templateDir, "shims", "empty.ts")
       }));
-      build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, (args) => ({
-        path: path9.join(templateDir, "shims", "empty.ts")
+      build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
+        path: path12.join(templateDir, "shims", "empty.ts")
       }));
     }
   };
 }
 
-// src/config.ts
-import { readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
-import path10, { relative } from "node:path";
-var PACKAGE_NAME = "@opennextjs/cloudflare";
-var UserConfig = {
-  cache: {
-    bindingName: "NEXT_CACHE_WORKERS_KV"
-  }
-};
-function getConfig(appDir, outputDir2) {
-  const dotNext = path10.join(outputDir2, ".next");
-  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
-  const standaloneApp = path10.join(dotNext, "standalone", appPath);
-  const standaloneAppDotNext = path10.join(standaloneApp, ".next");
-  const standaloneAppServer = path10.join(standaloneAppDotNext, "server");
-  const nodeModules = path10.join(standaloneApp, "node_modules");
-  const internalPackage = path10.join(nodeModules, ...PACKAGE_NAME.split("/"));
-  return {
-    paths: {
-      nextApp: appDir,
-      builderOutput: outputDir2,
-      dotNext,
-      standaloneApp,
-      standaloneAppDotNext,
-      standaloneAppServer,
-      internalPackage
-    },
-    cache: {
-      kvBindingName: UserConfig.cache.bindingName
-    },
-    internalPackageName: PACKAGE_NAME
-  };
-}
-function containsDotNextDir(folder) {
-  try {
-    return statSync2(path10.join(folder, ".next")).isDirectory();
-  } catch (e) {
-    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(path10.join(dotNextDir, "standalone"), serverPath);
-}
-function findServerParentPath(parentPath) {
-  try {
-    if (statSync2(path10.join(parentPath, ".next", "server")).isDirectory()) {
-      return parentPath;
-    }
-  } catch {
-  }
-  const folders = readdirSync3(parentPath);
-  for (const folder of folders) {
-    const subFolder = path10.join(parentPath, folder);
-    if (statSync2(path10.join(parentPath, folder)).isDirectory()) {
-      const dirServerPath = findServerParentPath(subFolder);
-      if (dirServerPath) {
-        return dirServerPath;
-      }
-    }
-  }
-}
-
-// src/build/build.ts
-import { cpSync as cpSync3 } from "node:fs";
-import path11 from "node:path";
+// src/cli/build/index.ts
+import { cpSync as cpSync2 } from "node:fs";
+import path13 from "node:path";
+import { rm } from "node:fs/promises";
 async function build2(appDir, opts) {
   if (!opts.skipBuild) {
-    buildNextjsApp(appDir);
+    await buildNextjsApp(appDir);
   }
   if (!containsDotNextDir(appDir)) {
     throw new Error(`.next folder not found in ${appDir}`);
   }
-  const outputDir2 = path11.resolve(opts.outputDir ?? appDir, ".worker-next");
+  const outputDir2 = path13.resolve(opts.outputDir ?? appDir, ".worker-next");
   await cleanDirectory(outputDir2);
-  cpSync3(path11.join(appDir, ".next"), path11.join(outputDir2, ".next"), { recursive: true });
+  cpSync2(path13.join(appDir, ".next"), path13.join(outputDir2, ".next"), { recursive: true });
   const config = getConfig(appDir, outputDir2);
   await buildWorker(config);
 }
-async function cleanDirectory(path12) {
-  return await rm(path12, { recursive: true, force: true });
+async function cleanDirectory(path14) {
+  return await rm(path14, { recursive: true, force: true });
 }
 
-// src/index.ts
+// 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 {
+    outputDir: outputDir2,
+    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+  };
+}
+function assertDirArg(path14, argName, make) {
+  let dirStats;
+  try {
+    dirStats = statSync2(path14);
+  } catch {
+    if (!make) {
+      throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
+    }
+    mkdirSync(path14);
+    return;
+  }
+  if (!dirStats.isDirectory()) {
+    throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a directory`);
+  }
+}
+
+// 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}`))) {