vinext 1.4.0 → 1.4.2

package/dist/server/app-page-stream.js

@@ -86,7 +86,8 @@ async function renderAppPageHtmlStream(options) {
 		initialDevServerError: options.initialDevServerError,
 		onSsrError: options.onSsrError,
 		mirrorNextFlight: options.mirrorNextFlight,
-		fallbackToErrorDocumentOnShellError: options.fallbackToErrorDocumentOnShellError ?? (options.waitForAllReady !== true && options.hasCustomGlobalError === false),
+		fallbackToErrorDocumentOnShellError: options.fallbackToErrorDocumentOnShellError,
+		isServerComponentError: options.isServerComponentError,
 		resolveCaughtNotFoundBoundaries: options.resolveCaughtNotFoundBoundaries,
 		dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds,
 		getInitialNavigationCacheMetadata: options.getInitialNavigationCacheMetadata

package/dist/server/app-request-stage-independent-entry.js

@@ -32,7 +32,7 @@ function handleRequestStage(request, env, ctx, dispatchResponseStage) {
 			callback: () => handleRequest(request, env, ctx, dispatchResponseStage, ctx?.assets).then((response) => applyCdnResponseIdentityHeaders(response, originalRequest)),
 			getStatus: (response) => response?.status,
 			headers: request.headers,
-			isRsc: url.pathname.endsWith(".rsc") || request.headers.get("RSC") === "1",
+			isRsc: request.headers.get("RSC") === "1",
 			method: request.method,
 			target: url.pathname + url.search
 		});

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

@@ -58,6 +58,7 @@ async function handleResponseStage(request, env, platformCtx, props, dispatchReq
 		probeMode: props.cacheability.probeMode,
 		rawManifest: __cacheabilityManifest,
 		recomposesRequestScopedHeaders: props.kind === "app-page" && props.isRscRequest,
+		keepsParamsHeader: props.kind === "app-page" && props.interceptionContext !== null,
 		registerCacheAdapters: () => registerConfiguredCacheAdapters(env),
 		request,
 		representation: props.cacheability.representation,

package/dist/server/app-route-handler-execution.js

@@ -1,6 +1,7 @@
 import { isFullyBufferedBody } from "./fully-buffered-response.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { frameworkTracer } from "./tracer.js";
+import { logRequestError } from "./request-error-log.js";
 import { getRouteCacheabilityCaptureOptions, getRouteCacheabilityDynamicReason, isRouteCacheabilityEvaluation, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityResponseBodyComplete, recordRouteCacheability } from "../shims/cacheability-classification.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy } from "./cache-control.js";
 import { buildAppRouteMissIsrCacheControl } from "./isr-decision.js";
@@ -117,7 +118,7 @@ async function runAppRouteHandler(options) {
 		onDynamicAccess() {
 			options.markDynamicUsage();
 		},
-		requestMode: options.dynamicConfig === "force-static" || options.dynamicConfig === "error" ? options.dynamicConfig : "auto",
+		requestMode: options.dynamicConfig === "force-dynamic" || options.dynamicConfig === "force-static" || options.dynamicConfig === "error" ? options.dynamicConfig : "auto",
 		signal: options.requestSignal,
 		staticGenerationErrorMessage(expression) {
 			return getAppRouteStaticGenerationErrorMessage(options.routePattern, expression);
@@ -339,7 +340,7 @@ async function executeAppRouteHandlerImpl(options) {
 			}), options.middlewareContext, middlewareMergeOptions), shouldApplyDraftPolicy);
 			return applyDraftModeCachePolicy(applyRouteHandlerMiddlewareContext(new Response(null, { status: specialError.statusCode }), options.middlewareContext, middlewareMergeOptions), shouldApplyDraftPolicy);
 		}
