vinext 1.1.0 → 1.2.1

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

@@ -1,6 +1,6 @@
-import "./server-globals.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped, repeatedSlashRedirectResponse } from "./open-redirect.js";
+import "./server-globals.js";
 import { isPprFallbackShellAbortError } from "../shims/ppr-fallback-shell.js";
 import { onRenderDynamicLatched } from "../shims/internal/headers-state.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
@@ -18,7 +18,7 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { isAppRenderAbortError } from "./app-render-abort-error.js";
+import { createRenderStreamCancellation, isAppRenderAbortError } from "./app-render-abort-error.js";
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
@@ -27,6 +27,7 @@ import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-
 import { runWithRootParamsScope } from "../shims/root-params.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { startCandidateSearchParamsGate } from "./app-ssr-search-params-gate.js";
+import { withAppRouterTree } from "../shims/app-router-tree-context.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
@@ -246,10 +247,11 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					beforeInteractiveInlineScripts.push(script);
 				};
 				const treeWithBeforeInteractive = createElement(BeforeInteractiveContext.Provider, { value: registerBeforeInteractiveInlineScript }, ssrTree);
-				const ssrRoot = withScriptNonce(treeWithBeforeInteractive, options?.scriptNonce);
+				const ssrRoot = withScriptNonce(withAppRouterTree(treeWithBeforeInteractive), options?.scriptNonce);
 				const bootstrapModuleUrl = extractBootstrapModuleUrl(await import.meta.viteRsc.loadBootstrapScriptContent("index"));
 				const errorMetaRenderer = createSsrErrorMetaRenderer({ basePath: options?.basePath });
 				const pprFallbackShellSignal = options?.pprFallbackShellSignal;
+				const htmlCancellation = createRenderStreamCancellation();
 				let reactLinkHeader = "";
 				const maxHeadersLength = options?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 				const captureHeaders = maxHeadersLength > 0;
@@ -267,7 +269,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					maxHeadersLength: captureHeaders ? maxHeadersLength : void 0,
 					onError(error) {
 						if (pprFallbackShellSignal && isPprFallbackShellAbortError(error)) return;
-						if (isAppRenderAbortError(error)) return void 0;
+						if (isAppRenderAbortError(error) || htmlCancellation.isReason(error)) return;
 						errorMetaRenderer.capture(error);
 						const instrumentationDigest = options?.onSsrError?.(error);
 						if (typeof instrumentationDigest === "string") return instrumentationDigest;
@@ -341,7 +343,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
 				if (shouldDelayInitialHtmlPull) await waitAtLeastOneReactRenderTask();
 				return {
-					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup),
+					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup, void 0, htmlCancellation.record),
 					metadataReady: Promise.resolve(),
 					renderComplete,
 					capturedRscData: options?.capturedRscDataRef?.value ?? null,

package/dist/server/app-visited-response-cache.js

@@ -1,6 +1,6 @@
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { parseRscRequestPath, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { resolveCachedRscResponseExpiresAt } from "../shims/navigation.js";
 //#region src/server/app-visited-response-cache.ts
 const VISITED_RESPONSE_CACHE_TTL = 3e5;
@@ -27,7 +27,7 @@ function isVisitedResponseCacheEntryFresh(entry, options) {
 }
 function normalizeVisitedResponseCacheLookupUrl(rscUrl) {
 	try {
-		const url = new URL(rscUrl, "http://vinext.local");
+		const url = parseRscRequestPath(rscUrl);
 		stripRscCacheBustingSearchParam(url);
 		return `${url.pathname}${url.search}`;
 	} catch {

package/dist/server/app-worker-stages.d.ts

@@ -18,6 +18,11 @@ type AppWorkerResponseStageEnvelope = {
 };
 type AppFullRequestWorkerResponseStageProps = AppWorkerResponseStageEnvelope & {
   kind: "app-full-request";
+  /**
+   * The public request is HEAD. It is dispatched as GET so a transport that
+   * applies HEAD semantics cannot drop the static-file signal's body.
+   */
+  headRequest: boolean;
   prerenderDiscovery: boolean;
   staticFileSignalToken: string;
   trustedPrerenderState: TrustedPrerenderState | null;

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

@@ -81,7 +81,7 @@ function isAppWorkerResponseStageProps(value) {
 	if (!value || typeof value !== "object") return false;
 	const props = value;
 	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.prerenderDiscovery === "boolean" && typeof props.staticFileSignalToken === "string" && STATIC_FILE_SIGNAL_TOKEN_RE.test(props.staticFileSignalToken) && (props.trustedPrerenderState === null || isTrustedPrerenderState(props.trustedPrerenderState));
+	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;

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, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
-import { isNonCacheableCacheControl } from "../shims/cdn-cache.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;

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,5 +1,5 @@
-import { matchHeaders } from "../config/config-matchers.js";
 import "./headers.js";
+import { matchHeaders } from "../config/config-matchers.js";
 import { markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityFinalResponseUncacheable } from "../shims/cacheability-classification.js";
 import { isCdnResponsePolicyHeader, isNonCacheableCdnResponsePolicy } from "./cache-control.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";

package/dist/server/defer-until-stream-consumed.d.ts

@@ -1,6 +1,7 @@
 //#region src/server/defer-until-stream-consumed.d.ts
 /**
  * Defers cleanup until the downstream consumer drains or cancels the stream.
+ * `onCancel` runs before the cancellation reaches the source stream.
  */
-export declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, onFlush: () => void, onError?: (error: unknown) => void): ReadableStream<Uint8Array>;
+export declare function deferUntilStreamConsumed(stream: ReadableStream<Uint8Array>, onFlush: () => void, onError?: (error: unknown) => void, onCancel?: (reason: unknown) => void): ReadableStream<Uint8Array>;
 //#endregion

package/dist/server/defer-until-stream-consumed.js

@@ -1,8 +1,9 @@
 //#region src/server/defer-until-stream-consumed.ts
 /**
 * Defers cleanup until the downstream consumer drains or cancels the stream.
+* `onCancel` runs before the cancellation reaches the source stream.
 */
-function deferUntilStreamConsumed(stream, onFlush, onError) {
+function deferUntilStreamConsumed(stream, onFlush, onError, onCancel) {
 	let called = false;
 	const once = () => {
 		if (!called) {
@@ -26,6 +27,7 @@ function deferUntilStreamConsumed(stream, onFlush, onError) {
 			});
 		},
 		cancel(reason) {
+			onCancel?.(reason);
 			once();
 			return reader.cancel(reason);
 		}

package/dist/server/dev-server.js

@@ -2,10 +2,10 @@ import { closeAfterResponse, createRequestContext, runWithRequestContext } from
 import { createValidFileMatcher, findFileWithExts } from "../routing/file-matcher.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { sanitizeDestination } from "../config/config-matchers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
 import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
@@ -18,7 +18,9 @@ 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";
@@ -31,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";
@@ -142,8 +144,6 @@ 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");
@@ -171,7 +171,7 @@ function toHtmlTransformPath(url) {
 * 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,
@@ -211,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  ";
@@ -227,29 +229,29 @@ 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>`;
@@ -262,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";
@@ -384,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) {
@@ -452,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,
@@ -864,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,
@@ -963,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");
@@ -983,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 = {
@@ -1004,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;
 				}
@@ -1035,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;
@@ -1068,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,
@@ -1095,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,
@@ -1103,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
 				},

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";

package/dist/server/headers.js

@@ -48,7 +48,10 @@ const VINEXT_PRERENDER_READINESS_PATH = "/__vinext/prerender/readiness";
 const VINEXT_PRERENDER_READINESS_HEADER = "X-Vinext-Prerender-Readiness";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 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.
+*/
 const VINEXT_REVALIDATED_CACHE_TAG_HEADER = "x-vinext-revalidated-cache-tag";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
 const VINEXT_RSC_MARKER_HEADER = "x-vinext-rsc";

package/dist/server/http-conditional.d.ts

@@ -6,6 +6,17 @@
  * validator with the same opaque tag compare equal.
  */
 export declare function matchesIfNoneMatch(ifNoneMatch: string | undefined, etag: string): boolean;
+/**
+ * Whether a page answers its request with a 304, as Next.js's
+ * `sendEtagResponse` does with `fresh(req.headers, { etag })`. Next.js gives a
+ * page no Last-Modified, so a request with If-Modified-Since gets the page, and
+ * a request `Cache-Control: no-cache` always does.
+ */
+export declare function isPageNotModified(request: {
+  cacheControl?: string;
+  ifModifiedSince?: string;
+  ifNoneMatch?: string;
+}, etag: string): boolean;
 /** Test an If-Match field using Next.js's weak/strong-equivalent comparison. */
 export declare function matchesIfMatch(ifMatch: string | undefined, etag: string | undefined): boolean;
 type StaticConditionalHeaders = {