vinext 0.1.2 → 0.1.4

package/dist/server/navigation-planner.js

@@ -6,6 +6,7 @@ import "./app-elements.js";
 import { resolveHardNavigationTargetFromRscResponse, resolveRscCompatibilityNavigationDecision } from "./app-rsc-cache-busting.js";
 import { resolveRscRedirectLifecycleHop, resolveStreamedRscRedirectLifecycleHop } from "./app-browser-rsc-redirect.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
+import { verifyOperationTokenForCacheReuse } from "./operation-token.js";
 //#region src/server/navigation-planner.ts
 const ROUTE_INTERCEPTION_CONTEXT_SEPARATOR = "\0";
 const CACHE_ENTRY_PROOF_MISSING_CODE = "CP_CACHE_ENTRY_PROOF_MISSING";
@@ -213,6 +214,71 @@ function classifyEarlyNavigationIntent(facts) {
 		trace: createEarlyNavigationIntentTrace(NavigationTraceReasonCodes.crossDocumentFlight, facts)
 	};
 }
+function classifyVisitedResponseCacheCandidate(facts) {
+	if (facts.candidate === "missing") return { kind: "miss" };
+	if (!facts.mountedSlotsMatch) return {
+		kind: "evict",
+		reason: "mountedSlotsMismatch"
+	};
+	if (facts.navigationKind === "refresh") return {
+		kind: "evict",
+		reason: "refresh"
+	};
+	if (!facts.fresh) return {
+		kind: "evict",
+		reason: "stale"
+	};
+	return { kind: "reuse" };
+}
+function createNavigationReuseTrace(code, facts, fields = {}) {
+	return createNavigationTrace(code, {
+		eventKind: facts.navigationKind,
+		targetHref: facts.targetHref,
+		...fields
+	});
+}
+function createFreshFetchDecision(facts, reason) {
+	return {
+		kind: "fetchFresh",
+		reason,
+		trace: createNavigationReuseTrace(NavigationTraceReasonCodes.fetchFresh, facts, { freshFetchReason: reason })
+	};
+}
+function classifyNavigationReuse(facts) {
+	if (facts.navigationKind === "refresh") return createFreshFetchDecision(facts, "refresh");
+	if (!facts.bypassNavigationCache && facts.visitedResponse.status === "available") return {
+		kind: "reuseVisitedResponse",
+		trace: createNavigationReuseTrace(NavigationTraceReasonCodes.visitedResponseReuse, facts)
+	};
+	if (!facts.bypassNavigationCache && facts.prefetch.status === "available") return {
+		kind: "consumePrefetch",
+		trace: createNavigationReuseTrace(NavigationTraceReasonCodes.prefetchResponseReuse, facts)
+	};
+	if (facts.navigationKind === "navigate") {
+		if (facts.optimisticRouteShell.status === "available") return {
+			kind: "attemptOptimisticRouteShell",
+			trace: createNavigationReuseTrace(NavigationTraceReasonCodes.optimisticRouteShell, facts)
+		};
+		return createFreshFetchDecision(facts, facts.bypassNavigationCache ? "cacheBypassed" : facts.optimisticRouteShell.reason);
+	}
+	if (facts.bypassNavigationCache) return createFreshFetchDecision(facts, "cacheBypassed");
+	return createFreshFetchDecision(facts, "cacheMiss");
+}
+function classifyNavigationPrefetchProbe(facts) {
+	if (facts.visitedResponse.status === "available") return {
+		kind: "skip",
+		reason: "visitedResponseAvailable"
+	};
+	if (facts.navigationKind === "refresh") return {
+		kind: "skip",
+		reason: "refresh"
+	};
+	if (facts.bypassNavigationCache) return {
+		kind: "skip",
+		reason: "cacheBypassed"
+	};
+	return { kind: "probe" };
+}
 function createSnapshotRouteTopology(snapshot) {
 	return {
 		layoutIds: snapshot.layoutIds,
@@ -466,6 +532,18 @@ function createCacheProofRejectedDecision(options) {
 		url: options.event.result.href
 	};
 }
+function createCacheReuseTokenRejectedDecision(options) {
+	return {
+		kind: "hardNavigate",
+		reason: "cacheReuseTokenRejected",
+		token: options.event.token,
+		trace: createNavigationTrace(NavigationTraceReasonCodes.cacheReuseTokenRejected, {
+			...options.traceFields,
+			cacheReuseTokenReason: options.reason
+		}),
+		url: options.event.result.href
+	};
+}
 function createAcceptedCacheProofTraceFields(traceFields, decision) {
 	if (decision === null) return traceFields;
 	return {
@@ -554,6 +632,17 @@ function planFlightResponseArrived(options) {
 		traceFields
 	});
 	const acceptedCacheEntryDecision = cacheEntryProofEvaluation.decision;
+	if (acceptedCacheEntryDecision !== null) {
+		const reuseVerdict = verifyOperationTokenForCacheReuse(options.event.token, {
+			graphVersion: options.routeManifest?.graphVersion ?? null,
+			installedCacheVariantFingerprint: null
+		});
+		if (!reuseVerdict.authorized) return createCacheReuseTokenRejectedDecision({
+			event: options.event,
+			reason: reuseVerdict.reason,
+			traceFields
+		});
+	}
 	const commitTraceFields = createAcceptedCacheProofTraceFields(traceFields, acceptedCacheEntryDecision);
 	const cacheEntryProposalFields = createCacheEntryProposalFields(acceptedCacheEntryDecision);
 	if (targetSnapshot.interception !== null) {
@@ -680,10 +769,59 @@ function planNavigation(input) {
 		}
 	}
 }
+function classifyServerActionResult(facts) {
+	if (facts.clientCompatibilityId === null) return {
+		kind: "proceed",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.proceedToCommit, {})
+	};
+	if (!facts.isRscContentType) return {
+		kind: "proceed",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.proceedToCommit, {})
+	};
+	if (resolveRscCompatibilityNavigationDecision({
+		clientCompatibilityId: facts.clientCompatibilityId,
+		currentHref: facts.currentHref,
+		origin: facts.origin,
+		responseCompatibilityId: facts.compatibilityIdHeader,
+		responseUrl: facts.responseUrl
+	}).kind === "compatible") return {
+		kind: "proceed",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.proceedToCommit, {})
+	};
+	if (facts.actionRedirectHref !== null) return {
+		kind: "hardNavigate",
+		url: facts.actionRedirectHref,
+		historyMode: facts.actionRedirectType === "push" ? "assign" : "replace",
+		clearClientNavigationCaches: true,
+		reason: "serverActionRedirectCompatibilityMismatch",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.serverActionRedirectCompatibilityMismatch, { targetHref: facts.actionRedirectHref })
+	};
+	const targetUrl = facts.currentHref;
+	return {
+		kind: "hardNavigate",
+		url: targetUrl,
+		clearClientNavigationCaches: false,
+		reason: "serverActionRscCompatibilityMismatch",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.serverActionRscCompatibilityMismatch, { targetHref: targetUrl })
+	};
+}
+function classifyRscNavigationError(facts) {
+	return {
+		kind: "hardNavigate",
+		url: facts.currentHref,
+		reason: "rscNavigationError",
+		trace: createNavigationTrace(NavigationTraceReasonCodes.rscNavigationError, { targetHref: facts.currentHref })
+	};
+}
 const navigationPlanner = {
 	classifyEarlyNavigationIntent,
+	classifyNavigationPrefetchProbe,
+	classifyNavigationReuse,
 	classifyRscFetchResult,
+	classifyRscNavigationError,
 	classifyRootBoundaryTransition,
+	classifyServerActionResult,
+	classifyVisitedResponseCacheCandidate,
 	plan: planNavigation,
 	resolveCurrentRootBoundaryElementPersistence,
 	resolveMountedParallelSlotPersistence,

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

@@ -3,8 +3,10 @@ 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";
   invalidRscPayload: "NC_RSC_INVALID";
   interceptedCommitCurrent: "NC_INTERCEPT_COMMIT";
   interceptedRejectedIncompatibleRoot: "NC_INTERCEPT_REJECT_ROOT";
@@ -13,7 +15,9 @@ declare const NavigationTraceReasonCodes: {
   interceptedRejectedTargetMismatch: "NC_INTERCEPT_REJECT_TARGET";
   interceptedRejectedUndeclaredTopology: "NC_INTERCEPT_REJECT_GRAPH";
   interceptedRejectedUnknownSource: "NC_INTERCEPT_REJECT_SOURCE";
+  optimisticRouteShell: "NC_OPTIMISTIC_SHELL";
   prefetchOnly: "NC_PREFETCH_ONLY";
+  prefetchResponseReuse: "NC_PREFETCH_REUSE";
   proceedToCommit: "NC_RSC_PROCEED";
   redirectFollow: "NC_RSC_REDIRECT_FOLLOW";
   redirectTerminalDepth: "NC_RSC_REDIRECT_DEPTH";
@@ -22,10 +26,14 @@ declare const NavigationTraceReasonCodes: {
   rootBoundaryChanged: "NC_ROOT";
   rootBoundaryUnknown: "NC_ROOT_UNKNOWN";
   rscCompatibilityMismatch: "NC_RSC_COMPAT_MISMATCH";
+  rscNavigationError: "NC_RSC_NAV_ERROR";
   sameDocumentScroll: "NC_SAME_DOC_SCROLL";
   samePageSearch: "NC_SAME_PAGE_SEARCH";
+  serverActionRedirectCompatibilityMismatch: "NC_SA_REDIRECT_COMPAT";
+  serverActionRscCompatibilityMismatch: "NC_SA_RSC_COMPAT";
   staleOperation: "NC_STALE";
   streamedRedirectLoop: "NC_RSC_STREAMED_REDIRECT_LOOP";
+  visitedResponseReuse: "NC_VISITED_REUSE";
 };
 declare const NavigationTraceTransactionCodes: {
   hardNavigate: "NT_HARD_NAVIGATE";
@@ -35,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" | "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,8 +2,10 @@
 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",
 	invalidRscPayload: "NC_RSC_INVALID",
 	interceptedCommitCurrent: "NC_INTERCEPT_COMMIT",
 	interceptedRejectedIncompatibleRoot: "NC_INTERCEPT_REJECT_ROOT",
@@ -12,7 +14,9 @@ const NavigationTraceReasonCodes = {
 	interceptedRejectedTargetMismatch: "NC_INTERCEPT_REJECT_TARGET",
 	interceptedRejectedUndeclaredTopology: "NC_INTERCEPT_REJECT_GRAPH",
 	interceptedRejectedUnknownSource: "NC_INTERCEPT_REJECT_SOURCE",
+	optimisticRouteShell: "NC_OPTIMISTIC_SHELL",
 	prefetchOnly: "NC_PREFETCH_ONLY",
+	prefetchResponseReuse: "NC_PREFETCH_REUSE",
 	proceedToCommit: "NC_RSC_PROCEED",
 	redirectFollow: "NC_RSC_REDIRECT_FOLLOW",
 	redirectTerminalDepth: "NC_RSC_REDIRECT_DEPTH",
@@ -21,10 +25,14 @@ const NavigationTraceReasonCodes = {
 	rootBoundaryChanged: "NC_ROOT",
 	rootBoundaryUnknown: "NC_ROOT_UNKNOWN",
 	rscCompatibilityMismatch: "NC_RSC_COMPAT_MISMATCH",
+	rscNavigationError: "NC_RSC_NAV_ERROR",
 	sameDocumentScroll: "NC_SAME_DOC_SCROLL",
 	samePageSearch: "NC_SAME_PAGE_SEARCH",
+	serverActionRedirectCompatibilityMismatch: "NC_SA_REDIRECT_COMPAT",
+	serverActionRscCompatibilityMismatch: "NC_SA_RSC_COMPAT",
 	staleOperation: "NC_STALE",
-	streamedRedirectLoop: "NC_RSC_STREAMED_REDIRECT_LOOP"
+	streamedRedirectLoop: "NC_RSC_STREAMED_REDIRECT_LOOP",
+	visitedResponseReuse: "NC_VISITED_REUSE"
 };
 const NavigationTraceTransactionCodes = {
 	hardNavigate: "NT_HARD_NAVIGATE",

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-api-route.d.ts

@@ -1,3 +1,4 @@
+import { NextI18nConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
 import { ExecutionContextLike } from "../shims/request-context.js";
 import { PagesReqResRequest, PagesReqResResponse, PagesRequestQuery } from "./pages-node-compat.js";
@@ -71,6 +72,11 @@ type HandlePagesApiRouteOptions = {
   reportRequestError?: (error: Error, routePattern: string) => void | Promise<void>;
   request: Request;
   url: string;
+  nextConfig?: {
+    basePath?: string;
+    i18n?: NextI18nConfig | null;
+    trailingSlash?: boolean;
+  };
 };
 declare function handlePagesApiRoute(options: HandlePagesApiRouteOptions): Promise<Response>;
 //#endregion

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

@@ -2,7 +2,8 @@ import "./server-globals.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import { NextRequest } from "../shims/server.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
-import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
+import { cloneRequestWithUrl } from "./request-pipeline.js";
+import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { PagesBodyParseError } from "./pages-media-type.js";
 import { isEdgeApiRuntime } from "./edge-api-runtime.js";
 import { resolveBodyParserConfig } from "./pages-body-parser-config.js";
@@ -14,6 +15,12 @@ function resolveModuleRuntime(module) {
 function buildPagesApiQuery(url, params) {
 	return mergeRouteParamsIntoQuery(parseQueryString(url), params);
 }
+function createEdgeApiRequest(request, url, params) {
+	const resolvedUrl = new URL(request.url);
+	resolvedUrl.search = urlQueryToSearchParams(buildPagesApiQuery(url, params)).toString();
+	const resolvedUrlString = resolvedUrl.toString();
+	return resolvedUrlString === request.url ? request : cloneRequestWithUrl(request, resolvedUrlString);
+}
 function isEdgeApiRouteModule(module) {
 	return typeof module.default === "function" && isEdgeApiRuntime(resolveModuleRuntime(module));
 }
@@ -29,7 +36,11 @@ async function _handlePagesApiRoute(options) {
 	const { route, params } = options.match;
 	try {
 		if (isEdgeApiRouteModule(route.module)) {
-			const nextRequest = new NextRequest(options.request);
+			const nextRequest = new NextRequest(createEdgeApiRequest(options.request, options.url, params), options.nextConfig ? { nextConfig: {
+				basePath: options.nextConfig.basePath,
+				i18n: options.nextConfig.i18n ?? void 0,
+				trailingSlash: options.nextConfig.trailingSlash
+			} } : void 0);
 			const response = await route.module.default(nextRequest);
 			if (response instanceof Response) return response;
 			throw new Error("Edge API route did not return a Response");

package/dist/server/pages-asset-tags.d.ts

@@ -30,7 +30,7 @@ declare function getManifestFilesForModule(manifest: Record<string, string[]> |
  * asset URLs. SSR-manifest values are base-anchored; re-anchor under any
  * configured `assetPrefix` (default `""` keeps the legacy `"/" + file`).
  */
-declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string): string | undefined;
+declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string, _deploymentId?: string): string | undefined;
 type CollectAssetTagsOptions = {
   /**
    * SSR manifest mapping module file paths to their associated asset list.
@@ -57,6 +57,7 @@ type CollectAssetTagsOptions = {
    */
   basePath?: string;
   assetPrefix?: string;
+  deploymentId?: string;
 };
 /**
  * Build the HTML `<link>` and `<script>` tag string for the SSR response.

package/dist/server/pages-asset-tags.js

@@ -1,3 +1,4 @@
+import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { createNonceAttribute } from "./html.js";
 import { assetServingUrlFromBaseAnchored } from "../utils/manifest-paths.js";
 //#region src/server/pages-asset-tags.ts
@@ -41,7 +42,7 @@ function getManifestFilesForModule(manifest, moduleId) {
 * asset URLs. SSR-manifest values are base-anchored; re-anchor under any
 * configured `assetPrefix` (default `""` keeps the legacy `"/" + file`).
 */
-function resolveClientModuleUrl(manifest, moduleId, basePath = "", assetPrefix = "") {
+function resolveClientModuleUrl(manifest, moduleId, basePath = "", assetPrefix = "", _deploymentId) {
 	const files = getManifestFilesForModule(resolveSsrManifest(manifest), moduleId);
 	if (!files) return void 0;
 	for (let i = 0; i < files.length; i++) {
@@ -72,7 +73,10 @@ function collectAssetTags(options) {
 	const deferAttr = options.disableOptimizedLoading ? "" : " defer";
 	const basePath = options.basePath ?? "";
 	const assetPrefix = options.assetPrefix ?? "";
-	const href = (value) => assetServingUrlFromBaseAnchored(value, basePath, assetPrefix);
+	const href = (value) => {
+		const url = assetServingUrlFromBaseAnchored(value, basePath, assetPrefix);
+		return value.endsWith(".js") ? url : appendDeploymentIdQuery(url, options.deploymentId);
+	};
 	const lazyChunks = typeof globalThis !== "undefined" && globalThis.__VINEXT_LAZY_CHUNKS__ || null;
 	const lazySet = lazyChunks && lazyChunks.length > 0 ? new Set(lazyChunks) : null;
 	if (typeof globalThis !== "undefined" && globalThis.__VINEXT_CLIENT_ENTRY__) {

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

@@ -60,6 +60,13 @@ declare function parseNextDataPathname(pathname: string, buildId: string): NextD
  *   { pageProps: {...}, /* optional locale data, redirect markers, etc. *\/ }
  */
 declare function buildNextDataJsonResponse(pageProps: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
+/**
+ * Build a `_next/data` JSON response from the full Pages props object returned
+ * through `_app.getInitialProps`. Next.js serializes the same outer props
+ * object that would be passed to `<App />`, so custom app-level props remain
+ * siblings of `pageProps` in the data envelope.
+ */
+declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
 /**
  * Build the 404 response Next.js returns for an unknown `_next/data` page.
  * Next.js renders this as a normal 404 page, but the body shape that clients
@@ -109,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, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+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
 /**
@@ -66,7 +67,16 @@ function parseNextDataPathname(pathname, buildId) {
 *   { pageProps: {...}, /* optional locale data, redirect markers, etc. *\/ }
 */
 function buildNextDataJsonResponse(pageProps, safeJsonStringify, init) {
-	const body = safeJsonStringify({ pageProps });
+	return buildNextDataPropsJsonResponse({ pageProps }, safeJsonStringify, init);
+}
+/**
+* Build a `_next/data` JSON response from the full Pages props object returned
+* through `_app.getInitialProps`. Next.js serializes the same outer props
+* object that would be passed to `<App />`, so custom app-level props remain
+* siblings of `pageProps` in the data envelope.
+*/
+function buildNextDataPropsJsonResponse(props, safeJsonStringify, init) {
+	const body = safeJsonStringify(props);
 	return new Response(body, {
 		status: init?.status ?? 200,
 		statusText: init?.statusText,
@@ -114,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,
@@ -132,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),
@@ -142,4 +154,4 @@ function normalizePagesDataRequest(request, buildId) {
 	};
 }
 //#endregion
-export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };

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`)
  */