opennextjs · conico974 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
diff --git a/.changeset/twelve-turtles-trade.md b/.changeset/twelve-turtles-trade.md
@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix page router shared context to use the correct one
diff --git a/examples/playground14/e2e/head.spec.ts b/examples/playground14/e2e/head.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from "@playwright/test";
+
+test.describe("head properly populated", () => {
+  test("should properly populate the <head>", async ({ page }) => {
+    await page.goto("/head");
+    const title = await page.title();
+    const description = await page.locator('meta[name="description"]').getAttribute("content");
+    const favicon = await page.locator('link[rel="icon"]').getAttribute("href");
+    expect(title).toBe("SSR Head");
+    expect(description).toBe("SSR");
+    expect(favicon).toBe("/favicon.ico");
+  });
+});
diff --git a/examples/playground14/pages/head.tsx b/examples/playground14/pages/head.tsx
@@ -0,0 +1,23 @@
+import Head from "next/head";
+
+export function getServerSideProps() {
+  return {
+    props: {
+      time: new Date().toISOString(),
+    },
+  };
+}
+export default function Page({ time }) {
+  return (
+    <div>
+      <Head>
+        <title>SSR Head</title>
+        <meta name="description" content="SSR" />
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+      <div className="flex" data-testid="time">
+        Time: {time}
+      </div>
+    </div>
+  );
+}
diff --git a/examples/playground15/e2e/head.spec.ts b/examples/playground15/e2e/head.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from "@playwright/test";
+
+test.describe("head properly populated", () => {
+  test("should properly populate the <head>", async ({ page }) => {
+    await page.goto("/head");
+    const title = await page.title();
+    const description = await page.locator('meta[name="description"]').getAttribute("content");
+    const favicon = await page.locator('link[rel="icon"]').getAttribute("href");
+    expect(title).toBe("SSR Head");
+    expect(description).toBe("SSR");
+    expect(favicon).toBe("/favicon.ico");
+  });
+});
diff --git a/examples/playground15/pages/head.tsx b/examples/playground15/pages/head.tsx
@@ -0,0 +1,23 @@
+import Head from "next/head";
+
+export function getServerSideProps() {
+  return {
+    props: {
+      time: new Date().toISOString(),
+    },
+  };
+}
+export default function Page({ time }) {
+  return (
+    <div>
+      <Head>
+        <title>SSR Head</title>
+        <meta name="description" content="SSR" />
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+      <div className="flex" data-testid="time">
+        Time: {time}
+      </div>
+    </div>
+  );
+}
diff --git a/examples/playground15/tsconfig.json b/examples/playground15/tsconfig.json
@@ -17,7 +17,8 @@
         "name": "next"
       }
     ],
-    "target": "ES2017"
+    "target": "ES2017",
+    "strictNullChecks": true
   },
   "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx", "worker-configuration.d.ts"],
   "exclude": ["node_modules", "open-next.config.ts"]

diff --git a/packages/cloudflare/src/cli/build/bundle-server.ts b/packages/cloudflare/src/cli/build/bundle-server.ts
@@ -17,6 +17,7 @@ import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
+import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
@@ -93,6 +94,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
       fixRequire(updater),
       handleOptionalDependencies(optionalDependencies),
       patchInstrumentation(updater, buildOpts),
+      patchPagesRouterContext(buildOpts),
       inlineEvalManifest(updater, buildOpts),
       inlineFindDir(updater, buildOpts),
       inlineLoadManifest(updater, buildOpts),

diff --git a/packages/cloudflare/src/cli/build/patches/plugins/pages-router-context.ts b/packages/cloudflare/src/cli/build/patches/plugins/pages-router-context.ts
@@ -0,0 +1,40 @@
+/**
+ * ESBuild plugin to handle pages router context.
+ *
+ * We need to change the import path for the pages router context to use the one provided in `pages-runtime.prod.js`
+ */
+
+import { BuildOptions, compareSemver } from "@opennextjs/aws/build/helper.js";
+import type { OnResolveResult, PluginBuild } from "esbuild";
+
+export function patchPagesRouterContext(buildOpts: BuildOptions) {
+  const pathRegex = /^.*\/(?<CONTEXT>.*)\.shared-runtime$/;
+  const isAfter15 = compareSemver(buildOpts.nextVersion, ">=", "15.0.0");
+  const isAfter153 = compareSemver(buildOpts.nextVersion, ">=", "15.3.0");
+  const basePath = `next/dist/server/${isAfter15 ? "" : "future/"}route-modules/pages/vendored/contexts/`;
+  return {
+    name: "pages-router-context",
+    setup: (build: PluginBuild) => {
+      // We need to modify some imports (i.e. https://github.com/vercel/next.js/blob/48540b836642525b38a2cba40a92b4532c553a52/packages/next/src/server/require-hook.ts#L59-L68)
+      build.onResolve(
+        { filter: /.*shared-runtime/ },
+        async ({ path, resolveDir, ...options }): Promise<OnResolveResult> => {
+          // If we are after 15.3, we don't need to patch the context anymore
+          if (isAfter153) {
+            return {};
+          }
+          const match = path.match(pathRegex);
+          if (match && match.groups?.CONTEXT) {
+            const newPath = `${basePath}${match.groups.CONTEXT}.js`;
+            const result = await build.resolve(newPath, {
+              resolveDir,
+              ...options,
+            });
+            return result;
+          }
+          return {};
+        }
+      );
+    },
+  };
+}