vinext 1.4.0 → 1.4.1

package/dist/server/app-rsc-request-normalization.js

@@ -8,7 +8,7 @@ import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { normalizePath } from "./normalize-path.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
-import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM } from "./app-rsc-cache-busting.js";
 import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 //#region src/server/app-rsc-request-normalization.ts
 function extractFlightRouterStatePath(value, depth = 0) {
@@ -78,13 +78,13 @@ function tryNormalizeComparablePathAndSearch(value, basePath, baseUrl) {
 *   4. Collapse double-slashes, resolve `.` and `..` segments (normalizePath)
 *   5. basePath check + strip — 404 when pathname lacks the basePath prefix.
 *      `/__vinext/` bypasses this for internal prerender endpoints.
-*   6. RSC detection: `.rsc` suffix or Next-style `RSC: 1`. The internal
-*      `_rsc` cache-busting query is validated separately so full-route Flight
-*      responses do not share the canonical HTML URL in caches that ignore Vary.
-*   7. cleanPathname — pathname with `.rsc` suffix stripped
-*   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
-*   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
-*   10. Read semantic render mode for refresh/action payload rendering
+*   6. RSC detection: `RSC: 1`, as in Next.js. A `.rsc` suffix is an ordinary
+*      part of the pathname. The internal `_rsc` cache-busting query is
+*      validated separately so full-route Flight responses do not share the
+*      canonical HTML URL in caches that ignore Vary.
+*   7. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
+*   8. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
+*   9. Read semantic render mode for refresh/action payload rendering
 *
 * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
 *          or a NormalizedRscRequest for valid requests.
@@ -110,9 +110,7 @@ function normalizeRscRequest(request, basePath, allowOutsideBasePath = false, as
 			requestPathname = stripBasePath(requestPathname, basePath);
 		}
 	}
-	const isRscRequest = pathname.endsWith(".rsc") || request.headers.get("RSC") === "1";
-	const cleanPathname = stripRscSuffix(pathname);
-	const requestCleanPathname = stripRscSuffix(requestPathname);
+	const isRscRequest = request.headers.get("RSC") === "1";
 	const interceptionContextHeader = normalizeInterceptionContextHeader(request.headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER));
 	const rawInterceptionId = request.headers.get(VINEXT_INTERCEPTION_ID_HEADER);
 	if (rawInterceptionId !== null && (rawInterceptionId.length > 4096 || !rawInterceptionId.startsWith("interception:"))) return badRequestResponse();
