vinext 1.4.0 → 1.4.1

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

@@ -8,6 +8,7 @@ import { getRequestExecutionContext } from "../shims/request-context.js";
 import { extractLocaleFromUrl, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, recordRouteCacheability } from "../shims/cacheability-classification.js";
 import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, isCdnResponsePolicyHeader, shouldUseNextDeployCacheControl } from "./cache-control.js";
@@ -22,7 +23,7 @@ import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { pagesPathCacheTag } from "./pages-cache-tag.js";
-import { renderPagesPageResponse } from "./pages-page-response.js";
+import { applyPagesPrerenderRevalidateHeader, renderPagesPageResponse } from "./pages-page-response.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
 import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath, setPagesResponseHeader } from "./pages-page-data.js";
@@ -244,10 +245,12 @@ function createPagesPageHandler(opts) {
 			hasRewrites
 		});
 		const isCacheabilityProbe = isRouteCacheabilityProbe();
-		if (!isRouteMissErrorRender && options?.__forcedRoute === void 0) {
+		const isTopLevelPageRoute = !isRouteMissErrorRender && options?.__forcedRoute === void 0;
+		const isInitialPropsRender = isTopLevelPageRoute && !isStaticPropsRoute && pagesReadiness.gssp !== true && (pagesReadiness.gip === true || pagesReadiness.appGip === true);
+		if (isTopLevelPageRoute) {
 			beginRouteCacheability("pages-page", route.pattern);
 			if (isRouteCacheabilityIdentityProbe()) return new Response(null, { status: 204 });
-			if (pagesReadiness.gssp !== true && pagesReadiness.gip !== true && !(pagesReadiness.appGip === true && !isStaticPropsRoute) && !isStaticPropsRoute) recordRouteCacheability({
+			if (pagesReadiness.gssp !== true && !isInitialPropsRender && !isStaticPropsRoute) recordRouteCacheability({
 				cacheable: true,
 				cacheControl: STATIC_CACHE_CONTROL
 			});
@@ -282,7 +285,7 @@ function createPagesPageHandler(opts) {
 			resolveSentResponse = resolve;
 		});
 		const reportSsrError = async (e) => {
-			console.error("[vinext] SSR error:", e);
+			logRequestError("[vinext] SSR error:", e);
 			await reportRequestError(e, {
 				path: url,
 				method: request.method,
@@ -435,6 +438,7 @@ function createPagesPageHandler(opts) {
 						clientTraceMetadata: shouldEmitPagesClientTraceMetadata(pageModule, AppComponent) ? vinextConfig.clientTraceMetadata : void 0,
 						documentReqRes: render.documentReqRes,
 						gsspRes: render.gsspRes,
+						isInitialPropsRender,
 						isrCacheKey: pageIsrCacheKey,
 						isrCachePathname,
 						expireSeconds: render.expireSeconds,
@@ -585,6 +589,7 @@ function createPagesPageHandler(opts) {
 					notFoundResponse = stripPagesNotFoundFramingHeaders(notFoundResponse);
 					if (isOnDemandRevalidate) notFoundResponse = withPagesCacheState(notFoundResponse, "REVALIDATED", isrCachePathname);
 					else if (pageDataResult.cacheState) notFoundResponse = withPagesCacheState(notFoundResponse, pageDataResult.cacheState);
+					if (pageDataResult.revalidateSeconds !== void 0) applyPagesPrerenderRevalidateHeader(notFoundResponse.headers, pageDataResult.revalidateSeconds);
 					return finalizePagesPreviewResponse(withBrowserPolicy(notFoundResponse), preview);
 				}
 				if (pageDataResult.kind === "response") {
@@ -614,6 +619,7 @@ function createPagesPageHandler(opts) {
 				});
 				if (isDataReq) {
 					const headers = new Headers();
+					let resHasCacheControl = false;
 					if (gsspRes && typeof gsspRes.getHeaders === "function") {
 						const gsspHeaders = gsspRes.getHeaders();
 						for (const k of Object.keys(gsspHeaders)) {
@@ -622,10 +628,15 @@ function createPagesPageHandler(opts) {
 							if (k.toLowerCase() === "set-cookie" && Array.isArray(v)) for (const cookie of v) headers.append(k, String(cookie));
 							else headers.set(k, Array.isArray(v) ? v.join(", ") : String(v));
 						}
+						resHasCacheControl = headers.has("Cache-Control");
+					} else if (isInitialPropsRender && documentReqRes) {
+						const resHeaders = documentReqRes.res.getHeaders();
+						for (const [name, value] of Object.entries(resHeaders)) if (isCdnResponsePolicyHeader(name)) setPagesResponseHeader(headers, name, value);
+						resHasCacheControl = Boolean(resHeaders["cache-control"]);
 					}
 					if (hasCdnResponsePolicy(headers)) markRouteCacheabilityExplicitResponsePolicy();
-					if (gsspRes) {
-						if (!headers.has("Cache-Control")) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
+					if (gsspRes || isInitialPropsRender) {
+						if (!resHasCacheControl) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
 					} else if (isStaticPropsRoute) {
 						if (isrRevalidateSeconds !== null) applyCdnResponseHeaders(headers, {
 							cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime),

package/dist/server/pages-page-response.d.ts

@@ -17,6 +17,13 @@ export declare function generatePagesETag(payload: string): string;
  * A page whose status carries no body has nothing to store.
  */
 export declare function rendersPagesNotModified(status: number): boolean;
+/**
+ * Hand the revalidate getStaticProps returned to build/prerender.ts, which
+ * records it in vinext-prerender.json like Next.js's `initialRevalidateSeconds`.
+ * The CDN adapter may rewrite Cache-Control, so the build cannot read it there.
+ * Only build-time renders carry this header.
+ */
+export declare function applyPagesPrerenderRevalidateHeader(headers: Headers, revalidateSeconds: number | false): void;
 type PagesFontPreload = {
   href: string;
   type: string;
@@ -79,6 +86,8 @@ type RenderPagesPageResponseOptions = {
   setDocumentInitialHead?: ((head: ReactNode[]) => void) | undefined;
   documentReqRes?: PagesDocumentReqRes | null;
   gsspRes: PagesGsspResponse | null;
+  /** A page or custom `_app` getInitialProps render; rendered per request like gSSP. */
+  isInitialPropsRender?: boolean;
   isrCacheKey: (router: string, pathname: string) => string;
   /** Filesystem-route identity used for ISR persistence and cache tags. */
   isrCachePathname?: string;

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

@@ -1,7 +1,8 @@
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
-import { NEXTJS_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
+import { NEXTJS_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { markRouteCacheabilityExplicitResponsePolicy } from "../shims/cacheability-classification.js";
 import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
@@ -17,6 +18,7 @@ import { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts,
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { pagesPathCacheTag } from "./pages-cache-tag.js";
+import { applyPrerenderCacheLifeHeader } from "./prerender-cache-life-header.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
@@ -42,6 +44,17 @@ function generatePagesETag(payload) {
 function rendersPagesNotModified(status) {
 	return status === 204 || status === 205 || status === 304 || getCdnCacheAdapter().deferNotModifiedResponse?.() !== true;
 }
+/**
+* Hand the revalidate getStaticProps returned to build/prerender.ts, which
+* records it in vinext-prerender.json like Next.js's `initialRevalidateSeconds`.
+* The CDN adapter may rewrite Cache-Control, so the build cannot read it there.
+* Only build-time renders carry this header.
+*/
+function applyPagesPrerenderRevalidateHeader(headers, revalidateSeconds) {
+	if (typeof process === "undefined" || process.env?.VINEXT_PRERENDER !== "1") return;
+	headers.delete(VINEXT_PRERENDER_CACHE_LIFE_HEADER);
+	if (typeof revalidateSeconds === "number") applyPrerenderCacheLifeHeader(headers, { revalidate: revalidateSeconds });
+}
 function buildPagesFontHeadHtml(fontLinks, fontPreloads, fontStyles, scriptNonce) {
 	let html = "";
 	const nonceAttr = createNonceAttribute(scriptNonce);
@@ -121,7 +134,7 @@ async function buildPagesCompositeStream(bodyStream, shellPrefix, shellSuffix) {
 	} });
 }
 async function reportPagesIsrCacheWriteError(error, cacheKey, routePattern) {
-	console.error(`[vinext] Pages ISR cache write failed for ${cacheKey}:`, error);
+	logRequestError(`[vinext] Pages ISR cache write failed for ${cacheKey}:`, error);
 	try {
 		await reportRequestError(error, {
 			path: cacheKey,
@@ -284,12 +297,13 @@ async function renderPagesPageResponse(options) {
 			cacheControl: buildMissIsrCacheControl(options.isrRevalidateSeconds, options.expireSeconds),
 			tags: [pathTag]
 		});
+		applyPagesPrerenderRevalidateHeader(responseHeaders, options.isrRevalidateSeconds);
 		if (options.isOnDemandRevalidate) {
 			responseHeaders.set(NEXTJS_CACHE_HEADER, "REVALIDATED");
 			responseHeaders.set(VINEXT_REVALIDATED_CACHE_TAG_HEADER, encodeURIComponent(pathTag));
 		} else setCacheStateHeaders(responseHeaders, "MISS");
 	} else if (options.isStaticPropsRoute && shouldUseNextDeployCacheControl()) responseHeaders.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
-	else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
+	else if ((options.gsspRes || options.isInitialPropsRender || options.isFallback) && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
 	if (options.fontLinkHeader) responseHeaders.set("Link", options.fontLinkHeader);
 	if (options.userAgent && isPagesStreamingBot(options.userAgent)) {
 		const fullHtml = await readStreamAsText(compositeStream);
@@ -314,4 +328,4 @@ async function renderPagesPageResponse(options) {
 	}), { __vinextStreamedHtmlResponse: true });
 }
 //#endregion
-export { buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, rendersPagesNotModified };
+export { applyPagesPrerenderRevalidateHeader, buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, rendersPagesNotModified };

package/dist/server/pages-request-stage-entry.js

@@ -1,9 +1,10 @@
 import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { applyMiddlewareResponseHeadersToRequest } from "../utils/middleware-request-headers.js";
 import { requestContextFromRequest } from "../config/request-context.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { notFoundStaticAssetResponse } from "./http-error-responses.js";
-import { attachRequestCfMetadata, cloneRequestWithUrl, filterInternalHeaders, guardProtocolRelativeUrl, haveSameHeaders, withRequestHeaders } from "./request-pipeline.js";
+import { attachRequestCfMetadata, cloneRequestWithUrl, filterInternalHeaders, guardProtocolRelativeUrl, haveSameHeaders, stripRequestUrlFragment, withRequestHeaders } from "./request-pipeline.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
@@ -35,6 +36,15 @@ import * as pagesEntry from "virtual:vinext-pages-request-entry";
 * The public pages-router-entry delegates here. Multi-stage hosts import the
 * named request handler directly and provide their response-stage dispatcher.
 */
+/**
+* Whether middleware's request-header overrides changed the request. Next.js
+* also copies ordinary middleware response headers onto the request; like a
+* client's own headers, those do not opt the render out of the shared stage.
+*/
+function hasRequestHeaderOverrides(originalHeaders, requestHeaders, middlewareResponseHeaders) {
+	const expectedHeaders = middlewareResponseHeaders ? applyMiddlewareResponseHeadersToRequest(originalHeaders, middlewareResponseHeaders) : originalHeaders;
+	return !haveSameHeaders(expectedHeaders, requestHeaders);
+}
 function captureOuterResponsePolicyHeaders(stagedHeaders, transportedPolicyHeaders) {
 	return captureCdnResponsePolicyOverrides(stagedHeaders, new Headers(transportedPolicyHeaders ?? []));
 }
@@ -86,6 +96,7 @@ function handleRequestStageLocally(request, env, ctx, dispatchResponseStage) {
 	return handleRequest(request, env, ctx, (stageRequest, props, _options, stageEnv, stageCtx) => dispatchResponseStage(stageRequest, stageEnv, stageCtx, props), true, "worker", ctx?.assets).then((response) => applyCdnResponseIdentityHeaders(response, originalRequest));
 }
 function handleRequest(request, env, platformCtx, dispatchResponseStage, forceCacheBypass, defaultHostRuntime, assets) {
+	request = stripRequestUrlFragment(request);
 	const url = new URL(request.url);
 	const trace = async () => {
 		await pagesEntry.__ensureInstrumentation?.(platformCtx);
@@ -208,6 +219,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 			requestContext: requestContextFromRequest(request)
 		});
 		let speculativeRenderRequest = null;
+		let middlewareResponseHeaders;
 		const deps = {
 			assetPrefix: vinextConfig?.assetPrefix,
 			basePath,
@@ -229,7 +241,15 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 			authorizeOnDemandRevalidate: typeof authorizeOnDemandRevalidate === "function" ? authorizeOnDemandRevalidate : void 0,
 			matchApiRoute: typeof matchApiRoute === "function" ? matchApiRoute : null,
 			matchPageRoute: typeof matchPageRoute === "function" ? matchPageRoute : null,
-			runMiddleware: typeof runMiddleware === "function" ? wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath) : null,
+			runMiddleware: typeof runMiddleware === "function" ? async (middlewareInput, middlewareCtx, middlewareOptions) => {
+				const result = await wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath)(middlewareInput, middlewareCtx, middlewareOptions);
+				middlewareResponseHeaders = void 0;
+				if (result.responseHeaders) {
+					middlewareResponseHeaders = new Headers();
+					for (const [key, value] of result.responseHeaders) middlewareResponseHeaders.append(key, value);
+				}
+				return result;
+			} : null,
 			renderPage: (req, resolvedUrl, options, stagedHeaders) => {
 				if (options?.renderErrorPageOnMiss === false && req.body !== null && !req.bodyUsed) speculativeRenderRequest = req;
 				const stageRequest = speculativeRenderRequest === req && req.body !== null && !req.bodyUsed ? attachRequestCfMetadata(req.clone(), req) : req;
@@ -238,7 +258,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 					authorizeOnDemandRevalidate: typeof authorizeOnDemandRevalidate === "function" ? authorizeOnDemandRevalidate : void 0,
 					hasRequestAwareDocument: hasRequestAwareDocument === true,
 					request: req,
-					requestHeadersChanged: !haveSameHeaders(filteredHeaders, req.headers),
+					requestHeadersChanged: hasRequestHeaderOverrides(filteredHeaders, req.headers, middlewareResponseHeaders),
 					routeDataKind: matchedPage?.route.dataKind,
 					stagedHeaders
 				});
@@ -306,7 +326,7 @@ async function handleRequestImpl(request, env, platformCtx, dispatchResponseStag
 				const cache = forceCacheBypass || probeMode ? "bypass" : getPagesResponseStageCacheDisposition({
 					authorizeOnDemandRevalidate: typeof authorizeOnDemandRevalidate === "function" ? authorizeOnDemandRevalidate : void 0,
 					request: req,
-					requestHeadersChanged: !haveSameHeaders(filteredHeaders, req.headers),
+					requestHeadersChanged: hasRequestHeaderOverrides(filteredHeaders, req.headers, middlewareResponseHeaders),
 					stagedHeaders
 				});
 				const dispatched = trackedDispatchResponseStage(req, responseStageProps(), { cache }, env, ctx);

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

@@ -1,5 +1,5 @@
 import { VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_QUERY_PARAM } from "./headers.js";
-import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, stripRequestUrlFragment } from "./request-pipeline.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { validateCdnRequest } from "./cache-control.js";
@@ -52,7 +52,8 @@ async function handleSingleStageRequest(request, env, platformCtx) {
 	return finalize ? finalize(response, ctx) : response;
 }
 var pages_router_entry_default = { fetch(request, env, ctx) {
-	const handle = () => handleSingleStageRequest(request, env, ctx);
+	const strippedRequest = stripRequestUrlFragment(request);
+	const handle = () => handleSingleStageRequest(strippedRequest, env, ctx);
 	return ctx && typeof ctx.waitUntil === "function" ? runWithExecutionContext(ctx, handle) : handle();
 } };
 //#endregion

package/dist/server/prod-server.d.ts

@@ -102,11 +102,11 @@ declare function sendCompressed(req: IncomingMessage, res: ServerResponse, body:
  * Without a cache, falls back to async filesystem probing (still non-blocking,
  * unlike the old sync existsSync/statSync approach).
  *
- * `extraHeaders` go on every response for the file. `representationHeaders` go
+ * `stagedHeaders` go on every response for the file. `representationHeaders` go
  * only on responses that carry the file's bytes (200 and 206), never on a 304,
  * 412, 416 or 405.
  */
-declare function tryServeStatic(req: IncomingMessage, res: ServerResponse, clientDir: string, pathname: string, compress: boolean, cache?: StaticFileCache, extraHeaders?: Record<string, string | string[]>, statusCode?: number, representationHeaders?: Record<string, string>): Promise<boolean>;
+declare function tryServeStatic(req: IncomingMessage, res: ServerResponse, clientDir: string, pathname: string, compress: boolean, cache?: StaticFileCache, stagedHeaders?: Record<string, string | string[]>, statusCode?: number, representationHeaders?: Record<string, string>): Promise<boolean>;
 /**
  * Convert a Node.js IncomingMessage to a Web Request object.
  *

package/dist/server/prod-server.js

@@ -8,7 +8,7 @@ import { getRepeatedSlashRedirect, isOpenRedirectShaped, sendRepeatedSlashRedire
 import { readStaticFileSignal } from "./static-file-signal.js";
 import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
 import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix, isAssetPrefixBuildAsset } from "../utils/asset-prefix.js";
-import { StaticFileCache, contentTypeForPath, etagFromFilenameHash } from "./static-file-cache.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";
@@ -19,7 +19,7 @@ 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, INVALID_IMAGE_SOURCE_MESSAGE, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, parseImageParams, readImageOptimizationSignal } from "./image-optimization.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_RESPONSE_CACHE_STATE, INVALID_IMAGE_SOURCE_MESSAGE, MUTABLE_IMAGE_SOURCE_CACHE_CONTROL, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, parseImageParams, readImageOptimizationSignal } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./revalidation-host.js";
@@ -284,6 +284,16 @@ function readHeaderCaseInsensitive(headersRecord, name) {
 	const value = headersRecord[key];
 	return Array.isArray(value) ? value.join(", ") : value;
 }
+/** Spell a header's name as `name`, so spreading the record replaces that key. */
+function withHeaderName(headersRecord, name) {
+	const lowerName = name.toLowerCase();
+	const key = Object.keys(headersRecord).find((entry) => entry !== name && entry.toLowerCase() === lowerName);
+	if (key === void 0) return headersRecord;
+	const { [key]: value, ...rest } = headersRecord;
+	const existing = rest[name];
+	rest[name] = existing === void 0 ? value : [existing, value].flat();
+	return rest;
+}
 /** Remove one field name from a Vary header, dropping the header if it empties. */
 function omitVaryToken(headers, token) {
 	const varyKey = Object.keys(headers).find((key) => key.toLowerCase() === "vary");
@@ -464,6 +474,18 @@ function staticCacheLookupPath(pathname) {
 	if (lookupPath.startsWith("/.vite/") || lookupPath === "/.vite") return null;
 	return lookupPath;
 }
+/**
+* Give a Node image passthrough Next.js's image Cache-Control instead of the
+* public-file default: a hashed build asset keeps its immutable default, and
+* any other source is revalidated after the default `images.minimumCacheTTL`.
+*/
+function withImageSourceCacheControl(headers, sourcePath) {
+	if (sourcePath.includes(`/_next/static/`)) return headers;
+	return {
+		...headers,
+		"Cache-Control": MUTABLE_IMAGE_SOURCE_CACHE_CONTROL
+	};
+}
 /** Pathnames the Pages Router serves from routes rather than the client directory. */
 function isPagesFilesystemExcludedPath(pathname, phase) {
 	return pathname === "/" || pathname === "/api" || pathname.startsWith("/api/") || phase === "direct" && pathname.startsWith(`/_next/static/`);
@@ -479,12 +501,13 @@ function isPagesFilesystemExcludedPath(pathname, phase) {
 * Without a cache, falls back to async filesystem probing (still non-blocking,
 * unlike the old sync existsSync/statSync approach).
 *
-* `extraHeaders` go on every response for the file. `representationHeaders` go
+* `stagedHeaders` go on every response for the file. `representationHeaders` go
 * only on responses that carry the file's bytes (200 and 206), never on a 304,
 * 412, 416 or 405.
 */
-async function tryServeStatic(req, res, clientDir, pathname, compress, cache, extraHeaders, statusCode, representationHeaders) {
+async function tryServeStatic(req, res, clientDir, pathname, compress, cache, stagedHeaders, statusCode, representationHeaders) {
 	if (pathname === "/") return false;
+	const extraHeaders = stagedHeaders && withHeaderName(stagedHeaders, "Cache-Control");
 	const responseStatus = statusCode ?? 200;
 	const omitBody = isNoBodyResponseStatus(responseStatus);
 	const requestRange = req.method === "GET" || req.method === "HEAD" ? req.headers.range : void 0;
@@ -610,7 +633,7 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 	const ext = path.extname(resolved.path);
 	const ct = contentTypeForPath(resolved.path);
 	const isHashed = pathname.includes(`/${ASSET_PREFIX_URL_DIR}/`);
-	const cacheControl = isHashed ? "public, max-age=31536000, immutable" : "public, max-age=3600";
+	const cacheControl = staticFileCacheControl(isHashed);
 	const etag = isHashed && etagFromFilenameHash(resolved.path, ext) || `W/"${resolved.size}-${Math.floor(resolved.mtimeMs / 1e3)}"`;
 	const baseHeaders = {
 		"Content-Type": ct,
@@ -798,6 +821,15 @@ async function statIfFile(filePath) {
 	}
 }
 /**
+* Node's parser keeps a `#fragment` sent on the request line in `req.url`.
+* Next.js rebuilds request URLs from pathname + search, so neither routing,
+* middleware nor handlers observe one; drop it before anything reads the URL.
+*/
+function stripNodeRequestUrlFragment(req) {
+	const hashIndex = req.url?.indexOf("#") ?? -1;
+	if (hashIndex !== -1) req.url = req.url?.slice(0, hashIndex);
+}
+/**
 * Convert a Node.js IncomingMessage to a Web Request object.
 *
 * When `urlOverride` is provided, it is used as the path + query string
@@ -1182,7 +1214,7 @@ async function startAppRouterServer(options) {
 			"X-Content-Type-Options": "nosniff",
 			"Content-Disposition": imageConfig?.contentDispositionType === "attachment" ? "attachment" : "inline"
 		};
-		const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, imageSecurityHeaders, void 0, IMAGE_REPRESENTATION_HEADERS);
+		const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, sourcePath), void 0, IMAGE_REPRESENTATION_HEADERS);
 		const sourceUrl = new URL(params.imageUrl, request.url);
 		let sourcePathname = null;
 		try {
@@ -1299,6 +1331,7 @@ async function startAppRouterServer(options) {
 		}
 	};
 	const handleRequest = async (req, res) => {
+		stripNodeRequestUrlFragment(req);
 		try {
 			await ensureInstrumentation();
 		} catch (error) {
@@ -1319,7 +1352,7 @@ async function startAppRouterServer(options) {
 			},
 			getStatus: () => res.statusCode,
 			headers,
-			isRsc: target.split("?", 1)[0].endsWith(".rsc") || headers.get("RSC") === "1",
+			isRsc: headers.get("RSC") === "1",
 			method: req.method ?? "GET",
 			target
 		});
@@ -1434,6 +1467,7 @@ async function createPagesRouterRequestHandler(options) {
 	});
 	const staticCache = await StaticFileCache.create(clientDir);
 	const handleRequest = async (req, res) => {
+		stripNodeRequestUrlFragment(req);
 		try {
 			await ensureInstrumentation();
 		} catch (error) {
@@ -1671,7 +1705,7 @@ async function createPagesRouterRequestHandler(options) {
 							"X-Content-Type-Options": "nosniff",
 							"Content-Disposition": pagesImageConfig?.contentDispositionType === "attachment" ? "attachment" : "inline"
 						};
-						const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, imageSecurityHeaders, void 0, IMAGE_REPRESENTATION_HEADERS);
+						const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, sourcePath), void 0, IMAGE_REPRESENTATION_HEADERS);
 						const sourceUrl = new URL(params.imageUrl, webRequest.url);
 						let sourcePathname = null;
 						try {

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

@@ -0,0 +1,9 @@
+//#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

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

@@ -0,0 +1,13 @@
+//#region 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'
+* `quiet` server option, so an `onRequestError` that redacts errors before
+* recording them is the only place they reach.
+*/
+function logRequestError(...args) {
+	if (process.env.VINEXT_QUIET === "1") return;
+	console.error(...args);
+}
+//#endregion
+export { logRequestError };

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

@@ -73,7 +73,6 @@ type ResolvePublicFileRouteOptions = {
   middlewareContext: StaticFileSignalContext & {
     requestHeaders?: Headers | null;
   };
-  pathname: string;
   publicFiles: ReadonlySet<string>;
   request: Request;
 };
@@ -82,7 +81,7 @@ type ResolvePublicFileRouteOptions = {
  *
  * Public files are checked after middleware and before afterFiles/fallback
  * rewrites. The generated App Router entry provides the public-file set; this
- * helper owns the RSC exclusion, existence-first method enforcement, and
+ * helper owns existence-first method enforcement and
  * static-file signaling. Missing mutation targets continue through routing.
  */
 export declare function resolvePublicFileRoute(options: ResolvePublicFileRouteOptions): Response | null;
@@ -91,8 +90,8 @@ export declare function normalizeTrailingSlashPathname(pathname: string, trailin
  * Check if the pathname needs a trailing slash redirect, and return the
  * redirect Response if so.
  *
- * Follows Next.js behavior:
- * - `/api` routes are never redirected
+ * Follows Next.js behavior, whose internal trailing-slash redirects cover
+ * every path, `/api` included:
  * - The root path `/` is never redirected
  * - If `trailingSlash` is true, redirect `/about` → `/about/`
  * - If `trailingSlash` is true, redirect file-looking `/file.ext/` → `/file.ext`
@@ -200,5 +199,11 @@ export declare function withRequestHeaders(request: Request, headers: Headers):
  * exists.
  */
 export declare function cloneRequestWithUrl(request: Request, url: string): Request;
+/**
+ * Drop a `#fragment` the host kept from the request line. Next.js rebuilds
+ * request URLs from pathname + search, so neither middleware nor handlers
+ * 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

@@ -84,7 +84,8 @@ function guardProtocolRelativeUrl(rawPathname, search = "") {
 	if (isOpenRedirectShaped(rawPathname)) return notFoundResponse();
 	return null;
 }
-const FILE_LIKE_PATHNAME_RE = /\.[^/]+\/?$/;
+const SLASHED_FILE_PATHNAME_RE = /^\/(?:[^/]+\/)*[^/]+\.\w+\/$/;
+const UNSLASHED_NON_FILE_PATHNAME_RE = /^\/(?:[^/]+\/)*[^/.]+$/;
 function isWellKnownPathname(pathname) {
 	return pathname === "/.well-known" || pathname.startsWith("/.well-known/");
 }
@@ -93,37 +94,32 @@ function isWellKnownPathname(pathname) {
 *
 * Public files are checked after middleware and before afterFiles/fallback
 * rewrites. The generated App Router entry provides the public-file set; this
-* helper owns the RSC exclusion, existence-first method enforcement, and
+* helper owns existence-first method enforcement and
 * static-file signaling. Missing mutation targets continue through routing.
 */
 function resolvePublicFileRoute(options) {
-	if (options.pathname.endsWith(".rsc")) return null;
 	if (!options.publicFiles.has(options.cleanPathname)) return null;
 	if (options.request.method !== "GET" && options.request.method !== "HEAD") return methodNotAllowedResponse("GET, HEAD", { headers: options.middlewareContext.headers ?? void 0 });
 	const { requestHeaders } = options.middlewareContext;
 	return createStaticFileSignal(options.cleanPathname, options.middlewareContext, requestHeaders ? buildRequestHeadersFromMiddlewareResponse(options.request.headers, requestHeaders) : null);
 }
 function normalizeTrailingSlashPathname(pathname, trailingSlash) {
-	if (pathname === "/" || pathname === "/api" || pathname.startsWith("/api/")) return null;
-	const hasTrailing = pathname.endsWith("/");
+	if (pathname === "/") return null;
 	if (trailingSlash) {
 		if (isWellKnownPathname(pathname)) return null;
-		if (FILE_LIKE_PATHNAME_RE.test(pathname)) {
-			const normalized = removeTrailingSlash(pathname);
-			return normalized === pathname ? null : normalized;
-		}
-		if (!hasTrailing && !pathname.endsWith(".rsc")) return `${pathname}/`;
+		if (SLASHED_FILE_PATHNAME_RE.test(pathname)) return pathname.slice(0, -1);
+		if (UNSLASHED_NON_FILE_PATHNAME_RE.test(pathname)) return `${pathname}/`;
 		return null;
 	}
-	if (hasTrailing) return removeTrailingSlash(pathname);
+	if (pathname.endsWith("/")) return removeTrailingSlash(pathname);
 	return null;
 }
 /**
 * Check if the pathname needs a trailing slash redirect, and return the
 * redirect Response if so.
 *
-* Follows Next.js behavior:
-* - `/api` routes are never redirected
+* Follows Next.js behavior, whose internal trailing-slash redirects cover
+* every path, `/api` included:
 * - The root path `/` is never redirected
 * - If `trailingSlash` is true, redirect `/about` → `/about/`
 * - If `trailingSlash` is true, redirect file-looking `/file.ext/` → `/file.ext`
@@ -137,7 +133,7 @@ function normalizeTrailingSlashPathname(pathname, trailingSlash) {
 * @returns A 308 redirect Response, or null if no redirect is needed
 */
 function normalizeTrailingSlash(pathname, basePath, trailingSlash, search) {
-	if (pathname === "/" || pathname === "/api" || pathname.startsWith("/api/")) return null;
+	if (pathname === "/") return null;
 	if (isOpenRedirectShaped(pathname)) return notFoundResponse();
 	const normalizedPathname = normalizeTrailingSlashPathname(pathname, trailingSlash);
 	if (normalizedPathname === null) return null;
@@ -463,5 +459,17 @@ function cloneRequestWithUrl(request, url) {
 	}
 	return attachRequestCfMetadata(cloned, request);
 }
+/**
+* Drop a `#fragment` the host kept from the request line. Next.js rebuilds
+* request URLs from pathname + search, so neither middleware nor handlers
+* ever observe one, and pathname-keyed cache entries must not either.
+*/
+function stripRequestUrlFragment(request) {
+	const hashIndex = request.url.indexOf("#");
+	if (hashIndex === -1) return request;
+	const signal = request.signal;
+	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, haveSameHeaders, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, sendRepeatedSlashRedirect, stripBasePath, validateCsrfOrigin, validateServerActionPayload, withRequestHeaders };
+export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, attachRequestCfMetadata, canonicalizeRequestPathname, canonicalizeRequestUrlPathname, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, dropEmptyMiddlewareSetCookie, filterInternalHeaders, getRepeatedSlashRedirect, guardProtocolRelativeUrl, hasBasePath, haveSameHeaders, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, sendRepeatedSlashRedirect, stripBasePath, stripRequestUrlFragment, validateCsrfOrigin, validateServerActionPayload, withRequestHeaders };

package/dist/server/rsc-completion-metadata.js

@@ -88,9 +88,11 @@ function extractRscCompletionMetadata(buffer) {
 }
 function appendRscCompletionMetadata(source, getMetadata) {
 	const reader = source.getReader();
+	let cancelled = false;
 	return new ReadableStream({
 		async pull(controller) {
 			const next = await reader.read();
+			if (cancelled) return;
 			if (!next.done) {
 				controller.enqueue(escapeFlightChunk(next.value));
 				return;
@@ -100,6 +102,7 @@ function appendRscCompletionMetadata(source, getMetadata) {
 			controller.close();
 		},
 		cancel(reason) {
+			cancelled = true;
 			return reader.cancel(reason);
 		}
 	});

package/dist/server/static-file-cache.d.ts

@@ -3,6 +3,15 @@
 export declare const CONTENT_TYPES: Record<string, string>;
 /** Resolve a path's MIME type with case-insensitive extension matching. */
 export declare function contentTypeForPath(filePath: string): string;
+/**
+ * Default `Cache-Control` for a file in the client build directory. Hashed
+ * build assets never change at their URL. Every other file (`public/`) must be
+ * revalidated on each reuse, as Next.js's `send` serves it with `max-age=0`:
+ * middleware may admit it per request, so a shared cache must not reuse it
+ * without asking the origin. A `Cache-Control` set by middleware or config
+ * headers replaces this default.
+ */
+export declare function staticFileCacheControl(isHashed: boolean): string;
 /** A servable file variant with pre-computed response headers. */
 type FileVariant = {
   /** Absolute file path (used for streaming large files). */

package/dist/server/static-file-cache.js

@@ -57,6 +57,17 @@ function contentTypeForPath(filePath) {
 	return CONTENT_TYPES[path.extname(filePath).toLowerCase()] ?? "application/octet-stream";
 }
 /**
+* Default `Cache-Control` for a file in the client build directory. Hashed
+* build assets never change at their URL. Every other file (`public/`) must be
+* revalidated on each reuse, as Next.js's `send` serves it with `max-age=0`:
+* middleware may admit it per request, so a shared cache must not reuse it
+* without asking the origin. A `Cache-Control` set by middleware or config
+* headers replaces this default.
+*/
+function staticFileCacheControl(isHashed) {
+	return isHashed ? "public, max-age=31536000, immutable" : "public, max-age=0";
+}
+/**
 * Files below this size are buffered in memory at startup for zero-syscall
 * serving via res.end(buffer). Above this, files stream via createReadStream.
 * 64KB covers virtually all precompressed assets (a 200KB JS bundle compresses
@@ -98,7 +109,7 @@ var StaticFileCache = class StaticFileCache {
 			if (isHashed && PRECOMPRESSION_TEMP_FILE_RE.test(relativePath)) continue;
 			const ext = path.extname(relativePath);
 			const contentType = contentTypeForPath(relativePath);
-			const cacheControl = isHashed ? "public, max-age=31536000, immutable" : "public, max-age=3600";
+			const cacheControl = staticFileCacheControl(isHashed);
 			const etag = isHashed && etagFromFilenameHash(relativePath, ext) || `W/"${fileInfo.size}-${Math.floor(fileInfo.mtimeMs / 1e3)}"`;
 			const lastModified = new Date(fileInfo.mtimeMs).toUTCString();
 			const baseHeaders = {
@@ -266,4 +277,4 @@ async function* walkFilesWithStats(dir, base = dir) {
 	}
 }
 //#endregion
-export { CONTENT_TYPES, StaticFileCache, contentTypeForPath, etagFromFilenameHash };
+export { CONTENT_TYPES, StaticFileCache, contentTypeForPath, etagFromFilenameHash, staticFileCacheControl };