@opennextjs/cloudflare 1.18.0 → 1.18.1

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

@@ -32,6 +32,11 @@ export function patchVercelOgLibrary(buildOpts) {
         if (!existsSync(outputEdgePath)) {
             const tracedEdgePath = path.join(path.dirname(traceInfoPath), tracedNodePath.replace("index.node.js", "index.edge.js"));
             copyFileSync(tracedEdgePath, outputEdgePath);
+            // On Next 16.2 and above, we also need to copy the yoga.wasm file used by the library.
+            const tracedWasmPath = path.join(path.dirname(traceInfoPath), tracedNodePath.replace("index.node.js", "yoga.wasm"));
+            if (existsSync(tracedWasmPath)) {
+                copyFileSync(tracedWasmPath, path.join(outputDir, "yoga.wasm"));
+            }
         }
         // Change font fetches in the library to use imports.
         {

package/dist/cli/build/patches/plugins/dynamic-requires.d.ts

@@ -1,3 +1,4 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function getRequires(idVariable: string, files: string[], serverDir: string): string;
 export declare function inlineDynamicRequires(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/dynamic-requires.js

@@ -25,9 +25,13 @@ async function getAppPathsManifests(serverDir) {
 function getServerDir(buildOpts) {
     return join(buildOpts.outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
 }
-function getRequires(idVariable, files, serverDir) {
+export function getRequires(idVariable, files, serverDir) {
     // Inline fs access and dynamic requires that are not supported by workerd.
-    return files
+    // Sort by path length descending so longer (more specific) paths match first.
+    // Without this, `/test/app/page.js` could match the `.endsWith("app/page.js")`
+    // check for `/` before reaching the correct `.endsWith("test/app/page.js")` check.
+    const sorted = [...files].sort((a, b) => b.length - a.length);
+    return sorted
         .map((file) => `
     if (${idVariable}.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)}).endsWith(${JSON.stringify(normalizePath(file))})) {
       return require(${JSON.stringify(join(serverDir, file))});
@@ -93,7 +97,9 @@ async function getRequirePageRule(buildOpts) {
     const pagesManifests = await getPagesManifests(serverDir);
     const appPathsManifests = await getAppPathsManifests(serverDir);
     const manifests = pagesManifests.concat(appPathsManifests);
-    const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
+    // Sort html files by path length descending so longer (more specific) paths
+    // match first, preventing suffix collisions in the `.endsWith()` chain (see #1156).
+    const htmlFiles = manifests.filter((file) => file.endsWith(".html")).sort((a, b) => b.length - a.length);
     const jsFiles = manifests.filter((file) => file.endsWith(".js"));
     return {
         rule: {

package/dist/cli/build/patches/plugins/load-manifest.js

@@ -78,7 +78,10 @@ async function getEvalManifestRule(buildOpts) {
     const manifests = await glob(join(baseDir, "**/*_client-reference-manifest.js"), {
         windowsPathsNoEscape: true,
     });
-    const returnManifests = manifests
+    // Sort by path length descending so longer (more specific) paths match first,
+    // preventing suffix collisions in the `.endsWith()` chain (see #1156).
+    const sortedManifests = [...manifests].sort((a, b) => b.length - a.length);
+    const returnManifests = sortedManifests
         .map((manifest) => {
         const endsWith = normalizePath(relative(baseDir, manifest));
         const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");

package/package.json

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