@opennextjs/cloudflare 0.1.1 → 0.2.1

package/dist/cli/index.mjs

@@ -235,25 +235,29 @@ var require_brace_expansion = __commonJS({
 });
 
 // src/cli/config.ts
-import path, { relative } from "node:path";
+import { join, 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");
+function getConfig(projectOpts) {
+  const dotNext = join(projectOpts.outputDir, ".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");
+  const standaloneRoot = join(dotNext, "standalone");
+  const standaloneApp = join(standaloneRoot, appPath);
+  const standaloneAppDotNext = join(standaloneApp, ".next");
+  const standaloneAppServer = join(standaloneAppDotNext, "server");
+  const nodeModules = join(standaloneApp, "node_modules");
+  const internalPackage = join(nodeModules, ...PACKAGE_NAME.split("/"));
+  const internalTemplates = join(internalPackage, "cli", "templates");
   process.env.__OPENNEXT_KV_BINDING_NAME ??= "NEXT_CACHE_WORKERS_KV";
   return {
-    buildTimestamp: Date.now(),
+    build: {
+      timestamp: Date.now(),
+      skipNextBuild: projectOpts.skipNextBuild,
+      shouldMinify: projectOpts.minify
+    },
     paths: {
-      nextApp: appDir,
-      builderOutput: outputDir2,
+      sourceDir: projectOpts.sourceDir,
+      outputDir: projectOpts.outputDir,
       dotNext,
       standaloneRoot,
       standaloneApp,
@@ -270,7 +274,7 @@ function getConfig(appDir, outputDir2) {
 }
 function containsDotNextDir(folder) {
   try {
-    return statSync(path.join(folder, ".next")).isDirectory();
+    return statSync(join(folder, ".next")).isDirectory();
   } catch {
     return false;
   }
@@ -280,19 +284,19 @@ function getNextjsApplicationPath(dotNextDir) {
   if (!serverPath) {
     throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
   }
-  return relative(path.join(dotNextDir, "standalone"), serverPath);
+  return relative(join(dotNextDir, "standalone"), serverPath);
 }
 function findServerParentPath(parentPath) {
   try {
-    if (statSync(path.join(parentPath, ".next", "server")).isDirectory()) {
+    if (statSync(join(parentPath, ".next", "server")).isDirectory()) {
       return parentPath;
     }
   } catch {
   }
   const folders = readdirSync(parentPath);
   for (const folder of folders) {
-    const subFolder = path.join(parentPath, folder);
-    if (statSync(path.join(parentPath, folder)).isDirectory()) {
+    const subFolder = join(parentPath, folder);
+    if (statSync(join(parentPath, folder)).isDirectory()) {
       const dirServerPath = findServerParentPath(subFolder);
       if (dirServerPath) {
         return dirServerPath;
@@ -321,32 +325,32 @@ var LOCKS = {
 // ../../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 path 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))) {
+      if (await fileExists(path.join(directory, lock))) {
         const name = LOCKS[lock];
-        const result2 = await parsePackageJson(path2.join(directory, "package.json"), onUnknown);
+        const result2 = await parsePackageJson(path.join(directory, "package.json"), onUnknown);
         if (result2)
           return result2;
         else
           return { name, agent: name };
       }
     }
-    const result = await parsePackageJson(path2.join(directory, "package.json"), onUnknown);
+    const result = await parsePackageJson(path.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);
+  let directory = path.resolve(cwd);
+  const { root } = path.parse(directory);
   while (directory && directory !== root) {
     yield directory;
-    directory = path2.dirname(directory);
+    directory = path.dirname(directory);
   }
 }
 async function parsePackageJson(filepath, onUnknown) {
@@ -403,7 +407,7 @@ function runNextBuildCommand(packager, nextAppDir2) {
     cwd: nextAppDir2,
     env: {
       ...process.env,
-      // equivalent to: https://github.com/sst/open-next/blob/f61b0e9/packages/open-next/src/build.ts#L168-L173
+      // equivalent to: https://github.com/opennextjs/opennextjs-aws/blob/f61b0e9/packages/open-next/src/build.ts#L168-L173
       // Equivalent to setting `output: "standalone"` in next.config.js
       NEXT_PRIVATE_STANDALONE: "true"
     }
@@ -413,15 +417,16 @@ function runNextBuildCommand(packager, nextAppDir2) {
 // src/cli/build/build-worker.ts
 import { build as build2 } from "esbuild";
 import { cp, readFile, writeFile } from "node:fs/promises";
+import { dirname as dirname2, join as join13 } from "node:path";
 import { existsSync as existsSync5, readFileSync as readFileSync7 } from "node:fs";
 
 // src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-import path3 from "node:path";
+import { join as join2 } from "node:path";
 function copyPackageCliFiles(packageDistDir2, config) {
   console.log("# copyPackageTemplateFiles");
-  const sourceDir = path3.join(packageDistDir2, "cli");
-  const destinationDir = path3.join(config.paths.internalPackage, "cli");
+  const sourceDir = join2(packageDistDir2, "cli");
+  const destinationDir = join2(config.paths.internalPackage, "cli");
   cpSync(sourceDir, destinationDir, { recursive: true });
 }
 
@@ -439,16 +444,16 @@ 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";
+import { dirname, join as join4 } from "node:path";
 
 // src/cli/build/utils/read-paths-recursively.ts
-import { join } from "node:path";
+import { join as join3 } 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);
+      const filePath = join3(dir, file.name);
       return file.isDirectory() ? readPathsRecursively(filePath) : filePath;
     });
   } catch {
@@ -459,29 +464,38 @@ function readPathsRecursively(dir) {
 // 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 serverAppDirPath = join4(config.paths.standaloneAppServer, "app");
+  const prerenderManifestPath = join4(config.paths.standaloneAppDotNext, "prerender-manifest.json");
+  const outputPath = join4(config.paths.outputDir, "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);
+    const destPath = join4(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 }));
+      writeFileSync(destPath, JSON.stringify({ ...data, lastModified: config.build.timestamp }));
     } else {
       copyFileSync(fullPath, destPath);
     }
   });
 }
 
+// src/cli/build/utils/normalize-path.ts
+import { posix, sep } from "node:path";
+function normalizePath(path3) {
+  return path3.replaceAll(sep, posix.sep);
+}
+
 // src/cli/build/build-worker.ts
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
+// src/cli/build/patches/to-investigate/inline-eval-manifest.ts
+import { join as join5, posix as posix3 } from "node:path";
+
 // ../../node_modules/.pnpm/minimatch@10.0.1/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
 
@@ -1153,12 +1167,12 @@ 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 path4 = {
+var path2 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
-minimatch.sep = sep;
+var sep2 = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
+minimatch.sep = sep2;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
 var qmark2 = "[^/]";
@@ -3185,7 +3199,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 { posix as posix2, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { lstatSync, readdir as readdirCB, readdirSync as readdirSync3, readlinkSync, realpathSync as rps } from "fs";
 import * as actualFS from "node:fs";
@@ -4334,12 +4348,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path14) {
-    if (!path14) {
+  resolve(path3) {
+    if (!path3) {
       return this;
     }
-    const rootPath = this.getRootString(path14);
-    const dir = path14.substring(rootPath.length);
+    const rootPath = this.getRootString(path3);
+    const dir = path3.substring(rootPath.length);
     const dirParts = dir.split(this.splitSep);
     const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
     return result;
@@ -5091,8 +5105,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path14) {
-    return win32.parse(path14).root;
+  getRootString(path3) {
+    return win32.parse(path3).root;
   }
   /**
    * @internal
@@ -5138,8 +5152,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path14) {
-    return path14.startsWith("/") ? "/" : "";
+  getRootString(path3) {
+    return path3.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5188,7 +5202,7 @@ var PathScurryBase = class {
    *
    * @internal
    */
-  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs2 = defaultFS } = {}) {
+  constructor(cwd = process.cwd(), pathImpl, sep3, { nocase, childrenCacheSize = 16 * 1024, fs: fs2 = defaultFS } = {}) {
     this.#fs = fsFromOption(fs2);
     if (cwd instanceof URL || cwd.startsWith("file://")) {
       cwd = fileURLToPath(cwd);
@@ -5199,7 +5213,7 @@ var PathScurryBase = class {
     this.#resolveCache = new ResolveCache();
     this.#resolvePosixCache = new ResolveCache();
     this.#children = new ChildrenCache(childrenCacheSize);
-    const split = cwdPath.substring(this.rootPath.length).split(sep2);
+    const split = cwdPath.substring(this.rootPath.length).split(sep3);
     if (split.length === 1 && !split[0]) {
       split.pop();
     }
@@ -5228,11 +5242,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path14 = this.cwd) {
-    if (typeof path14 === "string") {
-      path14 = this.cwd.resolve(path14);
+  depth(path3 = this.cwd) {
+    if (typeof path3 === "string") {
+      path3 = this.cwd.resolve(path3);
     }
-    return path14.depth();
+    return path3.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5719,9 +5733,9 @@ var PathScurryBase = class {
     process3();
     return results;
   }
-  chdir(path14 = this.cwd) {
+  chdir(path3 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
+    this.cwd = typeof path3 === "string" ? this.cwd.resolve(path3) : path3;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5764,7 +5778,7 @@ var PathScurryPosix = class extends PathScurryBase {
   sep = "/";
   constructor(cwd = process.cwd(), opts = {}) {
     const { nocase = false } = opts;
-    super(cwd, posix, "/", { ...opts, nocase });
+    super(cwd, posix2, "/", { ...opts, nocase });
     this.nocase = nocase;
   }
   /**
@@ -6077,8 +6091,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path14, n]) => [
-      path14,
+    return [...this.store.entries()].map(([path3, n]) => [
+      path3,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6283,9 +6297,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path14, opts) {
+  constructor(patterns, path3, opts) {
     this.patterns = patterns;
-    this.path = path14;
+    this.path = path3;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6304,11 +6318,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path14) {
-    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
+  #ignored(path3) {
+    return this.seen.has(path3) || !!this.#ignore?.ignored?.(path3);
   }
-  #childrenIgnored(path14) {
-    return !!this.#ignore?.childrenIgnored?.(path14);
+  #childrenIgnored(path3) {
+    return !!this.#ignore?.childrenIgnored?.(path3);
   }
   // backpressure mechanism
   pause() {
@@ -6523,8 +6537,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path14, opts) {
-    super(patterns, path14, opts);
+  constructor(patterns, path3, opts) {
+    super(patterns, path3, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6561,8 +6575,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path14, opts) {
-    super(patterns, path14, opts);
+  constructor(patterns, path3, opts) {
+    super(patterns, path3, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6856,21 +6870,18 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // 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, "")
-  );
+    normalizePath(join5(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js"))
+  ).map((file) => normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + posix3.sep, ""));
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,
     `$&
 		${manifestJss.map(
       (manifestJs) => `
 			  if ($1.endsWith("${manifestJs}")) {
-				require(${JSON.stringify(path5.join(config.paths.standaloneApp, manifestJs))});
+				require(${JSON.stringify(join5(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", "")}"],
@@ -6886,10 +6897,10 @@ function inlineEvalManifest(code, config) {
 
 // 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";
+import { join as join6 } from "node:path";
 function inlineMiddlewareManifestRequire(code, config) {
   console.log("# inlineMiddlewareManifestRequire");
-  const middlewareManifestPath = path6.join(config.paths.standaloneAppServer, "middleware-manifest.json");
+  const middlewareManifestPath = join6(config.paths.standaloneAppServer, "middleware-manifest.json");
   const middlewareManifest = existsSync2(middlewareManifestPath) ? JSON.parse(readFileSync2(middlewareManifestPath, "utf-8")) : {};
   const patchedCode = code.replace(
     "require(this.middlewareManifestPath)",
@@ -6903,11 +6914,11 @@ function inlineMiddlewareManifestRequire(code, config) {
 
 // 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";
+import { join as join7 } from "node:path";
 function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
-  const pagesManifestFile = path7.join(config.paths.standaloneAppServer, "pages-manifest.json");
-  const appPathsManifestFile = path7.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
+  const pagesManifestFile = join7(config.paths.standaloneAppServer, "pages-manifest.json");
+  const appPathsManifestFile = join7(config.paths.standaloneAppServer, "app-paths-manifest.json");
   const pagesManifestFiles = existsSync3(pagesManifestFile) ? Object.values(JSON.parse(readFileSync3(pagesManifestFile, "utf-8"))).map(
     (file) => ".next/server/" + file
   ) : [];
@@ -6923,14 +6934,14 @@ function inlineNextRequire(code, config) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync3(path7.join(config.paths.standaloneApp, htmlPage), "utf-8"))};
+            return ${JSON.stringify(readFileSync3(join7(config.paths.standaloneApp, htmlPage), "utf-8"))};
           }
         `
     ).join("\n")}
     ${pageModules.map(
       (module) => `
           if (pagePath.endsWith("${module}")) {
-            return require(${JSON.stringify(path7.join(config.paths.standaloneApp, module))});
+            return require(${JSON.stringify(join7(config.paths.standaloneApp, module))});
           }
         `
     ).join("\n")}
@@ -6941,19 +6952,19 @@ function inlineNextRequire(code, config) {
 
 // src/cli/build/patches/investigated/patch-cache.ts
 import { build } from "esbuild";
-import { join as join3 } from "node:path";
+import { join as join8 } 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);
+  const cacheHandlerEntrypoint = join8(config.paths.internalTemplates, "cache-handler", "index.ts");
+  const cacheHandlerOutputFile = join8(config.paths.outputDir, cacheHandlerFileName);
   await build({
     entryPoints: [cacheHandlerEntrypoint],
     bundle: true,
     outfile: cacheHandlerOutputFile,
     format: "esm",
     target: "esnext",
-    minify: true,
+    minify: config.build.shouldMinify,
     define: {
       "process.env.__OPENNEXT_KV_BINDING_NAME": `"${config.cache.kvBindingName}"`
     }
@@ -6982,7 +6993,7 @@ function patchExceptionBubbling(code) {
 
 // src/cli/build/patches/to-investigate/patch-find-dir.ts
 import { existsSync as existsSync4 } from "node:fs";
-import path8 from "node:path";
+import { join as join9 } from "node:path";
 function patchFindDir(code, config) {
   console.log("# patchFindDir");
   return code.replace(
@@ -6990,10 +7001,10 @@ function patchFindDir(code, config) {
     `function findDir(dir, name) {
 			if (dir.endsWith(".next/server")) {
 			if (name === "app") {
-			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "app")}`)};
+			  return ${existsSync4(`${join9(config.paths.standaloneAppServer, "app")}`)};
 	    }
 			if (name === "pages") {
-			  return ${existsSync4(`${path8.join(config.paths.standaloneAppServer, "pages")}`)};
+			  return ${existsSync4(`${join9(config.paths.standaloneAppServer, "pages")}`)};
 	    }
 		}
 		throw new Error("Unknown findDir call: " + dir + " " + name);
@@ -7002,28 +7013,26 @@ function patchFindDir(code, config) {
 }
 
 // src/cli/build/patches/to-investigate/patch-read-file.ts
-import path9 from "node:path";
+import { join as join10, posix as posix4 } 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"))};
+      return ${JSON.stringify(readFileSync4(join10(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, "")
-  );
+    normalizePath(join10(config.paths.standaloneAppDotNext, "**", "*-manifest.json"))
+  ).map((file) => normalizePath(file).replace(normalizePath(config.paths.standaloneApp) + posix4.sep, ""));
   code = code.replace(
     /function loadManifest\((.+?), .+?\) {/,
     `$&
     ${manifestJsons.map(
       (manifestJson) => `
           if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync4(path9.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+            return ${readFileSync4(join10(config.paths.standaloneApp, manifestJson), "utf-8")};
           }
         `
     ).join("\n")}
@@ -7041,17 +7050,17 @@ function patchRequire(code) {
 
 // src/cli/build/patches/to-investigate/wrangler-deps.ts
 import { readFileSync as readFileSync5, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import path10 from "node:path";
+import { join as join11 } from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
   const distPath = getDistPath(config);
-  const pagesRuntimeFile = path10.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
+  const pagesRuntimeFile = join11(distPath, "compiled", "next-server", "pages.runtime.prod.js");
   const patchedPagesRuntime = readFileSync5(pagesRuntimeFile, "utf-8").replace(
     `e.exports=require("critters")`,
     `e.exports={}`
   );
   writeFileSync2(pagesRuntimeFile, patchedPagesRuntime);
-  const tracerFile = path10.join(distPath, "server", "lib", "trace", "tracer.js");
+  const tracerFile = join11(distPath, "server", "lib", "trace", "tracer.js");
   const patchedTracer = readFileSync5(tracerFile, "utf-8").replaceAll(
     /\w+\s*=\s*require\([^/]*opentelemetry.*\)/g,
     `throw new Error("@opentelemetry/api")`
@@ -7061,7 +7070,7 @@ function patchWranglerDeps(config) {
 function getDistPath(config) {
   for (const root of [config.paths.standaloneApp, config.paths.standaloneRoot]) {
     try {
-      const distPath = path10.join(root, "node_modules", "next", "dist");
+      const distPath = join11(root, "node_modules", "next", "dist");
       if (statSync2(distPath).isDirectory()) return distPath;
     } catch {
     }
@@ -7069,9 +7078,6 @@ function getDistPath(config) {
   throw new Error("Unexpected error: unable to detect the node_modules/next/dist directory");
 }
 
-// src/cli/build/build-worker.ts
-import path12 from "node:path";
-
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
 import { readFileSync as readFileSync6, readdirSync as readdirSync4, writeFileSync as writeFileSync3 } from "node:fs";
 
@@ -7178,12 +7184,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
 }
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
-import path11 from "node:path";
+import { join as join12 } from "node:path";
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path11.join(config.paths.standaloneAppServer, "webpack-runtime.js");
+  const webpackRuntimeFile = join12(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) => {
+  const chunks = readdirSync4(join12(config.paths.standaloneAppServer, "chunks")).filter((chunk) => /^\d+\.js$/.test(chunk)).map((chunk) => {
     console.log(` - chunk ${chunk}`);
     return chunk.replace(/\.js$/, "");
   });
@@ -7192,28 +7198,24 @@ async function updateWebpackChunksFile(config) {
 }
 
 // src/cli/build/build-worker.ts
-var packageDistDir = path12.join(path12.dirname(fileURLToPath3(import.meta.url)), "..");
+var packageDistDir = join13(dirname2(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");
+  await cp(join13(config.paths.dotNext, "static"), join13(config.paths.outputDir, "assets", "_next", "static"), {
+    recursive: true
+  });
+  const publicDir = join13(config.paths.sourceDir, "public");
   if (existsSync5(publicDir)) {
-    await cp(publicDir, path12.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, join13(config.paths.outputDir, "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 workerEntrypoint = join13(config.paths.internalTemplates, "worker.ts");
+  const workerOutputFile = join13(config.paths.outputDir, "index.mjs");
+  const nextConfigStr = readFileSync7(join13(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
   console.log(`\x1B[35m\u2699\uFE0F Bundling the worker file...
@@ -7232,15 +7234,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": path12.join(config.paths.internalTemplates, "shims", "empty.ts"),
+      "next/dist/compiled/ws": join13(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": path12.join(config.paths.internalTemplates, "shims", "empty.ts"),
+      "next/dist/compiled/edge-runtime": join13(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": path12.join(config.paths.internalTemplates, "shims", "env.ts")
+      "@next/env": join13(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
@@ -7318,10 +7320,10 @@ function createFixRequiresESBuildPlugin(config) {
     name: "replaceRelative",
     setup(build4) {
       build4.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
-        path: path12.join(config.paths.internalTemplates, "shims", "empty.ts")
+        path: join13(config.paths.internalTemplates, "shims", "empty.ts")
       }));
       build4.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
-        path: path12.join(config.paths.internalTemplates, "shims", "empty.ts")
+        path: join13(config.paths.internalTemplates, "shims", "empty.ts")
       }));
     }
   };
@@ -7329,23 +7331,22 @@ function createFixRequiresESBuildPlugin(config) {
 
 // src/cli/build/index.ts
 import { cpSync as cpSync2 } from "node:fs";
-import path13 from "node:path";
+import { join as join14 } from "node:path";
 import { rm } from "node:fs/promises";
-async function build3(appDir, opts) {
-  if (!opts.skipBuild) {
-    await buildNextjsApp(appDir);
+async function build3(projectOpts) {
+  if (!projectOpts.skipNextBuild) {
+    await buildNextjsApp(projectOpts.sourceDir);
   }
-  if (!containsDotNextDir(appDir)) {
-    throw new Error(`.next folder not found in ${appDir}`);
+  if (!containsDotNextDir(projectOpts.sourceDir)) {
+    throw new Error(`.next folder not found in ${projectOpts.sourceDir}`);
   }
-  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 cleanDirectory(projectOpts.outputDir);
+  cpSync2(join14(projectOpts.sourceDir, ".next"), join14(projectOpts.outputDir, ".next"), { recursive: true });
+  const config = getConfig(projectOpts);
   await buildWorker(config);
 }
-async function cleanDirectory(path14) {
-  return await rm(path14, { recursive: true, force: true });
+async function cleanDirectory(path3) {
+  return await rm(path3, { recursive: true, force: true });
 }
 
 // src/cli/index.ts
@@ -7357,7 +7358,7 @@ import { parseArgs } from "node:util";
 import { resolve } from "node:path";
 function getArgs() {
   const {
-    values: { skipBuild: skipBuild2, output }
+    values: { skipBuild, output, noMinify }
   } = parseArgs({
     options: {
       skipBuild: {
@@ -7368,6 +7369,10 @@ function getArgs() {
       output: {
         type: "string",
         short: "o"
+      },
+      noMinify: {
+        type: "boolean",
+        default: false
       }
     },
     allowPositionals: false
@@ -7378,18 +7383,19 @@ function getArgs() {
   }
   return {
     outputDir: outputDir2,
-    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+    skipNextBuild: skipBuild || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD)),
+    minify: !noMinify
   };
 }
-function assertDirArg(path14, argName, make) {
+function assertDirArg(path3, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync3(path14);
+    dirStats = statSync3(path3);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync2(path14);
+    mkdirSync2(path3);
     return;
   }
   if (!dirStats.isDirectory()) {
@@ -7407,8 +7413,10 @@ if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync6(`./next.config.${ext2
   );
   process.exit(1);
 }
-var { skipBuild, outputDir } = getArgs();
-await build3(nextAppDir, {
-  outputDir,
-  skipBuild: !!skipBuild
+var { skipNextBuild, outputDir, minify } = getArgs();
+await build3({
+  sourceDir: nextAppDir,
+  outputDir: resolve2(outputDir ?? nextAppDir, ".worker-next"),
+  skipNextBuild,
+  minify
 });

package/package.json

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