vinext 1.0.1 → 1.2.0

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

@@ -3,7 +3,7 @@ import { cacheabilityManifestPageState, cacheabilityRequestIdentity, cacheabilit
 import { keepOnlyValidatedRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { isTrustedPrerenderState } from "./prerender-route-params.js";
 //#region src/server/app-worker-stages.ts
-const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 10;
+const APP_WORKER_RESPONSE_STAGE_PROTOCOL_VERSION = 11;
 const APP_METADATA_RESPONSE_STAGE_NO_MATCH_HEADER = "x-vinext-app-metadata-stage-no-match";
 const STATIC_FILE_SIGNAL_TOKEN_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 /** Normalize a shared App page HEAD request onto its method-invariant GET representation. */
@@ -80,8 +80,8 @@ function isCanonicalHttpOrigin(value) {
 function isAppWorkerResponseStageProps(value) {
 	if (!value || typeof value !== "object") return false;
 	const props = value;
-	if (props.protocolVersion !== 10 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
-	if (props.kind === "app-full-request") return typeof props.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
+	if (props.protocolVersion !== 11 || props.buildId !== null && typeof props.buildId !== "string" || !isResponseStageCacheability(props.cacheability) || props.draftModeCookie !== null && typeof props.draftModeCookie !== "string" || props.middlewareCookieOverlay !== null && typeof props.middlewareCookieOverlay !== "string" || !isCanonicalHttpOrigin(props.requestOrigin) || props.scriptNonce !== null && typeof props.scriptNonce !== "string") return false;
+	if (props.kind === "app-full-request") return typeof props.headRequest === "boolean" && typeof props.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
 	if (props.kind === "hybrid-pages") {
 		const hybrid = props;
 		const appRouteMatch = hybrid.appRouteMatch;
@@ -91,7 +91,7 @@ function isAppWorkerResponseStageProps(value) {
 		const special = props;
 		return typeof special.canonicalPathname === "string" && special.canonicalPathname.startsWith("/") && typeof special.cleanPathname === "string" && special.cleanPathname.startsWith("/") && typeof special.isRscRequest === "boolean" && (special.mountedSlotsHeader === null || typeof special.mountedSlotsHeader === "string") && typeof special.resolvedUrl === "string" && special.resolvedUrl.startsWith("/") && (props.kind !== "app-metadata" || typeof props.routePathname === "string" && props.routePathname.startsWith("/")) && (special.renderMode === "navigation" || special.renderMode === "prefetch-empty" || special.renderMode === "prefetch-dynamic-shell" || special.renderMode === "prefetch-loading-shell");
 	}
-	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
+	return (props.kind === "app-page" || props.kind === "app-route-handler") && typeof props.bypassInterceptionContextCache === "boolean" && typeof props.cachePathname === "string" && props.cachePathname.startsWith("/") && typeof props.canUseCanonicalLoadingShell === "boolean" && typeof props.canonicalPathname === "string" && props.canonicalPathname.startsWith("/") && typeof props.cleanPathname === "string" && props.cleanPathname.startsWith("/") && (props.forceDynamic === void 0 || typeof props.forceDynamic === "boolean") && (props.interceptionContext === null || typeof props.interceptionContext === "string") && (props.interceptionId === null || typeof props.interceptionId === "string") && typeof props.isRscRequest === "boolean" && (props.matchKind === "interception" || props.matchKind === "raw-request" || props.matchKind === "request" || props.matchKind === "resolved") && (props.mountedSlotsHeader === null || typeof props.mountedSlotsHeader === "string") && isAppPageParams(props.params) && typeof props.resolvedUrl === "string" && props.resolvedUrl.startsWith("/") && typeof props.routePattern === "string" && props.routePattern.startsWith("/") && typeof props.routePathname === "string" && props.routePathname.startsWith("/") && (props.renderMode === "navigation" || props.renderMode === "prefetch-empty" || props.renderMode === "prefetch-dynamic-shell" || props.renderMode === "prefetch-loading-shell");
 }
 function isSerializedHeaders(value) {
 	return Array.isArray(value) && value.every((entry) => Array.isArray(entry) && entry.length === 2 && typeof entry[0] === "string" && typeof entry[1] === "string");

package/dist/server/cacheability-request.js

@@ -1,7 +1,7 @@
 import "../utils/protocol-headers.js";
 import { isVinextRscVaryField } from "./app-rsc-vary.js";
-import { VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER } from "./headers.js";
-import { isNonCacheableCacheControl } from "../shims/cdn-cache.js";
+import { VINEXT_CACHEABILITY_PROBE_HEADER, VINEXT_CACHEABILITY_PROBE_ROUTE_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
+import { hasSharedCacheCredentials, isNonCacheableCacheControl } from "../shims/cdn-cache.js";
 import { CACHEABILITY_REQUEST_STATE, recordConfigCdnCachePolicyHeader } from "../shims/cacheability-classification.js";
 import { NO_STORE_CACHE_CONTROL, applyCdnResponseBuildIdentityHeaders, applyCdnResponseHeaders, hasExplicitNonCacheableResponsePolicy, isCdnResponsePolicyHeader, readCdnResponseCacheControl, readCdnResponsePolicyHeaderName } from "./cache-control.js";
 import { cacheabilityManifestPageState, cacheabilityManifestRouteState, cacheabilityRepresentationMatchesPageRoute, cacheabilityRequestIdentity, cacheabilityRoutePathname, findCacheabilityManifestRoute, parseCacheabilityManifest, resolveCacheabilityRepresentation } from "./cacheability-manifest.js";
@@ -70,7 +70,7 @@ function readBoundManifest(raw, buildId) {
 }
 function createWorkerCacheabilityAdmissionContext(base, request, rawManifest, buildId, requiresCompletedResponseAdmission = rawManifest != null, responseVary, resolvedRoutePathname, trustedRepresentation, options) {
 	const identity = cacheabilityRequestIdentity(request, trustedRepresentation);
-	const credentialedRequest = request.headers.has("authorization") || request.headers.has("cookie") || request.headers.has("proxy-authorization");
+	const credentialedRequest = hasSharedCacheCredentials(request.headers);
 	const routePathname = identity ? cacheabilityRoutePathname(resolvedRoutePathname ?? new URL(request.url).pathname, identity.representation) : void 0;
 	if (!rawManifest) {
 		if (!requiresCompletedResponseAdmission) return base;
@@ -348,9 +348,10 @@ async function captureCacheabilityAdmissionBody(body, deadlineAt, limit = CACHEA
 		throw error;
 	}
 }
-function responseWithCachePolicy(response, body, outcome, browserCacheControl) {
+function responseWithCachePolicy(response, body, outcome, browserCacheControl, completedStatus) {
 	const headers = new Headers(response.headers);
 	if (typeof body === "string") headers.delete("Content-Length");
+	for (const [name, value] of Object.entries(completedStatus?.headers ?? {})) if (!headers.has(name)) headers.set(name, value);
 	applyCdnResponseHeaders(headers, outcome?.cacheable === true && outcome.cacheControl ? {
 		cacheControl: outcome.cacheControl,
 		tags: outcome.tags,
@@ -359,10 +360,13 @@ function responseWithCachePolicy(response, body, outcome, browserCacheControl) {
 		cacheControl: NO_STORE_CACHE_CONTROL,
 		browserCacheControl
 	});
+	const status = completedStatus?.status ?? response.status;
+	const completed = completedStatus?.status;
+	if (completed === 401 || completed === 403 || completed === 404) headers.set(VINEXT_SPECIAL_ERROR_STATUS_HEADER, String(completed));
 	return new Response(body, {
 		headers,
-		status: response.status,
-		statusText: response.statusText
+		status,
+		statusText: status === response.status ? response.statusText : ""
 	});
 }
 async function stripSharedHtmlClientTraceMetadata(body, marker) {
@@ -499,7 +503,7 @@ async function finalizeWorkerCacheabilityAdmission(response, state) {
 	const effectivePolicyHeader = readCdnResponsePolicyHeaderName(response.headers);
 	const replacesRendererPolicy = outcome !== rendererOutcome && effectivePolicyHeader !== null && state.configCdnCachePolicy?.get(effectivePolicyHeader) === response.headers.get(effectivePolicyHeader);
 	if (state.route.kind === "app-page" && !replacesRendererPolicy && rendererOutcome?.searchParamsUnread !== true) return responseWithCachePolicy(response, captured.body, null, browserCacheControl);
-	return responseWithCachePolicy(response, representation === "html" && state.clientTraceMetadataMarker ? await stripSharedHtmlClientTraceMetadata(captured.body, state.clientTraceMetadataMarker) : captured.body, outcome, browserCacheControl);
+	return responseWithCachePolicy(response, representation === "html" && state.clientTraceMetadataMarker ? await stripSharedHtmlClientTraceMetadata(captured.body, state.clientTraceMetadataMarker) : captured.body, outcome, browserCacheControl, rendererOutcome ?? void 0);
 }
 async function finalizeWorkerCacheabilityResponse(response, ctx) {
 	const state = readState(ctx);

package/dist/server/client-build-files.d.ts

@@ -0,0 +1,16 @@
+//#region src/server/client-build-files.d.ts
+/**
+ * Return the URL pathname of the client build file a request pathname names,
+ * or null. Client build files are the files the client build emits outside
+ * `_next/static` (see `collectClientBuildFiles`). Workers Static Assets serves
+ * them before the Worker unless the Worker runs first, so servers handle them
+ * before middleware and routing.
+ *
+ * `pathname` is the raw request pathname. The list holds file names and
+ * `basePath` is the configured string, so each segment is decoded exactly once
+ * before matching; a segment that decodes to a `/` names no file. The result
+ * is the file's segment-encoded pathname below `basePath`, so a server that
+ * decodes it once gets the file name back.
+ */
+export declare function resolveClientBuildFile(pathname: string, basePath: string, clientBuildFiles: ReadonlySet<string>): string | null;
+//#endregion

package/dist/server/client-build-files.js

@@ -0,0 +1,36 @@
+//#region src/server/client-build-files.ts
+/**
+* Return the URL pathname of the client build file a request pathname names,
+* or null. Client build files are the files the client build emits outside
+* `_next/static` (see `collectClientBuildFiles`). Workers Static Assets serves
+* them before the Worker unless the Worker runs first, so servers handle them
+* before middleware and routing.
+*
+* `pathname` is the raw request pathname. The list holds file names and
+* `basePath` is the configured string, so each segment is decoded exactly once
+* before matching; a segment that decodes to a `/` names no file. The result
+* is the file's segment-encoded pathname below `basePath`, so a server that
+* decodes it once gets the file name back.
+*/
+function resolveClientBuildFile(pathname, basePath, clientBuildFiles) {
+	if (clientBuildFiles.size === 0) return null;
+	let filePath = pathname;
+	if (filePath.includes("%")) {
+		let segments;
+		try {
+			segments = filePath.split("/").map(decodeURIComponent);
+		} catch {
+			return null;
+		}
+		if (segments.some((segment) => segment.includes("/"))) return null;
+		filePath = segments.join("/");
+	}
+	if (basePath) {
+		if (!filePath.startsWith(`${basePath}/`)) return null;
+		filePath = filePath.slice(basePath.length);
+	}
+	if (!clientBuildFiles.has(filePath)) return null;
+	return filePath.split("/").map(encodeURIComponent).join("/");
+}
+//#endregion
+export { resolveClientBuildFile };

package/dist/server/client-reuse-manifest.js

@@ -1,6 +1,6 @@
 import { isUnknownRecord } from "../utils/record.js";
-import { fnv1a64 } from "../utils/hash.js";
 import { parseAppElementsWireElementKey } from "./app-elements-wire-key.js";
+import { fnv1a64 } from "../utils/hash.js";
 import { parseArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { isNonNegativeSafeInteger } from "../utils/number.js";
 //#region src/server/client-reuse-manifest.ts

package/dist/server/config-headers.js

@@ -1,4 +1,5 @@
 import { matchHeaders } from "../config/config-matchers.js";
+import "./headers.js";
 import { markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
 import { isCdnResponsePolicyHeader, isNonCacheableCdnResponsePolicy } from "./cache-control.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
@@ -77,6 +78,7 @@ function applyConfigHeadersToResponse(responseHeaders, options) {
 	if (options.recordCacheability !== false) markExplicitConfigResponseVeto(matched);
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
+		if (lowerName === "x-vinext-special-error-status") continue;
 		if (lowerName === "link") {
 			if (options.middlewareHeaders?.get(lowerName)) continue;
 			const postConfigLink = options.appendToPostConfigLink ? responseHeaders.get(lowerName) : null;

package/dist/server/dev-server.js

@@ -18,9 +18,12 @@ import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import "../shims/router-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, safeJsonStringify } from "./html.js";
+import { createDocumentPlaceholderToken, getDocumentHeadOpenMarker } from "../shims/document-placeholders.js";
 import { applyDocumentAssetProps, extractDocumentAssetProps, markDocumentAssetPropsProtectedTags, stripDocumentAssetPropsProtectionMarkers } from "./pages-document-asset-props.js";
+import { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts, splitDocumentAtMain } from "./pages-document-splice.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { getScriptNonceFromNodeHeaderSources } from "./csp.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { logRequest, now } from "./request-log.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
@@ -30,7 +33,7 @@ import { callDocumentGetInitialProps } from "./document-initial-head.js";
 import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { traceFindPageComponents, tracePagesData, tracePagesDocument, tracePagesDocumentStream } from "./pages-execution-tracing.js";
-import { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds } from "./pages-page-data.js";
+import { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath } from "./pages-page-data.js";
 import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
 import { collectPagesDevInitialStylesheetHeadHTML } from "./pages-dev-stylesheets.js";
 import { createPagesDevHydrationScript } from "./pages-dev-hydration.js";
@@ -141,13 +144,20 @@ function writeGsspRedirect(res, redirect, isDataReq, props, options) {
 	});
 	res.end(location);
 }
-/** Body placeholder used to split the document shell for streaming. */
-const STREAM_BODY_MARKER = "<!--VINEXT_STREAM_BODY-->";
 function stripDevPagesNotFoundFramingHeaders(res) {
 	res.removeHeader("Content-Length");
 	res.removeHeader("Transfer-Encoding");
 }
 /**
+* Vite's `transformIndexHtml` treats its URL as the HTML document's path, so
+* the request query carries no meaning there. Since Vite 8.3.3 it also maps
+* `/?q` onto the project root directory and then watches the filesystem root
+* for each inline `<style>` proxy module, so pass the bare path.
+*/
+function toHtmlTransformPath(url) {
+	return stripViteModuleQuery(url);
+}
+/**
 * Stream a Pages Router page response using progressive SSR.
 *
 * Sends the HTML shell (head, layout, Suspense fallbacks) immediately
@@ -161,7 +171,7 @@ function stripDevPagesNotFoundFramingHeaders(res) {
 * shell sooner).
 */
 async function streamPageToResponseImpl(routePattern, res, element, options) {
-	const { url, server, fontHeadHTML, assetHeadHTML = "", scripts, DocumentComponent, statusCode, extraHeaders, getHeadHTML, getTailHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, crossOrigin, bufferBodyBeforeHeaders = false, preserveExistingContentType = false, onDocumentBody } = options;
+	const { url, server, runner, fontHeadHTML, assetHeadHTML = "", scripts, DocumentComponent, statusCode, extraHeaders, getHeadHTML, getTailHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, crossOrigin, bufferBodyBeforeHeaders = false, preserveExistingContentType = false, onDocumentBody } = options;
 	const renderDocument = async () => {
 		const documentRenderPage = await runDocumentRenderPage({
 			DocumentComponent,
@@ -201,6 +211,8 @@ async function streamPageToResponseImpl(routePattern, res, element, options) {
 	const ssrHeadMarkerId = randomUUID();
 	const ssrHeadStartMarker = `<!--VINEXT_SSR_HEAD_START:${ssrHeadMarkerId}-->`;
 	const ssrHeadEndMarker = `<!--VINEXT_SSR_HEAD_END:${ssrHeadMarkerId}-->`;
+	const streamBodyMarker = `<!--VINEXT_STREAM_BODY:${ssrHeadMarkerId}-->`;
+	const documentToken = createDocumentPlaceholderToken();
 	let tailHeadHTML = getTailHeadHTML?.() ?? "";
 	if (documentRenderPage.status === "rendered" && documentRenderPage.stylesHTML) {
 		if (tailHeadHTML) tailHeadHTML += "\n  ";
@@ -217,34 +229,34 @@ async function streamPageToResponseImpl(routePattern, res, element, options) {
 	if (DocumentComponent) {
 		const docProps = documentRenderPage.status === "skipped" ? await loadUserDocumentInitialProps(DocumentComponent) : documentRenderPage.docProps;
 		const docElement = docProps ? React.createElement(DocumentComponent, docProps) : React.createElement(DocumentComponent);
-		const renderedDocument = extractDocumentAssetProps(await renderToStringAsync(docElement));
+		const { withDocumentPlaceholders } = await runner.import("vinext/document-placeholders");
+		const renderedDocument = extractDocumentAssetProps(await renderToStringAsync(withDocumentPlaceholders(docElement, documentToken)), documentToken);
 		documentAssetProps = renderedDocument.props;
 		let docHtml = protectAssetTags(renderedDocument.html);
 		const generatedScripts = applyGeneratedAssetProps(scripts, renderedDocument.props, "next-script");
 		const generatedAssetHeadHTML = applyGeneratedAssetProps(assetHeadHTML, renderedDocument.props, "next-script");
-		docHtml = docHtml.replace("__NEXT_MAIN__", STREAM_BODY_MARKER);
-		if (headHTML || fontHeadHTML || generatedAssetHeadHTML || tailHeadHTML) docHtml = docHtml.replace("</head>", `${ssrHeadStartMarker}${protectAssetTags(headHTML)}${ssrHeadEndMarker}  ${protectAssetTags(fontHeadHTML)}\n  ${generatedAssetHeadHTML}\n  ${protectAssetTags(tailHeadHTML)}\n</head>`);
-		docHtml = docHtml.replace("<!-- __NEXT_SCRIPTS__ -->", generatedScripts);
-		if (!docHtml.includes("__NEXT_DATA__")) docHtml = docHtml.replace("</body>", `  ${generatedScripts}\n</body>`);
-		shellTemplate = docHtml;
+		docHtml = spliceDocumentHeadClose(docHtml, documentToken, headHTML || fontHeadHTML || generatedAssetHeadHTML || tailHeadHTML ? `${ssrHeadStartMarker}${protectAssetTags(headHTML)}${ssrHeadEndMarker}  ${protectAssetTags(fontHeadHTML)}\n  ${generatedAssetHeadHTML}\n  ${protectAssetTags(tailHeadHTML)}\n` : "");
+		docHtml = spliceDocumentScripts(docHtml, documentToken, generatedScripts);
+		const main = splitDocumentAtMain(docHtml, documentToken);
+		shellTemplate = main.prefix + streamBodyMarker + main.suffix;
 	} else {
 		const generatedScripts = applyGeneratedAssetProps(scripts, {}, "next-script");
 		const generatedAssetHeadHTML = applyGeneratedAssetProps(assetHeadHTML, {}, "next-script");
 		shellTemplate = `<!DOCTYPE html>
 <html>
-<head>
+<head${getDocumentHeadOpenMarker(documentToken)}>
   ${ssrHeadStartMarker}${protectAssetTags(headHTML)}${ssrHeadEndMarker}
   ${protectAssetTags(fontHeadHTML)}
   ${generatedAssetHeadHTML}
   ${protectAssetTags(tailHeadHTML)}
 </head>
 <body>
-  <div id="__next">${STREAM_BODY_MARKER}</div>
+  <div id="__next">${streamBodyMarker}</div>
   ${generatedScripts}
 </body>
 </html>`;
 	}
-	let transformedShell = await server.transformIndexHtml(url, shellTemplate);
+	let transformedShell = await server.transformIndexHtml(toHtmlTransformPath(url), shellTemplate);
 	transformedShell = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(transformedShell, documentAssetProps, {
 		configuredCrossOrigin: crossOrigin,
 		protectedAssetMarker,
@@ -252,14 +264,17 @@ async function streamPageToResponseImpl(routePattern, res, element, options) {
 	}), protectedAssetMarker);
 	const ssrHeadStart = transformedShell.indexOf(ssrHeadStartMarker);
 	const ssrHeadEnd = transformedShell.indexOf(ssrHeadEndMarker);
+	let transformedHeadHTML = "";
 	if (ssrHeadStart !== -1 && ssrHeadEnd > ssrHeadStart) {
-		const transformedHeadHTML = transformedShell.slice(ssrHeadStart + ssrHeadStartMarker.length, ssrHeadEnd);
-		transformedShell = transformedShell.slice(0, ssrHeadStart) + transformedShell.slice(ssrHeadEnd + ssrHeadEndMarker.length);
-		transformedShell = transformedShell.replace(/<head(?:\s[^>]*)?>/i, (openingHead) => `${openingHead}${transformedHeadHTML}`);
+		const ssrHeadHTML = transformedShell.slice(ssrHeadStart + ssrHeadStartMarker.length, ssrHeadEnd);
+		const moveToHeadOpen = transformedShell.includes(getDocumentHeadOpenMarker(documentToken));
+		if (moveToHeadOpen) transformedHeadHTML = ssrHeadHTML;
+		transformedShell = transformedShell.slice(0, ssrHeadStart) + (moveToHeadOpen ? "" : ssrHeadHTML) + transformedShell.slice(ssrHeadEnd + ssrHeadEndMarker.length);
 	}
-	const markerIdx = transformedShell.indexOf(STREAM_BODY_MARKER);
+	transformedShell = spliceDocumentHeadOpen(transformedShell, documentToken, transformedHeadHTML);
+	const markerIdx = transformedShell.indexOf(streamBodyMarker);
 	const prefix = transformedShell.slice(0, markerIdx);
-	const suffix = transformedShell.slice(markerIdx + 25);
+	const suffix = transformedShell.slice(markerIdx + streamBodyMarker.length);
 	const bufferedBody = bufferBodyBeforeHeaders ? await new Response(bodyStream).text() : null;
 	const headers = { "Transfer-Encoding": "chunked" };
 	if (!preserveExistingContentType || !res.hasHeader("Content-Type")) headers["Content-Type"] = "text/html; charset=utf-8";
@@ -374,7 +389,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			locale: locale ?? currentDefaultLocale,
 			locales: i18nConfig?.locales,
 			defaultLocale: currentDefaultLocale,
-			crossOrigin
+			crossOrigin,
+			trailingSlash,
+			requestPathname: new URL(originalUrl, "http://vinext.local").pathname
 		};
 		const match = matchRoute(localeStrippedUrl, routes);
 		if (!match) {
@@ -442,7 +459,8 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				isStaticPropsRender = typeof pageModule.getStaticProps === "function" && typeof pageModule.getServerSideProps !== "function";
 				if (isStaticPropsRender) {
 					query = mergeRouteParamsIntoQuery({}, params);
-					requestAsPath = localeStrippedUrl.split("?")[0];
+					const routePattern = patternToNextFormat(route.pattern);
+					requestAsPath = routePattern === "/404" || routePattern === "/500" ? resolvePagesStatusPageRenderPath(routePattern, trailingSlash, errorPageContext.requestPathname) : localeStrippedUrl.split("?")[0];
 				}
 				const requestPreview = typeof pageModule.getStaticProps === "function" || typeof pageModule.getServerSideProps === "function" ? getPagesPreviewState(req.headers.cookie, { isOnDemandRevalidate: isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]) }) : {
 					data: false,
@@ -854,6 +872,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				await streamPageToResponse(route.pattern, res, withScriptNonce(element, scriptNonce), {
 					url,
 					server,
+					runner,
 					fontHeadHTML,
 					assetHeadHTML,
 					scripts: allScripts,
@@ -953,10 +972,11 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 			if (!ErrorComponent) continue;
 			const createElement = React.createElement;
 			res.statusCode = statusCode;
+			const renderUrl = errorPage !== "/_error" && typeof errorModule.getStaticProps === "function" ? resolvePagesStatusPageRenderPath(errorPage, context.trailingSlash === true, context.requestPathname ?? url.split("?")[0]) : url;
 			const errorRouter = {
 				pathname: errorPage,
-				query: parseQueryString(url),
-				asPath: url
+				query: parseQueryString(renderUrl),
+				asPath: renderUrl
 			};
 			try {
 				errorRouterShim = await importModule(runner, "next/router");
@@ -973,7 +993,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				err,
 				pathname: errorPage,
 				query: errorRouter.query,
-				asPath: url
+				asPath: renderUrl
 			});
 			if (res.headersSent || res.writableEnded) return;
 			let errorProps = {
@@ -994,7 +1014,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 					writeGsspRedirect(res, staticResult.redirect, false, { pageProps: errorProps }, {
 						basePath: context.basePath,
 						method: "getStaticProps",
-						routeUrl: url
+						routeUrl: renderUrl
 					});
 					return;
 				}
@@ -1025,7 +1045,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 						err,
 						pathname: errorPage,
 						query: errorRouter.query,
-						asPath: url
+						asPath: renderUrl
 					}
 				});
 				if (res.headersSent || res.writableEnded) return;
@@ -1058,7 +1078,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 			const errorScripts = `${`<script id="__NEXT_DATA__" type="application/json"${nonceAttr}>${safeJsonStringify({
 				props: renderProps,
 				page: errorPage,
-				query: parseQueryString(url),
+				query: parseQueryString(renderUrl),
 				buildId: context.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development",
 				isFallback: false,
 				locale: context.locale,
@@ -1085,6 +1105,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 			if (DocumentComponent) await streamPageToResponse(errorPage, res, element, {
 				url,
 				server,
+				runner,
 				fontHeadHTML: "",
 				assetHeadHTML,
 				scripts: errorScripts,
@@ -1093,8 +1114,8 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				documentContext: {
 					err,
 					pathname: errorPage,
-					query: parseQueryString(url),
-					asPath: url,
+					query: parseQueryString(renderUrl),
+					asPath: renderUrl,
 					req,
 					res
 				},
@@ -1130,7 +1151,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
   ${protectedErrorScripts}
 </body>
 </html>`;
-				const transformedHtml = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(await server.transformIndexHtml(url, html), {}, {
+				const transformedHtml = stripDocumentAssetPropsProtectionMarkers(applyDocumentAssetProps(await server.transformIndexHtml(toHtmlTransformPath(url), html), {}, {
 					configuredCrossOrigin: context.crossOrigin,
 					protectedAssetMarker
 				}), protectedAssetMarker);

package/dist/server/dev-stack-sourcemap.js

@@ -1,7 +1,7 @@
-import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
-import { readFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { isFileLoadingAllowed } from "vite";
 //#region src/server/dev-stack-sourcemap.ts
 const MAX_ORIGINAL_STACK_TRACE_BODY_BYTES = 1048576;
 const V8_PAREN_STACK_LINE = /^(\s*at\s+.*?\()(.+):(\d+):(\d+)(\)\s*)$/;
@@ -162,7 +162,7 @@ async function mapGeneratedFrame(server, file, line, column, methodName, request
 	const original = traceOriginalPositionFor(sourceMap, generatedLine, generatedColumn);
 	if (!original) return null;
 	const originalFile = resolveSourceFile(original.source, sourceMap, generatedFrame.sourceMapBaseUrl);
-	const codeFrame = await createStackCodeFrame({
+	const codeFrame = createStackCodeFrame({
 		file: originalFile,
 		line: original.line,
 		column: original.column,
@@ -224,11 +224,12 @@ function getLocalSourcePath(server, file) {
 	}
 	localPath = stripQuery(localPath);
 	if (!isAbsolutePath(localPath)) return null;
+	localPath = path.resolve(localPath);
 	const localPathForCompare = normalizeLocalPathForCompare(localPath);
 	if (localPathForCompare.includes("/node_modules/")) return null;
 	const root = server.config?.root;
 	if (!root) return null;
-	const rootForCompare = normalizeLocalPathForCompare(root);
+	const rootForCompare = normalizeLocalPathForCompare(path.resolve(root));
 	return localPathForCompare === rootForCompare || localPathForCompare.startsWith(`${rootForCompare}/`) ? localPath : null;
 }
 function isAbsolutePath(value) {
@@ -242,18 +243,18 @@ function normalizeLocalPathForCompare(value) {
 	return /^[A-Za-z]:\//.test(normalized) ? normalized.toLowerCase() : normalized;
 }
 function normalizeIgnoreListPath(value) {
-	let path = devirtualizeReactServerFrame(value);
-	if (path.startsWith("file://")) try {
-		path = fileURLToPath(path);
+	let normalized = devirtualizeReactServerFrame(value);
+	if (normalized.startsWith("file://")) try {
+		normalized = fileURLToPath(normalized);
 	} catch {}
 	else try {
-		const url = new URL(path);
-		if (url.protocol === "http:" || url.protocol === "https:") path = `${url.pathname}${url.search}`;
+		const url = new URL(normalized);
+		if (url.protocol === "http:" || url.protocol === "https:") normalized = `${url.pathname}${url.search}`;
 	} catch {}
 	try {
-		path = decodeURIComponent(path);
+		normalized = decodeURIComponent(normalized);
 	} catch {}
-	return toSlash(path).toLowerCase();
+	return toSlash(normalized).toLowerCase();
 }
 function isExternalHttpFrame(file, requestHost) {
 	if (!/^https?:\/\//i.test(file) || !requestHost) return false;
@@ -274,10 +275,9 @@ function isIgnoreListedOriginalFrame(file) {
 function isSourceMapIgnored(sourceMap, sourceIndex) {
 	return sourceMap.ignoreList?.includes(sourceIndex) ?? false;
 }
-async function createStackCodeFrame({ file, line, column, methodName, sourceContent }) {
-	const source = sourceContent ?? await readSourceFileForCodeFrame(file);
-	if (!source) return null;
-	const sourceLines = source.split(/\r\n|\r|\n/);
+function createStackCodeFrame({ file, line, column, methodName, sourceContent }) {
+	if (!sourceContent) return null;
+	const sourceLines = sourceContent.split(/\r\n|\r|\n/);
 	if (line < 1 || line > sourceLines.length) return null;
 	const start = Math.max(1, line - 2);
 	const end = Math.min(sourceLines.length, line + 3);
@@ -295,14 +295,6 @@ async function createStackCodeFrame({ file, line, column, methodName, sourceCont
 		lines
 	};
 }
-async function readSourceFileForCodeFrame(file) {
-	if (!file.startsWith("file://")) return null;
-	try {
-		return await readFile(fileURLToPath(file), "utf8");
-	} catch {
-		return null;
-	}
-}
 function getMappableClientGeneratedUrl(file, requestHost) {
 	const isAbsoluteHttpUrl = /^https?:\/\//i.test(file);
 	let url;
@@ -335,6 +327,9 @@ async function loadServerSourceMapForLocalPath(server, localPath) {
 		const environment = server.environments[environmentName];
 		if (!environment) continue;
 		try {
+			const resolved = await environment.pluginContainer.resolveId(localPath);
+			if (!resolved || resolved.external || resolved.id.startsWith("\0")) continue;
+			if (!isFileLoadingAllowed(server.config, stripQuery(resolved.id))) continue;
 			const sourceMap = normalizeSourceMapPayload((await environment.transformRequest(localPath))?.map);
 			if (sourceMap) return sourceMap;
 		} catch {}

package/dist/server/document-initial-head.d.ts

@@ -1,15 +1,4 @@
 import React from "react";
 //#region src/server/document-initial-head.d.ts
-/**
- * True when `_document` supplies its own `getInitialProps`, rather than
- * exposing none or inheriting the shim's default. Comparing against the
- * captured `DEFAULT_GET_INITIAL_PROPS` reference is what distinguishes a user
- * override from the default — extending the shim's `Document` without
- * overriding inherits the same static function.
- *
- * Callers use this to decide whether the render pipeline owes `_document` the
- * full `getInitialProps` contract, since only an override can observe it.
- */
-export declare function hasUserDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined): boolean;
 export declare function callDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined, setDocumentInitialHead: ((head: React.ReactNode[]) => void) | undefined): Promise<void>;
 //#endregion

package/dist/server/document-initial-head.js

@@ -45,4 +45,4 @@ async function callDocumentGetInitialProps(DocumentComponent, setDocumentInitial
 	}
 }
 //#endregion
-export { callDocumentGetInitialProps, hasUserDocumentGetInitialProps };
+export { callDocumentGetInitialProps };

package/dist/server/forwarded-middleware-context.d.ts

@@ -0,0 +1,5 @@
+//#region src/server/forwarded-middleware-context.d.ts
+export declare function sealForwardedMiddlewareContext(key: string, context: string): string;
+/** Returns the forwarded context JSON, or null unless it carries `key`. */
+export declare function openForwardedMiddlewareContext(value: string | null, key: string | null | undefined): string | null;
+//#endregion

package/dist/server/forwarded-middleware-context.js

@@ -0,0 +1,22 @@
+import { safeEqual } from "./revalidation-request.js";
+//#region src/server/forwarded-middleware-context.ts
+/**
+* Hybrid app+pages dev runs middleware once in the Pages connect handler and
+* forwards the result to the App Router in x-vinext-mw-ctx. The value is
+* prefixed with a per-dev-server key that only vinext's generated RSC entry
+* knows, so a client-supplied copy can never stand in for running middleware,
+* whichever plugin builds the App Router request first.
+*/
+const KEY_SEPARATOR = ".";
+function sealForwardedMiddlewareContext(key, context) {
+	return key + KEY_SEPARATOR + context;
+}
+/** Returns the forwarded context JSON, or null unless it carries `key`. */
+function openForwardedMiddlewareContext(value, key) {
+	if (value === null || !key) return null;
+	const separatorIndex = value.indexOf(KEY_SEPARATOR);
+	if (separatorIndex === -1 || !safeEqual(value.slice(0, separatorIndex), key)) return null;
+	return value.slice(separatorIndex + 1);
+}
+//#endregion
+export { openForwardedMiddlewareContext, sealForwardedMiddlewareContext };

package/dist/server/headers.d.ts

@@ -48,7 +48,10 @@ export declare const VINEXT_PRERENDER_READINESS_PATH = "/__vinext/prerender/read
 export declare const VINEXT_PRERENDER_READINESS_HEADER = "X-Vinext-Prerender-Readiness";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 export declare const VINEXT_REVALIDATE_HEADER = "x-vinext-revalidate";
-/** Actual Pages cache tag regenerated by an authenticated on-demand request. */
+/**
+ * Actual Pages cache tag regenerated by an authenticated on-demand request.
+ * URI-encoded, because a decoded path can end in whitespace that Headers trims.
+ */
 export declare const VINEXT_REVALIDATED_CACHE_TAG_HEADER = "x-vinext-revalidated-cache-tag";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
 export declare const VINEXT_RSC_MARKER_HEADER = "x-vinext-rsc";
@@ -58,6 +61,12 @@ export declare const VINEXT_PARAMS_HEADER = "X-Vinext-Params";
 export declare const VINEXT_DYNAMIC_STALE_TIME_HEADER = "X-Vinext-Dynamic-Stale-Time";
 /** Marks an RSC body carrying completion metadata after the Flight payload. */
 export declare const VINEXT_RSC_COMPLETION_METADATA_HEADER = "X-Vinext-Rsc-Completion-Metadata";
+/**
+ * Carries the stored status of an App page RSC response whose 401, 403 or 404
+ * is its page's notFound(), forbidden() or unauthorized(). Middleware and
+ * config headers can't set it, and the request stage strips it.
+ */
+export declare const VINEXT_SPECIAL_ERROR_STATUS_HEADER = "x-vinext-special-error-status";
 /** URL-encoded rendered path and search after middleware/config rewrites. */
 export declare const VINEXT_RENDERED_PATH_AND_SEARCH_HEADER = "X-Vinext-Rendered-Path-And-Search";
 /** Prerender-only JSON side channel carrying request cacheLife metadata. */
@@ -66,6 +75,14 @@ export declare const VINEXT_PRERENDER_CACHE_LIFE_HEADER = "x-vinext-prerender-ca
 export declare const VINEXT_PRERENDER_REWRITTEN_HEADER = "x-vinext-prerender-rewritten";
 /** Marks a local prerender-server 500 that originated from a thrown render error. */
 export declare const VINEXT_PRERENDER_RENDER_ERROR_HEADER = "x-vinext-prerender-render-error";
+/**
+ * Prerender-only marker: the response's 401, 403, 404 or redirect is its page's
+ * notFound(), forbidden(), unauthorized() or redirect(), which escaped the shell.
+ * Its value is the JSON of the headers to store: a redirect's own location, or
+ * `{}`. Only the prerender server sets it, from the special error the page
+ * recorded on its ctx, and it drops one that the response carries.
+ */
+export declare const VINEXT_PRERENDER_SPECIAL_ERROR_HEADER = "x-vinext-prerender-special-error";
 /** Internal marker persisted only inside metadata-route APP_ROUTE cache values. */
 export declare const VINEXT_METADATA_ROUTE_CACHE_HEADER = "x-vinext-metadata-route-cache";
 /** Disabled-by-default client hint describing already-held App Router payload entries. */