vinext 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/server/middleware-path-to-regexp.js

@@ -0,0 +1,228 @@
+//#region src/server/middleware-path-to-regexp.ts
+function lexer(value) {
+	const tokens = [];
+	let index = 0;
+	while (index < value.length) {
+		const character = value[index];
+		if (character === "*" || character === "+" || character === "?") {
+			tokens.push({
+				type: "MODIFIER",
+				index,
+				value: value[index++]
+			});
+			continue;
+		}
+		if (character === "\\") {
+			tokens.push({
+				type: "ESCAPED_CHAR",
+				index: index++,
+				value: value[index++]
+			});
+			continue;
+		}
+		if (character === "{") {
+			tokens.push({
+				type: "OPEN",
+				index,
+				value: value[index++]
+			});
+			continue;
+		}
+		if (character === "}") {
+			tokens.push({
+				type: "CLOSE",
+				index,
+				value: value[index++]
+			});
+			continue;
+		}
+		if (character === ":") {
+			let name = "";
+			let nameEnd = index + 1;
+			while (nameEnd < value.length) {
+				const code = value.charCodeAt(nameEnd);
+				if (code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || code === 95) {
+					name += value[nameEnd++];
+					continue;
+				}
+				break;
+			}
+			if (!name) throw new TypeError(`Missing parameter name at ${index}`);
+			tokens.push({
+				type: "NAME",
+				index,
+				value: name
+			});
+			index = nameEnd;
+			continue;
+		}
+		if (character === "(") {
+			let depth = 1;
+			let pattern = "";
+			let patternEnd = index + 1;
+			if (value[patternEnd] === "?") throw new TypeError(`Pattern cannot start with "?" at ${patternEnd}`);
+			while (patternEnd < value.length) {
+				if (value[patternEnd] === "\\") {
+					pattern += value[patternEnd++] + value[patternEnd++];
+					continue;
+				}
+				if (value[patternEnd] === ")") {
+					depth--;
+					if (depth === 0) {
+						patternEnd++;
+						break;
+					}
+				} else if (value[patternEnd] === "(") {
+					depth++;
+					if (value[patternEnd + 1] !== "?") throw new TypeError(`Capturing groups are not allowed at ${patternEnd}`);
+				}
+				pattern += value[patternEnd++];
+			}
+			if (depth) throw new TypeError(`Unbalanced pattern at ${index}`);
+			if (!pattern) throw new TypeError(`Missing pattern at ${index}`);
+			tokens.push({
+				type: "PATTERN",
+				index,
+				value: pattern
+			});
+			index = patternEnd;
+			continue;
+		}
+		tokens.push({
+			type: "CHAR",
+			index,
+			value: value[index++]
+		});
+	}
+	tokens.push({
+		type: "END",
+		index,
+		value: ""
+	});
+	return tokens;
+}
+function parseMiddlewarePath(value) {
+	const tokens = lexer(value);
+	const result = [];
+	const prefixes = "./";
+	const delimiter = "/#?";
+	let key = 0;
+	let index = 0;
+	let path = "";
+	const tryConsume = (type) => {
+		if (index < tokens.length && tokens[index].type === type) return tokens[index++].value;
+	};
+	const mustConsume = (type) => {
+		const consumed = tryConsume(type);
+		if (consumed !== void 0) return consumed;
+		const next = tokens[index];
+		throw new TypeError(`Unexpected ${next.type} at ${next.index}, expected ${type}`);
+	};
+	const consumeText = () => {
+		let text = "";
+		let consumed;
+		while ((consumed = tryConsume("CHAR") ?? tryConsume("ESCAPED_CHAR")) !== void 0) text += consumed;
+		return text;
+	};
+	const containsDelimiter = (text) => {
+		for (const character of delimiter) if (text.includes(character)) return true;
+		return false;
+	};
+	const defaultPattern = (prefix) => {
+		const previous = result[result.length - 1];
+		const previousText = prefix || (typeof previous === "string" ? previous : "");
+		if (previous && !previousText) {
+			const name = typeof previous === "string" ? previous : previous.name;
+			throw new TypeError(`Must have text between two parameters, missing text after "${name}"`);
+		}
+		if (!previousText || containsDelimiter(previousText)) return "[^\\/#\\?]+?";
+		return `(?:(?!${escapeRegex(previousText)})[^\\/#\\?])+?`;
+	};
+	while (index < tokens.length) {
+		const character = tryConsume("CHAR");
+		const name = tryConsume("NAME");
+		const pattern = tryConsume("PATTERN");
+		if (name !== void 0 || pattern !== void 0) {
+			let prefix = character ?? "";
+			if (!prefixes.includes(prefix)) {
+				path += prefix;
+				prefix = "";
+			}
+			if (path) {
+				result.push(path);
+				path = "";
+			}
+			result.push({
+				name: name ?? key++,
+				prefix,
+				suffix: "",
+				pattern: pattern ?? defaultPattern(prefix),
+				modifier: tryConsume("MODIFIER") ?? ""
+			});
+			continue;
+		}
+		const text = character ?? tryConsume("ESCAPED_CHAR");
+		if (text !== void 0) {
+			path += text;
+			continue;
+		}
+		if (path) {
+			result.push(path);
+			path = "";
+		}
+		if (tryConsume("OPEN") !== void 0) {
+			const prefix = consumeText();
+			const groupName = tryConsume("NAME") ?? "";
+			const groupPattern = tryConsume("PATTERN") ?? "";
+			const suffix = consumeText();
+			mustConsume("CLOSE");
+			result.push({
+				name: groupName || (groupPattern ? key++ : ""),
+				pattern: groupName && !groupPattern ? defaultPattern(prefix) : groupPattern,
+				prefix,
+				suffix,
+				modifier: tryConsume("MODIFIER") ?? ""
+			});
+			continue;
+		}
+		mustConsume("END");
+	}
+	return result;
+}
+function escapeRegex(value) {
+	return value.replace(/([.+*?=^!:${}()[\]|/\\])/g, "\\$1");
+}
+function normalizeMiddlewarePathTokens(tokens) {
+	return tokens.map((token) => {
+		if (typeof token === "object" && (token.modifier === "*" || token.modifier === "+") && token.prefix === "" && token.suffix === "") return {
+			...token,
+			prefix: "/"
+		};
+		return token;
+	});
+}
+function middlewarePathTokensToRegExp(tokens) {
+	const delimiterRegex = `[${escapeRegex("/#?")}]`;
+	let route = "^";
+	for (const token of tokens) {
+		if (typeof token === "string") {
+			route += escapeRegex(token);
+			continue;
+		}
+		const prefix = escapeRegex(token.prefix);
+		const suffix = escapeRegex(token.suffix);
+		if (token.pattern) if (prefix || suffix) if (token.modifier === "+" || token.modifier === "*") {
+			const optional = token.modifier === "*" ? "?" : "";
+			route += `(?:${prefix}((?:${token.pattern})(?:${suffix}${prefix}(?:${token.pattern}))*)${suffix})${optional}`;
+		} else route += `(?:${prefix}(${token.pattern})${suffix})${token.modifier}`;
+		else {
+			if (token.modifier === "+" || token.modifier === "*") throw new TypeError(`Can not repeat "${token.name}" without a prefix and suffix`);
+			route += `(${token.pattern})${token.modifier}`;
+		}
+		else route += `(?:${prefix}${suffix})${token.modifier}`;
+	}
+	route += `${delimiterRegex}?$`;
+	return new RegExp(route, "i");
+}
+//#endregion
+export { middlewarePathTokensToRegExp, normalizeMiddlewarePathTokens, parseMiddlewarePath };

