fix: return route pattern from router.pathname, not resolved path

packages/vinext/src/build/static-export.ts

@@ -18,7 +18,7 @@
  *   - Dynamic routes without generateStaticParams → build error
  */
 import type { ViteDevServer } from "vite";
-import type { Route } from "../routing/pages-router.js";
+import { patternToNextFormat, type Route } from "../routing/pages-router.js";
 import type { AppRoute } from "../routing/app-router.js";
 import type { ResolvedNextConfig } from "../config/next-config.js";
 import { safeJsonStringify } from "../server/html.js";
@@ -277,7 +277,7 @@ async function renderStaticPage(options: RenderStaticPageOptions): Promise<strin
   // Set SSR context for router shim
   if (typeof routerShim.setSSRContext === "function") {
     routerShim.setSSRContext({
-      pathname: urlPath,
+      pathname: patternToNextFormat(route.pattern),
       query: params,
       asPath: urlPath,
     });

packages/vinext/src/entries/pages-server-entry.ts

@@ -715,7 +715,7 @@ async function _renderPage(request, url, manifest) {
   try {
     if (typeof setSSRContext === "function") {
       setSSRContext({
-        pathname: routeUrl.split("?")[0],
+        pathname: patternToNextFormat(route.pattern),
         query: { ...params, ...parseQuery(routeUrl) },
         asPath: routeUrl,
         locale: locale,

packages/vinext/src/server/dev-server.ts

@@ -365,7 +365,7 @@ export function createSSRHandler(
                         const routerShim = await server.ssrLoadModule("next/router");
                         if (typeof routerShim.setSSRContext === "function") {
                           routerShim.setSSRContext({
-                            pathname: localeStrippedUrl.split("?")[0],
+                            pathname: patternToNextFormat(route.pattern),
                             query: { ...params, ...parseQuery(url) },
                             asPath: url,
                             locale: locale ?? i18nConfig?.defaultLocale,

packages/vinext/src/shims/router.ts

@@ -279,7 +279,11 @@ function getPathnameAndQuery(): {
     }
     return { pathname: "/", query: {}, asPath: "/" };
   }
-  const pathname = stripBasePath(window.location.pathname, __basePath);
+  const resolvedPath = stripBasePath(window.location.pathname, __basePath);
+  // In Next.js, router.pathname is the route pattern (e.g., "/posts/[id]"),
+  // not the resolved path ("/posts/42"). __NEXT_DATA__.page holds the route
+  // pattern and is updated by navigateClient() on every client-side navigation.
+  const pathname = window.__NEXT_DATA__?.page ?? resolvedPath;
   const routeQuery: Record<string, string | string[]> = {};
   // Include dynamic route params from __NEXT_DATA__ (e.g., { id: "42" } from /posts/[id]).
   // Only include keys that are part of the route pattern (not stale query params).
@@ -302,7 +306,8 @@ function getPathnameAndQuery(): {
     addQueryParam(searchQuery, key, value);
   }
   const query = { ...searchQuery, ...routeQuery };
-  const asPath = pathname + window.location.search + window.location.hash;
+  // asPath uses the resolved browser path, not the route pattern
+  const asPath = resolvedPath + window.location.search + window.location.hash;
   return { pathname, query, asPath };
 }
 

tests/__snapshots__/entry-templates.test.ts.snap

@@ -18128,7 +18128,7 @@ async function _renderPage(request, url, manifest) {
   try {
     if (typeof setSSRContext === "function") {
       setSSRContext({
-        pathname: routeUrl.split("?")[0],
+        pathname: patternToNextFormat(route.pattern),
         query: { ...params, ...parseQuery(routeUrl) },
         asPath: routeUrl,
         locale: locale,

tests/e2e/pages-router/dynamic-routes.spec.ts

@@ -6,8 +6,8 @@ test.describe("Dynamic routes with getServerSideProps", () => {
   test("renders post page with dynamic id from GSSP", async ({ page }) => {
     await page.goto(`${BASE}/posts/123`);
     await expect(page.locator('[data-testid="post-title"]')).toHaveText("Post: 123");
-    // vinext returns the resolved pathname (not the route pattern)
-    await expect(page.locator('[data-testid="pathname"]')).toHaveText("Pathname: /posts/123");
+    // router.pathname returns the route pattern, not the resolved path
+    await expect(page.locator('[data-testid="pathname"]')).toHaveText("Pathname: /posts/[id]");
     await expect(page.locator('[data-testid="query"]')).toHaveText("Query ID: 123");
   });
 

tests/e2e/pages-router/navigation.spec.ts

@@ -75,8 +75,7 @@ test.describe("Client-side navigation", () => {
     await expect(page.locator('[data-testid="as-path"]')).toHaveText(
       "As Path: /posts/42?from=hook",
     );
-    // TODO(#462): after implementing two-value url/as navigation, assert that
-    // router.pathname stays as the route pattern (/posts/[id]) not the resolved path.
+    await expect(page.locator('[data-testid="pathname"]')).toHaveText("Pathname: /posts/[id]");
     expect(page.url()).toBe(`${BASE}/posts/42?from=hook`);
   });
 

tests/pages-router.test.ts

@@ -105,7 +105,7 @@ describe("Pages Router integration", () => {
     expect(html).toMatch(/Post:\s*(<!--\s*-->)?\s*42/);
     expect(html).toContain("post-title");
     // Router should have correct pathname and query during SSR
-    expect(html).toMatch(/Pathname:\s*(<!--\s*-->)?\s*\/posts\/42/);
+    expect(html).toMatch(/Pathname:\s*(<!--\s*-->)?\s*\/posts\/\[id\]/);
     expect(html).toMatch(/Query ID:\s*(<!--\s*-->)?\s*42/);
   });