vinext 1.0.0-beta.1 → 1.0.0-beta.3

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

@@ -42,6 +42,7 @@ type RunAppRouteHandlerOptions = {
   dynamicConfig?: string;
   handlerFn: AppRouteHandlerFunction;
   i18n?: NextI18nConfig | null;
+  isDraftMode?: boolean;
   trailingSlash?: boolean;
   markDynamicUsage: MarkAppRouteDynamicUsageFn;
   middlewareRequestHeaders?: Headers | null;
@@ -58,6 +59,7 @@ type RunAppRouteHandlerResult = {
   dynamicUsedInHandler: boolean;
   response: Response;
 };
+declare function applyDraftModeCachePolicy(response: Response, isDraftMode: boolean): Response;
 type ExecuteAppRouteHandlerOptions = {
   buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];
   clearRequestContext: () => void;
@@ -65,9 +67,12 @@ type ExecuteAppRouteHandlerOptions = {
   executionContext: ExecutionContextLike | null;
   getAndClearPendingCookies: () => string[];
   getCollectedFetchTags: () => string[];
+  getActiveDraftModeState?: () => boolean | null;
   getDraftModeCookieHeader: () => string | null | undefined;
   handler: AppRouteHandlerModule;
   isAutoHead: boolean;
+  initialDraftModeCookie?: string | null;
+  isDraftMode?: boolean;
   isProduction: boolean;
   isrDebug?: AppRouteDebugLogger;
   isrRouteKey: (pathname: string) => string;
@@ -83,4 +88,4 @@ type ExecuteAppRouteHandlerOptions = {
 declare function runAppRouteHandler(options: RunAppRouteHandlerOptions): Promise<RunAppRouteHandlerResult>;
 declare function executeAppRouteHandler(options: ExecuteAppRouteHandlerOptions): Promise<Response>;
 //#endregion
-export { AppRouteDebugLogger, AppRouteDynamicUsageFn, AppRouteHandlerFunction, AppRouteParams, MarkAppRouteDynamicUsageFn, RouteHandlerCacheSetter, executeAppRouteHandler, runAppRouteHandler };
+export { AppRouteDebugLogger, AppRouteDynamicUsageFn, AppRouteHandlerFunction, AppRouteParams, MarkAppRouteDynamicUsageFn, RouteHandlerCacheSetter, applyDraftModeCachePolicy, executeAppRouteHandler, runAppRouteHandler };

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

@@ -1,15 +1,27 @@
+import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
-import { runWithRootParamsUsage } from "../shims/root-params.js";
+import { _drainPendingRevalidations } from "../shims/cache-request-state.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
+import { runWithRootParamsUsage } from "../shims/root-params.js";
 import { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss } from "./app-route-handler-response.js";
 import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { createStaticGenerationHeadersContext, getAppRouteStaticGenerationErrorMessage } from "./app-static-generation.js";
 import { resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldWriteAppRouteHandlerCache } from "./app-route-handler-policy.js";
 //#region src/server/app-route-handler-execution.ts
+function applyDraftModeCachePolicy(response, isDraftMode) {
+	if (!isDraftMode) return response;
+	const headers = new Headers(response.headers);
+	applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
+	return new Response(response.body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	});
+}
 function configureAppRouteStaticGenerationContext(options) {
 	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") {
 		setHeadersContext(createStaticGenerationHeadersContext({
-			draftModeEnabled: options.draftModeSecret !== void 0 && isDraftModeRequest(options.request, options.draftModeSecret),
+			draftModeEnabled: options.isDraftMode ?? (options.draftModeSecret !== void 0 && isDraftModeRequest(options.request, options.draftModeSecret)),
 			draftModeSecret: options.draftModeSecret,
 			dynamicConfig: options.dynamicConfig,
 			routeKind: "route",
@@ -46,18 +58,30 @@ async function runAppRouteHandler(options) {
 async function executeAppRouteHandler(options) {
 	const previousHeadersPhase = options.setHeadersAccessPhase("route-handler");
 	try {
-		const { dynamicUsedInHandler, response } = await runAppRouteHandler({
-			...options,
-			dynamicConfig: options.handler.dynamic
-		});
+		let handlerResult;
+		try {
+			handlerResult = await runAppRouteHandler({
+				...options,
+				dynamicConfig: options.handler.dynamic
+			});
+		} finally {
+			await _drainPendingRevalidations();
+		}
+		const { dynamicUsedInHandler, response } = handlerResult;
 		assertSupportedAppRouteHandlerResponse(response);
 		const handlerSetCacheControl = response.headers.has("cache-control");
 		if (dynamicUsedInHandler) markKnownDynamicAppRoute(options.routePattern);
+		const pendingCookies = options.getAndClearPendingCookies();
+		const handlerDraftCookie = options.getDraftModeCookieHeader();
+		const draftCookie = handlerDraftCookie ?? options.initialDraftModeCookie;
+		const shouldApplyDraftPolicy = (options.getActiveDraftModeState?.() ?? options.isDraftMode === true) || draftCookie != null;
+		if (handlerDraftCookie != null) markKnownDynamicAppRoute(options.routePattern);
 		const routeTags = options.buildPageCacheTags(options.cleanPathname, options.getCollectedFetchTags());
 		if (shouldApplyAppRouteHandlerRevalidateHeader({
 			dynamicUsedInHandler,
 			handlerSetCacheControl,
 			isAutoHead: options.isAutoHead,
+			isDraftMode: shouldApplyDraftPolicy,
 			method: options.method,
 			revalidateSeconds: options.revalidateSeconds
 		})) {
@@ -70,6 +94,7 @@ async function executeAppRouteHandler(options) {
 			dynamicUsedInHandler,
 			handlerSetCacheControl,
 			isAutoHead: options.isAutoHead,
+			isDraftMode: shouldApplyDraftPolicy,
 			isProduction: options.isProduction,
 			method: options.method,
 			revalidateSeconds: options.revalidateSeconds
@@ -90,29 +115,30 @@ async function executeAppRouteHandler(options) {
 			})();
 			options.executionContext?.waitUntil(routeWritePromise);
 		}
-		const pendingCookies = options.getAndClearPendingCookies();
-		const draftCookie = options.getDraftModeCookieHeader();
 		options.clearRequestContext();
-		return applyRouteHandlerMiddlewareContext(finalizeRouteHandlerResponse(response, {
+		return applyDraftModeCachePolicy(applyRouteHandlerMiddlewareContext(finalizeRouteHandlerResponse(response, {
 			pendingCookies,
 			draftCookie,
 			isHead: options.isAutoHead
-		}), options.middlewareContext);
+		}), options.middlewareContext), shouldApplyDraftPolicy);
 	} catch (error) {
 		const pendingCookies = options.getAndClearPendingCookies();
-		const draftCookie = options.getDraftModeCookieHeader();
+		const handlerDraftCookie = options.getDraftModeCookieHeader();
+		const draftCookie = handlerDraftCookie ?? options.initialDraftModeCookie;
+		const shouldApplyDraftPolicy = (options.getActiveDraftModeState?.() ?? options.isDraftMode === true) || draftCookie != null;
+		if (handlerDraftCookie != null) markKnownDynamicAppRoute(options.routePattern);
 		const specialError = resolveAppRouteHandlerSpecialError(error, options.request.url, { isAction: isPossibleAppRouteActionRequest(options.request) });
 		options.clearRequestContext();
 		if (specialError) {
-			if (specialError.kind === "redirect") return applyRouteHandlerMiddlewareContext(finalizeRouteHandlerResponse(new Response(null, {
+			if (specialError.kind === "redirect") return applyDraftModeCachePolicy(applyRouteHandlerMiddlewareContext(finalizeRouteHandlerResponse(new Response(null, {
 				status: specialError.statusCode,
 				headers: { Location: specialError.location }
 			}), {
 				pendingCookies,
 				draftCookie,
 				isHead: options.isAutoHead
-			}), options.middlewareContext);
-			return applyRouteHandlerMiddlewareContext(new Response(null, { status: specialError.statusCode }), options.middlewareContext);
+			}), options.middlewareContext), shouldApplyDraftPolicy);
+			return applyDraftModeCachePolicy(applyRouteHandlerMiddlewareContext(new Response(null, { status: specialError.statusCode }), options.middlewareContext), shouldApplyDraftPolicy);
 		}
 		console.error("[vinext] Route handler error:", error);
 		options.reportRequestError(error instanceof Error ? error : new Error(String(error)), {
@@ -124,10 +150,10 @@ async function executeAppRouteHandler(options) {
 			routePath: options.routePattern,
 			routeType: "route"
 		});
-		return applyRouteHandlerMiddlewareContext(new Response(null, { status: 500 }), options.middlewareContext);
+		return applyDraftModeCachePolicy(applyRouteHandlerMiddlewareContext(new Response(null, { status: 500 }), options.middlewareContext), shouldApplyDraftPolicy);
 	} finally {
 		options.setHeadersAccessPhase(previousHeadersPhase);
 	}
 }
 //#endregion
-export { executeAppRouteHandler, runAppRouteHandler };
+export { applyDraftModeCachePolicy, executeAppRouteHandler, runAppRouteHandler };

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

@@ -20,6 +20,7 @@ type AppRouteHandlerCacheReadOptions = {
   handlerFn: unknown;
   isAutoHead: boolean;
   isKnownDynamic: boolean;
+  isDraftMode?: boolean;
   isProduction: boolean;
   method: string;
   revalidateSeconds: number | null;
@@ -29,6 +30,7 @@ type AppRouteHandlerResponseCacheOptions = {
   dynamicUsedInHandler: boolean;
   handlerSetCacheControl: boolean;
   isAutoHead: boolean;
+  isDraftMode?: boolean;
   isProduction: boolean;
   method: string;
   revalidateSeconds: number | null;

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

@@ -30,13 +30,13 @@ function resolveAppRouteHandlerMethod(handler, method) {
 	};
 }
 function shouldReadAppRouteHandlerCache(options) {
-	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && !options.isKnownDynamic && (options.method === "GET" || options.isAutoHead) && typeof options.handlerFn === "function";
+	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && !options.isDraftMode && !options.isKnownDynamic && (options.method === "GET" || options.isAutoHead) && typeof options.handlerFn === "function";
 }
 function shouldApplyAppRouteHandlerRevalidateHeader(options) {
-	return options.revalidateSeconds !== null && !options.dynamicUsedInHandler && (options.method === "GET" || options.isAutoHead) && !options.handlerSetCacheControl;
+	return options.revalidateSeconds !== null && !options.isDraftMode && !options.dynamicUsedInHandler && (options.method === "GET" || options.isAutoHead) && !options.handlerSetCacheControl;
 }
 function shouldWriteAppRouteHandlerCache(options) {
-	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && shouldApplyAppRouteHandlerRevalidateHeader(options);
+	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && !options.isDraftMode && shouldApplyAppRouteHandlerRevalidateHeader(options);
 }
 function resolveAppRouteHandlerSpecialError(error, requestUrl, options) {
 	if (!(error && typeof error === "object" && "digest" in error)) return null;

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

@@ -1,9 +1,9 @@
 import "../utils/protocol-headers.js";
 import "./headers.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildAppRouteMissIsrCacheControl, decideIsr } from "./isr-decision.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
 //#region src/server/app-route-handler-response.ts

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

@@ -28,6 +28,8 @@ type LazyModuleLoaderArray = readonly (LazyModuleThunk | null | undefined)[];
 type LazyLoadableIntercept = {
   interceptLayouts?: readonly unknown[] | null;
   __loadInterceptLayouts?: LazyModuleLoaderArray | null;
+  interceptLoadings?: readonly unknown[] | null;
+  __loadInterceptLoadings?: LazyModuleLoaderArray | null;
   __loadState?: {
     interceptLayoutsLoading: Promise<readonly unknown[]> | null;
   };
@@ -38,13 +40,17 @@ type LazyLoadableSlot = {
   layout?: unknown;
   configLayouts?: readonly unknown[];
   loading?: unknown;
+  loadings?: readonly unknown[];
   error?: unknown;
+  notFound?: unknown;
   __loadPage?: LazyModuleThunk | null;
   __loadDefault?: LazyModuleThunk | null;
   __loadLayout?: LazyModuleThunk | null;
   __loadConfigLayouts?: LazyModuleLoaderArray | null;
   __loadLoading?: LazyModuleThunk | null;
-  __loadError?: LazyModuleThunk | null; /** Hydrated only after an intercept matches, not with the slot's base modules. */
+  __loadLoadings?: LazyModuleLoaderArray | null;
+  __loadError?: LazyModuleThunk | null;
+  __loadNotFound?: LazyModuleThunk | null; /** Hydrated only after an intercept matches, not with the slot's base modules. */
   intercepts?: LazyLoadableIntercept[];
 };
 type LazyLoadableRoute = {
@@ -52,6 +58,7 @@ type LazyLoadableRoute = {
   routeHandler?: unknown;
   layouts?: unknown[];
   templates?: unknown[];
+  loadings?: unknown[];
   errors?: unknown[];
   errorPaths?: unknown[];
   notFounds?: unknown[];
@@ -68,6 +75,7 @@ type LazyLoadableRoute = {
   __loadRouteHandler?: LazyModuleThunk | null;
   __loadLayouts?: LazyModuleLoaderArray | null;
   __loadTemplates?: LazyModuleLoaderArray | null;
+  __loadLoadings?: LazyModuleLoaderArray | null;
   __loadErrors?: LazyModuleLoaderArray | null;
   __loadErrorPaths?: LazyModuleLoaderArray | null;
   __loadNotFounds?: LazyModuleLoaderArray | null;

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

@@ -20,6 +20,7 @@ function loadAppInterceptLayouts(intercept) {
 	if (loadState?.interceptLayoutsLoading) return loadState.interceptLayoutsLoading;
 	const loads = [];
 	pushArrayLoads(loads, intercept.interceptLayouts, intercept.__loadInterceptLayouts);
+	pushArrayLoads(loads, intercept.interceptLoadings, intercept.__loadInterceptLoadings);
 	if (loads.length === 0) return Promise.resolve(intercept.interceptLayouts ?? []);
 	const loading = Promise.all(loads).then(() => {
 		if (loadState) loadState.interceptLayoutsLoading = null;
@@ -52,6 +53,7 @@ function ensureAppRouteModulesLoaded(route) {
 	pushFieldLoad(loads, route, "unauthorized", route.__loadUnauthorized);
 	pushArrayLoads(loads, route.layouts, route.__loadLayouts);
 	pushArrayLoads(loads, route.templates, route.__loadTemplates);
+	pushArrayLoads(loads, route.loadings, route.__loadLoadings);
 	pushArrayLoads(loads, route.errors, route.__loadErrors);
 	pushArrayLoads(loads, route.errorPaths, route.__loadErrorPaths);
 	pushArrayLoads(loads, route.notFounds, route.__loadNotFounds);
@@ -63,7 +65,9 @@ function ensureAppRouteModulesLoaded(route) {
 		pushFieldLoad(loads, slot, "layout", slot.__loadLayout);
 		pushArrayLoads(loads, slot.configLayouts, slot.__loadConfigLayouts);
 		pushFieldLoad(loads, slot, "loading", slot.__loadLoading);
+		pushArrayLoads(loads, slot.loadings, slot.__loadLoadings);
 		pushFieldLoad(loads, slot, "error", slot.__loadError);
+		pushFieldLoad(loads, slot, "notFound", slot.__loadNotFound);
 	}
 	if (loads.length === 0) {
 		route.__loaded = true;

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

@@ -1,6 +1,6 @@
 import "./server-globals.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { badRequestResponse, notFoundResponse, notFoundStaticAssetResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, filterInternalHeaders } from "./request-pipeline.js";
@@ -8,6 +8,7 @@ import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js"
 import { getImageOptimizer, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { finalizeMissingStaticAssetResponse, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { createWorkerRevalidationContext } from "./worker-revalidation-context.js";
 import rscHandler, { __assetPrefix, __basePath, __imageAllowedWidths, __imageConfig } from "virtual:vinext-rsc-entry";
 import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import { registerConfiguredImageOptimizer } from "virtual:vinext-image-adapters";
@@ -17,7 +18,8 @@ const __workerAssetPathPrefix = assetPrefixPathname(typeof __assetPrefix === "st
 var app_router_entry_default = { async fetch(request, env, ctx) {
 	return handleRequest(request, env, ctx);
 } };
-async function handleRequest(request, env, ctx) {
+async function handleRequest(request, env, platformCtx) {
+	const ctx = platformCtx?.trustedRevalidateOrigin ? platformCtx : createWorkerRevalidationContext(platformCtx, (internalRequest, internalCtx) => handleRequest(internalRequest, env, internalCtx));
 	registerConfiguredCacheAdapters(env);
 	registerConfiguredImageOptimizer(env);
 	const url = new URL(request.url);
@@ -34,7 +36,8 @@ async function handleRequest(request, env, ctx) {
 	const missingBuildAsset = isNextStaticPath(url.pathname, __workerBasePath, __workerAssetPathPrefix);
 	{
 		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
-		const filteredHeaders = filterInternalHeaders(request.headers);
+		const filteredHeaders = ctx.isInternalPagesRevalidation ? new Headers(request.headers) : filterInternalHeaders(request.headers);
+		filteredHeaders.delete(VINEXT_REVALIDATE_HOST_HEADER);
 		const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);
 		if (prerenderRouteParamsHeader !== null) filteredHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
 		request = cloneRequestWithHeaders(request, filteredHeaders);

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

@@ -1,5 +1,5 @@
-import { VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { VINEXT_RSC_RENDER_MODE_HEADER } from "./headers.js";
 
 //#region src/server/app-rsc-cache-busting.d.ts
 /**

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

@@ -34,7 +34,7 @@ declare function getDigestForWellKnownError(error: unknown): string | undefined;
  * djb2 hash matching Next.js's string-hash package for RSC error digests.
  */
 declare function errorDigest(input: string): string;
-declare function sanitizeErrorForClient(error: unknown, nodeEnv?: string | undefined): unknown;
+declare function sanitizeErrorForClient(error: unknown, nodeEnv?: "development" | "production" | "test"): unknown;
 declare function createRscOnErrorHandler(options: CreateRscOnErrorHandlerOptions): (error: unknown) => string | undefined;
 //#endregion
 export { createRscOnErrorHandler, errorDigest, getDigestForWellKnownError, hasDigest, sanitizeErrorForClient };

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

@@ -1,11 +1,17 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 //#region src/server/app-rsc-errors.ts
+const ORIGINAL_SERVER_ERROR = Symbol.for("vinext.originalServerError");
 function hasDigest(error) {
 	return Boolean(error && typeof error === "object" && "digest" in error);
 }
 const BAILOUT_TO_CSR_DIGEST = "BAILOUT_TO_CLIENT_SIDE_RENDERING";
 const DYNAMIC_SERVER_USAGE_DIGEST = "DYNAMIC_SERVER_USAGE";
+function isAbortError(error) {
+	if (!error || typeof error !== "object") return false;
+	const name = Reflect.get(error, "name");
+	return name === "AbortError" || name === "ResponseAborted";
+}
 /**
 * vinext's mirror of Next.js's `getDigestForWellKnownError`: returns the digest
 * string only when the error is a genuine control-flow signal — a redirect,
@@ -39,19 +45,33 @@ function sanitizeErrorForClient(error, nodeEnv = process.env.NODE_ENV) {
 	if (resolveAppPageSpecialError(error)) return error;
 	if (nodeEnv !== "production") return error;
 	const sanitized = /* @__PURE__ */ new Error("An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.");
-	sanitized.digest = errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));
+	sanitized.digest = hasDigest(error) ? String(error.digest) : errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));
+	Object.defineProperty(sanitized, ORIGINAL_SERVER_ERROR, {
+		configurable: false,
+		enumerable: false,
+		value: error,
+		writable: false
+	});
 	return sanitized;
 }
 function createRscOnErrorHandler(options) {
 	return (error) => {
 		const nodeEnv = options.nodeEnv ?? process.env.NODE_ENV;
+		if (isAbortError(error)) return;
 		const wellKnownDigest = getDigestForWellKnownError(error);
 		if (wellKnownDigest !== void 0) return wellKnownDigest;
 		if (nodeEnv !== "production" && error instanceof Error && error.message.includes("Only plain objects, and a few built-ins, can be passed to Client Components")) {
 			console.error("[vinext] RSC serialization error: a non-plain object was passed from a Server Component to a Client Component.\n\nCommon causes:\n  * Passing a module namespace (import * as X) directly as a prop.\n    Unlike Next.js (webpack), Vite produces real ESM module namespace objects\n    which are not serializable. Fix: pass individual values instead,\n    e.g. <Comp value={module.value} />\n  * Passing a class instance (new Foo()) as a prop.\n    Fix: convert to a plain object, e.g. { id: foo.id, name: foo.name }\n  * Passing a Date, Map, or Set. Use .toISOString(), [...map.entries()], etc.\n  * Passing Object.create(null). Use { ...obj } to restore a prototype.\n\nOriginal error:", error.message);
 			return;
 		}
-		if (options.requestInfo && options.errorContext && error) options.reportRequestError(error instanceof Error ? error : new Error(getThrownValueMessage(error)), options.requestInfo, options.errorContext);
+		if (options.requestInfo && options.errorContext && error) {
+			const reportableError = typeof error === "object" && ORIGINAL_SERVER_ERROR in error ? Reflect.get(error, ORIGINAL_SERVER_ERROR) : error;
+			options.reportRequestError(reportableError instanceof Error ? reportableError : new Error(getThrownValueMessage(reportableError)), options.requestInfo, options.errorContext);
+		}
+		if (nodeEnv !== "production" && error && !hasDigest(error)) {
+			const loggableError = typeof error === "object" && ORIGINAL_SERVER_ERROR in error ? Reflect.get(error, ORIGINAL_SERVER_ERROR) : error;
+			console.error("[vinext] Server render error:", loggableError);
+		}
 		if (hasDigest(error)) return String(error.digest);
 		if (error) {
 			const digest = errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));

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

@@ -1,9 +1,9 @@
 import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
 import { ImageConfig } from "./image-optimization.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
 import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
 import { AppRouteTreePrefetchRoute, PrefetchInliningConfig } from "./app-route-tree-prefetch.js";
@@ -48,6 +48,7 @@ type DispatchMatchedPageOptions<TRoute> = {
   actionFailed?: boolean;
   handlerStart: number;
   interceptionContext: string | null;
+  interceptionPathname: string;
   isProgressiveActionRender: boolean;
   isRscRequest: boolean;
   middlewareContext: AppRscMiddlewareContext;
@@ -87,12 +88,13 @@ type DispatchMatchedRouteHandlerOptions<TRoute> = {
   route: TRoute;
   searchParams: URLSearchParams;
 };
-type HandleProgressiveActionRequestOptions = {
+type HandleProgressiveActionRequestOptions<TRoute> = {
   actionId: string | null;
   cleanPathname: string;
   contentType: string;
   middlewareContext: AppRscMiddlewareContext;
   request: Request;
+  routeMatch: AppRscRouteMatch<TRoute> | null;
 };
 /**
  * Side-effect headers captured during a progressive (no-JS) server action's
@@ -114,7 +116,7 @@ type ProgressiveActionFormStateResult = ({
   formState: null;
   kind: "form-state";
 } & ProgressiveActionSideEffects);
-type HandleServerActionRequestOptions = {
+type HandleServerActionRequestOptions<TRoute> = {
   actionId: string | null;
   cleanPathname: string;
   contentType: string;
@@ -123,6 +125,8 @@ type HandleServerActionRequestOptions = {
   middlewareContext: AppRscMiddlewareContext;
   mountedSlotsHeader: string | null;
   request: Request;
+  routeMatch: AppRscRouteMatch<TRoute> | null;
+  routePathname: string;
   searchParams: URLSearchParams;
 };
 type RenderNotFoundOptions<TRoute> = {
@@ -183,15 +187,16 @@ type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
    * Node server and dev included, not just the Cloudflare worker entry.
    */
   registerCacheAdapters: (env?: Record<string, unknown>) => void;
-  handleProgressiveActionRequest?: (options: HandleProgressiveActionRequestOptions) => Promise<Response | ProgressiveActionFormStateResult | null>;
+  handleProgressiveActionRequest?: (options: HandleProgressiveActionRequestOptions<TRoute>) => Promise<Response | ProgressiveActionFormStateResult | null>;
   handleMetadataRouteRequest?: (cleanPathname: string) => Promise<Response | null>;
   createPprFallbackShells?: (route: Pick<AppRscHandlerRoute, "params" | "pattern" | "rootParamNames">, params: AppPageParams) => AppPagePprFallbackCacheShell[];
-  handleServerActionRequest?: (options: HandleServerActionRequestOptions) => Promise<Response | null>;
+  handleServerActionRequest?: (options: HandleServerActionRequestOptions<TRoute>) => Promise<Response | null>;
   i18nConfig: NextI18nConfig | null;
   imageConfig?: ImageConfig;
   isDev: boolean;
   loadPrerenderPagesRoutes?: () => Promise<unknown>;
   matchRoute: (pathname: string) => AppRscRouteMatch<TRoute> | null;
+  matchRequestRoute?: (pathname: string) => AppRscRouteMatch<TRoute> | null;
   runMiddleware?: (options: RunAppMiddlewareOptions) => Promise<ApplyAppMiddlewareResult>;
   publicFiles: ReadonlySet<string>;
   prefetchInlining?: PrefetchInliningConfig;