vinext 0.1.3 → 0.1.5

package/dist/server/navigation-trace.d.ts

@@ -3,6 +3,7 @@ declare const NAVIGATION_TRACE_SCHEMA_VERSION = 0;
 type NavigationTraceSchemaVersion = 0;
 declare const NavigationTraceReasonCodes: {
   cacheProofRejected: "NC_CACHE_REJECT";
+  cacheReuseTokenRejected: "NC_CACHE_TOKEN_REJECT";
   commitCurrent: "NC_COMMIT";
   crossDocumentFlight: "NC_CROSS_DOC_FLIGHT";
   fetchFresh: "NC_FETCH_FRESH";
@@ -42,7 +43,7 @@ declare const NavigationTraceTransactionCodes: {
 type NavigationTraceReasonCode = (typeof NavigationTraceReasonCodes)[keyof typeof NavigationTraceReasonCodes];
 type NavigationTraceTransactionCode = (typeof NavigationTraceTransactionCodes)[keyof typeof NavigationTraceTransactionCodes];
 type NavigationTraceCode = NavigationTraceReasonCode | NavigationTraceTransactionCode;
-type NavigationTraceFieldName = "activeNavigationId" | "cacheProofCode" | "cacheProofMode" | "cacheProofReuseClass" | "cacheProofScope" | "currentRootLayoutTreePath" | "currentVisibleCommitVersion" | "nextRootLayoutTreePath" | "eventKind" | "fetchResultSource" | "freshFetchReason" | "operationLane" | "pendingOperationId" | "redirectDepth" | "redirectSignal" | "startedVisibleCommitVersion" | "startedNavigationId" | "targetHref" | "traverseDirection";
+type NavigationTraceFieldName = "activeNavigationId" | "cacheProofCode" | "cacheProofMode" | "cacheProofReuseClass" | "cacheProofScope" | "cacheReuseTokenReason" | "currentRootLayoutTreePath" | "currentVisibleCommitVersion" | "nextRootLayoutTreePath" | "eventKind" | "fetchResultSource" | "freshFetchReason" | "operationLane" | "pendingOperationId" | "redirectDepth" | "redirectSignal" | "startedVisibleCommitVersion" | "startedNavigationId" | "targetHref" | "traverseDirection";
 type NavigationTraceFieldValue = string | number | boolean | null;
 type NavigationTraceFields = Readonly<Partial<Record<NavigationTraceFieldName, NavigationTraceFieldValue>>>;
 type NavigationTraceEntry = Readonly<{

package/dist/server/navigation-trace.js

@@ -2,6 +2,7 @@
 const NAVIGATION_TRACE_SCHEMA_VERSION = 0;
 const NavigationTraceReasonCodes = {
 	cacheProofRejected: "NC_CACHE_REJECT",
+	cacheReuseTokenRejected: "NC_CACHE_TOKEN_REJECT",
 	commitCurrent: "NC_COMMIT",
 	crossDocumentFlight: "NC_CROSS_DOC_FLIGHT",
 	fetchFresh: "NC_FETCH_FRESH",

package/dist/server/open-redirect.d.ts

@@ -0,0 +1,12 @@
+//#region src/server/open-redirect.d.ts
+/**
+ * Returns true if a request pathname looks like a protocol-relative open
+ * redirect, in either literal or percent-encoded form.
+ *
+ * A pathname is considered "open redirect shaped" when its first segment,
+ * after decoding backslashes and encoded delimiters, would cause a browser
+ * to resolve a `Location` containing the pathname as protocol-relative.
+ */
+declare function isOpenRedirectShaped(rawPathname: string): boolean;
+//#endregion
+export { isOpenRedirectShaped };

package/dist/server/open-redirect.js

@@ -0,0 +1,21 @@
+//#region src/server/open-redirect.ts
+/**
+* Returns true if a request pathname looks like a protocol-relative open
+* redirect, in either literal or percent-encoded form.
+*
+* A pathname is considered "open redirect shaped" when its first segment,
+* after decoding backslashes and encoded delimiters, would cause a browser
+* to resolve a `Location` containing the pathname as protocol-relative.
+*/
+function isOpenRedirectShaped(rawPathname) {
+	if (!rawPathname.startsWith("/")) return false;
+	const afterSlash = rawPathname.slice(1);
+	if (afterSlash.startsWith("/") || afterSlash.startsWith("\\")) return true;
+	if (afterSlash.length >= 3 && afterSlash[0] === "%") {
+		const encoded = afterSlash.slice(0, 3).toLowerCase();
+		if (encoded === "%5c" || encoded === "%2f") return true;
+	}
+	return false;
+}
+//#endregion
+export { isOpenRedirectShaped };

package/dist/server/operation-token.d.ts

@@ -0,0 +1,40 @@
+//#region src/server/operation-token.d.ts
+type OperationLane = "hmr" | "navigation" | "prefetch" | "refresh" | "server-action" | "traverse";
+type OperationToken = {
+  operationId: number;
+  lane: OperationLane;
+  navigationId: number;
+  baseVisibleCommitVersion: number;
+  graphVersion: string | null;
+  deploymentVersion: string | null;
+  targetSnapshotFingerprint: string;
+  cacheVariantFingerprint?: string;
+};
+declare const verifiedOperationTokenBrand: unique symbol;
+type VerifiedOperationToken = OperationToken & {
+  readonly [verifiedOperationTokenBrand]: true;
+};
+type OperationTokenAuthority = {
+  activeNavigationId: number;
+  visibleCommitVersion: number;
+  graphVersion: string | null;
+  installedCacheVariantFingerprint: string | null;
+};
+type OperationTokenDimension = "navigation" | "visibleCommit" | "graphVersion" | "cacheVariant";
+type OperationTokenRejectionReason = "staleNavigation" | "staleVisibleCommit" | "graphVersionMismatch" | "graphVersionMissing" | "cacheVariantMismatch" | "cacheVariantMissing";
+type OperationTokenVerdict = {
+  readonly authorized: true;
+  readonly token: VerifiedOperationToken;
+} | {
+  readonly authorized: false;
+  readonly reason: OperationTokenRejectionReason;
+};
+type OperationTokenVerificationPolicy = {
+  check: readonly OperationTokenDimension[];
+  require: readonly OperationTokenDimension[];
+};
+declare function verifyOperationToken(token: OperationToken, authority: OperationTokenAuthority, policy: OperationTokenVerificationPolicy): OperationTokenVerdict;
+declare function verifyOperationTokenForCommit(token: OperationToken, authority: Pick<OperationTokenAuthority, "activeNavigationId" | "visibleCommitVersion">): OperationTokenVerdict;
+declare function verifyOperationTokenForCacheReuse(token: OperationToken, authority: Pick<OperationTokenAuthority, "graphVersion" | "installedCacheVariantFingerprint">): OperationTokenVerdict;
+//#endregion
+export { OperationLane, OperationToken, OperationTokenAuthority, OperationTokenRejectionReason, OperationTokenVerdict, OperationTokenVerificationPolicy, VerifiedOperationToken, verifyOperationToken, verifyOperationTokenForCacheReuse, verifyOperationTokenForCommit };

package/dist/server/operation-token.js

@@ -0,0 +1,85 @@
+//#region src/server/operation-token.ts
+const DIMENSION_ORDER = [
+	"navigation",
+	"visibleCommit",
+	"graphVersion",
+	"cacheVariant"
+];
+function evaluateDimension(dimension, token, authority) {
+	switch (dimension) {
+		case "navigation": return token.navigationId === authority.activeNavigationId ? { kind: "satisfied" } : {
+			kind: "mismatch",
+			reason: "staleNavigation"
+		};
+		case "visibleCommit": return token.baseVisibleCommitVersion === authority.visibleCommitVersion ? { kind: "satisfied" } : {
+			kind: "mismatch",
+			reason: "staleVisibleCommit"
+		};
+		case "graphVersion":
+			if (token.graphVersion === null || authority.graphVersion === null) return {
+				kind: "absent",
+				missingReason: "graphVersionMissing"
+			};
+			return token.graphVersion === authority.graphVersion ? { kind: "satisfied" } : {
+				kind: "mismatch",
+				reason: "graphVersionMismatch"
+			};
+		case "cacheVariant": {
+			const tokenVariant = token.cacheVariantFingerprint;
+			const installedVariant = authority.installedCacheVariantFingerprint;
+			if (tokenVariant === void 0 || installedVariant === null) return {
+				kind: "absent",
+				missingReason: "cacheVariantMissing"
+			};
+			return tokenVariant === installedVariant ? { kind: "satisfied" } : {
+				kind: "mismatch",
+				reason: "cacheVariantMismatch"
+			};
+		}
+		default: throw new Error("[vinext] Unknown operation-token dimension: " + String(dimension));
+	}
+}
+function verifyOperationToken(token, authority, policy) {
+	const required = new Set(policy.require);
+	const evaluated = new Set([...policy.check, ...policy.require]);
+	for (const dimension of DIMENSION_ORDER) {
+		if (!evaluated.has(dimension)) continue;
+		const status = evaluateDimension(dimension, token, authority);
+		if (status.kind === "mismatch") return {
+			authorized: false,
+			reason: status.reason
+		};
+		if (status.kind === "absent" && required.has(dimension)) return {
+			authorized: false,
+			reason: status.missingReason
+		};
+	}
+	return {
+		authorized: true,
+		token
+	};
+}
+function verifyOperationTokenForCommit(token, authority) {
+	return verifyOperationToken(token, {
+		activeNavigationId: authority.activeNavigationId,
+		visibleCommitVersion: authority.visibleCommitVersion,
+		graphVersion: token.graphVersion,
+		installedCacheVariantFingerprint: token.cacheVariantFingerprint ?? null
+	}, {
+		check: ["navigation", "visibleCommit"],
+		require: ["navigation", "visibleCommit"]
+	});
+}
+function verifyOperationTokenForCacheReuse(token, authority) {
+	return verifyOperationToken(token, {
+		activeNavigationId: token.navigationId,
+		visibleCommitVersion: token.baseVisibleCommitVersion,
+		graphVersion: authority.graphVersion,
+		installedCacheVariantFingerprint: authority.installedCacheVariantFingerprint
+	}, {
+		check: ["graphVersion", "cacheVariant"],
+		require: []
+	});
+}
+//#endregion
+export { verifyOperationToken, verifyOperationTokenForCacheReuse, verifyOperationTokenForCommit };

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

@@ -116,6 +116,6 @@ type NormalizePagesDataRequestResult = {
  * Extracted from `entries/pages-server-entry.ts` so both `renderPage` and
  * `runMiddleware` share a single implementation.
  */
-declare function normalizePagesDataRequest(request: Request, buildId: string | null): NormalizePagesDataRequestResult;
+declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string): NormalizePagesDataRequestResult;
 //#endregion
 export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };

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

@@ -1,3 +1,4 @@
+import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 //#region src/server/pages-data-route.ts
 /**
@@ -123,16 +124,18 @@ function buildNextDataNotFoundResponse() {
 * Extracted from `entries/pages-server-entry.ts` so both `renderPage` and
 * `runMiddleware` share a single implementation.
 */
-function normalizePagesDataRequest(request, buildId) {
+function normalizePagesDataRequest(request, buildId, basePath = "") {
 	const reqUrl = new URL(request.url);
-	if (!isNextDataPathname(reqUrl.pathname)) return {
+	const hadBasePath = !!basePath && hasBasePath(reqUrl.pathname, basePath);
+	const dataPathname = basePath ? stripBasePath(reqUrl.pathname, basePath) : reqUrl.pathname;
+	if (!isNextDataPathname(dataPathname)) return {
 		isDataReq: false,
 		request,
 		normalizedPathname: null,
 		search: "",
 		notFoundResponse: null
 	};
-	const dataMatch = buildId ? parseNextDataPathname(reqUrl.pathname, buildId) : null;
+	const dataMatch = buildId ? parseNextDataPathname(dataPathname, buildId) : null;
 	if (!dataMatch) return {
 		isDataReq: false,
 		request,
@@ -141,7 +144,7 @@ function normalizePagesDataRequest(request, buildId) {
 		notFoundResponse: buildNextDataNotFoundResponse()
 	};
 	const normalizedUrl = new URL(reqUrl);
-	normalizedUrl.pathname = dataMatch.pagePathname;
+	normalizedUrl.pathname = hadBasePath ? addBasePathToPathname(dataMatch.pagePathname, basePath) : dataMatch.pagePathname;
 	return {
 		isDataReq: true,
 		request: new Request(normalizedUrl, request),

package/dist/server/pages-dev-module-url.d.ts

@@ -0,0 +1,4 @@
+//#region src/server/pages-dev-module-url.d.ts
+declare function createPagesDevModuleUrl(viteRoot: string, moduleFilePath: string, viteBase: string): string;
+//#endregion
+export { createPagesDevModuleUrl };

package/dist/server/pages-dev-module-url.js

@@ -0,0 +1,15 @@
+import path from "node:path";
+//#region src/server/pages-dev-module-url.ts
+function normalizeBase(base) {
+	if (!base || base === "/") return "/";
+	return `/${base.replace(/^\/+|\/+$/g, "")}/`;
+}
+function encodeModulePath(modulePath) {
+	return encodeURI(modulePath).replace(/%5B/gi, "[").replace(/%5D/gi, "]").replace(/\?/g, "%3F").replace(/#/g, "%23");
+}
+function createPagesDevModuleUrl(viteRoot, moduleFilePath, viteBase) {
+	const relativePath = (/^[A-Za-z]:[\\/]/.test(viteRoot) ? path.win32 : path).relative(viteRoot, moduleFilePath).replace(/\\/g, "/");
+	return normalizeBase(viteBase) + encodeModulePath(relativePath);
+}
+//#endregion
+export { createPagesDevModuleUrl };

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

@@ -45,12 +45,6 @@ type DocumentRenderPageInput = {
  *                  the head nodes returned by `getInitialProps` (forward them to
  *                  `setDocumentInitialHead()` — do NOT call
  *                  `callDocumentGetInitialProps()` as well).
- *   - `consumed` — `getInitialProps` WAS invoked but no body was produced
- *                  (it never called `renderPage`, returned no `{ html }`, or
- *                  threw). Callers must NOT re-invoke `getInitialProps` (that
- *                  would call it a second time) — render the streaming body,
- *                  spread `docProps` (possibly empty) onto `<Document>`, and
- *                  forward `head` to `setDocumentInitialHead()`.
  */
 type RunDocumentRenderPageResult = {
   status: "skipped";
@@ -60,10 +54,6 @@ type RunDocumentRenderPageResult = {
   stylesHTML: string;
   docProps: Record<string, unknown>;
   head: ReactNode[];
-} | {
-  status: "consumed";
-  docProps: Record<string, unknown>;
-  head: ReactNode[];
 };
 /**
  * Run a user `_document.getInitialProps()` with a `ctx.renderPage()` that
@@ -75,11 +65,10 @@ type RunDocumentRenderPageResult = {
  * prod (`pages-page-response.ts`) and dev (`dev-server.ts`) SSR pipelines so
  * the `getInitialProps` + `renderPage` contract lives in one place.
  *
- * `getInitialProps` is invoked at most once here. When this returns `consumed`
- * or `rendered`, callers MUST treat that as the single invocation and must not
- * call `loadUserDocumentInitialProps` (which would invoke it again — and, for a
- * throwing override, surface the error as a 500 rather than the clean fallback
- * this contract guarantees).
+ * `getInitialProps` is invoked at most once here. When this returns `rendered`,
+ * callers MUST treat that as the single invocation and must not call
+ * `loadUserDocumentInitialProps` again. Errors intentionally propagate to the
+ * Pages Router's normal error-page pipeline, matching Next.js.
  *
  * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
  */

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

@@ -19,19 +19,19 @@ import React from "react";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
 * (search for `loadDocumentInitialProps` and `documentElement`).
 *
-* vinext only forwards `docProps`. The full `DocumentContext`
-* (`renderPage`, `defaultGetInitialProps`, `pathname`, `query`, `req`, `res`,
-* `err`, `asPath`) is not yet plumbed through. The common upstream pattern
+* `runDocumentRenderPage()` supplies `renderPage`, `defaultGetInitialProps`,
+* and the request pathname/query/asPath fields needed by the common upstream
+* pattern:
 *
 *   static async getInitialProps(ctx) {
 *     const initialProps = await Document.getInitialProps(ctx)
 *     return { ...initialProps, docValue }
 *   }
 *
-* works because the base `Document.getInitialProps` shim in
-* `shims/document.tsx` returns `{ html: "" }` and ignores `ctx`. User
-* overrides that *only* read `ctx` will see `undefined` fields — that is a
-* separate gap tracked alongside the shim TODO.
+* The standalone `loadUserDocumentInitialProps()` compatibility path supplies
+* an empty default render result because it is only used after the body has
+* already been produced. Request-only fields such as req/res remain outside
+* that compatibility helper.
 *
 * Returns `null` when the user did not override the base shim (the static
 * `getInitialProps` reference still points at the shim's stub) so callers
@@ -47,7 +47,7 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 	const getInitialProps = DocumentComponent.getInitialProps;
 	if (typeof getInitialProps !== "function") return null;
 	if (getInitialProps === BASE_GET_INITIAL_PROPS) return null;
-	const result = await getInitialProps({});
+	const result = await getInitialProps({ defaultGetInitialProps: async () => ({ html: "" }) });
 	return result && typeof result === "object" ? result : null;
 }
 /**
@@ -60,11 +60,10 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 * prod (`pages-page-response.ts`) and dev (`dev-server.ts`) SSR pipelines so
 * the `getInitialProps` + `renderPage` contract lives in one place.
 *
-* `getInitialProps` is invoked at most once here. When this returns `consumed`
-* or `rendered`, callers MUST treat that as the single invocation and must not
-* call `loadUserDocumentInitialProps` (which would invoke it again — and, for a
-* throwing override, surface the error as a 500 rather than the clean fallback
-* this contract guarantees).
+* `getInitialProps` is invoked at most once here. When this returns `rendered`,
+* callers MUST treat that as the single invocation and must not call
+* `loadUserDocumentInitialProps` again. Errors intentionally propagate to the
+* Pages Router's normal error-page pipeline, matching Next.js.
 *
 * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
 */
@@ -74,58 +73,30 @@ async function runDocumentRenderPage(input) {
 	if (DocCtor.getInitialProps === BASE_GET_INITIAL_PROPS) return { status: "skipped" };
 	if (!input.enhancePageElement) return { status: "skipped" };
 	const enhancePageElement = input.enhancePageElement;
-	let renderPageCalled = false;
 	const renderPage = async (opts = {}) => {
-		renderPageCalled = true;
-		const wrapped = withScriptNonce(enhancePageElement(opts), input.scriptNonce);
+		const wrapped = withScriptNonce(enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts), input.scriptNonce);
 		return {
 			html: await readStreamAsText(await input.renderToReadableStream(wrapped)),
 			head: []
 		};
 	};
-	let docInitialProps;
-	try {
-		docInitialProps = await DocCtor.getInitialProps({
-			renderPage,
-			defaultGetInitialProps: async (ctx) => {
-				const result = await (ctx.renderPage ?? renderPage)({ enhanceApp: (App) => (props) => React.createElement(App, props) });
-				return {
-					html: result.html,
-					head: result.head ?? [],
-					styles: void 0
-				};
-			},
-			...input.context
-		});
-	} catch (err) {
-		console.error("[vinext] _document.getInitialProps() threw:", err);
-		return {
-			status: "consumed",
-			docProps: {},
-			head: []
-		};
-	}
+	const docInitialProps = await DocCtor.getInitialProps({
+		renderPage,
+		defaultGetInitialProps: async (ctx) => {
+			const result = await ctx.renderPage({ enhanceApp: (App) => (props) => React.createElement(App, props) });
+			return {
+				html: result.html,
+				head: result.head ?? [],
+				styles: void 0
+			};
+		},
+		...input.context
+	});
 	const { html: _html, head: rawHead, styles: _styles, ...docProps } = docInitialProps ?? {};
 	const head = Array.isArray(rawHead) ? rawHead : [];
-	if (!renderPageCalled) return {
-		status: "consumed",
-		docProps,
-		head
-	};
-	if (!docInitialProps || typeof docInitialProps.html !== "string") {
-		console.error(`[vinext] "${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" did not return an object with a string "html" prop`);
-		return {
-			status: "consumed",
-			docProps,
-			head
-		};
-	}
+	if (!docInitialProps || typeof docInitialProps.html !== "string") throw new Error(`"${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" should resolve to an object with a "html" prop set with a valid html string`);
 	let stylesHTML = "";
-	if (docInitialProps.styles != null) try {
-		stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
-	} catch (err) {
-		console.error("[vinext] Failed to render _document.getInitialProps() styles:", err);
-	}
+	if (docInitialProps.styles != null) stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
 	return {
 		status: "rendered",
 		bodyHtml: docInitialProps.html,

package/dist/server/pages-i18n.js

@@ -127,8 +127,8 @@ function parseCookieLocaleFromHeader(cookieHeader, i18nConfig) {
 	} catch {
 		return null;
 	}
-	if (i18nConfig.locales.includes(value)) return value;
-	return null;
+	const lowerValue = value.toLowerCase();
+	return i18nConfig.locales.find((locale) => locale.toLowerCase() === lowerValue) ?? null;
 }
 function formatLocalizedRootPath(locale, defaultLocale, basePath = "", trailingSlash = false, search = "") {
 	if (locale.toLowerCase() === defaultLocale.toLowerCase()) return void 0;

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

@@ -1,6 +1,6 @@
 import { Route } from "../routing/pages-router.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
-import { CachedPagesValue } from "../shims/cache.js";
+import { CachedPagesValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";

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

@@ -198,7 +198,9 @@ function applyBotETagAndCheck(cachedResponse, html, options) {
 function rewritePagesCachedHtml(cachedHtml, freshBody, nextDataScript) {
 	const bodyStart = cachedHtml.indexOf("<div id=\"__next\">");
 	const contentStart = bodyStart >= 0 ? bodyStart + 17 : -1;
-	const nextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const canonicalNextDataStart = cachedHtml.search(/<script\b(?=[^>]*\bid=["']__NEXT_DATA__["'])(?=[^>]*\btype=["']application\/json["'])[^>]*>/);
+	const legacyNextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const nextDataStart = canonicalNextDataStart >= 0 ? canonicalNextDataStart : legacyNextDataStart;
 	if (contentStart >= 0 && nextDataStart >= 0) {
 		const region = cachedHtml.slice(contentStart, nextDataStart);
 		const lastCloseDiv = region.lastIndexOf("</div>");

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

@@ -184,7 +184,7 @@ function createPagesPageHandler(opts) {
 				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
-					err,
+					err: err instanceof Error ? err : void 0,
 					applyRequestContexts: applySSRContext,
 					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
@@ -327,6 +327,7 @@ function createPagesPageHandler(opts) {
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
 					},
 					DocumentComponent,
+					err: err instanceof Error ? err : void 0,
 					flushPreloads: typeof flushPreloads === "function" ? flushPreloads : void 0,
 					fontLinkHeader,
 					fontPreloads: allFontPreloads,
@@ -344,6 +345,7 @@ function createPagesPageHandler(opts) {
 					pageProps,
 					props: renderProps,
 					params,
+					query,
 					renderDocumentToString(element) {
 						return renderToStringAsync(element);
 					},

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

@@ -1,5 +1,5 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
-import { CachedPagesValue } from "../shims/cache.js";
+import { CachedPagesValue } from "../shims/cache-handler.js";
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -66,6 +66,7 @@ type RenderPagesPageResponseOptions = {
    */
   enhancePageElement?: ((opts: RenderPageEnhancers) => ReactNode) | undefined;
   DocumentComponent: ComponentType | null;
+  err?: Error;
   flushPreloads?: (() => Promise<void> | void) | undefined;
   fontLinkHeader: string;
   fontPreloads: PagesFontPreload[];
@@ -95,6 +96,7 @@ type RenderPagesPageResponseOptions = {
   pageProps: Record<string, unknown>;
   props?: Record<string, unknown>;
   params: Record<string, unknown>;
+  query?: Record<string, unknown>;
   renderDocumentToString: (element: ReactNode) => Promise<string>;
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
   resetSSRHead?: (() => void) | undefined;

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

@@ -1,13 +1,13 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { fnv1a52 } from "../utils/hash.js";
-import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
+import { fnv1a52 } from "../utils/hash.js";
+import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
-import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr } from "./html.js";
+import { createNonceAttribute, escapeHtmlAttr } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
@@ -89,8 +89,7 @@ function buildPagesNextDataScript(options) {
 		...options.nextData?.__vinext,
 		...options.vinext
 	};
-	const localeGlobals = options.i18n.locales ? `;window.__VINEXT_LOCALE__=${options.safeJsonStringify(options.i18n.locale)};window.__VINEXT_LOCALES__=${options.safeJsonStringify(options.i18n.locales)};window.__VINEXT_DEFAULT_LOCALE__=${options.safeJsonStringify(options.i18n.defaultLocale)}` : "";
-	return createInlineScriptTag(`window.__NEXT_DATA__ = ${options.safeJsonStringify(nextDataPayload)}${localeGlobals}`, options.scriptNonce);
+	return `<script id="__NEXT_DATA__" type="application/json"${createNonceAttribute(options.scriptNonce)}>${options.safeJsonStringify(nextDataPayload)}<\/script>`;
 }
 async function buildPagesShellHtml(bodyMarker, fontHeadHTML, nextDataScript, options) {
 	if (options.DocumentComponent) {
@@ -197,8 +196,9 @@ async function renderPagesPageResponse(options) {
 		renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
 		scriptNonce: options.scriptNonce,
 		context: {
+			err: options.err,
 			pathname: options.routePattern,
-			query: options.params,
+			query: options.query ?? options.params,
 			asPath: options.routeUrl
 		}
 	});

package/dist/server/pages-readiness.js

@@ -10,7 +10,7 @@ function buildPagesReadinessNextData(options) {
 	const hasAppGip = typeof options.appComponent?.getInitialProps === "function";
 	return {
 		gssp: hasPageGssp,
-		gsp: hasPageGsp,
+		gsp: hasPageGsp ? true : void 0,
 		gip: hasPageGip,
 		appGip: hasAppGip,
 		autoExport: !hasPageGssp && !hasPageGsp && !hasPageGip && !hasAppGip,

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

@@ -7,6 +7,8 @@ type PagesRenderOptions = {
   renderErrorPageOnMiss?: boolean;
   originalUrl?: string;
 };
+type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
   redirectUrl?: string;
@@ -53,15 +55,13 @@ type PagesPipelineDeps = {
    */
   proxyExternal?: ((currentRequest: Request, externalUrl: string) => Promise<Response>) | null;
   /**
-   * Optional public-directory static file server (Node prod only).
+   * Optional filesystem/static-asset probe supplied by each runtime adapter.
    * Called post-middleware (so middleware can intercept/redirect public files) with the
    * original basePath-stripped pathname and the staged middleware response headers.
-   * The callback writes the file to its own output (Node `res`) and resolves `true` when
-   * it served the request; the pipeline then returns `{ type: "handled" }`. Resolves `false`
-   * to fall through to rewrites/render. Worker/dev adapters omit this — their public files
-   * are served by the asset binding / Vite respectively.
+   * Node may write directly to `res` and return true; dev/Workers return a Response.
+   * Resolves false to continue through rewrites, API routes, and page rendering.
    */
-  serveStaticFile?: ((requestPathname: string, stagedHeaders: HeaderRecord) => Promise<boolean>) | null;
+  serveFilesystemRoute?: ((requestPathname: string, stagedHeaders: HeaderRecord, phase: FilesystemRoutePhase) => Promise<boolean | Response>) | null;
 };
 /**
  * Wrap an adapter's `runMiddleware` callback so middleware receives the original
@@ -111,4 +111,4 @@ type PagesPipelineResult = {
  */
 declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
 //#endregion
-export { MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, runPagesRequest, wrapMiddlewareWithBasePath };
+export { FilesystemRoutePhase, MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath };