vinext 0.1.2 → 0.1.3

package/dist/server/prod-server.js

@@ -201,6 +201,7 @@ function toWebHeaders(headersRecord) {
 }
 function appendWebHeader(headers, key, value) {
 	if (value === void 0) return;
+	if (key.startsWith(":")) return;
 	if (Array.isArray(value)) {
 		for (const item of value) headers.append(key, item);
 		return;
@@ -783,7 +784,7 @@ async function startAppRouterServer(options) {
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
-			const params = parseImageParams(new URL(rawUrl, "http://localhost"), [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES]);
+			const params = parseImageParams(new URL(rawUrl, "http://localhost"), [...imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], imageConfig?.qualities);
 			if (!params) {
 				res.writeHead(400);
 				res.end("Bad Request");
@@ -891,6 +892,7 @@ async function startPagesRouterServer(options) {
 	const pagesImageConfig = vinextConfig?.images ? {
 		dangerouslyAllowSVG: vinextConfig.images.dangerouslyAllowSVG,
 		dangerouslyAllowLocalIP: vinextConfig.images.dangerouslyAllowLocalIP,
+		qualities: vinextConfig.images.qualities,
 		contentDispositionType: vinextConfig.images.contentDispositionType,
 		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
 	} : void 0;
@@ -960,7 +962,7 @@ async function startPagesRouterServer(options) {
 			return;
 		}
 		if (isImageOptimizationPath(pathname) || isImageOptimizationPath(staticLookupPath)) {
-			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths);
+			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths, pagesImageConfig?.qualities);
 			if (!params) {
 				res.writeHead(400);
 				res.end("Bad Request");
@@ -991,6 +993,7 @@ async function startPagesRouterServer(options) {
 				}
 			}
 			let isDataReq = false;
+			const originalRenderUrl = url;
 			if (isNextDataPathname(pathname)) {
 				const dataMatch = pagesBuildId ? parseNextDataPathname(pathname, pagesBuildId) : null;
 				if (!dataMatch) {
@@ -1028,7 +1031,10 @@ async function startPagesRouterServer(options) {
 				rawSearch: rawQs,
 				matchPageRoute: matchPageRoute ?? null,
 				runMiddleware: typeof runMiddleware === "function" ? wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath) : null,
-				renderPage: typeof renderPage === "function" ? (request, resolvedUrl, options, stagedHeaders) => renderPage(request, resolvedUrl, ssrManifest, void 0, stagedHeaders, options) : null,
+				renderPage: typeof renderPage === "function" ? (request, resolvedUrl, options, stagedHeaders) => renderPage(request, resolvedUrl, ssrManifest, void 0, stagedHeaders, {
+					...options,
+					originalUrl: originalRenderUrl
+				}) : null,
 				handleApi: typeof handleApi === "function" ? (request, apiUrl) => handleApi(request, apiUrl, createNodeExecutionContext()) : null,
 				serveStaticFile: async (requestPathname, stagedHeaders) => {
 					if (requestPathname === "/" || requestPathname.startsWith("/api/") || requestPathname.startsWith(`/_next/static/`)) return false;

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

@@ -76,7 +76,8 @@ type ApplyConfigHeadersOptions = {
    * (basePath: true) rule for backward compatibility — callers that need to
    * support `basePath: false` headers must pass this in.
    */
-  basePathState?: BasePathMatchState;
+  basePathState?: BasePathMatchState; /** Existing framework-generated headers that matching config rules may replace. */
+  overwriteExisting?: ReadonlySet<string>;
 };
 type StaticFileSignalContext = {
   headers: Headers | null;
@@ -157,19 +158,6 @@ declare function validateCsrfOrigin(request: Request, allowedOrigins?: string[])
  */
 declare function validateServerActionPayload(body: string | FormData): Promise<Response | null>;
 declare function isOriginAllowed(origin: string, allowed: string[]): boolean;
-/**
- * Validate an image optimization URL parameter.
- *
- * Ensures the URL is a relative path that doesn't escape the origin:
- * - Must start with "/" but not "//"
- * - Backslashes are normalized (browsers treat `\` as `/`)
- * - Origin validation as defense-in-depth
- *
- * @param rawUrl - The raw `url` query parameter value
- * @param requestUrl - The full request URL for origin comparison
- * @returns An error Response if validation fails, or the normalized image URL
- */
-declare function validateImageUrl(rawUrl: string | null, requestUrl: string): Response | string;
 /**
  * Strip internal `x-middleware-*` headers from a Headers object.
  *
@@ -219,4 +207,4 @@ declare function cloneRequestWithHeaders(request: Request, headers: Headers): Re
  */
 declare function cloneRequestWithUrl(request: Request, url: string): Request;
 //#endregion
-export { HeaderRecord, INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateImageUrl, validateServerActionPayload };
+export { HeaderRecord, INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };

package/dist/server/request-pipeline.js

@@ -122,7 +122,7 @@ function applyConfigHeadersToResponse(responseHeaders, options) {
 	for (const header of matched) {
 		const lowerName = header.key.toLowerCase();
 		if (lowerName === "vary" || lowerName === "set-cookie") responseHeaders.append(header.key, header.value);
-		else if (!responseHeaders.has(lowerName)) responseHeaders.set(header.key, header.value);
+		else if (options.overwriteExisting?.has(lowerName) || !responseHeaders.has(lowerName)) responseHeaders.set(header.key, header.value);
 	}
 }
 /**
@@ -197,9 +197,10 @@ function normalizeTrailingSlash(pathname, basePath, trailingSlash, search) {
 	if (isOpenRedirectShaped(pathname)) return notFoundResponse();
 	const normalizedPathname = normalizeTrailingSlashPathname(pathname, trailingSlash);
 	if (normalizedPathname === null) return null;
+	const encodedPathname = normalizedPathname.replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@/%]/gu, encodeURIComponent);
 	return new Response(null, {
 		status: 308,
-		headers: { Location: basePath + normalizedPathname + search }
+		headers: { Location: basePath + encodedPathname + search }
 	});
 }
 /**
@@ -246,45 +247,74 @@ function validateCsrfOrigin(request, allowedOrigins = []) {
 * Regular user form fields are ignored entirely.
 */
 async function validateServerActionPayload(body) {
-	const containerRefRe = /"\$([QWi])(\d+)"/g;
+	const maxNumericFields = 4096;
+	const maxContainerReferences = 16384;
+	const maxContainerDepth = 1024;
+	const containerRefRe = /"\$([QWi])([0-9a-f]+)(?=[:"])/gi;
 	const fieldRefs = /* @__PURE__ */ new Map();
+	let referenceCount = 0;
+	const invalidPayloadResponse = () => new Response("Invalid server action payload", {
+		status: 400,
+		headers: { "Content-Type": "text/plain" }
+	});
 	const collectRefs = (fieldKey, text) => {
+		if (fieldRefs.has(fieldKey)) return true;
+		if (fieldRefs.size >= maxNumericFields) return false;
 		const refs = /* @__PURE__ */ new Set();
 		let match;
 		containerRefRe.lastIndex = 0;
-		while ((match = containerRefRe.exec(text)) !== null) refs.add(match[2]);
+		while ((match = containerRefRe.exec(text)) !== null) {
+			const previousSize = refs.size;
+			refs.add(String(Number.parseInt(match[2], 16)));
+			if (refs.size !== previousSize && ++referenceCount > maxContainerReferences) return false;
+		}
 		fieldRefs.set(fieldKey, refs);
+		return true;
 	};
-	if (typeof body === "string") collectRefs("0", body);
-	else for (const [key, value] of body.entries()) {
+	if (typeof body === "string") {
+		if (!collectRefs("0", body)) return invalidPayloadResponse();
+	} else for (const [key, value] of body.entries()) {
 		if (!/^\d+$/.test(key)) continue;
 		if (typeof value === "string") {
-			collectRefs(key, value);
+			if (!collectRefs(key, value)) return invalidPayloadResponse();
 			continue;
 		}
-		if (typeof value?.text === "function") collectRefs(key, await value.text());
+		if (typeof value?.text === "function") {
+			if (!collectRefs(key, await value.text())) return invalidPayloadResponse();
+		}
 	}
 	if (fieldRefs.size === 0) return null;
 	const knownFields = new Set(fieldRefs.keys());
-	for (const refs of fieldRefs.values()) for (const ref of refs) if (!knownFields.has(ref)) return new Response("Invalid server action payload", {
-		status: 400,
-		headers: { "Content-Type": "text/plain" }
-	});
-	const visited = /* @__PURE__ */ new Set();
-	const stack = /* @__PURE__ */ new Set();
-	const hasCycle = (node) => {
-		if (stack.has(node)) return true;
-		if (visited.has(node)) return false;
-		visited.add(node);
-		stack.add(node);
-		for (const ref of fieldRefs.get(node) ?? []) if (hasCycle(ref)) return true;
-		stack.delete(node);
-		return false;
-	};
-	for (const node of fieldRefs.keys()) if (hasCycle(node)) return new Response("Invalid server action payload", {
-		status: 400,
-		headers: { "Content-Type": "text/plain" }
-	});
+	for (const refs of fieldRefs.values()) for (const ref of refs) if (!knownFields.has(ref)) return invalidPayloadResponse();
+	const state = /* @__PURE__ */ new Map();
+	for (const root of fieldRefs.keys()) {
+		if (state.has(root)) continue;
+		const stack = [{
+			node: root,
+			refs: [...fieldRefs.get(root) ?? []],
+			nextRef: 0
+		}];
+		state.set(root, "visiting");
+		while (stack.length > 0) {
+			if (stack.length > maxContainerDepth) return invalidPayloadResponse();
+			const frame = stack[stack.length - 1];
+			const ref = frame.refs[frame.nextRef++];
+			if (ref === void 0) {
+				state.set(frame.node, "visited");
+				stack.pop();
+				continue;
+			}
+			const refState = state.get(ref);
+			if (refState === "visiting") return invalidPayloadResponse();
+			if (refState === "visited") continue;
+			state.set(ref, "visiting");
+			stack.push({
+				node: ref,
+				refs: [...fieldRefs.get(ref) ?? []],
+				nextRef: 0
+			});
+		}
+	}
 	return null;
 }
 /**
@@ -329,25 +359,6 @@ function isOriginAllowed(origin, allowed) {
 	return false;
 }
 /**
-* Validate an image optimization URL parameter.
-*
-* Ensures the URL is a relative path that doesn't escape the origin:
-* - Must start with "/" but not "//"
-* - Backslashes are normalized (browsers treat `\` as `/`)
-* - Origin validation as defense-in-depth
-*
-* @param rawUrl - The raw `url` query parameter value
-* @param requestUrl - The full request URL for origin comparison
-* @returns An error Response if validation fails, or the normalized image URL
-*/
-function validateImageUrl(rawUrl, requestUrl) {
-	const imgUrl = rawUrl?.replaceAll("\\", "/") ?? null;
-	if (!imgUrl || !imgUrl.startsWith("/") || imgUrl.startsWith("//")) return new Response(!rawUrl ? "Missing url parameter" : "Only relative URLs allowed", { status: 400 });
-	const url = new URL(requestUrl);
-	if (new URL(imgUrl, url.origin).origin !== url.origin) return new Response("Only relative URLs allowed", { status: 400 });
-	return imgUrl;
-}
-/**
 * Strip internal `x-middleware-*` headers from a Headers object.
 *
 * Middleware uses `x-middleware-*` headers as internal signals (e.g.
@@ -465,4 +476,4 @@ function cloneRequestWithUrl(request, url) {
 	return cloned;
 }
 //#endregion
-export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateImageUrl, validateServerActionPayload };
+export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };

package/dist/server/rsc-stream-hints.d.ts

@@ -1,6 +1,10 @@
 //#region src/server/rsc-stream-hints.d.ts
 declare function normalizeReactFlightPreloadHints(stream: ReadableStream<Uint8Array>): ReadableStream<Uint8Array>;
 type RscRawRenderer = (model: unknown, options?: unknown) => ReadableStream<Uint8Array>;
+type RscRawPrerenderer = (model: unknown, options?: unknown) => Promise<{
+  prelude: ReadableStream<Uint8Array>;
+}>;
 declare function createRscRenderer(render: RscRawRenderer): RscRawRenderer;
+declare function createRscPrerenderer(prerender: RscRawPrerenderer): RscRawPrerenderer;
 //#endregion
-export { createRscRenderer, normalizeReactFlightPreloadHints };
+export { RscRawPrerenderer, RscRawRenderer, createRscPrerenderer, createRscRenderer, normalizeReactFlightPreloadHints };

package/dist/server/rsc-stream-hints.js

@@ -32,5 +32,10 @@ function normalizeReactFlightPreloadHints(stream) {
 function createRscRenderer(render) {
 	return (model, options) => normalizeReactFlightPreloadHints(render(model, options));
 }
+function createRscPrerenderer(prerender) {
+	return async (model, options) => {
+		return { prelude: normalizeReactFlightPreloadHints((await prerender(model, options)).prelude) };
+	};
+}
 //#endregion
-export { createRscRenderer, normalizeReactFlightPreloadHints };
+export { createRscPrerenderer, createRscRenderer, normalizeReactFlightPreloadHints };

package/dist/server/seed-cache.js

@@ -1,8 +1,8 @@
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
-import { normalizePath } from "./normalize-path.js";
 import { isrCacheKey, isrSetPrerenderedAppPage } from "./isr-cache.js";
 import { buildAppPageCacheTags } from "./app-page-cache.js";
 import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
+import { addPregeneratedConcretePath, clearPregeneratedConcretePaths, normalizePregeneratedPathname } from "./pregenerated-concrete-paths.js";
+import { getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest } from "./prerender-manifest.js";
 import fs from "node:fs";
 import path from "node:path";
 //#region src/server/seed-cache.ts
@@ -46,26 +46,21 @@ import path from "node:path";
 * @returns The number of routes seeded (0 if no manifest or no renderable routes).
 */
 async function seedMemoryCacheFromPrerender(serverDir, options) {
-	const manifestPath = path.join(serverDir, "vinext-prerender.json");
-	if (!fs.existsSync(manifestPath)) return 0;
-	let manifest;
-	try {
-		manifest = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-	} catch (err) {
-		console.warn("[vinext] Failed to parse vinext-prerender.json, skipping cache seeding:", err);
-		return 0;
-	}
+	clearPregeneratedConcretePaths();
+	const manifest = readPrerenderManifest(path.join(serverDir, "vinext-prerender.json"));
+	if (!manifest) return 0;
 	const { buildId, routes } = manifest;
 	if (!buildId || !Array.isArray(routes)) return 0;
 	const trailingSlash = manifest.trailingSlash ?? false;
 	const prerenderDir = path.join(serverDir, "prerendered-routes");
 	const writeAppPageEntry = options?.writeAppPageEntry ?? createDefaultAppPageEntryWriter();
 	let seeded = 0;
-	for (const route of routes) {
-		if (route.status !== "rendered") continue;
-		if (route.router !== "app") continue;
+	const appRoutes = getRenderedAppRoutes(routes);
+	for (const route of appRoutes) {
+		const concretePathname = route.path ?? route.route;
+		if (!isFallbackShellArtifactPath(concretePathname, route)) addPregeneratedConcretePath(route.route, concretePathname);
 		const artifactPathname = route.path ?? route.route;
-		const cachePathname = normalizePrerenderCachePathname(artifactPathname);
+		const cachePathname = normalizePregeneratedPathname(artifactPathname);
 		const baseKey = isrCacheKey("app", cachePathname, buildId);
 		const htmlKey = options?.buildAppPageHtmlKey?.(cachePathname) ?? baseKey + ":html";
 		const rscKey = options?.buildAppPageRscKey?.(cachePathname) ?? baseKey + ":rsc";
@@ -79,9 +74,6 @@ async function seedMemoryCacheFromPrerender(serverDir, options) {
 	}
 	return seeded;
 }
-function normalizePrerenderCachePathname(pathname) {
-	return normalizePath(normalizePathnameForRouteMatch(pathname));
-}
 function createDefaultAppPageEntryWriter() {
 	return (key, data, metadata) => isrSetPrerenderedAppPage(key, data, metadata);
 }

package/dist/shims/app-router-scroll-state.d.ts

@@ -3,11 +3,13 @@ type AppRouterScrollIntent = Readonly<{
   commitId: number | null;
   hash: string | null;
   id: number;
+  targetHoistedInHead: boolean;
 }>;
 declare function beginAppRouterScrollIntent(hash: string | null): AppRouterScrollIntent;
 declare function clearAppRouterScrollIntent(): void;
 declare function getPendingAppRouterScrollIntent(): AppRouterScrollIntent | null;
 declare function claimAppRouterScrollIntentForCommit(expected: AppRouterScrollIntent | null | undefined, commitId: number): void;
+declare function markAppRouterScrollIntentHeadHoisted(expected: AppRouterScrollIntent | null | undefined, commitId: number): void;
 declare function consumeAppRouterScrollIntent(expected: AppRouterScrollIntent | null | undefined, commitId?: number): AppRouterScrollIntent | null;
 //#endregion
-export { AppRouterScrollIntent, beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent };
+export { AppRouterScrollIntent, beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted };

package/dist/shims/app-router-scroll-state.js

@@ -14,7 +14,8 @@ function beginAppRouterScrollIntent(hash) {
 	const intent = {
 		commitId: null,
 		hash,
-		id: store.nextId
+		id: store.nextId,
+		targetHoistedInHead: false
 	};
 	store.pending = intent;
 	return intent;
@@ -35,6 +36,17 @@ function claimAppRouterScrollIntentForCommit(expected, commitId) {
 		commitId
 	};
 }
+function markAppRouterScrollIntentHeadHoisted(expected, commitId) {
+	const store = getScrollIntentStore();
+	const intent = store.pending;
+	if (expected === null || expected === void 0 || intent === null) return;
+	if (intent.id !== expected.id) return;
+	if (intent.commitId !== commitId) return;
+	store.pending = {
+		...intent,
+		targetHoistedInHead: true
+	};
+}
 function consumeAppRouterScrollIntent(expected, commitId) {
 	if (expected === null || expected === void 0) return null;
 	const store = getScrollIntentStore();
@@ -46,4 +58,4 @@ function consumeAppRouterScrollIntent(expected, commitId) {
 	return intent;
 }
 //#endregion
-export { beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent };
+export { beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted };

package/dist/shims/app-router-scroll.d.ts

@@ -5,9 +5,12 @@ declare class AppRouterScrollTargetInner extends React$1.Component<{
   children: React$1.ReactNode;
   commitId: number | null;
 }> {
+  scheduledCommitId: number | null;
+  schedulePotentialScroll: () => void;
   handlePotentialScroll: () => void;
   componentDidMount(): void;
   componentDidUpdate(): void;
+  componentWillUnmount(): void;
   render(): React$1.ReactNode;
 }
 declare function AppRouterScrollCommitProvider({

package/dist/shims/app-router-scroll.js

@@ -1,6 +1,6 @@
 "use client";
 import { decodeHashFragment } from "./hash-scroll.js";
-import { consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted } from "./app-router-scroll-state.js";
 import * as React$1 from "react";
 import { jsx } from "react/jsx-runtime";
 import * as ReactDOM from "react-dom";
@@ -46,8 +46,7 @@ function topOfElementInViewport(element, viewportHeight) {
 function getHashFragmentDomNode(hash) {
 	const fragment = decodeHashFragment(hash.startsWith("#") ? hash.slice(1) : hash);
 	if (fragment === "top") return document.body;
-	const element = document.getElementById(fragment) ?? document.getElementsByName(fragment)[0];
-	return element instanceof HTMLElement ? element : null;
+	return document.getElementById(fragment) ?? document.getElementsByName(fragment)[0] ?? null;
 }
 function isInDocumentHead(node) {
 	const head = node.ownerDocument?.head;
@@ -55,7 +54,7 @@ function isInDocumentHead(node) {
 }
 function findNextScrollTarget(node) {
 	if (!(node instanceof Element)) return null;
-	if (isInDocumentHead(node)) return { kind: "document-top" };
+	if (isInDocumentHead(node)) return null;
 	let target = node;
 	while (!(target instanceof HTMLElement) || shouldSkipElement(target)) {
 		if (target.nextElementSibling === null) return null;
@@ -82,34 +81,45 @@ function scrollToElement(target, hash) {
 	});
 }
 var AppRouterScrollTargetInner = class extends React$1.Component {
+	scheduledCommitId = null;
+	schedulePotentialScroll = () => {
+		const commitId = this.props.commitId;
+		this.scheduledCommitId = commitId;
+		queueMicrotask(() => {
+			if (this.scheduledCommitId !== commitId) return;
+			this.handlePotentialScroll();
+		});
+	};
 	handlePotentialScroll = () => {
 		const intent = getPendingAppRouterScrollIntent();
 		if (intent === null) return;
 		if (this.props.commitId === null || intent.commitId !== this.props.commitId) return;
-		let target;
-		if (intent.hash !== null) {
-			target = getHashFragmentDomNode(intent.hash);
-			if (target === null) return;
-		} else {
-			const next = findNextScrollTarget(findDOMNode(this));
-			if (next === null) return;
-			if (next.kind === "document-top") {
-				if (consumeAppRouterScrollIntent(intent, this.props.commitId) === null) return;
-				document.documentElement.scrollTop = 0;
+		let node;
+		if (intent.hash !== null) node = getHashFragmentDomNode(intent.hash);
+		else node = null;
+		if (node === null) {
+			node = findDOMNode(this);
+			if (node !== null && isInDocumentHead(node)) {
+				markAppRouterScrollIntentHeadHoisted(intent, this.props.commitId);
 				return;
 			}
-			target = next.element;
 		}
+		const next = findNextScrollTarget(node);
+		if (next === null) return;
+		const target = next.element;
 		const consumed = consumeAppRouterScrollIntent(intent, this.props.commitId);
 		if (consumed === null) return;
 		scrollToElement(target, consumed.hash);
-		target.focus({ preventScroll: true });
+		target.focus();
 	};
 	componentDidMount() {
-		this.handlePotentialScroll();
+		this.schedulePotentialScroll();
 	}
 	componentDidUpdate() {
-		this.handlePotentialScroll();
+		this.schedulePotentialScroll();
+	}
+	componentWillUnmount() {
+		this.scheduledCommitId = null;
 	}
 	render() {
 		return this.props.children;

package/dist/shims/cache-runtime.js

@@ -1,6 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { VINEXT_RSC_MARKER_HEADER } from "../server/headers.js";
+import { trackPprFallbackShellCacheTask } from "./ppr-fallback-shell.js";
 import { markDynamicUsage } from "./headers.js";
 import { _registerCacheContextAccessor, _setRequestScopedCacheLife, cacheLifeProfiles, getDataCacheHandler } from "./cache.js";
 import { addCollectedRequestTags, getCurrentFetchSoftTags } from "./fetch-cache.js";
@@ -243,7 +244,7 @@ function registerCachedFunction(fn, id, variant, options = {}) {
 	const cacheVariant = variant ?? "";
 	const omitAppPageSearchParamsFromFirstArg = options.appPageDefaultExport === true;
 	const isDev = typeof process !== "undefined" && process.env.NODE_ENV === "development";
-	const cachedFn = async (...args) => {
+	const cachedFn = (...args) => trackPprFallbackShellCacheTask(async () => {
 		const rsc = await getRscModule();
 		const keySeed = getUseCacheKeySeed();
 		let cacheKey;
@@ -320,7 +321,7 @@ function registerCachedFunction(fn, id, variant, options = {}) {
 			});
 		} catch {}
 		return result;
-	};
+	}, cacheVariant);
 	Object.defineProperty(cachedFn, "length", {
 		value: fn.length,
 		configurable: true

package/dist/shims/cache.d.ts

@@ -53,6 +53,7 @@ type CachedPagesValue = {
   kind: "PAGES";
   html: string;
   pageData: object;
+  generatedFromDataRequest?: boolean;
   headers: Record<string, string | string[]> | undefined;
   status: number | undefined;
 };

package/dist/shims/cache.js

@@ -1,10 +1,10 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { makeHangingPromise } from "./internal/make-hanging-promise.js";
 import { getHeadersAccessPhase, markDynamicUsage } from "./headers.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
-import { makeHangingPromise } from "./internal/make-hanging-promise.js";
 import { readCacheControlNumberField } from "../utils/cache-control-metadata.js";
 import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
 import { getCdnCacheAdapter } from "./cdn-cache.js";

package/dist/shims/cdn-cache.d.ts

@@ -1,8 +1,8 @@
 import { CacheHandlerValue, IncrementalCacheValue } from "./cache.js";
 
 //#region src/shims/cdn-cache.d.ts
-/** A map of response header name -> value the adapter wants applied. */
-type CdnResponseHeaders = Record<string, string>;
+/** A map of response header name -> value the adapter wants applied or removed. */
+type CdnResponseHeaders = Record<string, string | null>;
 type CdnCacheableHeaderInput = {
   /**
    * The cacheable `Cache-Control` value the framework computed for shared
@@ -50,9 +50,9 @@ type CdnCacheAdapter = {
    */
   set(key: string, data: IncrementalCacheValue | null, ctx?: Record<string, unknown>): Promise<void>;
   /**
-   * Build the response cache headers for a given cacheable policy. Returns a map
-   * so an adapter can emit more than one header (e.g. `Cache-Control` +
-   * `CDN-Cache-Control`).
+   * Build the response cache headers for a given policy. Returns a map so an
+   * adapter can emit more than one header (e.g. `Cache-Control` +
+   * `CDN-Cache-Control`) and remove stale adapter-owned headers with `null`.
    */
   buildResponseHeaders(input: CdnCacheableHeaderInput): CdnResponseHeaders;
   /**

package/dist/shims/dynamic-preload-chunks.js

@@ -1,4 +1,5 @@
 "use client";
+import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { useScriptNonce } from "./script-nonce-context.js";
 import React from "react";
 import * as ReactDOM from "react-dom";
@@ -51,8 +52,9 @@ function DynamicPreloadChunks(props) {
 	if (files.length === 0) return null;
 	const stylesheets = [];
 	for (const file of files) {
-		const href = dynamicPreloadHref(file);
-		if (href.endsWith(".css")) {
+		const assetHref = dynamicPreloadHref(file);
+		if (assetHref.endsWith(".css")) {
+			const href = appendAssetDeploymentIdQuery(assetHref);
 			stylesheets.push(React.createElement("link", {
 				key: href,
 				rel: "stylesheet",
@@ -62,13 +64,13 @@ function DynamicPreloadChunks(props) {
 			}));
 			continue;
 		}
-		if (href.endsWith(".js") && typeof ReactDOM.preload === "function") {
+		if (assetHref.endsWith(".js") && typeof ReactDOM.preload === "function") {
 			const preloadOptions = {
 				as: "script",
 				fetchPriority: "low",
 				nonce
 			};
-			ReactDOM.preload(href, preloadOptions);
+			ReactDOM.preload(assetHref, preloadOptions);
 		}
 	}
 	return stylesheets.length > 0 ? React.createElement(React.Fragment, null, ...stylesheets) : null;

package/dist/shims/error-boundary.d.ts

@@ -17,6 +17,7 @@ type RedirectBoundaryState = {
   redirectType: "push" | "replace" | null;
 };
 type ErrorBoundaryInnerProps = {
+  isImplicitRootErrorBoundary?: boolean;
   pathname: string | null;
 } & ErrorBoundaryProps;
 type ErrorBoundaryState = {
@@ -131,6 +132,7 @@ declare function UnauthorizedBoundary({
   resetKey
 }: UnauthorizedBoundaryProps): React.JSX.Element;
 type DevRecoveryBoundaryProps = {
+  isImplicitRootErrorBoundary?: boolean;
   resetKey: number;
   onCatch?: (resetKey: number) => void;
   children?: React.ReactNode;

package/dist/shims/error-boundary.js

@@ -1,5 +1,7 @@
 "use client";
+import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { decodeRedirectError, isRedirectError, usePathname, useRouter } from "./navigation.js";
+import DefaultGlobalError from "./default-global-error.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import React from "react";
@@ -98,6 +100,10 @@ var ErrorBoundaryInner = class extends React.Component {
 	}
 	static getDerivedStateFromProps(props, state) {
 		const nextResetState = readBoundaryResetState(props);
+		if (state.error && handleAppNavigationFailure(state.error.thrownValue)) return {
+			error: null,
+			...nextResetState
+		};
 		if (state.error && shouldResetBoundary(nextResetState, state)) return {
 			error: null,
 			...nextResetState
@@ -150,6 +156,7 @@ function GlobalErrorBoundary({ fallback, children }) {
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
 		pathname: usePathname(),
 		fallback,
+		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
 		children
 	});
 }

package/dist/shims/error.js

@@ -1,6 +1,7 @@
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
-import { isNextRouterError, usePathname } from "./navigation.js";
+import { isNextRouterError } from "./navigation.js";
+import { useUntrackedPathname } from "./internal/navigation-untracked.js";
 import React from "react";
 //#region src/shims/error.tsx
 /**
@@ -104,7 +105,7 @@ function unstable_catchError(fallback) {
 	Fallback.displayName = fallback.name || "CatchErrorFallback";
 	function CatchErrorBoundary(allProps) {
 		const { children, ...rest } = allProps;
-		const pathname = usePathname();
+		const pathname = useUntrackedPathname();
 		const isPagesRouter = React.useContext(RouterContext) !== null;
 		const forwardedProps = rest;
 		return React.createElement(_CatchError, {