vinext 0.1.8 → 0.2.0

package/dist/shims/router.js

@@ -1,22 +1,23 @@
 import { splitPathSegments } from "../routing/utils.js";
-import { removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { RouterContext } from "./internal/router-context.js";
 import { applyVinextLocaleGlobals, extractVinextNextDataJson, parseVinextNextDataJson } from "../client/vinext-next-data.js";
 import { isValidModulePath } from "../client/validate-module-path.js";
 import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
-import { buildPagesDataHref } from "./internal/pages-data-url.js";
+import { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../utils/deployment-id.js";
-import { dedupedPagesDataFetch } from "./internal/pages-data-fetch-dedup.js";
-import { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
-import { getPagesRouterComponentsMap, markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { dedupedPagesDataFetch, evictPagesDataCache, fetchCachedPagesData, fetchStaticPagesData, getPagesStaticDataCache } from "./internal/pages-data-fetch-dedup.js";
+import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
+import { getPagesRouterComponentsMap } from "./internal/pages-router-components.js";
+import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { installWindowNext } from "../client/window-next.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
+import { addQueryParam, appendSearchParamsToUrl, mergeRewriteQuery, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState } from "./pages-router-runtime.js";
 import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
@@ -841,31 +842,185 @@ function resolveLocalRedirectUrl(location) {
 	if (appPath === null) return null;
 	return normalizePathTrailingSlash(toBrowserNavigationHref(stripLocalePrefixForApiRedirect(appPath), window.location.href, __basePath), __trailingSlash);
 }
-function hasVinextMiddleware(nextData) {
-	if (!isUnknownRecord(nextData)) return false;
-	const vinext = nextData.__vinext;
-	return isUnknownRecord(vinext) && vinext.hasMiddleware === true;
+function hasClientRewriteRules() {
+	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
+	return Boolean(rewrites && (rewrites.beforeFiles.length > 0 || rewrites.afterFiles.length > 0 || rewrites.fallback.length > 0));
 }
-function getMiddlewarePagesDataFetchUrl(browserUrl) {
-	const nextData = window.__NEXT_DATA__;
-	if (!nextData || !hasVinextMiddleware(nextData)) return null;
-	const buildId = nextData.buildId;
-	if (typeof buildId !== "string" || buildId.length === 0) return null;
+function hasClientRedirectRules() {
+	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
+	return Array.isArray(redirects) && redirects.length > 0;
+}
+function hasClientAppRouteManifest() {
+	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
+	return Array.isArray(routes) && routes.length > 0;
+}
+function getClientConfigRouteContext(href) {
 	let parsed;
 	try {
-		parsed = new URL(browserUrl, window.location.href);
+		parsed = new URL(href, window.location.href);
 	} catch {
 		return null;
 	}
 	if (parsed.origin !== getWindowOrigin()) return null;
-	return buildPagesDataHref(__basePath, buildId, stripBasePath(parsed.pathname, __basePath), parsed.search);
+	const hadBasePath = __basePath ? hasBasePath(parsed.pathname, __basePath) : true;
+	const pathname = hadBasePath ? stripBasePath(parsed.pathname, __basePath) : parsed.pathname;
+	const headers = new Headers({ "user-agent": globalThis.navigator?.userAgent ?? "" });
+	return {
+		basePathState: {
+			basePath: __basePath,
+			hadBasePath
+		},
+		context: {
+			cookies: parseCookieHeader(globalThis.document?.cookie ?? ""),
+			headers,
+			host: parsed.hostname,
+			query: parsed.searchParams
+		},
+		pathname,
+		search: parsed.search
+	};
+}
+async function resolveClientConfigRedirect(href) {
+	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
+	if (!redirects || redirects.length === 0) return null;
+	const routeContext = getClientConfigRouteContext(href);
+	if (!routeContext) return null;
+	const { isExternalUrl, matchRedirect, preserveRedirectDestinationQuery } = await import("../config/config-matchers.js");
+	const redirect = matchRedirect(routeContext.pathname, redirects, routeContext.context, routeContext.basePathState);
+	if (!redirect) return null;
+	return preserveRedirectDestinationQuery(__basePath && routeContext.basePathState.hadBasePath && !isExternalUrl(redirect.destination) && !hasBasePath(redirect.destination, __basePath) ? __basePath + redirect.destination : redirect.destination, routeContext.search);
+}
+async function applyClientConfigRewrite(href, rewrite) {
+	const routeContext = getClientConfigRouteContext(href);
+	if (!routeContext) return null;
+	const { isExternalUrl, matchRewrite } = await import("../config/config-matchers.js");
+	const rewritten = matchRewrite(routeContext.pathname, [rewrite], routeContext.context, routeContext.basePathState);
+	if (rewritten === null) return null;
+	if (isExternalUrl(rewritten)) return { kind: "document" };
+	return {
+		href: mergeRewriteQuery(href, rewritten),
+		kind: "rewrite"
+	};
+}
+function shouldEvaluateClientConfigRule(ruleBasePath, state) {
+	if (!state.basePath) return true;
+	return ruleBasePath === false ? !state.hadBasePath : state.hadBasePath;
+}
+function matchSimpleClientConfigPattern(pathname, source) {
+	if (source.includes("(") || source.includes("\\") || /:[\w-]+[*+][^/]/.test(source)) return;
+	const sourceParts = removeTrailingSlash(source).split("/");
+	const pathParts = removeTrailingSlash(pathname).split("/");
+	const params = {};
+	let pathIndex = 0;
+	for (let sourceIndex = 0; sourceIndex < sourceParts.length; sourceIndex++) {
+		const sourcePart = sourceParts[sourceIndex];
+		const pathPart = pathParts[pathIndex];
+		if (sourcePart.startsWith(":")) {
+			const catchAll = sourcePart.match(/^:([\w-]+)([*+])$/);
+			if (catchAll) {
+				const rest = pathParts.slice(pathIndex).join("/");
+				if (catchAll[2] === "+" && rest === "") return null;
+				params[catchAll[1]] = rest;
+				return sourceIndex === sourceParts.length - 1 ? params : void 0;
+			}
+			if (pathPart === void 0) return null;
+			params[sourcePart.slice(1)] = pathPart;
+			pathIndex++;
+			continue;
+		}
+		if (pathPart !== sourcePart) return null;
+		pathIndex++;
+	}
+	return pathIndex === pathParts.length ? params : null;
+}
+function simpleClientConfigSourceCouldMatch(pathname, source) {
+	const wildcardIndex = source.search(/[:(\\*+?]/);
+	const normalizedPrefix = removeTrailingSlash(wildcardIndex === -1 ? source : source.slice(0, wildcardIndex));
+	if (!normalizedPrefix || normalizedPrefix === "/") return true;
+	const normalizedPathname = removeTrailingSlash(pathname);
+	return normalizedPathname === normalizedPrefix || normalizedPathname.startsWith(`${normalizedPrefix}/`);
+}
+function substituteSimpleClientConfigDestination(destination, params) {
+	const keys = Object.keys(params);
+	if (keys.length === 0) return destination;
+	const alternation = keys.sort((a, b) => b.length - a.length).map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+	return destination.replace(new RegExp(`:(${alternation})([+*])?(?![A-Za-z0-9_])`, "g"), (_token, key) => params[key] ?? _token);
+}
+function isExternalClientConfigUrl(url) {
+	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
+}
+function clientConfigRedirectCouldMatch(href) {
+	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
+	if (!redirects || redirects.length === 0) return false;
+	const routeContext = getClientConfigRouteContext(href);
+	if (!routeContext) return false;
+	for (const redirect of redirects) {
+		if (!shouldEvaluateClientConfigRule(redirect.basePath, routeContext.basePathState)) continue;
+		if (!simpleClientConfigSourceCouldMatch(routeContext.pathname, redirect.source)) continue;
+		if (matchSimpleClientConfigPattern(routeContext.pathname, redirect.source) !== null) return true;
+	}
+	return false;
+}
+function resolveClientConfigRewriteSync(href) {
+	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
+	if (!rewrites) return null;
+	let currentHref = href;
+	let matched = false;
+	for (const rewrite of rewrites.beforeFiles) {
+		const routeContext = getClientConfigRouteContext(currentHref);
+		if (!routeContext) return null;
+		if (!shouldEvaluateClientConfigRule(rewrite.basePath, routeContext.basePathState)) continue;
+		if (!simpleClientConfigSourceCouldMatch(routeContext.pathname, rewrite.source)) continue;
+		if (rewrite.has || rewrite.missing) return void 0;
+		const params = matchSimpleClientConfigPattern(routeContext.pathname, rewrite.source);
+		if (params === void 0) return void 0;
+		if (params === null) continue;
+		const rewritten = substituteSimpleClientConfigDestination(rewrite.destination, params);
+		if (isExternalClientConfigUrl(rewritten)) return { kind: "document" };
+		currentHref = mergeRewriteQuery(currentHref, rewritten);
+		matched = true;
+	}
+	return matched ? {
+		href: currentHref,
+		kind: "rewrite"
+	} : null;
+}
+async function resolveClientConfigRewrite(href) {
+	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
+	if (!rewrites) return null;
+	let currentHref = href;
+	let matched = false;
+	for (const rewrite of rewrites.beforeFiles) {
+		const result = await applyClientConfigRewrite(currentHref, rewrite);
+		if (result?.kind === "document") return result;
+		if (result?.kind !== "rewrite") continue;
+		currentHref = result.href;
+		matched = true;
+	}
+	return matched ? {
+		href: currentHref,
+		kind: "rewrite"
+	} : null;
+}
+function getMiddlewarePagesDataFetchUrl(browserUrl) {
+	return getPagesMiddlewareDataHref(browserUrl, __basePath);
+}
+function getPagesDataCacheHref(dataHref) {
+	try {
+		return new URL(dataHref, window.location.href).href;
+	} catch {
+		return dataHref;
+	}
+}
+function shouldEvictMiddlewareDataCache(middlewareEffect, dataTarget) {
+	return middlewareEffect?.redirectLocation != null || dataTarget?.dataKind !== "static";
 }
 async function resolveMiddlewareDataEffect(browserUrl, signal) {
 	const dataUrl = getMiddlewarePagesDataFetchUrl(browserUrl);
 	if (!dataUrl) return null;
 	if (signal.aborted) throw new DOMException("Aborted", "AbortError");
 	try {
-		const res = await dedupedPagesDataFetch(dataUrl, {
+		const res = await fetchCachedPagesData(dataUrl, {
 			headers: {
 				Accept: "application/json",
 				"x-nextjs-data": "1"
@@ -873,6 +1028,7 @@ async function resolveMiddlewareDataEffect(browserUrl, signal) {
 			signal
 		});
 		return {
+			dataHref: getPagesDataCacheHref(dataUrl),
 			redirectLocation: res.headers.get("x-nextjs-redirect"),
 			rewriteTarget: res.headers.get("x-nextjs-rewrite"),
 			response: res
@@ -900,6 +1056,110 @@ function handleDataRedirect(destination, redirectBasePath, mode = "push") {
 	if (!(destination.startsWith("/") && redirectBasePath !== false)) scheduleHardNavigationAndThrow(destination, "Navigation redirected externally");
 	performNavigation(destination, void 0, { locale: false }, mode);
 }
+async function loadTargetPageModule(target, url, failurePrefix) {
+	try {
+		return await target.loader();
+	} catch (err) {
+		console.error("[vinext] Page loader threw during navigation:", err);
+		scheduleHardNavigationAndThrow(url, `${failurePrefix}: page loader threw`);
+	}
+}
+async function loadPagesAppComponent() {
+	let AppComponent = window.__VINEXT_APP__;
+	if (!AppComponent && typeof window.__VINEXT_APP_LOADER__ === "function") try {
+		const appModule = await window.__VINEXT_APP_LOADER__();
+		AppComponent = isAppComponent(appModule.default) ? appModule.default : void 0;
+		if (AppComponent) window.__VINEXT_APP__ = AppComponent;
+	} catch {}
+	return AppComponent;
+}
+function buildPagesNavigationNextData(target, props) {
+	const mergedQuery = mergeRouteParamsIntoQuery(parseQueryString(target.search), target.params);
+	const prev = window.__NEXT_DATA__;
+	const nextLocale = (window.__VINEXT_LOCALES__?.length ?? 0) > 0 ? target.locale ?? window.__VINEXT_DEFAULT_LOCALE__ : prev?.locale;
+	return {
+		...prev,
+		props,
+		page: target.pattern,
+		query: mergedQuery,
+		buildId: target.buildId,
+		isFallback: false,
+		...nextLocale !== void 0 ? { locale: nextLocale } : {}
+	};
+}
+function propsObject(value) {
+	return isUnknownRecord(value) ? value : {};
+}
+async function loadComponentOnlyProps(PageComponent, AppComponent, target, asPath) {
+	const query = mergeRouteParamsIntoQuery(parseQueryString(target.search), target.params);
+	const ctx = {
+		pathname: target.pattern,
+		query,
+		asPath,
+		locale: target.locale ?? window.__VINEXT_LOCALE__,
+		locales: window.__VINEXT_LOCALES__,
+		defaultLocale: window.__VINEXT_DEFAULT_LOCALE__
+	};
+	if (typeof AppComponent?.getInitialProps === "function") {
+		const AppTree = (appProps) => createElement(AppComponent, {
+			...appProps,
+			Component: PageComponent,
+			router: Router
+		});
+		return propsObject(await AppComponent.getInitialProps({
+			Component: PageComponent,
+			AppTree,
+			ctx,
+			router: Router
+		}));
+	}
+	if (typeof PageComponent.getInitialProps === "function") return { pageProps: propsObject(await PageComponent.getInitialProps(ctx)) };
+	return { pageProps: {} };
+}
+async function renderPagesNavigationTarget(url, target, props, options, assertStillCurrent, preloaded) {
+	const pageModule = preloaded?.pageModule ?? await loadTargetPageModule(target, url, "Navigation failed");
+	assertStillCurrent();
+	const PageComponent = pageModule.default;
+	if (!isPageComponent(PageComponent)) scheduleHardNavigationAndThrow(url, "Navigation failed: page module default export is not a component");
+	const AppComponent = preloaded?.appComponent ?? await loadPagesAppComponent();
+	assertStillCurrent();
+	const React = (await import("react")).default;
+	assertStillCurrent();
+	const rawPageProps = props.pageProps;
+	const pageProps = isUnknownRecord(rawPageProps) ? rawPageProps : {};
+	let element;
+	if (AppComponent) element = React.createElement(AppComponent, {
+		...props,
+		Component: PageComponent,
+		pageProps: rawPageProps,
+		router: Router
+	});
+	else element = React.createElement(PageComponent, pageProps);
+	const nextData = buildPagesNavigationNextData(target, props);
+	window.__NEXT_DATA__ = nextData;
+	applyVinextLocaleGlobals(window, nextData);
+	await renderPagesRouterElement(element, options.scroll);
+	assertStillCurrent();
+}
+async function navigateClientNoData(url, target, controller, assertStillCurrent, options = {}) {
+	if (!window.__VINEXT_ROOT__) {
+		window.location.href = url;
+		return;
+	}
+	if (controller.signal.aborted) throw new NavigationCancelledError(url);
+	const pageModule = await loadTargetPageModule(target, url, "Navigation failed");
+	assertStillCurrent();
+	const PageComponent = pageModule.default;
+	if (!isPageComponent(PageComponent)) scheduleHardNavigationAndThrow(url, "Navigation failed: page module default export is not a component");
+	const AppComponent = await loadPagesAppComponent();
+	assertStillCurrent();
+	const props = await loadComponentOnlyProps(PageComponent, AppComponent, target, url);
+	assertStillCurrent();
+	await renderPagesNavigationTarget(url, target, props, options, assertStillCurrent, {
+		appComponent: AppComponent,
+		pageModule
+	});
+}
 /**
 * Perform client-side navigation via the `/_next/data/<id>/<page>.json`
 * endpoint. Used when `__VINEXT_PAGE_LOADERS__` has a matching code-split
@@ -927,7 +1187,7 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		};
 		const deploymentId = getDeploymentId();
 		if (deploymentId) headers[NEXT_DEPLOYMENT_ID_HEADER] = deploymentId;
-		res = await dedupedPagesDataFetch(initialTarget.dataHref, {
+		res = await (initialTarget.dataKind === "static" ? fetchStaticPagesData : dedupedPagesDataFetch)(initialTarget.dataHref, {
 			headers,
 			signal: controller.signal
 		});
@@ -936,6 +1196,9 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		throw err;
 	}
 	assertStillCurrent();
+	const responseDeploymentId = res.headers.get("x-nextjs-deployment-id");
+	const currentDeploymentId = getDeploymentId() ?? null;
+	if (responseDeploymentId !== null && responseDeploymentId !== currentDeploymentId) scheduleHardNavigationAndThrow(url, "Loaded static props were from an outdated deployment");
 	const softRedirect = res.headers.get("x-nextjs-redirect");
 	if (softRedirect) {
 		const redirectedUrl = resolveLocalRedirectUrl(softRedirect);
@@ -960,54 +1223,13 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 	const props = isUnknownRecord(body) ? body : {};
 	const rawPageProps = props.pageProps;
 	const pageProps = isUnknownRecord(rawPageProps) ? rawPageProps : {};
+	if (initialTarget.dataKind === "server") evictPagesDataCache(initialTarget.dataHref);
 	const redirectDestination = pageProps.__N_REDIRECT;
 	if (typeof redirectDestination === "string") {
 		handleDataRedirect(redirectDestination, pageProps.__N_REDIRECT_BASE_PATH, options.mode);
 		throw new NavigationCancelledError(url);
 	}
-	let pageModule;
-	try {
-		pageModule = await target.loader();
-	} catch (err) {
-		console.error("[vinext] Page loader threw during navigation:", err);
-		scheduleHardNavigationAndThrow(url, "Data navigation failed: page loader threw");
-	}
-	assertStillCurrent();
-	const PageComponent = pageModule.default;
-	if (!isPageComponent(PageComponent)) scheduleHardNavigationAndThrow(url, "Data navigation failed: page module default export is not a component");
-	let AppComponent = window.__VINEXT_APP__;
-	if (!AppComponent && typeof window.__VINEXT_APP_LOADER__ === "function") try {
-		const appModule = await window.__VINEXT_APP_LOADER__();
-		AppComponent = isAppComponent(appModule.default) ? appModule.default : void 0;
-		if (AppComponent) window.__VINEXT_APP__ = AppComponent;
-	} catch {}
-	assertStillCurrent();
-	const React = (await import("react")).default;
-	assertStillCurrent();
-	let element;
-	if (AppComponent) element = React.createElement(AppComponent, {
-		...props,
-		Component: PageComponent,
-		pageProps: rawPageProps,
-		router: Router
-	});
-	else element = React.createElement(PageComponent, pageProps);
-	const mergedQuery = mergeRouteParamsIntoQuery(parseQueryString(target.search), target.params);
-	const prev = window.__NEXT_DATA__;
-	const nextLocale = (window.__VINEXT_LOCALES__?.length ?? 0) > 0 ? target.locale ?? window.__VINEXT_DEFAULT_LOCALE__ : prev?.locale;
-	const nextData = {
-		...prev,
-		props,
-		page: target.pattern,
-		query: mergedQuery,
-		buildId: target.buildId,
-		isFallback: false,
-		...nextLocale !== void 0 ? { locale: nextLocale } : {}
-	};
-	window.__NEXT_DATA__ = nextData;
-	applyVinextLocaleGlobals(window, nextData);
-	await renderPagesRouterElement(element, options.scroll);
-	assertStillCurrent();
+	await renderPagesNavigationTarget(url, target, props, options, assertStillCurrent);
 }
 /**
 * Perform client-side navigation by fetching the page's full HTML and
@@ -1130,6 +1352,7 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 	const controller = new AbortController();
 	routerRuntimeState.activeAbortController = controller;
 	const navId = ++routerRuntimeState.navigationId;
+	let middlewareDataCacheEvictHref = null;
 	/** Check if this navigation is still the active one. If not, throw. */
 	function assertStillCurrent() {
 		if (navId !== routerRuntimeState.navigationId) throw new NavigationCancelledError(url);
@@ -1139,36 +1362,70 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 		else {
 			let browserUrl = url;
 			let htmlFetchUrl = fetchUrl;
-			let dataTarget = resolvePagesDataNavigationTarget(routeUrl, __basePath);
+			const configRedirect = hasClientRedirectRules() && clientConfigRedirectCouldMatch(browserUrl) ? await resolveClientConfigRedirect(browserUrl) : null;
+			if (configRedirect) {
+				const redirectedUrl = resolveLocalRedirectUrl(configRedirect);
+				if (!redirectedUrl) scheduleHardNavigationAndThrow(configRedirect, "Navigation redirected externally");
+				window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
+				routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+				routerRuntimeState.lastHash = window.location.hash;
+				browserUrl = redirectedUrl;
+				htmlFetchUrl = redirectedUrl;
+			}
+			let routeLookupUrl = configRedirect ? browserUrl : routeUrl;
+			if (routeUrl === url && hasClientRewriteRules()) {
+				const syncConfigRewrite = hasClientAppRouteManifest() ? void 0 : resolveClientConfigRewriteSync(browserUrl);
+				const configRewrite = syncConfigRewrite === void 0 ? await resolveClientConfigRewrite(browserUrl) : syncConfigRewrite;
+				if (configRewrite?.kind === "document") scheduleHardNavigationAndThrow(browserUrl, "Navigation rewritten to a document route");
+				else if (configRewrite?.kind === "rewrite") {
+					routeLookupUrl = configRewrite.href;
+					htmlFetchUrl = configRewrite.href;
+				}
+			}
+			let dataTarget = resolvePagesDataNavigationTarget(routeLookupUrl, __basePath);
 			let middlewareDataResponse;
-			if (!dataTarget) {
-				let middlewareEffect;
+			let middlewareEffect = null;
+			let middlewareRewrittenTarget;
+			const middlewareProbeDataHref = getMiddlewarePagesDataFetchUrl(browserUrl);
+			if (middlewareProbeDataHref !== null) {
+				middlewareDataCacheEvictHref = getPagesDataCacheHref(middlewareProbeDataHref);
 				try {
 					middlewareEffect = await resolveMiddlewareDataEffect(browserUrl, controller.signal);
 				} catch (err) {
 					if (err instanceof DOMException && err.name === "AbortError") throw new NavigationCancelledError(browserUrl);
 					throw err;
 				}
+				if (middlewareEffect?.rewriteTarget) middlewareRewrittenTarget = resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
+				if (middlewareEffect) if (shouldEvictMiddlewareDataCache(middlewareEffect, middlewareRewrittenTarget !== void 0 ? middlewareRewrittenTarget : dataTarget)) middlewareDataCacheEvictHref = middlewareEffect.dataHref;
+				else middlewareDataCacheEvictHref = null;
 				assertStillCurrent();
-				const redirectLocation = middlewareEffect?.redirectLocation ?? null;
-				if (redirectLocation) {
-					const redirectedUrl = resolveLocalRedirectUrl(redirectLocation);
-					if (!redirectedUrl) scheduleHardNavigationAndThrow(redirectLocation, "Navigation redirected externally");
-					window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
-					routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
-					routerRuntimeState.lastHash = window.location.hash;
-					browserUrl = redirectedUrl;
-					htmlFetchUrl = redirectedUrl;
-				} else if (middlewareEffect?.rewriteTarget) {
-					dataTarget = resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
-					if (dataTarget) middlewareDataResponse = middlewareEffect.response;
+			}
+			const redirectLocation = middlewareEffect?.redirectLocation ?? null;
+			if (redirectLocation) {
+				const redirectedUrl = resolveLocalRedirectUrl(redirectLocation);
+				if (!redirectedUrl) scheduleHardNavigationAndThrow(redirectLocation, "Navigation redirected externally");
+				window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
+				routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+				routerRuntimeState.lastHash = window.location.hash;
+				browserUrl = redirectedUrl;
+				htmlFetchUrl = redirectedUrl;
+			} else if (middlewareEffect) {
+				if (middlewareEffect.rewriteTarget || routeUrl === url) middlewareDataResponse = middlewareEffect.response;
+				if (middlewareEffect.rewriteTarget) {
+					const rewrittenTarget = middlewareRewrittenTarget ?? resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
+					if (!rewrittenTarget) scheduleHardNavigationAndThrow(browserUrl, "Navigation rewritten to a non-Pages route");
+					dataTarget = rewrittenTarget;
 				}
 			}
-			if (dataTarget) await navigateClientData(browserUrl, dataTarget, controller, navId, assertStillCurrent, options, middlewareDataResponse);
+			if (middlewareEffect && shouldEvictMiddlewareDataCache(middlewareEffect, dataTarget)) middlewareDataCacheEvictHref = middlewareEffect.dataHref;
+			else if (middlewareEffect) middlewareDataCacheEvictHref = null;
+			if (dataTarget?.dataKind === "static" || dataTarget?.dataKind === "server") await navigateClientData(browserUrl, dataTarget, controller, navId, assertStillCurrent, options, middlewareDataResponse);
+			else if (dataTarget) await navigateClientNoData(browserUrl, dataTarget, controller, assertStillCurrent, options);
 			else await navigateClientHtml(browserUrl, htmlFetchUrl, controller, navId, assertStillCurrent, options);
 		}
 	} finally {
 		if (navId === routerRuntimeState.navigationId) routerRuntimeState.activeAbortController = null;
+		if (middlewareDataCacheEvictHref !== null) evictPagesDataCache(middlewareDataCacheEvictHref);
 	}
 }
 /**
@@ -1391,7 +1648,14 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	const appPath = getLocalPathname(resolved);
 	const appPathNorm = appPath !== null ? removeTrailingSlash(appPath) : null;
 	const appPathEntry = appPathNorm !== null ? getPagesRouterComponentsMap()[appPathNorm] : void 0;
-	if (appPathEntry !== void 0 && "__appRouter" in appPathEntry && appPathEntry.__appRouter || ["app", "document"].includes(resolveHybridClientRouteOwner(resolved, __basePath) ?? "")) {
+	if (appPathEntry !== void 0 && "__appRouter" in appPathEntry && appPathEntry.__appRouter) {
+		if (mode === "push") window.location.assign(full);
+		else window.location.replace(full);
+		return new Promise(() => {});
+	}
+	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
+	const hybridOwner = rewrites && (rewrites.beforeFiles.length > 0 || rewrites.afterFiles.length > 0 || rewrites.fallback.length > 0) && hasClientAppRouteManifest() ? (await import("./internal/hybrid-client-route-owner.js")).resolveHybridClientRouteOwner(resolved, __basePath) : resolveDirectHybridClientRouteOwner(resolved, __basePath);
+	if (["app", "document"].includes(hybridOwner ?? "")) {
 		if (mode === "push") window.location.assign(full);
 		else window.location.replace(full);
 		return new Promise(() => {});
@@ -1417,12 +1681,11 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 * Prefetch the resources needed for a future Pages Router navigation.
 *
 * When the client has a registered code-split loader for the target route
-* (the prod hot path), we prefetch in parallel:
-*   1. The `/_next/data/<buildId>/<page>.json` payload — same URL the actual
-*      navigation will request, so a cache hit is automatic.
-*   2. The page's JS chunk — by invoking the loader thunk now. Vite's
-*      dynamic `import()` machinery is responsible for fetching + caching;
-*      the returned Promise is intentionally discarded.
+* (the prod hot path), we warm the page's JS chunk by invoking the loader
+* thunk now. Vite's dynamic `import()` machinery is responsible for fetching
+* and caching it; the returned Promise is intentionally discarded. SSG routes
+* also prefetch their `/_next/data/<buildId>/<page>.json` payload, matching
+* Next.js's Pages Router `_isSsg(route)` gate.
 *
 * When no loader is registered (dev server, or an unmapped route), we fall
 * back to the legacy `<link rel="prefetch" as="document">` hint, which lets
@@ -1432,17 +1695,22 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 * Ported from Next.js: `packages/next/src/client/page-loader.ts` `prefetch`
 * (the data + chunk parallel prefetch shape).
 */
-async function prefetchUrl(url) {
+async function prefetchUrl(url, as) {
 	if (typeof document === "undefined") return;
+	const displayUrl = as ?? url;
 	const dataTarget = resolvePagesDataNavigationTarget(url, __basePath);
 	if (dataTarget) {
-		prefetchPagesData(dataTarget);
+		const middlewareDataHref = displayUrl === url ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(displayUrl, __basePath) ?? void 0;
+		prefetchPagesData({
+			...dataTarget,
+			middlewareDataHref
+		});
 		return;
 	}
-	markAppRouteDetectedOnPrefetch(url, __basePath);
+	await markAppRouteDetectedOnPrefetch(displayUrl, __basePath);
 	const link = document.createElement("link");
 	link.rel = "prefetch";
-	link.href = url;
+	link.href = displayUrl;
 	link.as = "document";
 	document.head.appendChild(link);
 }
@@ -1654,6 +1922,7 @@ function withRouter(ComposedComponent) {
 const RouterMethods = {
 	/** See `_components` comment above for the dual role this map plays. */
 	components: getPagesRouterComponentsMap(),
+	sdc: getPagesStaticDataCache(),
 	push: (url, as, options) => {
 		if (typeof window === "undefined") throwNoRouterInstance();
 		assertSafeNavigationUrl(resolveUrl(url));
@@ -1674,9 +1943,9 @@ const RouterMethods = {
 		if (typeof window === "undefined") throwNoRouterInstance();
 		window.location.reload();
 	},
-	prefetch: (url) => {
+	prefetch: (url, as) => {
 		if (typeof window === "undefined") throwNoRouterInstance();
-		return prefetchUrl(url);
+		return prefetchUrl(url, as);
 	},
 	beforePopState: (cb) => {
 		if (typeof window === "undefined") throwNoRouterInstance();

package/dist/shims/server.js

@@ -1,7 +1,8 @@
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "./request-context.js";
-import { MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER } from "../server/headers.js";
-import { encodeMiddlewareRequestHeaders } from "../server/middleware-request-headers.js";
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import { MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER } from "../server/headers.js";
+import { encodeMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
 import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";

package/dist/shims/slot.js

@@ -166,12 +166,9 @@ function mergeElements(prev, next, options = {}) {
 	const preserveElementIds = typeof options === "boolean" ? [] : options.preserveElementIds ?? [];
 	const preservePreviousSlotIds = typeof options === "boolean" ? [] : options.preservePreviousSlotIds ?? [];
 	const merged = { ...next };
-	for (const id of preserveElementIds) {
-		if (Object.hasOwn(merged, id)) continue;
-		if (Object.hasOwn(prev, id)) {
-			const value = prev[id];
-			if (value !== void 0) merged[id] = value;
-		}
+	for (const id of preserveElementIds) if (Object.hasOwn(prev, id)) {
+		const value = prev[id];
+		if (value !== void 0) merged[id] = value;
 	}
 	const slotKeys = new Set([...Object.keys(prev), ...Object.keys(next)].filter((key) => AppElementsWire.isSlotId(key)));
 	if (clearAbsentSlots) {

package/dist/utils/client-runtime-metadata.d.ts

@@ -1,6 +1,7 @@
 //#region src/utils/client-runtime-metadata.d.ts
 type ClientRuntimeMetadata = {
   clientEntryFile?: string;
+  appBootstrapPreinitModules?: string[];
   lazyChunks?: string[];
   dynamicPreloads?: Record<string, string[]>;
 };
@@ -24,22 +25,5 @@ declare function computeClientRuntimeMetadata(opts: {
   assetPrefix: string;
   includeClientEntry?: boolean | "pages-client-entry";
 }): ClientRuntimeMetadata;
-/**
- * Serialize runtime metadata into the `globalThis.__VINEXT_*` assignment script
- * that the Cloudflare `closeBundle` hook prepends to the worker entry. Returns
- * `""` when there is nothing to inject.
- *
- * Both the App Router and Pages Router closeBundle paths call this (and the
- * deploy tests mirror it), so the injection shape stays in one place. The caller
- * decides which fields to pass — e.g. App Router only forwards `clientEntryFile`
- * for mixed app+pages builds (where `computeClientRuntimeMetadata` was asked for
- * the Pages client entry); pure App Router leaves it undefined.
- */
-declare function buildRuntimeGlobalsScript(input: {
-  clientEntryFile?: string | null;
-  ssrManifest?: Record<string, string[]> | null;
-  lazyChunks?: string[] | null;
-  dynamicPreloads?: Record<string, string[]> | null;
-}): string;
 //#endregion
-export { buildRuntimeGlobalsScript, computeClientRuntimeMetadata };
+export { computeClientRuntimeMetadata };