-		console.error("[vinext] Route handler error:", error);
+		logRequestError("[vinext] Route handler error:", error);
 		await options.reportRequestError(error, {
 			path: options.cleanPathname,
 			method: options.request.method,

package/dist/server/app-route-handler-runtime.d.ts

@@ -21,7 +21,7 @@ type NextUrlDynamicAccess = "nextUrl.search" | "nextUrl.searchParams" | "nextUrl
 type HostDerivedNextUrlDynamicAccess = "nextUrl.protocol" | "nextUrl.username" | "nextUrl.password" | "nextUrl.host" | "nextUrl.hostname" | "nextUrl.port" | DomainLocaleNextUrlDynamicAccess;
 type DomainLocaleNextUrlDynamicAccess = "nextUrl.locale" | "nextUrl.defaultLocale" | "nextUrl.domainLocale";
 type AppRouteDynamicRequestAccess = RequestDynamicAccess | NextUrlDynamicAccess;
-type AppRouteRequestMode = "auto" | "force-static" | "error";
+type AppRouteRequestMode = "auto" | "force-dynamic" | "force-static" | "error";
 type TrackedAppRouteRequestOptions = {
   basePath?: string;
   i18n?: NextI18nConfig | null;

package/dist/server/app-route-handler-runtime.js

@@ -2,6 +2,7 @@ import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-r
 import { addBasePathToPathname } from "../utils/base-path.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
 import { NextRequest, RequestCookies, sealRequestCookies, sealRequestHeaders } from "../shims/server.js";
+import { throwIfInsideCacheScope } from "../shims/internal/headers-state.js";
 import { BUILT_IN_REQUEST_PROPERTIES } from "./app-route-request-built-ins.js";
 //#region src/server/app-route-handler-runtime.ts
 const BUILT_IN_REQUEST_PROPERTY_MAP = new Map(BUILT_IN_REQUEST_PROPERTIES.map((property) => [property.key, property]));
@@ -150,7 +151,8 @@ function createTrackedAppRouteRequest(request, options = {}) {
 	let didAccessDynamicRequest = false;
 	const requestMode = options.requestMode ?? "auto";
 	const nextConfig = buildNextConfig(options);
-	const markDynamicAccess = (access) => {
+	const markDynamicAccess = (access, trackedByNext) => {
+		if (trackedByNext && requestMode !== "force-dynamic") throwIfInsideCacheScope(access);
 		didAccessDynamicRequest = true;
 		options.onDynamicAccess?.(access);
 	};
@@ -184,7 +186,7 @@ function createTrackedAppRouteRequest(request, options = {}) {
 	const wrapNextUrl = (nextUrl) => {
 		return new Proxy(nextUrl, { get(target, prop) {
 			if (isNextDynamicNextUrlProperty(prop) || isHostDerivedNextUrlProperty(prop)) {
-				markDynamicAccess(`nextUrl.${String(prop)}`);
+				markDynamicAccess(`nextUrl.${String(prop)}`, isNextDynamicNextUrlProperty(prop));
 				return bindMethodIfNeeded(Reflect.get(target, prop, target), target);
 			}
 			if (prop === "clone") return () => wrapNextUrl(target.clone());
@@ -252,7 +254,7 @@ function createTrackedAppRouteRequest(request, options = {}) {
 		const accessCf = (read, forceStaticValue) => {
 			if (requestMode === "force-static") return forceStaticValue;
 			if (requestMode === "error") return throwStaticGenerationError("request.cf");
-			markDynamicAccess("request.cf");
+			markDynamicAccess("request.cf", false);
 			return read();
 		};
 		const controlledCfGetter = () => accessCf(sourceCfAccessor ? () => Reflect.apply(sourceCfAccessor, requestWithOverrides, []) : () => rawCfMetadata, void 0);
@@ -354,17 +356,19 @@ function createTrackedAppRouteRequest(request, options = {}) {
 						return proxiedNextUrl;
 					case "headers":
 					case "cookies":
-					case "ip":
-					case "geo":
 					case "url":
 					case "body":
 					case "blob":
-					case "bytes":
 					case "json":
 					case "text":
 					case "arrayBuffer":
 					case "formData":
-						markDynamicAccess(`request.${String(prop)}`);
+						markDynamicAccess(`request.${String(prop)}`, true);
+						return bindMethodIfNeeded(Reflect.get(target, prop, target), target);
+					case "ip":
+					case "geo":
+					case "bytes":
+						markDynamicAccess(`request.${String(prop)}`, false);
 						return bindMethodIfNeeded(Reflect.get(target, prop, target), target);
 					case "clone": return cloneTrackedRequest;
 					default: return getTrackedRequestProperty(target, prop, receiver);

package/dist/server/app-route-module-loader.d.ts

@@ -67,6 +67,7 @@ type LazyLoadableSlot = {
   loading?: unknown;
   loadings?: readonly unknown[];
   error?: unknown;
+  errors?: readonly unknown[];
   notFound?: unknown;
   notFounds?: readonly unknown[];
   __loadPage?: LazyModuleThunk | null;
@@ -76,6 +77,7 @@ type LazyLoadableSlot = {
   __loadLoading?: LazyModuleThunk | null;
   __loadLoadings?: LazyModuleLoaderArray | null;
   __loadError?: LazyModuleThunk | null;
+  __loadErrors?: LazyModuleLoaderArray | null;
   __loadNotFound?: LazyModuleThunk | null;
   __loadNotFounds?: LazyModuleLoaderArray | null;
   /** Hydrated only after an intercept matches, not with the slot's base modules. */

package/dist/server/app-route-module-loader.js

@@ -145,6 +145,7 @@ function ensureAppRouteModulesLoaded(route) {
 		pushFieldLoad(loads, slot, "loading", slot.__loadLoading);
 		pushArrayLoads(loads, slot.loadings, slot.__loadLoadings);
 		pushFieldLoad(loads, slot, "error", slot.__loadError);
+		pushArrayLoads(loads, slot.errors, slot.__loadErrors);
 		pushFieldLoad(loads, slot, "notFound", slot.__loadNotFound);
 		pushArrayLoads(loads, slot.notFounds, slot.__loadNotFounds);
 	}

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

@@ -37,7 +37,7 @@ var app_router_entry_default = {
 				callback: async () => applyCdnResponseIdentityHeaders(await handleRequest(request, env, ctx), request),
 				getStatus: (response) => response?.status,
 				headers: request.headers,
-				isRsc: url.pathname.endsWith(".rsc") || request.headers.get("RSC") === "1",
+				isRsc: request.headers.get("RSC") === "1",
 				method: request.method,
 				target: url.pathname + url.search
 			});

package/dist/server/app-rsc-cache-busting.d.ts

@@ -68,11 +68,6 @@ export declare function stripRscCacheBustingSearchParam(url: URL): void;
  * are dropped. Other requests keep no `_rsc`, because it selects nothing there.
  */
 export declare function keepOnlyValidatedRscCacheBustingSearchParam(url: URL, isRscRequest: boolean): void;
-/**
- * Remove a trailing `.rsc` suffix from a pathname. Returns the pathname
- * unchanged when the suffix is absent.
- */
-export declare function stripRscSuffix(pathname: string): string;
 export declare function createCanonicalRscRequestHeaders(deploymentId?: string | null | undefined): Headers;
 /** Headers for the deterministic loading-boundary prefetch representation. */
 export declare function createCanonicalLoadingShellRscRequestHeaders(deploymentId?: string | null | undefined): Headers;
@@ -96,13 +91,18 @@ export declare function canonicalizeLoadingShellRscRequestHeaders(headers: Heade
  * appended to the base instead of resolved against it.
  */
 export declare function parseRscRequestPath(href: string): URL;
+/**
+ * A pathname as the start of a path-absolute reference. One that begins with
+ * "//" would serialize as a protocol-relative URL naming another host, so it
+ * keeps a "/." prefix, as the WHATWG URL serializer does. URL resolution drops
+ * the dot segment, so the reference still targets the same pathname on the
+ * origin it is resolved against.
+ */
+export declare function toPathAbsolutePathname(pathname: string): string;
 /**
  * Serialize the path-absolute reference callers fetch against the app origin.
- * A pathname that begins with "//" would serialize as a protocol-relative URL
- * and send the request to another host, so it keeps a "/." prefix, as the
- * WHATWG URL serializer does. URL resolution drops the dot segment, so the
- * request still targets the same pathname on the app origin, as Next.js's
- * full-URL fetch does.
+ * A "//" pathname keeps its "/." prefix so the request still targets the same
+ * pathname on the app origin, as Next.js's full-URL fetch does.
  */
 export declare function formatRscRequestPath(url: URL): string;
 export declare function createRscRequestUrl(href: string, headers: Headers): Promise<string>;

package/dist/server/app-rsc-cache-busting.js

@@ -22,8 +22,10 @@ function encodeBase64Url(bytes) {
 	for (const byte of bytes) binary += String.fromCharCode(byte);
 	return btoa(binary).replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/, "");
 }
-function normalizeHeaderValue(value) {
-	return value ?? "0";
+function serializeHeaderValue(value) {
+	if (value === null) return "0";
+	if (value === "0") return "\\0";
+	return value.replaceAll("\\", "\\\\").replaceAll(",", "\\,");
 }
 function normalizeCompatibilityId(value) {
 	return value && value.length > 0 ? value : null;
@@ -57,9 +59,9 @@ function resolveHardNavigationTargetFromRscResponse(responseUrl, currentHref, or
 	const parsed = new URL(responseUrl, origin);
 	stripRscCacheBustingSearchParam(parsed);
 	const origUrl = new URL(currentHref, origin);
-	let pathname = stripRscSuffix(parsed.pathname);
+	let pathname = parsed.pathname;
 	if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
-	let hardNavigationTarget = pathname + parsed.search;
+	let hardNavigationTarget = toPathAbsolutePathname(pathname) + parsed.search;
 	if (origUrl.hash) hardNavigationTarget += origUrl.hash;
 	return hardNavigationTarget;
 }
@@ -74,21 +76,21 @@ function normalizeRenderModeHeaderValue(value) {
 	const renderMode = parseAppRscRenderMode(value);
 	return renderMode === "navigation" ? null : renderMode;
 }
-function createCacheBustingInput(headers, options = {}) {
+function createCacheBustingInput(headers) {
 	const values = [
 		headers.get(NEXT_ROUTER_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER),
 		headers.get(NEXT_ROUTER_STATE_TREE_HEADER),
 		headers.get(NEXT_URL_HEADER),
 		headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER),
-		...options.includeInterceptionIdHeader === false ? [] : [headers.get(VINEXT_INTERCEPTION_ID_HEADER)],
+		headers.get(VINEXT_INTERCEPTION_ID_HEADER),
 		headers.get(VINEXT_MOUNTED_SLOTS_HEADER),
-		...options.includeRenderModeHeader === false ? [] : [normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))]
+		normalizeRenderModeHeaderValue(headers.get(VINEXT_RSC_RENDER_MODE_HEADER))
 	];
 	const stateFingerprint = headers.get(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-	if (options.includeStateFingerprintHeader !== false && stateFingerprint !== null) values.push(stateFingerprint);
+	if (stateFingerprint !== null) values.push(stateFingerprint);
 	if (values.every((value) => value === null)) return null;
-	return values.map(normalizeHeaderValue).join(",");
+	return values.map(serializeHeaderValue).join(",");
 }
 async function sha256CacheBustingHash(input) {
 	const subtle = globalThis.crypto?.subtle;
@@ -147,13 +149,6 @@ function keepOnlyValidatedRscCacheBustingSearchParam(url, isRscRequest) {
 	url.search = "";
 	if (hash !== null) setRscCacheBustingSearchParam(url, hash);
 }
-/**
-* Remove a trailing `.rsc` suffix from a pathname. Returns the pathname
-* unchanged when the suffix is absent.
-*/
-function stripRscSuffix(pathname) {
-	return pathname.endsWith(".rsc") ? pathname.slice(0, -4) : pathname;
-}
 function createCanonicalRscRequestHeaders(deploymentId = getDeploymentId()) {
 	const headers = new Headers({
 		Accept: VINEXT_RSC_CONTENT_TYPE,
@@ -232,15 +227,22 @@ function parseRscRequestPath(href) {
 	return new URL(beforeHash, RSC_REQUEST_URL_BASE);
 }
 /**
+* A pathname as the start of a path-absolute reference. One that begins with
+* "//" would serialize as a protocol-relative URL naming another host, so it
+* keeps a "/." prefix, as the WHATWG URL serializer does. URL resolution drops
+* the dot segment, so the reference still targets the same pathname on the
+* origin it is resolved against.
+*/
+function toPathAbsolutePathname(pathname) {
+	return pathname.startsWith("//") ? `/.${pathname}` : pathname;
+}
+/**
 * Serialize the path-absolute reference callers fetch against the app origin.
-* A pathname that begins with "//" would serialize as a protocol-relative URL
-* and send the request to another host, so it keeps a "/." prefix, as the
-* WHATWG URL serializer does. URL resolution drops the dot segment, so the
-* request still targets the same pathname on the app origin, as Next.js's
-* full-URL fetch does.
+* A "//" pathname keeps its "/." prefix so the request still targets the same
+* pathname on the app origin, as Next.js's full-URL fetch does.
 */
 function formatRscRequestPath(url) {
-	return `${url.pathname.startsWith("//") ? `/.${url.pathname}` : url.pathname}${url.search}`;
+	return `${toPathAbsolutePathname(url.pathname)}${url.search}`;
 }
 async function createRscRequestUrl(href, headers) {
 	const url = parseRscRequestPath(href);
@@ -275,55 +277,12 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	const url = new URL(options.request.url);
 	const actualHash = url.searchParams.get(VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM);
 	const expectedHash = await computeRscCacheBustingSearchParam(options.request.headers);
-	if (actualHash === null && expectedHash === "" && url.pathname.endsWith(".rsc")) return null;
-	const acceptedHashes = /* @__PURE__ */ new Set([expectedHash]);
-	if (actualHash !== null && actualHash !== expectedHash) {
-		acceptedHashes.add(computeLegacyRscCacheBustingSearchParam(options.request.headers));
-		const compatibilityInputs = [];
-		const hasInterceptionId = options.request.headers.has(VINEXT_INTERCEPTION_ID_HEADER);
-		const hasStateFingerprint = options.request.headers.has(VINEXT_RSC_STATE_FINGERPRINT_HEADER);
-		const hasNormalRenderMode = normalizeRenderModeHeaderValue(options.request.headers.get(VINEXT_RSC_RENDER_MODE_HEADER)) === null;
-		if (!hasInterceptionId) compatibilityInputs.push({ includeInterceptionIdHeader: false });
-		if (hasStateFingerprint) {
-			compatibilityInputs.push({ includeStateFingerprintHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		if (hasNormalRenderMode) {
-			compatibilityInputs.push({ includeRenderModeHeader: false });
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false
-			});
-		}
-		if (hasStateFingerprint && hasNormalRenderMode) {
-			compatibilityInputs.push({
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-			if (!hasInterceptionId) compatibilityInputs.push({
-				includeInterceptionIdHeader: false,
-				includeRenderModeHeader: false,
-				includeStateFingerprintHeader: false
-			});
-		}
-		for (const compatibilityOptions of compatibilityInputs) {
-			const input = createCacheBustingInput(options.request.headers, compatibilityOptions);
-			if (input === null) acceptedHashes.add("");
-			else {
-				acceptedHashes.add(await sha256CacheBustingHash(input));
-				acceptedHashes.add(fnv1a64(input));
-			}
-		}
-	}
-	if (actualHash !== null && acceptedHashes.has(actualHash)) return null;
+	if (actualHash !== null && (actualHash === expectedHash || actualHash === computeLegacyRscCacheBustingSearchParam(options.request.headers))) return null;
 	setRscCacheBustingSearchParam(url, expectedHash);
 	return new Response(null, {
 		status: 307,
-		headers: { Location: `${url.pathname}${url.search}` }
+		headers: { Location: formatRscRequestPath(url) }
 	});
 }
 //#endregion
-export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
+export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, toPathAbsolutePathname };

package/dist/server/app-rsc-error-handler.js

@@ -23,7 +23,7 @@ function createAppRscOnErrorHandler(reportRequestError, request, pathname, route
 		routerKind: "App Router",
 		routePath: routePath || pathname,
 		routeType: overrides?.routeType ?? "render",
-		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" || new URL(request.url).pathname.endsWith(".rsc") ? "react-server-components-payload" : "react-server-components"),
+		renderSource: overrides?.renderSource ?? (request.headers.get("RSC") === "1" ? "react-server-components-payload" : "react-server-components"),
 		revalidateReason: isOnDemandRevalidateRequest(request.headers.get("x-prerender-revalidate")) ? "on-demand" : overrides?.revalidateReason
 	};
 	let loggedErrors = loggedErrorsByRequest.get(request);

package/dist/server/app-rsc-errors.js

@@ -1,4 +1,6 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { logRequestError } from "./request-error-log.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 import { isAppRenderAbortError } from "./app-render-abort-error.js";
 import { getProperError } from "./proper-error.js";
@@ -87,6 +89,7 @@ function createRscOnErrorHandler(options) {
 		if (!hasDigest(properError) && (properError !== reportableError || options.attachDigest !== false)) try {
 			Object.assign(properError, { digest });
 		} catch {}
+		if (nodeEnv !== "production") rewriteClientHookError(properError);
 		if (options.requestInfo && options.errorContext) options.reportRequestError(properError, options.requestInfo, options.errorContext);
 		if (process.env.VINEXT_PRERENDER === "1" && error) {
 			if (!loggedPrerenderErrors?.has(reportableError)) {
@@ -94,7 +97,7 @@ function createRscOnErrorHandler(options) {
 				const route = options.requestInfo?.path ?? options.errorContext?.routePath ?? "<unknown>";
 				console.error(`[vinext] Error prerendering route ${JSON.stringify(route)}:`, reportableError);
 			}
-		} else if (!(reportableError !== error && thrownHasDigest) && !wasLogged(reportableError)) console.error("[vinext] Server render error:", properError);
+		} else if (!(reportableError !== error && thrownHasDigest) && !wasLogged(reportableError)) logRequestError("[vinext] Server render error:", properError);
 		return digest;
 	};
 }

package/dist/server/app-rsc-handler.d.ts

@@ -6,6 +6,7 @@ import { ExecutionContextLike } from "../shims/request-context.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
+import { AppPageNavigationParamSlot } from "./app-page-navigation-params.js";
 import { PagesRouteDataKind } from "./pages-route-data-kind.js";
 import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
 import { TrustedPrerenderState } from "./prerender-route-params.js";
@@ -41,9 +42,17 @@ export type AppRscHandlerRoute = {
   rootParamNames?: readonly string[];
   routeHandler?: unknown;
   routeSegments: readonly string[];
-  slots?: AppRouteTreePrefetchRoute["slots"];
+  slots?: Readonly<Record<string, NonNullable<AppRouteTreePrefetchRoute["slots"]>[string] & AppPageNavigationParamSlot>> | null;
 };
 type AppRscRouteMatch<TRoute> = {
+  /**
+   * For an interception match, the source route and params the interception
+   * context names, when they differ from the rendered `route` and `params`:
+   * a sibling intercept opened from a deeper source renders the intercepting
+   * route itself, while the deeper source is what gets authorized.
+   */
+  authorizationParams?: AppPageParams;
+  authorizationRoute?: TRoute;
   interceptionSourceIsConcrete?: boolean;
   params: AppPageParams;
   route: TRoute;