package/dist/server/middleware-runtime.js

@@ -112,10 +112,11 @@ function resolveMiddlewarePathname(request) {
 		return badRequestResponse();
 	}
 }
-function createNextRequest(request, normalizedPathname, i18nConfig, basePath, trailingSlash, hadBasePath) {
+function createNextRequest(request, i18nConfig, basePath, trailingSlash, hadBasePath) {
 	const url = new URL(request.url);
 	let mwRequest = request.body && !request.bodyUsed ? request.clone() : request;
-	const mwPathname = basePath && hadBasePath ? addBasePathToPathname(normalizedPathname, basePath) : normalizedPathname;
+	const requestPathname = url.pathname;
+	const mwPathname = basePath && hadBasePath && !hasBasePath(requestPathname, basePath) ? addBasePathToPathname(requestPathname, basePath) : requestPathname;
 	if (mwPathname !== url.pathname) {
 		const mwUrl = new URL(url);
 		mwUrl.pathname = mwPathname;
@@ -141,7 +142,7 @@ async function executeMiddleware(options) {
 	const hadBasePath = options.hadBasePath ?? (!options.basePath || hasBasePath(new URL(options.request.url).pathname, options.basePath));
 	const matchPathname = options.basePath ? stripBasePath(normalizedPathname, options.basePath) : normalizedPathname;
 	if (!matchesMiddleware(matchPathname, middlewareMatcher(options.module), options.request, options.i18nConfig)) return { continue: true };
-	const nextRequest = createNextRequest(options.request, normalizedPathname, options.i18nConfig, options.basePath, options.trailingSlash, hadBasePath);
+	const nextRequest = createNextRequest(options.request, options.i18nConfig, options.basePath, options.trailingSlash, hadBasePath);
 	if (options.isDataRequest) Object.defineProperty(nextRequest, "__isData", {
 		enumerable: false,
 		value: true

package/dist/server/middleware.d.ts

@@ -58,6 +58,6 @@ declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher,
  * @param request - The incoming Request object
  * @returns Middleware result describing what action to take
  */
-declare function runMiddleware(runner: ModuleRunner, middlewarePath: string, request: Request, i18nConfig?: NextI18nConfig | null, basePath?: string, trailingSlash?: boolean, isDataRequest?: boolean): Promise<MiddlewareResult>;
+declare function runMiddleware(runner: ModuleRunner, middlewarePath: string, request: Request, i18nConfig?: NextI18nConfig | null, basePath?: string, trailingSlash?: boolean, isDataRequest?: boolean, normalizedPathname?: string): Promise<MiddlewareResult>;
 //#endregion
 export { findMiddlewareFile, isProxyFile, matchPattern, matchesMiddleware, resolveMiddlewareHandler, runMiddleware };

package/dist/server/middleware.js

@@ -94,7 +94,7 @@ function isMiddlewareModule(value) {
 * @param request - The incoming Request object
 * @returns Middleware result describing what action to take
 */
-async function runMiddleware(runner, middlewarePath, request, i18nConfig, basePath, trailingSlash, isDataRequest) {
+async function runMiddleware(runner, middlewarePath, request, i18nConfig, basePath, trailingSlash, isDataRequest, normalizedPathname) {
 	const mod = await runner.import(middlewarePath);
 	if (!isMiddlewareModule(mod)) throw new Error(`Middleware module "${middlewarePath}" did not evaluate to an object.`);
 	return runGeneratedMiddleware({
@@ -106,6 +106,7 @@ async function runMiddleware(runner, middlewarePath, request, i18nConfig, basePa
 		isDataRequest,
 		isProxy: isProxyFile(middlewarePath),
 		module: mod,
+		normalizedPathname,
 		request,
 		trailingSlash
 	});

package/dist/server/pages-data-route.d.ts

@@ -34,6 +34,16 @@ type NextDataMatch = {
  * even when the buildId is wrong (so we can still return a 404 JSON response).
  */
 declare function isNextDataPathname(pathname: string): boolean;
+/**
+ * WHATWG URL parsing removes TAB, LF, and CR characters. Reject paths where
+ * that normalization would manufacture the internal Pages data namespace.
+ */
+declare function urlParserCreatesPagesDataPath(pathname: string): boolean;
+/**
+ * Keep URL-parser-ignored characters encoded until route matching decodes the
+ * captured parameter. Passing them literally to `new URL()` would remove them.
+ */
+declare function encodeUrlParserIgnoredCharacters(pathname: string): string;
 /**
  * Parse `/_next/data/<buildId>/<...page>.json` and return the normalized page
  * pathname. Returns `null` if the pathname does not match the pattern or if
@@ -120,4 +130,4 @@ type NormalizePagesDataRequestResult = {
  */
 declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string, trailingSlash?: boolean): NormalizePagesDataRequestResult;
 //#endregion
-export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname, urlParserCreatesPagesDataPath };

package/dist/server/pages-data-route.js

@@ -32,6 +32,21 @@ function isNextDataPathname(pathname) {
 	return pathname.startsWith(NEXT_DATA_PREFIX) && pathname.endsWith(NEXT_DATA_SUFFIX);
 }
 /**
+* WHATWG URL parsing removes TAB, LF, and CR characters. Reject paths where
+* that normalization would manufacture the internal Pages data namespace.
+*/
+function urlParserCreatesPagesDataPath(pathname) {
+	const parsedPathname = pathname.replaceAll("	", "").replaceAll("\n", "").replaceAll("\r", "");
+	return pathname !== parsedPathname && !isNextDataPathname(pathname) && isNextDataPathname(parsedPathname);
+}
+/**
+* Keep URL-parser-ignored characters encoded until route matching decodes the
+* captured parameter. Passing them literally to `new URL()` would remove them.
+*/
+function encodeUrlParserIgnoredCharacters(pathname) {
+	return pathname.replaceAll("	", "%09").replaceAll("\n", "%0A").replaceAll("\r", "%0D");
+}
+/**
 * Parse `/_next/data/<buildId>/<...page>.json` and return the normalized page
 * pathname. Returns `null` if the pathname does not match the pattern or if
 * the buildId segment does not match the server's buildId.
@@ -168,4 +183,4 @@ function normalizePagesDataRequest(request, buildId, basePath = "", trailingSlas
 	};
 }
 //#endregion
-export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname, urlParserCreatesPagesDataPath };

package/dist/server/pages-get-initial-props.d.ts

@@ -1,3 +1,5 @@
+import { NextRouter } from "../shims/router.js";
+
 //#region src/server/pages-get-initial-props.d.ts
 type PagesGetInitialPropsContext = {
   req?: unknown;
@@ -10,6 +12,16 @@ type PagesGetInitialPropsContext = {
   locales?: string[];
   defaultLocale?: string;
 } & Record<string, unknown>;
+type PagesGetInitialPropsRouter = Omit<Pick<NextRouter, "route" | "pathname" | "query" | "asPath">, "query"> & {
+  query: Record<string, unknown>;
+};
+/**
+ * Build the URL-state subset of Next.js's ServerRouter used by isolated
+ * initial-props helpers. Real request handlers pass their full `next/router`
+ * instance; this fallback keeps direct helper callers and tests aligned with
+ * the same required fields.
+ */
+declare function createPagesGetInitialPropsRouter(pathname: string, query: Record<string, unknown>, asPath: string): PagesGetInitialPropsRouter;
 declare function hasPagesGetInitialProps(component: unknown): boolean;
 declare function isResponseSent(res: unknown): boolean;
 declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
@@ -47,7 +59,8 @@ type DevAppInitialPropsContext = {
   res: unknown;
   pathname: string;
   query: Record<string, unknown>;
-  asPath: string;
+  asPath: string; /** The request-scoped `next/router` server instance when available. */
+  router?: PagesGetInitialPropsRouter;
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
@@ -64,4 +77,4 @@ type DevAppInitialPropsContext = {
  */
 declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
 //#endregion
-export { DevAppInitialPropsContext, DevAppInitialPropsResult, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };
+export { DevAppInitialPropsContext, DevAppInitialPropsResult, PagesGetInitialPropsRouter, createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-get-initial-props.js

@@ -1,4 +1,18 @@
 //#region src/server/pages-get-initial-props.ts
+/**
+* Build the URL-state subset of Next.js's ServerRouter used by isolated
+* initial-props helpers. Real request handlers pass their full `next/router`
+* instance; this fallback keeps direct helper callers and tests aligned with
+* the same required fields.
+*/
+function createPagesGetInitialPropsRouter(pathname, query, asPath) {
+	return {
+		route: pathname.replace(/\/$/, "") || "/",
+		pathname,
+		query,
+		asPath
+	};
+}
 function isObjectLike(value) {
 	return typeof value === "object" && value !== null || typeof value === "function";
 }
@@ -61,11 +75,7 @@ async function loadDevAppInitialProps(ctx) {
 	const initialProps = await loadPagesGetInitialProps(ctx.appComponent, {
 		AppTree: ctx.appTree,
 		Component: ctx.component,
-		router: {
-			pathname: ctx.pathname,
-			query: ctx.query,
-			asPath: ctx.asPath
-		},
+		router: ctx.router ?? createPagesGetInitialPropsRouter(ctx.pathname, ctx.query, ctx.asPath),
 		ctx: {
 			req: ctx.req,
 			res: ctx.res,
@@ -89,4 +99,4 @@ async function loadDevAppInitialProps(ctx) {
 	};
 }
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };
+export { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-page-data.d.ts

@@ -3,6 +3,7 @@ import { VinextNextData } from "../client/vinext-next-data.js";
 import { CachedPagesValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PagesPreviewData } from "./pages-preview.js";
+import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 
@@ -161,7 +162,8 @@ type ResolvePagesPageDataOptions = {
   deploymentId?: string;
   htmlLimitedBots?: string;
   pageModule: PagesPageModule;
-  AppComponent?: unknown;
+  AppComponent?: unknown; /** The request-scoped `next/router` server instance when available. */
+  router?: PagesGetInitialPropsRouter;
   params: Record<string, unknown>;
   query: Record<string, unknown>;
   asPath?: string;

package/dist/server/pages-page-data.js

@@ -1,4 +1,6 @@
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
+import { isDangerousScheme } from "../shims/url-safety.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
@@ -6,7 +8,7 @@ import { decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue } from "./isr-cache.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
-import { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
@@ -57,11 +59,7 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 	const initialProps = await loadPagesGetInitialProps(options.AppComponent, {
 		AppTree: options.createAppTree ?? options.createPageElement,
 		Component: options.pageModule.default,
-		router: {
-			pathname: options.routePattern,
-			query: options.query,
-			asPath: options.asPath ?? options.routeUrl
-		},
+		router: options.router ?? createPagesGetInitialPropsRouter(options.routePattern, options.query, options.asPath ?? options.routeUrl),
 		ctx: {
 			req,
 			res,
@@ -111,6 +109,17 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 */
 function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }) {
 	const destination = options.sanitizeDestination(redirect.destination);
+	if (isDangerousScheme(destination)) {
+		const headers = new Headers({
+			"Cache-Control": "private, no-cache, no-store, max-age=0, must-revalidate",
+			"Content-Type": "text/plain; charset=utf-8"
+		});
+		if (options.deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, options.deploymentId);
+		return new Response("Invalid redirect destination", {
+			status: 500,
+			headers
+		});
+	}
 	if (options.isDataReq) {
 		const init = { headers: {} };
 		if (options.deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = options.deploymentId;
@@ -152,7 +161,7 @@ function getPagesRouteParams(routePattern) {
 	}).filter((param) => param !== null);
 }
 function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl) {
-	if (typeof pathEntry === "string") return normalizeStaticPathname(pathEntry) === normalizeStaticPathname(routeUrl);
+	if (typeof pathEntry === "string") return normalizePathnameForRouteMatch(normalizeStaticPathname(pathEntry)) === normalizePathnameForRouteMatch(normalizeStaticPathname(routeUrl));
 	const entryParams = pathEntry.params;
 	if (entryParams === void 0 || entryParams === null) return false;
 	return routeParams.every(({ key, repeat, optional }) => {

package/dist/server/pages-page-handler.d.ts

@@ -1,4 +1,5 @@
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
+import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesPageModule } from "./pages-page-data.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -23,7 +24,7 @@ type I18nConfig = {
     domain: string;
     defaultLocale: string;
     locales?: string[];
-    http?: boolean;
+    http?: true;
   }>;
 } | null;
 type VinextConfigSubset = {
@@ -60,7 +61,8 @@ type CreatePagesPageHandlerOptions = {
    */
   getPagesNavigationIsReadyFromSerializedState: ((routePattern: string | undefined, searchString: string, nextData?: Record<string, unknown>) => boolean) | null; /** `setI18nContext` from `vinext/i18n-context`. */
   setI18nContext: ((ctx: Record<string, unknown>) => void) | null; /** `wrapWithRouterContext` from `next/router`. */
-  wrapWithRouterContext: ((element: ReactNode) => ReactNode) | null; /** `resetSSRHead` from `next/head`. */
+  wrapWithRouterContext: ((element: ReactNode) => ReactNode) | null; /** Request-scoped `next/router` server instance. */
+  router?: PagesGetInitialPropsRouter; /** `resetSSRHead` from `next/head`. */
   resetSSRHead: (() => void) | undefined; /** `getSSRHeadHTML` from `next/head`. */
   getSSRHeadHTML: (() => string) | undefined; /** `setDocumentInitialHead` from `next/head`. */
   setDocumentInitialHead: ((head: ReactNode[]) => void) | undefined; /** `flushPreloads` from `next/dynamic`. */

package/dist/server/pages-page-handler.js

@@ -53,7 +53,7 @@ function buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domain
 * accepts the same options shape the generated entry always passed inline.
 */
 function createPagesPageHandler(opts) {
-	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, renderIsrPassToStringAsync, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
+	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, router, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, renderIsrPassToStringAsync, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
 	function renderToStringAsync(element) {
 		return renderToReadableStream(element).then((stream) => new Response(stream).text());
 	}
@@ -138,15 +138,18 @@ function createPagesPageHandler(opts) {
 			} else return buildDefaultPagesNotFoundResponse();
 		}
 		const { route, params } = match;
-		const routerAsPath = i18nConfig ? extractLocaleFromUrl(renderAsPath ?? routeUrl, i18nConfig, locale).url : renderAsPath ?? routeUrl;
+		const pageModule = route.module;
+		const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
+		const isStaticPropsRender = isStaticPropsRoute && typeof pageModule.getServerSideProps !== "function";
+		const renderRouteUrl = isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
+		const routerAsPathSource = isStaticPropsRender ? renderRouteUrl : renderAsPath ?? renderRouteUrl;
+		const routerAsPath = i18nConfig ? extractLocaleFromUrl(routerAsPathSource, i18nConfig, locale).url : routerAsPathSource;
 		return runWithRequestContext(createRequestContext({ executionContext: getRequestExecutionContext() }), async () => {
 			ensureFetchPatch();
 			try {
 				const routePattern = patternToNextFormat(route.pattern);
 				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
-				const query = mergeRouteParamsIntoQuery(parseQueryString(routeUrl), params);
-				const pageModule = route.module;
-				const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
+				const query = mergeRouteParamsIntoQuery(parseQueryString(renderRouteUrl), params);
 				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
 				const preview = isStaticPropsRoute || typeof pageModule.getServerSideProps === "function" ? getPagesPreviewState(request.headers.get("cookie"), { isOnDemandRevalidate }) : {
 					data: false,
@@ -161,7 +164,7 @@ function createPagesPageHandler(opts) {
 					}),
 					...previewData === false ? {} : { isPreview: true }
 				};
-				const navigationIsReady = typeof getPagesNavigationIsReadyFromSerializedState === "function" ? getPagesNavigationIsReadyFromSerializedState(routePattern, new URL(routerAsPath, "http://_").search, pagesNextData) : true;
+				const navigationIsReady = isStaticPropsRender ? false : typeof getPagesNavigationIsReadyFromSerializedState === "function" ? getPagesNavigationIsReadyFromSerializedState(routePattern, originalRequestUrl.search, pagesNextData) : true;
 				function applySSRContext(extra) {
 					if (typeof setSSRContext === "function") setSSRContext({
 						pathname: routePattern,
@@ -204,7 +207,7 @@ function createPagesPageHandler(opts) {
 						pageModuleUrl,
 						appModuleUrl,
 						hasMiddleware,
-						routeUrl
+						routeUrl: renderRouteUrl
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
@@ -253,6 +256,7 @@ function createPagesPageHandler(opts) {
 					previewData,
 					pageModule,
 					AppComponent,
+					router,
 					params,
 					query,
 					asPath: routerAsPath,
@@ -260,7 +264,7 @@ function createPagesPageHandler(opts) {
 					renderIsrPassToStringAsync,
 					route: { isDynamic: route.isDynamic },
 					routePattern,
-					routeUrl,
+					routeUrl: renderRouteUrl,
 					runInFreshUnifiedContext(callback) {
 						return runWithRequestContext(createRequestContext({ executionContext: null }), async () => {
 							ensureFetchPatch();
@@ -309,15 +313,10 @@ function createPagesPageHandler(opts) {
 				const documentReqRes = serializedPagesNextData.autoExport === true ? null : pageDataResult.documentReqRes ?? createPageReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
-				if (isFallbackRender && typeof setSSRContext === "function") setSSRContext({
-					pathname: routePattern,
-					query,
-					asPath: routerAsPath,
+				if (isFallbackRender) applySSRContext({
+					query: {},
+					asPath: routePattern,
 					navigationIsReady: false,
-					locale,
-					locales: i18nConfig ? i18nConfig.locales : void 0,
-					defaultLocale: currentDefaultLocale,
-					domainLocales,
 					isFallback: true
 				});
 				if (isDataReq) {
@@ -404,7 +403,7 @@ function createPagesPageHandler(opts) {
 					resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : void 0,
 					setDocumentInitialHead: typeof setDocumentInitialHead === "function" ? setDocumentInitialHead : void 0,
 					routePattern,
-					routeUrl,
+					routeUrl: renderRouteUrl,
 					safeJsonStringify,
 					scriptNonce,
 					statusCode: renderStatusCode,

package/dist/server/pages-page-response.js

@@ -72,7 +72,7 @@ function buildPagesNextDataScript(options) {
 	const nextDataPayload = {
 		props: options.props ?? { pageProps: options.pageProps },
 		page: options.routePattern,
-		query: options.params,
+		query: options.isFallback === true ? {} : options.params,
 		buildId: options.buildId,
 		isFallback: options.isFallback === true
 	};

package/dist/server/pages-readiness.d.ts

@@ -7,9 +7,9 @@ import { PagesPageModule } from "./pages-page-data.js";
  *
  * The initial `router.isReady` value for the `next/navigation` compat hooks is
  * derived from the page/_app data-fetching exports plus the configured-rewrites
- * flag, serialized into `__NEXT_DATA__`. The dev SSR handler and the production
- * Pages page handler must compute this identically so server HTML and client
- * hydration agree — see `getPagesNavigationIsReadyFromSerializedState` in
+ * flag. The client recomputes readiness from those flags and its live URL,
+ * matching the Pages Router constructor; server-only readiness remains in the
+ * request context. See `getPagesNavigationIsReadyFromSerializedState` in
  * `shims/router.ts`.
  */
 /**

package/dist/server/pages-request-pipeline.d.ts

@@ -44,6 +44,7 @@ type PagesPipelineDeps = {
   hasMiddleware: boolean;
   ctx?: unknown;
   rawSearch?: string;
+  configMatchPathname?: string;
   matchPageRoute?: ((pathname: string, request: Request) => PageRouteMatch | null) | null;
   runMiddleware?: ((request: Request, ctx: unknown, opts: {
     isDataRequest: boolean;