@opennextjs/cloudflare 0.0.0-28d3ca1 → 0.0.0-361f2b7

package/dist/cli/index.mjs

@@ -279,13 +279,103 @@ function findServerParentPath(parentPath) {
   }
 }
 
+// ../../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"
+};
+
+// ../../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/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,
@@ -305,11 +395,11 @@ import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:f
 
 // src/cli/build/patches/investigated/copy-package-cli-files.ts
 import { cpSync } from "node:fs";
-import path2 from "node:path";
+import path3 from "node:path";
 function copyPackageCliFiles(packageDistDir2, config) {
   console.log("# copyPackageTemplateFiles");
-  const sourceDir = path2.join(packageDistDir2, "cli");
-  const destinationDir = path2.join(config.paths.internalPackage, "cli");
+  const sourceDir = path3.join(packageDistDir2, "cli");
+  const destinationDir = path3.join(config.paths.internalPackage, "cli");
   cpSync(sourceDir, destinationDir, { recursive: true });
 }
 
@@ -987,11 +1077,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 path3 = {
+var path4 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path3.win32.sep : path3.posix.sep;
+var sep = defaultPlatform === "win32" ? path4.win32.sep : path4.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -4168,12 +4258,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path13) {
-    if (!path13) {
+  resolve(path14) {
+    if (!path14) {
       return this;
     }
-    const rootPath = this.getRootString(path13);
-    const dir = path13.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;
@@ -4925,8 +5015,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path13) {
-    return win32.parse(path13).root;
+  getRootString(path14) {
+    return win32.parse(path14).root;
   }
   /**
    * @internal
@@ -4972,8 +5062,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path13) {
-    return path13.startsWith("/") ? "/" : "";
+  getRootString(path14) {
+    return path14.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5022,8 +5112,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);
     }
@@ -5062,11 +5152,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path13 = this.cwd) {
-    if (typeof path13 === "string") {
-      path13 = this.cwd.resolve(path13);
+  depth(path14 = this.cwd) {
+    if (typeof path14 === "string") {
+      path14 = this.cwd.resolve(path14);
     }
-    return path13.depth();
+    return path14.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5445,7 +5535,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();
@@ -5486,9 +5576,9 @@ var PathScurryBase = class {
             }
           }
           if (paused && !results.flowing) {
-            results.once("drain", process2);
+            results.once("drain", process3);
           } else if (!sync2) {
-            process2();
+            process3();
           }
         };
         let sync2 = true;
@@ -5496,7 +5586,7 @@ var PathScurryBase = class {
         sync2 = false;
       }
     };
-    process2();
+    process3();
     return results;
   }
   streamSync(entry = this.cwd, opts = {}) {
@@ -5514,7 +5604,7 @@ var PathScurryBase = class {
     }
     const queue = [entry];
     let processing = 0;
-    const process2 = () => {
+    const process3 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -5548,14 +5638,14 @@ var PathScurryBase = class {
         }
       }
       if (paused && !results.flowing)
-        results.once("drain", process2);
+        results.once("drain", process3);
     };
-    process2();
+    process3();
     return results;
   }
-  chdir(path13 = this.cwd) {
+  chdir(path14 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path13 === "string" ? this.cwd.resolve(path13) : path13;
+    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5581,8 +5671,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
@@ -5610,8 +5700,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
@@ -5911,8 +6001,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path13, n]) => [
-      path13,
+    return [...this.store.entries()].map(([path14, n]) => [
+      path14,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6117,9 +6207,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path13, opts) {
+  constructor(patterns, path14, opts) {
     this.patterns = patterns;
-    this.path = path13;
+    this.path = path14;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6138,11 +6228,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path13) {
-    return this.seen.has(path13) || !!this.#ignore?.ignored?.(path13);
+  #ignored(path14) {
+    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
   }
-  #childrenIgnored(path13) {
-    return !!this.#ignore?.childrenIgnored?.(path13);
+  #childrenIgnored(path14) {
+    return !!this.#ignore?.childrenIgnored?.(path14);
   }
   // backpressure mechanism
   pause() {
@@ -6357,8 +6447,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path13, opts) {
-    super(patterns, path13, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6395,8 +6485,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path13, opts) {
-    super(patterns, path13, opts);
+  constructor(patterns, path14, opts) {
+    super(patterns, path14, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6690,11 +6780,11 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/cli/build/patches/to-investigate/inline-eval-manifest.ts
-import path4 from "node:path";
+import path5 from "node:path";
 function inlineEvalManifest(code, config) {
   console.log("# inlineEvalManifest");
   const manifestJss = globSync(
-    path4.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
+    path5.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
   ).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
   return code.replace(
     /function evalManifest\((.+?), .+?\) {/,
@@ -6702,7 +6792,7 @@ function inlineEvalManifest(code, config) {
 		${manifestJss.map(
       (manifestJs) => `
 			  if ($1.endsWith("${manifestJs}")) {
-				require("${path4.join(config.paths.standaloneApp, 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", "")}"],
@@ -6718,11 +6808,11 @@ function inlineEvalManifest(code, config) {
 
 // src/cli/build/patches/to-investigate/inline-next-require.ts
 import { existsSync, readFileSync } from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 function inlineNextRequire(code, config) {
   console.log("# inlineNextRequire");
-  const pagesManifestFile = path5.join(config.paths.standaloneAppServer, "pages-manifest.json");
-  const appPathsManifestFile = path5.join(config.paths.standaloneAppServer, "app-paths-manifest.json");
+  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
   ) : [];
@@ -6738,14 +6828,14 @@ function inlineNextRequire(code, config) {
     ${htmlPages.map(
       (htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync(path5.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("${path5.join(config.paths.standaloneApp, module)}");
+            return require("${path6.join(config.paths.standaloneApp, module)}");
           }
         `
     ).join("\n")}
@@ -6755,10 +6845,10 @@ function inlineNextRequire(code, config) {
 }
 
 // src/cli/build/patches/investigated/patch-cache.ts
-import path6 from "node:path";
+import path7 from "node:path";
 function patchCache(code, config) {
   console.log("# patchCached");
-  const cacheHandler = path6.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
+  const cacheHandler = path7.join(config.paths.internalPackage, "cli", "cache-handler.mjs");
   const patchedCode = code.replace(
     "const { cacheHandler } = this.nextConfig;",
     `const cacheHandler = null;
@@ -6774,7 +6864,7 @@ CacheHandler.maybeKVNamespace = process.env["${config.cache.kvBindingName}"];
 
 // src/cli/build/patches/to-investigate/patch-find-dir.ts
 import { existsSync as existsSync2 } from "node:fs";
-import path7 from "node:path";
+import path8 from "node:path";
 function patchFindDir(code, config) {
   console.log("# patchFindDir");
   return code.replace(
@@ -6782,10 +6872,10 @@ function patchFindDir(code, config) {
     `function findDir(dir, name) {
 			if (dir.endsWith(".next/server")) {
 			if (name === "app") {
-			  return ${existsSync2(`${path7.join(config.paths.standaloneAppServer, "app")}`)};
+			  return ${existsSync2(`${path8.join(config.paths.standaloneAppServer, "app")}`)};
 	    }
 			if (name === "pages") {
-			  return ${existsSync2(`${path7.join(config.paths.standaloneAppServer, "pages")}`)};
+			  return ${existsSync2(`${path8.join(config.paths.standaloneAppServer, "pages")}`)};
 	    }
 		}
 		throw new Error("Unknown findDir call: " + dir + " " + name);
@@ -6794,17 +6884,17 @@ function patchFindDir(code, config) {
 }
 
 // src/cli/build/patches/to-investigate/patch-read-file.ts
-import path8 from "node:path";
+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(path8.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+      return ${JSON.stringify(readFileSync2(path9.join(config.paths.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
     `
   );
-  const manifestJsons = globSync(path8.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
+  const manifestJsons = globSync(path9.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
     (file) => file.replace(config.paths.standaloneApp + "/", "")
   );
   code = code.replace(
@@ -6813,7 +6903,7 @@ function patchReadFile(code, config) {
     ${manifestJsons.map(
       (manifestJson) => `
           if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync2(path8.join(config.paths.standaloneApp, manifestJson), "utf-8")};
+            return ${readFileSync2(path9.join(config.paths.standaloneApp, manifestJson), "utf-8")};
           }
         `
     ).join("\n")}
@@ -6830,11 +6920,11 @@ function patchRequire(code) {
 }
 
 // src/cli/build/patches/to-investigate/wrangler-deps.ts
-import fs, { writeFileSync } from "node:fs";
-import path9 from "node:path";
+import fs2, { writeFileSync } from "node:fs";
+import path10 from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  const pagesRuntimeFile = path9.join(
+  const pagesRuntimeFile = path10.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6843,9 +6933,9 @@ function patchWranglerDeps(config) {
     "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 = path9.join(
+  const patchedPagesRuntime = fs2.readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
+  fs2.writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
+  const tracerFile = path10.join(
     config.paths.standaloneApp,
     "node_modules",
     "next",
@@ -6855,12 +6945,12 @@ function patchWranglerDeps(config) {
     "trace",
     "tracer.js"
   );
-  const pacthedTracer = fs.readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
+  const pacthedTracer = fs2.readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
   writeFileSync(tracerFile, pacthedTracer);
 }
 
 // src/cli/build/build-worker.ts
-import path11 from "node:path";
+import path12 from "node:path";
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
 import { readFileSync as readFileSync3, readdirSync as readdirSync3, writeFileSync as writeFileSync2 } from "node:fs";
@@ -6976,12 +7066,12 @@ async function getUpdatedWebpackChunksFileContent(fileContent, chunks) {
 }
 
 // src/cli/build/patches/investigated/update-webpack-chunks-file/index.ts
-import path10 from "node:path";
+import path11 from "node:path";
 async function updateWebpackChunksFile(config) {
   console.log("# updateWebpackChunksFile");
-  const webpackRuntimeFile = path10.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 = readdirSync3(path10.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$/, "");
   });
@@ -6990,28 +7080,28 @@ async function updateWebpackChunksFile(config) {
 }
 
 // src/cli/build/build-worker.ts
-var packageDistDir = path11.join(path11.dirname(fileURLToPath3(import.meta.url)), "..");
+var packageDistDir = path12.join(path12.dirname(fileURLToPath3(import.meta.url)), "..");
 async function buildWorker(config) {
   console.log(`\x1B[35m\u2699\uFE0F Copying files...
 \x1B[0m`);
   await cp(
-    path11.join(config.paths.dotNext, "static"),
-    path11.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 = path11.join(config.paths.nextApp, "public");
+  const publicDir = path12.join(config.paths.nextApp, "public");
   if (existsSync3(publicDir)) {
-    await cp(publicDir, path11.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path12.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 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...
@@ -7030,15 +7120,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": path11.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": path11.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": path11.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
@@ -7118,10 +7208,10 @@ function createFixRequiresESBuildPlugin(templateDir) {
     name: "replaceRelative",
     setup(build3) {
       build3.onResolve({ filter: /^\.\/require-hook$/ }, () => ({
-        path: path11.join(templateDir, "shims", "empty.ts")
+        path: path12.join(templateDir, "shims", "empty.ts")
       }));
       build3.onResolve({ filter: /\.\/lib\/node-fs-methods$/ }, () => ({
-        path: path11.join(templateDir, "shims", "empty.ts")
+        path: path12.join(templateDir, "shims", "empty.ts")
       }));
     }
   };
@@ -7129,23 +7219,23 @@ function createFixRequiresESBuildPlugin(templateDir) {
 
 // src/cli/build/index.ts
 import { cpSync as cpSync2 } from "node:fs";
-import path12 from "node:path";
+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 = path12.resolve(opts.outputDir ?? appDir, ".worker-next");
+  const outputDir2 = path13.resolve(opts.outputDir ?? appDir, ".worker-next");
   await cleanDirectory(outputDir2);
-  cpSync2(path12.join(appDir, ".next"), path12.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(path13) {
-  return await rm(path13, { recursive: true, force: true });
+async function cleanDirectory(path14) {
+  return await rm(path14, { recursive: true, force: true });
 }
 
 // src/cli/index.ts
@@ -7181,15 +7271,15 @@ function getArgs() {
     skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
   };
 }
-function assertDirArg(path13, argName, make) {
+function assertDirArg(path14, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync2(path13);
+    dirStats = statSync2(path14);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync(path13);
+    mkdirSync(path14);
     return;
   }
   if (!dirStats.isDirectory()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-28d3ca1",
+  "version": "0.0.0-361f2b7",
   "bin": "dist/cli/index.mjs",
   "main": "./dist/api/index.mjs",
   "types": "./dist/api/index.d.mts",
@@ -40,6 +40,7 @@
     "glob": "^11.0.0",
     "globals": "^15.9.0",
     "next": "14.2.11",
+    "package-manager-detector": "^0.2.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.7.0",