vinext 1.4.3 → 1.4.5

package/dist/server/prod-server.js

@@ -1,39 +1,40 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { isUnknownRecord } from "../utils/record.js";
+import { resolveClientBuildFile } from "./client-build-files.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
-import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "./headers.js";
-import { notFoundResponse } from "./http-error-responses.js";
-import { getRepeatedSlashRedirect, isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./open-redirect.js";
-import { readStaticFileSignal } from "./static-file-signal.js";
-import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
-import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { StaticFileCache, contentTypeForPath, etagFromFilenameHash, staticFileCacheControl } from "./static-file-cache.js";
-import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
-import { resolveRequestHost, resolveRequestProtocol, resolveTrustedForwardedHost, trustProxy, trustedHosts } from "./proxy-trust.js";
-import { normalizePath } from "./normalize-path.js";
-import { shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
-import { buildNextDataNotFoundResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./pages-data-route.js";
-import { buildCacheStateHeaders } from "./cache-headers.js";
-import { parseHttpDate } from "./http-date.js";
-import { evaluateStaticPreconditions } from "./http-conditional.js";
-import { setPagesClientAssets } from "./pages-client-assets.js";
 import { signalFromNodeResponse } from "./node-response-signal.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_RESPONSE_CACHE_STATE, IMAGE_TYPE_NOT_ALLOWED_MESSAGE, INVALID_IMAGE_SOURCE_MESSAGE, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, parseImageParams, readImageOptimizationSignal, sourceImageCacheControl } from "./image-optimization.js";
-import { installSocketErrorBackstop } from "./socket-error-backstop.js";
-import { collectInlineCssManifest } from "../build/inline-css.js";
-import { readTrustedRevalidationHostname } from "./revalidation-host.js";
-import { traceFrameworkRequest } from "./request-tracing.js";
-import { mergeHeaders } from "./worker-utils.js";
+import { getRepeatedSlashRedirect, isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./open-redirect.js";
+import { normalizePath } from "./normalize-path.js";
+import { closeServerOnTerminationSignals, trackBackgroundWork } from "./prod-server-shutdown.js";
+import { registerPrerenderCloudflareLoader } from "../build/prerender-cloudflare-loader.js";
+import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
+import { notFoundResponse } from "./http-error-responses.js";
 import { isServableFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
+import { mergeHeaders } from "./worker-utils.js";
+import { buildNextDataNotFoundResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./pages-data-route.js";
+import { hasBasePath, stripBasePath } from "../utils/base-path.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
+import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
+import { isUnknownRecord } from "../utils/record.js";
+import { collectInlineCssManifest } from "../build/inline-css.js";
 import { readPrerenderSecret, readServerCompress } from "../build/server-manifest.js";
+import { VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "./headers.js";
+import { buildCacheStateHeaders } from "./cache-headers.js";
 import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
-import { resolveClientBuildFile } from "./client-build-files.js";
-import { registerPrerenderCloudflareLoader } from "../build/prerender-cloudflare-loader.js";
+import { installSocketErrorBackstop } from "./socket-error-backstop.js";
+import { resolveRequestHost, resolveRequestProtocol, resolveTrustedForwardedHost, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
 import { COMPRESS_THRESHOLD, hasNoTransform, isCompressibleContentType, parseContentLengthHeader, resolveResponseCompression } from "./response-compression.js";
 import { ifRangeAllowsRange, parseByteRange } from "./http-range.js";
+import { evaluateStaticPreconditions } from "./http-conditional.js";
+import { parseHttpDate } from "./http-date.js";
+import { readTrustedRevalidationHostname } from "./revalidation-host.js";
+import { readStaticFileSignal } from "./static-file-signal.js";
+import { traceFrameworkRequest } from "./request-tracing.js";
+import { shouldRestoreLocaleRootTrailingSlash } from "./pages-i18n.js";
 import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
 import fs from "node:fs";
@@ -42,7 +43,7 @@ import { pathToFileURL } from "node:url";
 import { Readable, pipeline } from "node:stream";
 import zlib from "node:zlib";
 import { createServer } from "node:http";
-//#region src/server/prod-server.ts
+// src/server/prod-server.ts
 /**
 * Production server for vinext.
 *
@@ -933,33 +934,34 @@ async function startProdServer(options = {}) {
 		console.error("Run `vite build` first.");
 		process.exit(1);
 	}
-	if (isAppRouter) return startAppRouterServer({
+	const started = isAppRouter ? await startAppRouterServer({
 		port,
 		host,
 		clientDir,
 		serverDir,
 		rscEntryPath,
 		compress,
-		purpose,
-		silent
-	});
-	return startPagesRouterServer({
+		purpose
+	}) : await startPagesRouterServer({
 		port,
 		host,
 		clientDir,
 		serverDir,
 		serverEntryPath,
 		compress,
-		purpose,
-		silent
+		purpose
 	});
+	if (purpose !== "prerender") closeServerOnTerminationSignals(started.server);
+	if (!silent) logProdServerStarted(host, started.port, purpose);
+	return started;
 }
 function createNodeExecutionContext(trustedRevalidateOrigin, { middlewareOrigin, requestSignal } = {}) {
 	return {
 		hostRuntime: "node",
+		skipsPagesApiHandlerWaitUntil: true,
 		requestSignal,
 		waitUntil(promise) {
-			Promise.resolve(promise).catch(() => {});
+			trackBackgroundWork(promise);
 		},
 		passThroughOnException() {},
 		trustedRevalidateOrigin,
@@ -1139,7 +1141,7 @@ function installPagesClientAssets(options) {
 * 4. Stream the Web Response back (with optional compression)
 */
 async function startAppRouterServer(options) {
-	const { port, host, clientDir, serverDir, rscEntryPath, compress: compressOption, purpose, silent } = options;
+	const { port, host, clientDir, serverDir, rscEntryPath, compress: compressOption, purpose } = options;
 	const prerenderSecret = readPrerenderSecret(serverDir);
 	const compress = compressOption && readServerCompress(serverDir);
 	const rscModule = await importServerEntryModule(rscEntryPath);
@@ -1350,11 +1352,9 @@ async function startAppRouterServer(options) {
 		runWithServerEntryRequire(rscEntryRequire, () => handleRequest(req, res));
 	});
 	disablePrerenderKeepAliveTimeout(server, purpose);
-	const actualPort = await listen(server, port, host);
-	if (!silent) logProdServerStarted(host, actualPort, purpose);
 	return {
 		server,
-		port: actualPort
+		port: await listen(server, port, host)
 	};
 }
 function isPagesServerEntryPageRoute(value) {
@@ -1381,15 +1381,13 @@ function readPagesServerEntryPageRoutes(value) {
 * - vinextConfig — embedded next.config.js settings
 */
 async function startPagesRouterServer(options) {
-	const { port, host, purpose, silent } = options;
+	const { port, host, purpose } = options;
 	const handler = await createPagesRouterRequestHandler(options);
 	const server = createServer(handler);
 	disablePrerenderKeepAliveTimeout(server, purpose);
-	const actualPort = await listen(server, port, host);
-	if (!silent) logProdServerStarted(host, actualPort, purpose);
 	return {
 		server,
-		port: actualPort
+		port: await listen(server, port, host)
 	};
 }
 /**
@@ -1678,7 +1676,7 @@ async function createPagesRouterRequestHandler(options) {
 				matchPageRoute: matchPageRoute ?? null,
 				matchApiRoute: matchApiRoute ?? null,
 				runMiddleware: runNodeMiddleware ? wrapMiddlewareWithBasePath(runNodeMiddleware, basePath, hadBasePath) : null,
-				renderPage: typeof renderPage === "function" ? (request, resolvedUrl, options, stagedHeaders) => renderPage(request, resolvedUrl, ssrManifest, void 0, stagedHeaders, {
+				renderPage: typeof renderPage === "function" ? (request, resolvedUrl, options, stagedHeaders) => renderPage(request, resolvedUrl, ssrManifest, createNodeExecutionContext(), stagedHeaders, {
 					...options,
 					originalUrl: originalRenderUrl
 				}, stagedHeaders?.has("Cache-Control") ? new Headers({ "Cache-Control": stagedHeaders.get("Cache-Control") }) : void 0) : null,
@@ -1779,5 +1777,4 @@ async function createPagesRouterRequestHandler(options) {
 		runWithServerEntryRequire(serverEntryRequire, () => handleRequest(req, res));
 	};
 }
-//#endregion
 export { COMPRESS_THRESHOLD, createPagesPreviewHandler, importServerEntryModule, isCompressibleContentType, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic, waitForNodeResponseCompletion };

package/dist/server/proper-error.d.ts

@@ -1,4 +1,2 @@
-//#region src/server/proper-error.d.ts
 /** Turn a thrown value into an Error, as Next.js does before reporting it. */
-export declare function getProperError(error: unknown): Error;
-//#endregion
+export declare function getProperError(error: unknown): Error;

package/dist/server/proper-error.js

@@ -1,4 +1,4 @@
-//#region src/server/proper-error.ts
+// src/server/proper-error.ts
 function isPlainObject(value) {
 	if (Object.prototype.toString.call(value) !== "[object Object]") return false;
 	const prototype = Object.getPrototypeOf(value);
@@ -27,5 +27,4 @@ function getProperError(error) {
 	}
 	return new Error(isPlainObject(error) ? safeStringifyLite(error) : String(error));
 }
-//#endregion
 export { getProperError };

package/dist/server/proxy-trust.d.ts

@@ -1,5 +1,4 @@
 import { IncomingMessage } from "node:http";
-//#region src/server/proxy-trust.d.ts
 /**
  * Hosts that are allowed as `X-Forwarded-Host` values (stored lowercase).
  *
@@ -40,5 +39,4 @@ export declare function resolveRequestHost(source: IncomingMessage | Headers, fa
  * otherwise undefined. Unlike the raw `Host` header, this host is
  * operator-approved.
  */
-export declare function resolveTrustedForwardedHost(source: IncomingMessage | Headers): string | undefined;
-//#endregion
+export declare function resolveTrustedForwardedHost(source: IncomingMessage | Headers): string | undefined;

package/dist/server/proxy-trust.js

@@ -1,4 +1,4 @@
-//#region src/server/proxy-trust.ts
+// src/server/proxy-trust.ts
 function firstHeaderValue(value) {
 	if (value === void 0 || value === null) return void 0;
 	return Array.isArray(value) ? value[0] : value;
@@ -70,5 +70,4 @@ function readHost(source) {
 function isWebHeaders(source) {
 	return typeof source.get === "function";
 }
-//#endregion
 export { resolveRequestHost, resolveRequestProtocol, resolveTrustedForwardedHost, trustProxy, trustedHosts };

package/dist/server/remove-request-headers.d.ts

@@ -0,0 +1,14 @@
+import { IncomingMessage } from "node:http";
+import { Http2ServerRequest } from "node:http2";
+/**
+ * Remove headers from every view of a Node request.
+ *
+ * Node keeps each client header in req.rawHeaders as well as req.headers, and
+ * srvx (plugin-rsc's dev request adapter) answers Headers reads from rawHeaders
+ * once anything iterates them, so later handlers must not find a removed
+ * header in either. On HTTP/1, Node builds req.headers and req.headersDistinct
+ * lazily from rawHeaders and the header count it parsed, so both must exist
+ * before rawHeaders gets shorter. HTTP/2 compatibility requests (Vite with
+ * `server.https`) have no headersDistinct.
+ */
+export declare function removeRequestHeaders(req: IncomingMessage | Http2ServerRequest, names: ReadonlySet<string>): void;

package/dist/server/remove-request-headers.js

@@ -0,0 +1,22 @@
+// src/server/remove-request-headers.ts
+/**
+* Remove headers from every view of a Node request.
+*
+* Node keeps each client header in req.rawHeaders as well as req.headers, and
+* srvx (plugin-rsc's dev request adapter) answers Headers reads from rawHeaders
+* once anything iterates them, so later handlers must not find a removed
+* header in either. On HTTP/1, Node builds req.headers and req.headersDistinct
+* lazily from rawHeaders and the header count it parsed, so both must exist
+* before rawHeaders gets shorter. HTTP/2 compatibility requests (Vite with
+* `server.https`) have no headersDistinct.
+*/
+function removeRequestHeaders(req, names) {
+	const headersDistinct = "headersDistinct" in req ? req.headersDistinct : void 0;
+	for (const name of names) {
+		delete req.headers[name];
+		if (headersDistinct) delete headersDistinct[name];
+	}
+	const rawHeaders = req.rawHeaders;
+	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (names.has(rawHeaders[i].toLowerCase())) rawHeaders.splice(i, 2);
+}
+export { removeRequestHeaders };

package/dist/server/request-error-log.d.ts

@@ -1,9 +1,7 @@
-//#region src/server/request-error-log.d.ts
 /**
  * Logs an error vinext also passes to instrumentation's `onRequestError`, as
  * `next start` logs it. `VINEXT_QUIET=1` turns these logs off, like Next.js'
  * `quiet` server option, so an `onRequestError` that redacts errors before
  * recording them is the only place they reach.
  */
-export declare function logRequestError(...args: unknown[]): void;
-//#endregion
+export declare function logRequestError(...args: unknown[]): void;

package/dist/server/request-error-log.js

@@ -1,4 +1,4 @@
-//#region src/server/request-error-log.ts
+// src/server/request-error-log.ts
 /**
 * Logs an error vinext also passes to instrumentation's `onRequestError`, as
 * `next start` logs it. `VINEXT_QUIET=1` turns these logs off, like Next.js'
@@ -9,5 +9,4 @@ function logRequestError(...args) {
 	if (process.env.VINEXT_QUIET === "1") return;
 	console.error(...args);
 }
-//#endregion
 export { logRequestError };

package/dist/server/request-log.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/request-log.d.ts
 /**
  * Request logging for the vinext dev server.
  *
@@ -31,5 +30,4 @@ export declare function logRequest({ method, url, status, totalMs, compileMs, re
  * Returns `performance.now()` - a high-resolution monotonic timestamp.
  */
 export declare function now(): number;
-//#endregion
 export {};

package/dist/server/request-log.js

@@ -1,4 +1,4 @@
-//#region src/server/request-log.ts
+// src/server/request-log.ts
 /**
 * Request logging for the vinext dev server.
 *
@@ -52,5 +52,4 @@ function logRequest({ method, url, status, totalMs, compileMs, renderMs }) {
 function now() {
 	return performance.now();
 }
-//#endregion
 export { logRequest, now };

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

@@ -1,8 +1,7 @@
-import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { StaticFileSignalContext, createStaticFileSignal } from "./static-file-signal.js";
 import { getRepeatedSlashRedirect, isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./open-redirect.js";
-//#region src/server/request-pipeline.d.ts
+import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 /**
  * Apply the URL Standard's pathname canonicalization without decoding and
  * re-encoding ordinary percent escapes.
@@ -210,5 +209,4 @@ export declare function cloneRequestWithUrl(request: Request, url: string): Requ
  * ever observe one, and pathname-keyed cache entries must not either.
  */
 export declare function stripRequestUrlFragment(request: Request): Request;
-//#endregion
 export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, createStaticFileSignal, getRepeatedSlashRedirect, hasBasePath, isOpenRedirectShaped, sendRepeatedSlashRedirect, stripBasePath };

package/dist/server/request-pipeline.js

@@ -1,11 +1,11 @@
-import "../utils/protocol-headers.js";
-import { buildRequestHeadersFromMiddlewareResponse, getUnconsumedMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
+import "../utils/protocol-headers.js";
+import { buildRequestHeadersFromMiddlewareResponse, getUnconsumedMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { forbiddenResponse, methodNotAllowedResponse, notFoundResponse } from "./http-error-responses.js";
 import { getRepeatedSlashRedirect, isOpenRedirectShaped, repeatedSlashRedirectResponse, sendRepeatedSlashRedirect } from "./open-redirect.js";
 import { createStaticFileSignal } from "./static-file-signal.js";
-//#region src/server/request-pipeline.ts
+// src/server/request-pipeline.ts
 const PATHNAME_CANONICALIZATION_BASE = new URL("http://vinext.invalid/");
 /**
 * Apply the URL Standard's pathname canonicalization without decoding and
@@ -481,5 +481,4 @@ function stripRequestUrlFragment(request) {
 	const stripped = cloneRequestWithUrl(request, request.url.slice(0, hashIndex));
 	return attachRequestCfMetadata(new Request(stripped, { signal }), request);
 }
-//#endregion
 export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, attachRequestCfMetadata, canonicalizeRequestPathname, canonicalizeRequestUrlPathname, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, dropEmptyMiddlewareSetCookie, filterInternalHeaders, getRepeatedSlashRedirect, guardProtocolRelativeUrl, hasBasePath, hasUrlParserDotSegment, haveSameHeaders, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, sendRepeatedSlashRedirect, stripBasePath, stripRequestUrlFragment, validateCsrfOrigin, validateServerActionPayload, withRequestHeaders };

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

@@ -1,5 +1,3 @@
 import { VinextRequestStageModule } from "./multi-stage.js";
-//#region src/server/request-stage.d.ts
 /** Lazily load the router-specific request stage selected by vinext. */
-export declare function loadVinextRequestStage<Env = unknown, Context = unknown>(): Promise<VinextRequestStageModule<Env, Context>>;
-//#endregion
+export declare function loadVinextRequestStage<Env = unknown, Context = unknown>(): Promise<VinextRequestStageModule<Env, Context>>;

package/dist/server/request-stage.js

@@ -1,7 +1,6 @@
-//#region src/server/request-stage.ts
+// src/server/request-stage.ts
 /** Lazily load the router-specific request stage selected by vinext. */
 function loadVinextRequestStage() {
 	return import("virtual:vinext-request-stage");
 }
-//#endregion
 export { loadVinextRequestStage };

package/dist/server/request-tracing.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/request-tracing.d.ts
 type RequestTraceInput<T> = {
   callback: () => Promise<T>;
   /** Trace an intentional in-process request as a separate propagated request segment. */
@@ -10,7 +9,11 @@ type RequestTraceInput<T> = {
   target: string;
 };
 export declare function setFrameworkRequestRoute(route: string | undefined, isRsc?: boolean): void;
-export declare function captureFrameworkRequestRoute<T>(callback: () => Promise<T>, onRoute?: (route: string) => void): Promise<{
+/** Relabel a request that routing rejected after it recorded the matched route. */
+export declare function replaceFrameworkRequestRoute(route: string): void;
+/** Forget the recorded route when routing resumes after rejecting it. */
+export declare function resetFrameworkRequestRoute(): void;
+export declare function captureFrameworkRequestRoute<T>(callback: () => Promise<T>, onRoute?: (route: string | undefined) => void): Promise<{
   result: T;
   route: string | undefined;
 }>;
@@ -19,5 +22,4 @@ export declare function clearFrameworkRequestError(response: Response): Response
 export declare function attachFrameworkRequestError(response: Response, error: unknown): Response;
 export declare function consumeFrameworkRequestRoute(response: Response): Response;
 export declare function traceFrameworkRequest<T>(input: RequestTraceInput<T>): Promise<T>;
-//#endregion
 export {};

package/dist/server/request-tracing.js

@@ -1,14 +1,22 @@
 import { getOrCreateAls } from "../shims/internal/als-registry.js";
-import { isFullyBufferedBody, markFullyBufferedBody, preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+import { isFullyBufferedBody, markFullyBufferedBody, preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { VINEXT_TRACE_BUFFERED_BODY_HEADER, VINEXT_TRACE_ERROR_HEADER, VINEXT_TRACE_ROUTE_HEADER } from "./headers.js";
 import { frameworkTracer } from "./tracer.js";
 import { getResponseStartCompletion } from "./response-start-tracing.js";
-//#region src/server/request-tracing.ts
+// src/server/request-tracing.ts
 const activeRequestTrace = getOrCreateAls("vinext.requestTracing.als");
 function setFrameworkRequestRoute(route, isRsc) {
 	activeRequestTrace.getStore()?.setRoute(route, isRsc);
 }
+/** Relabel a request that routing rejected after it recorded the matched route. */
+function replaceFrameworkRequestRoute(route) {
+	activeRequestTrace.getStore()?.setRoute(route, void 0, true);
+}
+/** Forget the recorded route when routing resumes after rejecting it. */
+function resetFrameworkRequestRoute() {
+	activeRequestTrace.getStore()?.setRoute(void 0, void 0, true);
+}
 function updateResponseHeader(response, name, value) {
 	try {
 		if (value === void 0) response.headers.delete(name);
@@ -25,8 +33,8 @@ async function captureFrameworkRequestRoute(callback, onRoute) {
 	return {
 		result: await activeRequestTrace.run({
 			recordError() {},
-			setRoute(nextRoute) {
-				if (route === void 0 && nextRoute !== void 0) {
+			setRoute(nextRoute, _isRsc, replace) {
+				if (replace || route === void 0 && nextRoute !== void 0) {
 					route = nextRoute;
 					onRoute?.(nextRoute);
 				}
@@ -114,8 +122,8 @@ function traceFrameworkRequest(input) {
 					recordError(error) {
 						carriedError = error;
 					},
-					setRoute(nextRoute, nextIsRsc) {
-						if (route === void 0 && nextRoute !== void 0) route = nextRoute;
+					setRoute(nextRoute, nextIsRsc, replace) {
+						if (replace || route === void 0 && nextRoute !== void 0) route = nextRoute;
 						if (nextIsRsc !== void 0) isRsc = nextIsRsc;
 					}
 				}, input.callback);
@@ -176,5 +184,4 @@ function finalizeFrameworkRequestSpan(options) {
 function wrapResponseBody(response, onConsumed, onError) {
 	return new Response(deferUntilStreamConsumed(response.body, onConsumed, onError), response);
 }
-//#endregion
-export { attachFrameworkRequestError, attachFrameworkRequestRoute, captureFrameworkRequestRoute, clearFrameworkRequestError, consumeFrameworkRequestRoute, setFrameworkRequestRoute, traceFrameworkRequest };
+export { attachFrameworkRequestError, attachFrameworkRequestRoute, captureFrameworkRequestRoute, clearFrameworkRequestError, consumeFrameworkRequestRoute, replaceFrameworkRequestRoute, resetFrameworkRequestRoute, setFrameworkRequestRoute, traceFrameworkRequest };

package/dist/server/response-compression.d.ts

@@ -1,6 +1,5 @@
 import { NegotiatedEncoding } from "./accept-encoding.js";
 import { IncomingMessage } from "node:http";
-//#region src/server/response-compression.d.ts
 /**
  * Whether a Content-Type is compressible, matching `compressible()`. This
  * covers `text/x-component` (RSC payloads) through the `text/` rule.
@@ -39,5 +38,4 @@ export type ResponseCompression = {
  */
 export declare function resolveResponseCompression(req: IncomingMessage, compress: boolean, headers: ResponseCompressionHeaders): ResponseCompression;
 /** Parse a Content-Length header value the way the middleware compares it. */
-export declare function parseContentLengthHeader(value: string | null | undefined): number | undefined;
-//#endregion
+export declare function parseContentLengthHeader(value: string | null | undefined): number | undefined;

package/dist/server/response-compression.js

@@ -1,5 +1,5 @@
 import { negotiateEncoding } from "./accept-encoding.js";
-//#region src/server/response-compression.ts
+// src/server/response-compression.ts
 /**
 * Response compression rules for the Node production server, ported from the
 * `compression` middleware that `next start` installs for every response
@@ -107,5 +107,4 @@ function parseContentLengthHeader(value) {
 	const length = Number(value);
 	return Number.isNaN(length) ? void 0 : length;
 }
-//#endregion
 export { COMPRESS_THRESHOLD, hasNoTransform, isCompressibleContentType, parseContentLengthHeader, resolveResponseCompression };

package/dist/server/response-stage-cacheability.d.ts

@@ -1,8 +1,7 @@
-import { CacheabilityRepresentation } from "./cacheability-manifest.js";
-import { VinextResponseStageDispatchOptions } from "./multi-stage.js";
 import { ExecutionContextLike } from "../shims/request-context.js";
+import { VinextResponseStageDispatchOptions } from "./multi-stage.js";
 import { WorkerCacheabilityProbeMode } from "./cacheability-request.js";
-//#region src/server/response-stage-cacheability.d.ts
+import { CacheabilityRepresentation } from "./cacheability-manifest.js";
 export type ResponseStageCacheabilityOptions = {
   buildId: string | null | undefined;
   cache: VinextResponseStageDispatchOptions["cache"];
@@ -40,5 +39,4 @@ export type ResponseStageCacheabilityOptions = {
  * Adapter registration and cacheability state live here so a shared transport
  * hit can avoid loading the response stage and its application graph entirely.
  */
-export declare function withResponseStageCacheability(options: ResponseStageCacheabilityOptions, render: (context: ExecutionContextLike) => Promise<Response>): Promise<Response>;
-//#endregion
+export declare function withResponseStageCacheability(options: ResponseStageCacheabilityOptions, render: (context: ExecutionContextLike) => Promise<Response>): Promise<Response>;

package/dist/server/response-stage-cacheability.js

@@ -1,8 +1,8 @@
+import { CACHEABILITY_REQUEST_STATE } from "../shims/cacheability-classification.js";
+import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
-import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
-import { CACHEABILITY_REQUEST_STATE } from "../shims/cacheability-classification.js";
-//#region src/server/response-stage-cacheability.ts
+// src/server/response-stage-cacheability.ts
 /**
 * Run a response-stage render behind completed-response cache admission.
 *
@@ -52,5 +52,4 @@ function withoutRequestScopedHeaders(response, keepsParams) {
 		statusText: response.statusText
 	}));
 }
-//#endregion
 export { withResponseStageCacheability };

package/dist/server/response-stage-policy.d.ts

@@ -1,5 +1,4 @@
 import { PagesResponseStagePolicyOwner } from "./worker-stages.js";
-//#region src/server/response-stage-policy.d.ts
 /** Apply request-stage cache policy before response-stage admission. */
 export declare function applyResponseStagePolicyHeaders(headers: Headers, policyHeaders: ReadonlyArray<readonly [string, string]> | null | undefined): void;
 /**
@@ -19,5 +18,4 @@ export declare function prependResponseStageAdditiveHeaders(responseHeaders: Hea
 export declare function consumePagesResponseStagePolicyOwner(response: Response): {
   owner: PagesResponseStagePolicyOwner | null;
   response: Response;
-};
-//#endregion
+};

package/dist/server/response-stage-policy.js

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
-import "../shims/unified-request-context.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
+import "../shims/unified-request-context.js";
 import { PAGES_RESPONSE_STAGE_POLICY_OWNER_HEADER } from "./worker-stages.js";
-//#region src/server/response-stage-policy.ts
+// src/server/response-stage-policy.ts
 /** Apply request-stage cache policy before response-stage admission. */
 function applyResponseStagePolicyHeaders(headers, policyHeaders) {
 	for (const [name, value] of policyHeaders ?? []) if (name.toLowerCase() === "vary") mergeVaryHeader(headers, value);
@@ -85,5 +85,4 @@ function consumePagesResponseStagePolicyOwner(response) {
 		}))
 	};
 }
-//#endregion
 export { applyResponseStagePolicyHeaders, consumePagesResponseStagePolicyOwner, prependResponseStageAdditiveHeaders, stripInheritedResponseStageCookies, withResponseStageVary, withoutResponseStageVary };

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

@@ -1,5 +1,3 @@
 import { VinextResponseStageModule } from "./multi-stage.js";
-//#region src/server/response-stage.d.ts
 /** Lazily load the router-specific response stage selected by vinext. */
-export declare function loadVinextResponseStage<Env = unknown, Context = unknown>(): Promise<VinextResponseStageModule<Env, Context>>;
-//#endregion
+export declare function loadVinextResponseStage<Env = unknown, Context = unknown>(): Promise<VinextResponseStageModule<Env, Context>>;

package/dist/server/response-stage.js

@@ -1,7 +1,6 @@
-//#region src/server/response-stage.ts
+// src/server/response-stage.ts
 /** Lazily load the router-specific response stage selected by vinext. */
 function loadVinextResponseStage() {
 	return import("virtual:vinext-response-stage");
 }
-//#endregion
 export { loadVinextResponseStage };

package/dist/server/response-start-tracing.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/response-start-tracing.d.ts
 export declare function getResponseStartCompletion(response: Response): Promise<void> | undefined;
 export declare function createResponseStartSpanDescriptor(): {
   readonly name: "start response";
@@ -10,5 +9,4 @@ export declare function traceResponseStartWithCompletion(response: Response): {
 };
 export declare function traceResponseStart(response: Response): Response;
 /** Trace a response replayed by a cache above the framework renderer. */
-export declare function traceCachedResponseStart(response: Response, cacheStatus: string | null, responseStageProps: unknown): Response;
-//#endregion
+export declare function traceCachedResponseStart(response: Response, cacheStatus: string | null, responseStageProps: unknown): Response;

package/dist/server/response-start-tracing.js

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
+import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { observeStreamConsumption } from "./defer-until-stream-consumed.js";
 import { frameworkTracer } from "./tracer.js";
-import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
-//#region src/server/response-start-tracing.ts
+// src/server/response-start-tracing.ts
 const tracedResponses = /* @__PURE__ */ new WeakMap();
 function getResponseStartCompletion(response) {
 	return tracedResponses.get(response);
@@ -54,5 +54,4 @@ function traceCachedResponseStart(response, cacheStatus, responseStageProps) {
 	const kind = props ? Reflect.get(props, "kind") : void 0;
 	return (kind === "app-route-handler" || kind === "app-page" && props !== null && Reflect.get(props, "isRscRequest") === false) && (cacheStatus === "HIT" || cacheStatus === "STALE" || cacheStatus === "REVALIDATED" || cacheStatus === "UPDATING") ? traceResponseStart(response) : response;
 }
-//#endregion
 export { createResponseStartSpanDescriptor, getResponseStartCompletion, traceCachedResponseStart, traceResponseStart, traceResponseStartWithCompletion };

package/dist/server/revalidation-host.d.ts

@@ -1,9 +1,7 @@
 import { NextI18nConfig } from "../config/next-config.js";
-//#region src/server/revalidation-host.d.ts
 /**
  * Read the logical request hostname carried by a server-pinned revalidation
  * loopback. The side channel is accepted only as part of the authenticated
  * revalidation protocol and only for an exact configured i18n domain.
  */
-export declare function readTrustedRevalidationHostname(headers: Headers, i18nConfig: NextI18nConfig | null | undefined, authorizeRevalidation?: (headerValue: string | null) => boolean): string | null;
-//#endregion
+export declare function readTrustedRevalidationHostname(headers: Headers, i18nConfig: NextI18nConfig | null | undefined, authorizeRevalidation?: (headerValue: string | null) => boolean): string | null;

package/dist/server/revalidation-host.js

@@ -1,8 +1,8 @@
 import { VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import "./headers.js";
 import { normalizeDomainHostname } from "../utils/domain-locale.js";
+import "./headers.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
-//#region src/server/revalidation-host.ts
+// src/server/revalidation-host.ts
 /**
 * Read the logical request hostname carried by a server-pinned revalidation
 * loopback. The side channel is accepted only as part of the authenticated
@@ -16,5 +16,4 @@ function readTrustedRevalidationHostname(headers, i18nConfig, authorizeRevalidat
 	if (normalizeDomainHostname(hostname) !== hostname) return null;
 	return i18nConfig.domains.find((item) => normalizeDomainHostname(item.domain) === hostname)?.domain.toLowerCase() ?? null;
 }
-//#endregion
 export { readTrustedRevalidationHostname };

package/dist/server/revalidation-request.d.ts

@@ -1,9 +1,7 @@
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
-//#region src/server/revalidation-request.d.ts
 export declare function getRevalidateSecret(): string;
 export declare function safeEqual(first: string, second: string): boolean;
 export declare function isRevalidateSecret(value: string | null | undefined): boolean;
 /** Match Next.js: the header value must equal the preview/revalidation secret. */
 export declare function isOnDemandRevalidateRequest(headerValue: string | string[] | null | undefined): boolean;
-//#endregion
 export { PRERENDER_REVALIDATE_HEADER };