@opennextjs/cloudflare 0.0.0-9aff12e → 0.0.0-acc0c5e

package/dist/cli/index.mjs

@@ -225,7 +225,8 @@ var UserConfig = {
 function getConfig(appDir, outputDir2) {
   const dotNext = path.join(outputDir2, ".next");
   const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
-  const standaloneApp = path.join(dotNext, "standalone", appPath);
+  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");
@@ -235,6 +236,7 @@ function getConfig(appDir, outputDir2) {
       nextApp: appDir,
       builderOutput: outputDir2,
       dotNext,
+      standaloneRoot,
       standaloneApp,
       standaloneAppDotNext,
       standaloneAppServer,
@@ -6924,30 +6926,24 @@ import fs2, { writeFileSync } from "node:fs";
 import path10 from "node:path";
 function patchWranglerDeps(config) {
   console.log("# patchWranglerDeps");
-  const pagesRuntimeFile = path10.join(
-    config.paths.standaloneApp,
-    "node_modules",
-    "next",
-    "dist",
-    "compiled",
-    "next-server",
-    "pages.runtime.prod.js"
-  );
+  const distPath = getDistPath(config);
+  const pagesRuntimeFile = path10.join(distPath, "compiled", "next-server", "pages.runtime.prod.js");
   const patchedPagesRuntime = 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",
-    "dist",
-    "server",
-    "lib",
-    "trace",
-    "tracer.js"
-  );
+  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/cli/build/build-worker.ts
 import path12 from "node:path";

package/package.json

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