@opennextjs/cloudflare 0.5.0 → 0.5.1

package/dist/cli/build/open-next/createServerBundle.js

@@ -39,10 +39,9 @@ export async function createServerBundle(options) {
     // We build every other function than default before so we know which route there is left
     await Promise.all(promises);
     const remainingRoutes = new Set();
-    const { appBuildOutputPath, monorepoRoot } = options;
-    const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
+    const { appBuildOutputPath } = options;
     // Find remaining routes
-    const serverPath = path.join(appBuildOutputPath, ".next", "standalone", packagePath, ".next", "server");
+    const serverPath = path.join(appBuildOutputPath, ".next/standalone", buildHelper.getPackagePath(options), ".next/server");
     // Find app dir routes
     if (fs.existsSync(path.join(serverPath, "app"))) {
         const appPath = path.join(serverPath, "app");
@@ -81,7 +80,7 @@ async function generateBundle(name, options, fnOptions) {
     //       `node_modules` inside `.next/standalone`, and others inside
     //       `.next/standalone/package/path` (ie. `.next`, `server.js`).
     //       We need to output the handler file inside the package path.
-    const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
+    const packagePath = buildHelper.getPackagePath(options);
     fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });
     const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
     fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outputPath, packagePath, "cache.cjs"));
@@ -113,7 +112,7 @@ async function generateBundle(name, options, fnOptions) {
         buildHelper.compareSemver(options.nextVersion, "13.4.1") <= 0;
     const overrides = fnOptions.override ?? {};
     const isBefore13413 = buildHelper.compareSemver(options.nextVersion, "13.4.13") <= 0;
-    const isAfter141 = buildHelper.compareSemver(options.nextVersion, "14.0.4") >= 0;
+    const isAfter141 = buildHelper.compareSemver(options.nextVersion, "14.1") >= 0;
     const disableRouting = isBefore13413 || config.middleware?.external;
     const plugins = [
         openNextReplacementPlugin({

package/dist/cli/build/patches/ast/patch-vercel-og-library.js

@@ -11,13 +11,14 @@ import { patchVercelOgFallbackFont, patchVercelOgImport } from "./vercel-og.js";
  */
 export function patchVercelOgLibrary(buildOpts) {
     const { appBuildOutputPath, outputDir } = buildOpts;
-    const packagePath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts));
+    const functionsPath = path.join(outputDir, "server-functions/default");
+    const packagePath = path.join(functionsPath, getPackagePath(buildOpts));
     for (const traceInfoPath of globSync(path.join(appBuildOutputPath, ".next/server/**/*.nft.json"))) {
         const traceInfo = JSON.parse(readFileSync(traceInfoPath, { encoding: "utf8" }));
         const tracedNodePath = traceInfo.files.find((p) => p.endsWith("@vercel/og/index.node.js"));
         if (!tracedNodePath)
             continue;
-        const outputDir = path.join(packagePath, "node_modules/next/dist/compiled/@vercel/og");
+        const outputDir = getOutputDir({ functionsPath, packagePath });
         const outputEdgePath = path.join(outputDir, "index.edge.js");
         // Ensure the edge version is available in the OpenNext node_modules.
         if (!existsSync(outputEdgePath)) {
@@ -37,3 +38,11 @@ export function patchVercelOgLibrary(buildOpts) {
         writeFileSync(routeFilePath, node.commitEdits(edits));
     }
 }
+function getOutputDir(opts) {
+    const vercelOgNodeModulePath = "node_modules/next/dist/compiled/@vercel/og";
+    const packageOutputPath = path.join(opts.packagePath, vercelOgNodeModulePath);
+    if (existsSync(packageOutputPath)) {
+        return packageOutputPath;
+    }
+    return path.join(opts.functionsPath, vercelOgNodeModulePath);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"