@@ -124,7 +122,7 @@ function normalizeRscRequest(request, basePath, allowOutsideBasePath = false, as
 		const routerState = parsePrefetchRouterState(request.headers.get(NEXT_ROUTER_STATE_TREE_HEADER));
 		if (nextUrl && routerState) {
 			const targetUrl = new URL(url);
-			targetUrl.pathname = cleanPathname;
+			targetUrl.pathname = pathname;
 			targetUrl.searchParams.delete(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 			const routerPathAndSearch = tryNormalizeComparablePathAndSearch(routerState.pathAndSearch, basePath, url);
 			const nextPathAndSearch = tryNormalizeComparablePathAndSearch(nextUrl, basePath, url);
@@ -136,8 +134,7 @@ function normalizeRscRequest(request, basePath, allowOutsideBasePath = false, as
 		hadBasePath,
 		url,
 		pathname,
-		cleanPathname,
-		requestCleanPathname,
+		requestPathname,
 		isRscRequest,
 		interceptionContextHeader,
 		interceptionIdHeader,

package/dist/server/app-rsc-response-stage.js

@@ -10,7 +10,7 @@ import { applyEffectiveRequestCookieHeader, getDraftModeCookieHeader, headersCon
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { traceFindPageComponents } from "./pages-execution-tracing.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
-import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, hasRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, hasRscCacheBustingSearchParam, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { traceAppPageRender } from "./app-page-tracing.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { pickRootParams, setRootParams } from "../shims/root-params.js";
@@ -48,13 +48,6 @@ function requestWithoutRscCacheBustingSearchParam(request) {
 	stripRscCacheBustingSearchParam(url);
 	return cloneRequestWithUrl(request, url.toString());
 }
-function requestWithoutRscSuffix(request) {
-	const url = new URL(request.url);
-	const pathname = stripRscSuffix(url.pathname);
-	if (pathname === url.pathname) return request;
-	url.pathname = pathname;
-	return cloneRequestWithUrl(request, url.toString());
-}
 function pathnameForResolvedUrl(resolvedUrl) {
 	return resolvedUrl.split("#", 1)[0].split("?", 1)[0];
 }
@@ -192,9 +185,8 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, sta
 		setRootParams(rootParams);
 		if (props.kind === "app-route-handler") {
 			setCurrentFetchSoftTags(buildPageCacheTags(props.cleanPathname, [], [...route.routeSegments], "route"));
-			const normalizedUserlandRequest = requestWithoutRscSuffix(request);
-			const userlandRequest = requestWithoutRscCacheBustingSearchParam(normalizedUserlandRequest);
-			const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : normalizedUserlandRequest;
+			const userlandRequest = requestWithoutRscCacheBustingSearchParam(request);
+			const routeHandlerRequest = isEdgeRouteHandler(route.routeHandler) ? userlandRequest : request;
 			const routeHandlerUrl = new URL(routeHandlerRequest.url);
 			const internalRscValues = isEdgeRouteHandler(route.routeHandler) ? [] : routeHandlerUrl.searchParams.getAll(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 			routeHandlerUrl.search = searchParams.toString();
@@ -225,7 +217,7 @@ async function renderAppWorkerResponseStage(options, rawRequest, ctx, props, sta
 			handlerStart: process.env.NODE_ENV !== "production" ? performance.now() : 0,
 			interceptionContext: normalized.interceptionContextHeader,
 			interceptionId: normalized.interceptionIdHeader,
-			interceptionPathname: props.matchKind === "resolved" ? props.cleanPathname : normalized.requestCleanPathname,
+			interceptionPathname: props.matchKind === "resolved" ? props.cleanPathname : normalized.requestPathname,
 			isProgressiveActionRender: false,
 			isRscRequest: normalized.isRscRequest,
 			middlewareContext,

package/dist/server/app-server-action-execution.js

@@ -11,6 +11,7 @@ import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-err
 import { attachRequestCfMetadata, validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { splitPathSegments } from "../routing/utils.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
+import { logRequestError } from "./request-error-log.js";
 import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
@@ -509,7 +510,10 @@ function createRejectedActionResult(error) {
 * Next.js, a thrown string is not logged in development.
 */
 function logRejectedActionResult(error) {
-	if (process.env.NODE_ENV === "production" || hasDigest(error)) console.error("[vinext] Server action error:", error);
+	if (process.env.NODE_ENV === "production" || hasDigest(error)) {
+		if (typeof error === "string") console.error("[vinext] Server action error:", error);
+		else logRequestError("[vinext] Server action error:", error);
+	}
 }
 function getActionHttpFallbackStatus(error) {
 	const digest = getNextErrorDigest(error);
@@ -520,7 +524,7 @@ function getActionHttpFallbackStatus(error) {
 }
 function createServerActionErrorResponse(error, options) {
 	options.getAndClearPendingCookies();
-	console.error("[vinext] Server action error:", error);
+	logRequestError("[vinext] Server action error:", error);
 	options.reportRequestError(error, {
 		path: options.cleanPathname,
 		method: options.request.method,
@@ -627,7 +631,7 @@ async function handleProgressiveServerActionRequest(options) {
 				actionFailed = true;
 				actionFailedWithError = getActionHttpFallbackStatus(error) === null && !isServerActionNotFoundError(error, null);
 				if (actionFailedWithError) {
-					console.error("[vinext] Server action error:", error);
+					logRequestError("[vinext] Server action error:", error);
 					options.reportRequestError(error, {
 						path: options.cleanPathname,
 						method: options.request.method,
@@ -699,7 +703,7 @@ async function handleProgressiveServerActionRequest(options) {
 		});
 		getAndClearActionRevalidationKind();
 		options.getAndClearPendingCookies();
-		console.error("[vinext] Server action payload parsing error:", error);
+		logRequestError("[vinext] Server action payload parsing error:", error);
 		options.reportRequestError(error, {
 			path: options.cleanPathname,
 			method: options.request.method,

package/dist/server/app-ssr-entry.d.ts

@@ -72,6 +72,12 @@ export declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navCont
    */
   isCacheCandidate?: boolean;
   fallbackToErrorDocumentOnShellError?: boolean;
+  /**
+   * Whether the RSC render threw the given shell error. As in Next.js, in
+   * dev the error document carries only an error that the HTML render alone
+   * threw, for the overlay: the browser reports the others itself.
+   */
+  isServerComponentError?: (error: unknown) => boolean;
   /**
    * The parallel slot not-found boundaries that catch the error that
    * rejected the shell, or null when none catches it. The document then

package/dist/server/app-ssr-entry.js

@@ -2,6 +2,7 @@ import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped, repeatedSlashRedirectResponse } from "./open-redirect.js";
 import "./server-globals.js";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
@@ -15,6 +16,7 @@ import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRsc
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
+import { isBailoutToCSRError, isDynamicServerError } from "../shims/navigation-errors.js";
 import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation-server.js";
 import { BfcacheIdentityMapContext } from "../shims/slot.js";
@@ -71,13 +73,14 @@ function createUtf8Stream(html) {
 		controller.close();
 	} });
 }
-function buildBootstrapModuleScript(bootstrapModuleUrl, nonce) {
+function buildBootstrapModuleScript(bootstrapModuleUrl, nonce, crossOrigin) {
 	if (!bootstrapModuleUrl) return "";
-	return `<script type="module"${createNonceAttribute(nonce)} src="` + escapeHtmlAttr(bootstrapModuleUrl) + "\" id=\"_R_\" async=\"\" fetchPriority=\"low\"><\/script>";
+	const crossOriginAttribute = crossOrigin === void 0 ? "" : ` crossorigin="${crossOrigin === "use-credentials" ? "use-credentials" : ""}"`;
+	return `<script type="module"${createNonceAttribute(nonce)} src="` + escapeHtmlAttr(bootstrapModuleUrl) + `"${crossOriginAttribute} id="_R_" async="" fetchPriority="low"><\/script>`;
 }
-function renderSsrErrorDocumentShell(bootstrapModuleUrl, nonce) {
-	const html = renderToStaticMarkup(createElement(DefaultGlobalError, { error: null })).replace("<style>", "<style data-vinext-error-shell-style=\"\">");
-	const bootstrapScript = buildBootstrapModuleScript(bootstrapModuleUrl, nonce);
+function renderSsrErrorDocumentShell(bootstrapModuleUrl, nonce, crossOrigin) {
+	const html = renderToStaticMarkup(createElement(DefaultGlobalError, { error: null })).replace("<head>", "<head><meta name=\"robots\" content=\"noindex\"/>").replace("<style>", "<style data-vinext-error-shell-style=\"\">");
+	const bootstrapScript = buildBootstrapModuleScript(bootstrapModuleUrl, nonce, crossOrigin);
 	if (!bootstrapScript) return createUtf8Stream(`<!DOCTYPE html>${html}`);
 	const documentClose = "</body></html>";
 	if (!html.endsWith(documentClose)) return createUtf8Stream(`<!DOCTYPE html>${html}${bootstrapScript}`);
@@ -292,6 +295,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				let htmlStream;
 				let renderComplete = Promise.resolve();
 				let shellErrorRecovered = false;
+				let ssrOnlyShellError;
 				let caughtShellError;
 				let caughtBoundaries = null;
 				let shouldDelayInitialHtmlPull = false;
@@ -355,10 +359,11 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 							shouldDelayInitialHtmlPull = options?.waitForAllReady !== true;
 							caughtShellError = error;
 							htmlStream = caughtHtmlStream;
-						} else if (options?.fallbackToErrorDocumentOnShellError !== true || options?.waitForAllReady === true || typeof error?.digest === "string") throw error;
+						} else if (options?.fallbackToErrorDocumentOnShellError !== true || isNavigationSignalError(error) || isBailoutToCSRError(error) || isDynamicServerError(error)) throw error;
 						else {
 							shellErrorRecovered = true;
-							htmlStream = renderSsrErrorDocumentShell(bootstrapModuleUrl, options?.scriptNonce);
+							if (options?.isServerComponentError?.(error) !== true) ssrOnlyShellError = error;
+							htmlStream = renderSsrErrorDocumentShell(bootstrapModuleUrl, options?.scriptNonce, assetCrossOrigin);
 						}
 					}
 				}
@@ -385,7 +390,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const getInsertedHTML = () => {
 					const insertedHTML = renderInsertedHtml(renderServerInsertedHTML());
 					const errorMetaHTML = errorMetaRenderer.flush();
-					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError, options?.scriptNonce);
+					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError ?? ssrOnlyShellError, options?.scriptNonce);
 					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML + getRenderedSearchHTML();
 					didInjectHeadHTML = true;
 					const hidesQuery = searchParamsGate !== null && searchParamsGate.gate.decision !== "real";

package/dist/server/app-worker-stages.d.ts

@@ -107,11 +107,20 @@ export type SharedAppCacheIdentityProps = Exclude<AppWorkerResponseStageProps, {
 export declare function createSharedAppCacheIdentity(request: Request, props: SharedAppCacheIdentityProps): SharedAppCacheIdentity;
 /**
  * Build the query-free cache identity of a shared App page dispatch. The user
- * query leaves both the URL and `resolvedUrl`; the `.rsc` suffix, an RSC
- * request's validated `_rsc`, and the render mode stay because they select the
- * representation. HTML identities also drop the RSC selector headers.
+ * query leaves both the URL and `resolvedUrl`; an RSC request's validated
+ * `_rsc` and the render mode stay because they select the representation. HTML identities also drop the RSC selector headers.
  */
 export declare function createSharedAppPageCacheIdentity(request: Request, props: AppMatchedWorkerResponseStageProps): SharedAppCacheIdentity;
+/**
+ * Build the query-free cache identity of a shared Route Handler or metadata
+ * route dispatch. Next.js keys a route handler by its pathname: the query and
+ * the RSC selectors pick no representation of a handler's response, and a
+ * handler that reads the request's URL or headers is dynamic, so admission
+ * refuses its response. Keeping them in the identity would only let a client
+ * store one entry per query or selector value. The method, path and route
+ * props stay; the selector headers and the props derived from them leave.
+ */
+export declare function createSharedAppRouteCacheIdentity(request: Request, props: AppMatchedWorkerResponseStageProps | AppMetadataWorkerResponseStageProps): SharedAppCacheIdentity;
 /**
  * Build the cache identity of a shared hybrid Pages page dispatch: the
  * dispatched request and props under `origin`, so every host that names it

package/dist/server/app-worker-stages.js

@@ -1,4 +1,5 @@
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { cacheabilityManifestPageState, cacheabilityRequestIdentity, cacheabilityRoutePathname } from "./cacheability-manifest.js";
 import { keepOnlyValidatedRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { isTrustedPrerenderState } from "./prerender-route-params.js";
@@ -32,9 +33,8 @@ function createSharedAppCacheIdentity(request, props) {
 }
 /**
 * Build the query-free cache identity of a shared App page dispatch. The user
-* query leaves both the URL and `resolvedUrl`; the `.rsc` suffix, an RSC
-* request's validated `_rsc`, and the render mode stay because they select the
-* representation. HTML identities also drop the RSC selector headers.
+* query leaves both the URL and `resolvedUrl`; an RSC request's validated
+* `_rsc` and the render mode stay because they select the representation. HTML identities also drop the RSC selector headers.
 */
 function createSharedAppPageCacheIdentity(request, props) {
 	const queryFree = withoutAppPageDispatchQuery(request.url, props);
@@ -49,6 +49,39 @@ function createSharedAppPageCacheIdentity(request, props) {
 	};
 }
 /**
+* Build the query-free cache identity of a shared Route Handler or metadata
+* route dispatch. Next.js keys a route handler by its pathname: the query and
+* the RSC selectors pick no representation of a handler's response, and a
+* handler that reads the request's URL or headers is dynamic, so admission
+* refuses its response. Keeping them in the identity would only let a client
+* store one entry per query or selector value. The method, path and route
+* props stay; the selector headers and the props derived from them leave.
+*/
+function createSharedAppRouteCacheIdentity(request, props) {
+	const url = new URL(request.url);
+	url.search = "";
+	const headers = new Headers(request.headers);
+	for (const name of VINEXT_RSC_VARY_HEADER.split(",")) headers.delete(name.trim());
+	const searchIndex = props.resolvedUrl.indexOf("?");
+	return {
+		...sharedAppCacheIdentity(url.toString(), {
+			headers,
+			method: request.method
+		}, {
+			...props,
+			...props.kind === "app-metadata" ? {} : {
+				interceptionContext: null,
+				interceptionId: null
+			},
+			isRscRequest: false,
+			mountedSlotsHeader: null,
+			renderMode: APP_RSC_RENDER_MODE_NAVIGATION,
+			resolvedUrl: searchIndex === -1 ? props.resolvedUrl : props.resolvedUrl.slice(0, searchIndex)
+		}),
+		queryFree: true
+	};
+}
+/**
 * Build the cache identity of a shared hybrid Pages page dispatch: the
 * dispatched request and props under `origin`, so every host that names it
 * shares one entry.
@@ -141,4 +174,4 @@ function isResponseStageCacheability(value) {
 	return (cacheability.probeMode === null || cacheability.probeMode === "probe" || cacheability.probeMode === "identity") && (cacheability.policyHeaders === null || Array.isArray(cacheability.policyHeaders) && cacheability.policyHeaders.every((entry) => Array.isArray(entry) && entry.length === 2 && typeof entry[0] === "string" && typeof entry[1] === "string")) && (cacheability.representation === void 0 || cacheability.representation === "app-route" || cacheability.representation === "html" || cacheability.representation === "pages-data" || cacheability.representation === "rsc-full" || cacheability.representation === "rsc-loading-shell") && typeof cacheability.resolvedRoutePathname === "string" && cacheability.resolvedRoutePathname.startsWith("/");
 }
 //#endregion
-export { APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER, APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION, createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedHybridPagesCacheIdentity, isAppWorkerResponseStageProps, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery };
+export { APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER, APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION, createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isAppWorkerResponseStageProps, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery };

package/dist/server/bfcache-identity.d.ts

@@ -3,6 +3,13 @@ type ParallelSlotBindingState = "active" | "default" | "unmatched";
 export declare function createNestedBfcacheSlotSegmentId(parentSlotId: string, level: number): string;
 export declare function isNestedBfcacheSlotSegmentId(id: string): boolean;
 export declare function isNestedBfcacheSlotSegmentIdFor(id: string, parentSlotId: string): boolean;
+/**
+ * Activity key for a route segment whose directory has no layout of its own.
+ * Next.js keeps a layout-router Activity list at every segment level, implicit
+ * layouts included, keyed by the child segment. The tag keeps these keys apart
+ * from identity strings, whose kinds never use it, and from BFCache ids.
+ */
+export declare function createBfcacheChildSegmentStateKey(segmentPathKey: string): string;
 export type BfcacheSegmentIdentity = string;
 export type BfcacheSegmentDescriptor = {
   kind: "page";

package/dist/server/bfcache-identity.js

@@ -13,6 +13,15 @@ function isNestedBfcacheSlotSegmentId(id) {
 function isNestedBfcacheSlotSegmentIdFor(id, parentSlotId) {
 	return isNestedBfcacheSlotSegmentId(id) && id.startsWith(createNestedBfcacheSlotParentPrefix(parentSlotId));
 }
+/**
+* Activity key for a route segment whose directory has no layout of its own.
+* Next.js keeps a layout-router Activity list at every segment level, implicit
+* layouts included, keyed by the child segment. The tag keeps these keys apart
+* from identity strings, whose kinds never use it, and from BFCache ids.
+*/
+function createBfcacheChildSegmentStateKey(segmentPathKey) {
+	return JSON.stringify(["segment", segmentPathKey]);
+}
 function deriveBfcacheSegmentIdentity(descriptor) {
 	switch (descriptor.kind) {
 		case "page":
@@ -49,4 +58,4 @@ function deriveBfcacheSegmentIdentity(descriptor) {
 	}
 }
 //#endregion
-export { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor };
+export { createBfcacheChildSegmentStateKey, createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor };

package/dist/server/cacheability-manifest.js

@@ -118,7 +118,7 @@ function cacheabilityRequestIdentity(request, trustedRepresentation) {
 		representation: "pages-data",
 		requestKey
 	};
-	if (!(request.headers.get("RSC") === "1" || url.pathname.endsWith(".rsc"))) return (request.headers.get("Accept")?.toLowerCase() ?? "").includes("text/html") ? {
+	if (!(request.headers.get("RSC") === "1")) return (request.headers.get("Accept")?.toLowerCase() ?? "").includes("text/html") ? {
 		representation: "html",
 		requestKey
 	} : {
@@ -146,7 +146,6 @@ function normalizeCacheabilityRoutePathname(pathname) {
 }
 function cacheabilityRoutePathname(pathname, representation) {
 	const normalized = new URL(pathname, "http://vinext.local").pathname;
-	if (representation === "rsc-full" || representation === "rsc-loading-shell") return normalizeCacheabilityRoutePathname(normalized.endsWith(".rsc") ? normalized.slice(0, -4) : normalized);
 	if (representation !== "pages-data") return normalizeCacheabilityRoutePathname(normalized);
 	const marker = normalized.indexOf("/_next/data/");
 	const restWithBuildId = marker === -1 ? "" : normalized.slice(marker + 12);

package/dist/server/dev-origin-check.d.ts

@@ -41,7 +41,8 @@ export declare function isCrossSiteNoCorsRequest(secFetchSite: string | null | u
  * Validate a dev server request from a Node.js IncomingMessage.
  *
  * Returns null if the request is allowed, or a reason string if it should be blocked.
- * This is used by the Pages Router connect middleware.
+ * This is used by the vinext:dev-origin-check connect middleware and the Pages
+ * Router handler.
  */
 export declare function validateDevRequest(headers: {
   origin?: string;

package/dist/server/dev-origin-check.js

@@ -74,7 +74,8 @@ function isCrossSiteNoCorsRequest(secFetchSite, secFetchMode) {
 * Validate a dev server request from a Node.js IncomingMessage.
 *
 * Returns null if the request is allowed, or a reason string if it should be blocked.
-* This is used by the Pages Router connect middleware.
+* This is used by the vinext:dev-origin-check connect middleware and the Pages
+* Router handler.
 */
 function validateDevRequest(headers, allowedDevOrigins) {
 	if (isCrossSiteNoCorsRequest(headers["sec-fetch-site"], headers["sec-fetch-mode"])) return `cross-site no-cors request blocked`;

package/dist/server/dev-server.js

@@ -9,6 +9,7 @@ import { matchRoute } from "../routing/pages-router.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
 import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
@@ -918,7 +919,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				_renderEnd = now();
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext(null);
 			} catch (e) {
-				console.error(e);
+				logRequestError(e);
 				await reportRequestError(e, {
 					path: url,
 					method: req.method ?? "GET",

package/dist/server/image-optimization.d.ts

@@ -143,6 +143,11 @@ export declare function negotiateImageFormat(acceptHeader: string | null): strin
  * Optimized images are immutable because the URL encodes the transform params.
  */
 export declare const IMAGE_CACHE_CONTROL = "public, max-age=31536000, immutable";
+/**
+ * Next.js's Cache-Control for an image whose source can change at its URL
+ * (anything but a hashed build asset), at the default `images.minimumCacheTTL`.
+ */
+export declare const MUTABLE_IMAGE_SOURCE_CACHE_CONTROL = "public, max-age=14400, must-revalidate";
 /**
  * Content-Security-Policy for image optimization responses.
  * Blocks script execution and framing to prevent XSS via SVG or other

package/dist/server/image-optimization.js

@@ -229,6 +229,11 @@ function negotiateImageFormat(acceptHeader) {
 */
 const IMAGE_CACHE_CONTROL = "public, max-age=31536000, immutable";
 /**
+* Next.js's Cache-Control for an image whose source can change at its URL
+* (anything but a hashed build asset), at the default `images.minimumCacheTTL`.
+*/
+const MUTABLE_IMAGE_SOURCE_CACHE_CONTROL = "public, max-age=14400, must-revalidate";
+/**
 * Content-Security-Policy for image optimization responses.
 * Blocks script execution and framing to prevent XSS via SVG or other
 * active content that might be served through the image endpoint.
@@ -397,4 +402,4 @@ function handleConfiguredImageOptimization(request, fetchAsset, allowedWidths, i
 	}, allowedWidths, imageConfig);
 }
 //#endregion
-export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, IMAGE_RESPONSE_CACHE_STATE, INVALID_IMAGE_SOURCE_MESSAGE, VINEXT_IMAGE_OPTIMIZATION_PATH, getImageOptimizer, handleConfiguredImageOptimization, handleImageOptimization, invalidImageSourceResponse, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, markImageOptimizationSignal, negotiateImageFormat, parseImageParams, readImageOptimizationSignal, resolveDevImageRedirect, restoreImageOptimizationSignalFromTransport, serializeImageOptimizationSignalForTransport, setImageOptimizer };
+export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, IMAGE_RESPONSE_CACHE_STATE, INVALID_IMAGE_SOURCE_MESSAGE, MUTABLE_IMAGE_SOURCE_CACHE_CONTROL, VINEXT_IMAGE_OPTIMIZATION_PATH, getImageOptimizer, handleConfiguredImageOptimization, handleImageOptimization, invalidImageSourceResponse, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, markImageOptimizationSignal, negotiateImageFormat, parseImageParams, readImageOptimizationSignal, resolveDevImageRedirect, restoreImageOptimizationSignalFromTransport, serializeImageOptimizationSignalForTransport, setImageOptimizer };

package/dist/server/isr-cache.js

@@ -3,6 +3,7 @@ import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { isInterceptionMatchedUrlPath } from "./normalize-path.js";
 import { reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
@@ -144,7 +145,9 @@ function triggerBackgroundRegeneration(key, renderFn, errorContext) {
 	if (!getCdnCacheAdapter().ownsBackgroundRevalidation) return;
 	if (pendingRegenerations.has(key)) return;
 	const promise = renderFn().catch(async (err) => {
-		console.error(`[vinext] ISR background regeneration failed for ${key}:`, err);
+		const message = `[vinext] ISR background regeneration failed for ${key}:`;
+		if (errorContext) logRequestError(message, err);
+		else console.error(message, err);
 		if (errorContext && (errorContext.shouldReport?.(err) ?? true)) await reportRequestError(err, {
 			path: key,
 			method: "GET",

package/dist/server/metadata-route-response.js

@@ -14,10 +14,10 @@ import { isRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { getActiveDraftModeState, getHeadersContext, hasDraftModeCookieHeader, replaceHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _isOnDemandRevalidate } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
+import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./prerender-cache-life-header.js";
 import { isValidMetadataImageId, manifestToJson, matchMetadataRoutePattern, robotsToText, sitemapToXml } from "./metadata-routes.js";
 import { buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
-import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./prerender-cache-life-header.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { completeAppRouteHandlerResponse } from "./app-route-handler-execution.js";

package/dist/server/middleware-matcher.js

@@ -50,17 +50,30 @@ function matchesMiddlewarePathname(pathname, matcher, i18nConfig, localeContext)
 }
 function matchMatcherPattern(pathname, pattern, i18nConfig, localeContext) {
 	if (localeContext?.kind === "next-data") return matchNextDataPattern(pathname, pattern, i18nConfig, true);
-	if (!i18nConfig) return matchPattern(pathname, pattern);
+	if (!i18nConfig) return matchRequestPattern(pathname, pattern);
 	if (localeContext) {
 		if (localeContext.kind === "internal") return false;
-		return matchPattern(localeContext.kind === "literal" ? stripFirstPathSegment(pathname) : pathname, pattern);
+		return matchRequestPattern(localeContext.kind === "literal" ? stripFirstPathSegment(pathname) : pathname, pattern);
 	}
-	return matchPattern(stripLocalePrefix(pathname, i18nConfig) ?? pathname, pattern);
+	return matchRequestPattern(stripLocalePrefix(pathname, i18nConfig) ?? pathname, pattern);
 }
 function matchObjectMatcher(pathname, matcher, i18nConfig, localeContext) {
 	if (localeContext?.kind === "next-data") return matchNextDataPattern(pathname, matcher.source, i18nConfig, matcher.locale !== false);
 	if (matcher.locale !== false) return matchMatcherPattern(pathname, matcher.source, i18nConfig, localeContext);
-	return matchPattern(localeContext?.kind === "defaulted" ? `/${localeContext.defaultLocale}${pathname === "/" ? "" : pathname}` : pathname, matcher.source);
+	return matchRequestPattern(localeContext?.kind === "defaulted" ? `/${localeContext.defaultLocale}${pathname === "/" ? "" : pathname}` : pathname, matcher.source);
+}
+const APP_ROUTE_TRANSPORT_SUFFIX = "\\.rsc|\\.segments/.+\\.segment\\.rsc";
+const APP_ROUTE_TRANSPORT_SUFFIX_RE = /(?:\.rsc|\.segments\/.+\.segment\.rsc)$/;
+/**
+* Next.js compiles every matcher with optional App Router transport suffixes,
+* so a matcher for `/about` runs middleware for `/about.rsc` too. Middleware
+* still sees the path as requested.
+* https://github.com/vercel/next.js/blob/v16.2.7/packages/next/src/build/analysis/get-page-static-info.ts
+*/
+function matchRequestPattern(pathname, source) {
+	if (matchPattern(pathname, source)) return true;
+	if (!APP_ROUTE_TRANSPORT_SUFFIX_RE.test(pathname)) return false;
+	return matchPattern(pathname, source === "/" ? `/(/?index(?:${APP_ROUTE_TRANSPORT_SUFFIX}))?` : `${source}{(${APP_ROUTE_TRANSPORT_SUFFIX})}?`);
 }
 function matchNextDataPattern(pathname, source, i18nConfig, localized) {
 	if (compiledPattern(source) === INVALID_MATCHER_PATTERN) return true;
@@ -69,8 +82,8 @@ function matchNextDataPattern(pathname, source, i18nConfig, localized) {
 /**
 * The source Next.js compiles for a matcher: an optional `_next/data/<buildId>`
 * prefix, an internal locale segment under i18n, and an optional data suffix.
-* Next.js also accepts App Router transport suffixes, which end in `.rsc` and
-* so can never match a `.json` data URL.
+* Its App Router transport suffixes end in `.rsc`, so they can never match a
+* `.json` data URL.
 * https://github.com/vercel/next.js/blob/v16.2.7/packages/next/src/build/analysis/get-page-static-info.ts
 */
 function nextDataMatcherSource(source, i18nConfig, localized) {

package/dist/server/middleware-runtime.js

@@ -19,6 +19,7 @@ import { nextDataMiddlewareMatchPathname } from "./pages-data-route.js";
 import { reportRequestError } from "./instrumentation.js";
 import { isValidNavigationSignalError } from "../utils/navigation-signal.js";
 import { frameworkTracer } from "./tracer.js";
+import { logRequestError } from "./request-error-log.js";
 //#region src/server/middleware-runtime.ts
 function reportProxyError(options, error) {
 	const url = new URL(options.request.url);
@@ -252,8 +253,11 @@ async function executeMiddlewareModule(options) {
 	} catch (e) {
 		const isDevelopmentNavigationSignal = process.env.NODE_ENV !== "production" && isValidNavigationSignalError(e);
 		if (isDevelopmentNavigationSignal && e instanceof Error) e.message = `Next.js navigation API is not allowed to be used in ${options.isProxy ? "Proxy" : "Middleware"}.`;
-		console.error("[vinext] Middleware error:", e);
-		if (!isDevelopmentNavigationSignal) await reportProxyError(options, e);
+		if (isDevelopmentNavigationSignal) console.error("[vinext] Middleware error:", e);
+		else {
+			logRequestError("[vinext] Middleware error:", e);
+			await reportProxyError(options, e);
+		}
 		const waitUntilPromises = drainFetchEvent(fetchEvent);
 		releaseMiddlewareRequestBody(nextRequest, waitUntilPromises);
 		const message = options.includeErrorDetails ? "Middleware Error: " + (e instanceof Error ? e.message : String(e)) : "Internal Server Error";

package/dist/server/multi-stage.d.ts

@@ -77,14 +77,18 @@ export type VinextResponseStageDispatchOptions = {
    *
    * Under `responseStageCacheIdentity: "query-free"`, an App page identity
    * also drops the user query from the URL and `resolvedUrl`, keeping
-   * framework representation selectors: the `.rsc` suffix, the render mode,
-   * and, for RSC requests only, the one validated `_rsc` value. That is safe
+   * framework representation selectors: the render mode and, for RSC
+   * requests only, the one validated `_rsc` value. That is safe
    * only because completed-response admission refuses a cacheable App page
    * response unless its render proved it never read `searchParams`. The
    * dispatched request still carries the real query for the render itself. A
    * page identity keeps the query when a `next.config` public cache policy
    * applies (cached per full URL, as Next.js CDN caching is), and for
-   * interception and mounted-slot dispatches.
+   * interception and mounted-slot dispatches. A Route Handler or metadata
+   * route identity keeps only the method, path (without `.rsc`) and route
+   * props, as Next.js keys a route handler by its pathname: the RSC selectors
+   * pick no representation of its response, and admission refuses a handler
+   * that read the request's URL or headers.
    */
   cacheIdentity?: {
     props: unknown;

package/dist/server/pages-node-compat.d.ts

@@ -7,7 +7,7 @@ export type PagesRequestQuery = Record<string, string | string[]>;
 export type PagesReqResRequest = Readable & {
   method: string;
   url: string;
-  headers: Record<string, string>;
+  headers: Record<string, string | string[] | undefined>;
   query: PagesRequestQuery;
   body: unknown;
   cookies: Record<string, string>;

package/dist/server/pages-node-compat.js

@@ -367,6 +367,8 @@ function isVinextStreamedApiResponse(response) {
 function createPagesReqRes(options) {
 	const headersObj = {};
 	for (const [key, value] of options.request.headers) headersObj[key.toLowerCase()] = value;
+	const setCookies = options.request.headers.getSetCookie();
+	if (setCookies.length > 1) headersObj["set-cookie"] = setCookies;
 	const req = Object.assign(createRequestReadable(options.request), {
 		method: options.request.method,
 		url: options.url,

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

@@ -13,7 +13,7 @@ import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { isPageNotModified } from "./http-conditional.js";
-import { generatePagesETag, isPagesStreamingBot, rendersPagesNotModified } from "./pages-page-response.js";
+import { applyPagesPrerenderRevalidateHeader, generatePagesETag, isPagesStreamingBot, rendersPagesNotModified } from "./pages-page-response.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { tracePagesData, tracePagesDocument } from "./pages-execution-tracing.js";
@@ -130,6 +130,7 @@ function applyPagesTerminalMissHeaders(response, revalidateSeconds, isrCachePath
 		tags: [pagesPathCacheTag(isrCachePathname)]
 	});
 	for (const [name, value] of Object.entries(buildCacheStateHeaders("MISS"))) response.headers.set(name, value);
+	applyPagesPrerenderRevalidateHeader(response.headers, revalidateSeconds);
 	return response;
 }
 function applyCachedPagesRepresentationHeaders(response, cacheState, entry, options) {