@qzsy/vinext 0.1.11 → 0.1.80

package/dist/shims/link.js

@@ -1,24 +1,18 @@
 "use client";
 import { stripBasePath } from "../utils/base-path.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "../routing/route-matching.js";
-import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/headers.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
-import { AppElementsWire } from "../server/app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
-import "../server/app-elements.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
+import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
 import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
-import { createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
-import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
 import { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
@@ -211,6 +205,17 @@ function prefetchUrl(href, mode, priority = "low") {
 	} : window.requestIdleCallback ?? ((fn) => setTimeout(fn, 100)))(() => {
 		(async () => {
 			if (hasAppNavigationRuntime()) {
+				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
+				const [navigation, { AppElementsWire }, rscCacheBusting, { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, { VINEXT_MOUNTED_SLOTS_HEADER }, { resolveHybridClientRouteOwner }] = await Promise.all([
+					import("./navigation.js"),
+					import("../server/app-elements.js"),
+					import("../server/app-rsc-cache-busting.js"),
+					import("../server/app-rsc-render-mode.js"),
+					import("../server/headers.js"),
+					import("./internal/hybrid-client-route-owner.js")
+				]);
+				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, hasPrefetchCacheEntryForNavigation, prefetchRscResponse } = navigation;
+				const { createRscRequestHeaders, createRscRequestUrl } = rscCacheBusting;
 				const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
 				if (hybridOwner === "pages" || hybridOwner === "document") return;
 				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchHref) : {
@@ -272,7 +277,7 @@ function prefetchUrl(href, mode, priority = "low") {
 				const dataTarget = resolvePagesDataNavigationTarget(fullHref, __basePath);
 				if (dataTarget) prefetchPagesData(dataTarget);
 				else {
-					markAppRouteDetectedOnPrefetch(fullHref, __basePath);
+					await markAppRouteDetectedOnPrefetch(fullHref, __basePath);
 					const link = document.createElement("link");
 					link.rel = "prefetch";
 					link.href = fullHref;
@@ -285,8 +290,10 @@ function prefetchUrl(href, mode, priority = "low") {
 		});
 	});
 }
-function promotePrefetchEntriesForNavigation(href) {
+async function promotePrefetchEntriesForNavigation(href) {
 	if (typeof window === "undefined") return;
+	if (!hasAppNavigationRuntime()) return;
+	const [{ getPrefetchCache }, { stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([import("./navigation.js"), import("../server/app-rsc-cache-busting.js")]);
 	let target;
 	try {
 		target = new URL(toBrowserNavigationHref(href, window.location.href, __basePath), window.location.href);
@@ -553,12 +560,14 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onNavigate(navEvent);
 			if (navEvent.defaultPrevented) return;
 		} catch {}
-		if (HAS_PAGES_ROUTER && hasAppNavigationRuntime && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
+		const hybridOwner = HAS_PAGES_ROUTER && hasAppNavigationRuntime ? (await import("./internal/hybrid-client-route-owner.js")).resolveHybridClientRouteOwner(navigateHref, __basePath) : null;
+		if (HAS_PAGES_ROUTER && hasAppNavigationRuntime && ["pages", "document"].includes(hybridOwner ?? "")) {
 			if (replace) window.location.replace(absoluteFullHref);
 			else window.location.assign(absoluteFullHref);
 			return;
 		}
 		if (hasAppNavigationRuntime) {
+			const { navigateClientSide } = await import("./navigation.js");
 			const setter = setPendingRef.current;
 			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
@@ -573,7 +582,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			const Router = window.next?.appDir === true ? void 0 : window.next?.router;
 			await navigatePagesRouterLinkWithFallback({
 				router: Router && "reload" in Router ? Router : void 0,
-				loadRouter: async () => (await import("next/router.js")).default,
+				loadRouter: async () => (await import("D:\\projects\\vinext\\node_modules\\.pnpm\\next@16.2.7_@opentelemetry+_a27effa3fabbfbd07255229e73bfb661\\node_modules\\next\\router.js")).default,
 				navigation: {
 					href: pagesHrefForLink,
 					as: pagesAsForLink,
@@ -651,7 +660,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onClick: (event) => {
 				if (childOnClick) childOnClick(event);
 				if (event.defaultPrevented) return;
-				handleClick(event, { skipLinkOnClick: true });
+				return handleClick(event, { skipLinkOnClick: true });
 			},
 			onMouseEnter: (event) => {
 				if (childOnMouseEnter) childOnMouseEnter(event);
@@ -673,9 +682,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		children: /* @__PURE__ */ jsx("a", {
 			ref: setRefs,
 			href: fullHref,
-			onClick: (event) => {
-				handleClick(event);
-			},
+			onClick: handleClick,
 			onMouseEnter: handleMouseEnter,
 			onTouchStart: handleTouchStart,
 			...anchorProps,

package/dist/shims/metadata.d.ts

@@ -1,3 +1,4 @@
+import { ThenableParamsObserver } from "./thenable-params.js";
 import React from "react";
 
 //#region src/shims/metadata.d.ts
@@ -18,7 +19,7 @@ type Viewport = {
  * Resolve viewport config from a module. Handles both static `viewport` export
  * and async `generateViewport()` function.
  */
-declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>): Promise<Viewport | null>;
+declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
 /**
  * Merge viewport configs from multiple sources (layouts + page).
  * Later entries override earlier ones.
@@ -267,7 +268,7 @@ declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): M
  *   resolution approach. If not provided, defaults to a promise that resolves
  *   to an empty object (so `await parent` never throws).
  */
-declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>): Promise<Metadata | null>;
+declare function resolveModuleMetadata(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<Metadata>, searchParamsObserver?: ThenableParamsObserver): Promise<Metadata | null>;
 type MetadataHeadProps = {
   metadata: Metadata;
   pathname?: string;

package/dist/shims/metadata.js

@@ -13,10 +13,14 @@ import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 * Resolve viewport config from a module. Handles both static `viewport` export
 * and async `generateViewport()` function.
 */
-async function resolveModuleViewport(mod, params) {
+async function resolveModuleViewport(mod, params, searchParams, searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
-		return await mod.generateViewport({ params: asyncParams });
+		const props = searchParams === void 0 ? { params: asyncParams } : {
+			params: asyncParams,
+			searchParams: makeThenableParams(searchParams, searchParamsObserver)
+		};
+		return await mod.generateViewport(props);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
 	return null;
@@ -213,12 +217,12 @@ function mergeMetadataEntries(entries) {
 *   resolution approach. If not provided, defaults to a promise that resolves
 *   to an empty object (so `await parent` never throws).
 */
-async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({})) {
+async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({}), searchParamsObserver) {
 	if (typeof mod.generateMetadata === "function") {
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
-			searchParams: makeThenableParams(searchParams)
+			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
 		return await (mod.generateMetadata.length >= 2 ? mod.generateMetadata(props, parent) : mod.generateMetadata(props));
 	}

package/dist/shims/navigation.js

@@ -5,11 +5,11 @@ import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
@@ -22,6 +22,7 @@ import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navig
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
+import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
@@ -41,7 +42,7 @@ function useChildSegments(parallelRoutesKey = "children") {
 	const ctx = getLayoutSegmentContext();
 	if (!ctx) return [];
 	try {
-		return React$1.useContext(ctx)[parallelRoutesKey] ?? [];
+		return (React$1.useContext(ctx)[parallelRoutesKey] ?? []).filter((segment) => !segment.startsWith("__PAGE__"));
 	} catch {
 		return [];
 	}
@@ -1033,6 +1034,7 @@ const _appRouter = {
 	prefetch(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
+		if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
 		try {
 			new URL(withBasePath(href, __basePath), window.location.href);
 		} catch {

package/dist/shims/root-params.d.ts

@@ -3,10 +3,24 @@ type RootParams = Record<string, string | string[] | undefined>;
 type RootParamsState = {
   rootParams: RootParams | null;
 };
+type RootParamsUsage = {
+  kind: "route";
+} | {
+  kind: "server-action";
+} | {
+  kind: "route-handler";
+  routePattern: string;
+};
+type RootParamsUsageController = {
+  transitionToRender(): void;
+};
 declare function pickRootParams(params: RootParams, rootParamNames: readonly string[] | null | undefined): RootParams;
 declare function setRootParams(params: RootParams | null): void;
 declare function getRootParam(name: string): Promise<string | string[] | undefined>;
+declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => Promise<T>, controller?: RootParamsUsageController): Promise<T>;
+declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => T | Promise<T>, controller?: RootParamsUsageController): T | Promise<T>;
+declare function createRootParamsUsageController(): RootParamsUsageController;
 declare function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;
 declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;
 //#endregion
-export { RootParams, RootParamsState, getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
+export { RootParams, RootParamsState, RootParamsUsage, RootParamsUsageController, createRootParamsUsageController, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };

package/dist/shims/root-params.js

@@ -1,9 +1,13 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 //#region src/shims/root-params.ts
+function createRootParamsUsageError(message) {
+	return new Error(message);
+}
 const _FALLBACK_KEY = Symbol.for("vinext.rootParams.fallback");
 const _g = globalThis;
 const _als = getOrCreateAls("vinext.rootParams.als");
+const _usageAls = getOrCreateAls("vinext.rootParams.usage.als");
 const _fallbackState = _g[_FALLBACK_KEY] ??= { rootParams: null };
 function getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
@@ -18,8 +22,24 @@ function setRootParams(params) {
 	getState().rootParams = params;
 }
 function getRootParam(name) {
+	const usage = _usageAls.getStore();
+	if (usage?.kind === "server-action" && usage.phase === "active") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside a Server Action. This is not supported. Functions from 'next/root-params' can only be called in the context of a route.`);
+	if (usage?.kind === "route-handler" && usage.phase === "active") throw createRootParamsUsageError(`Route ${usage.routePattern} used \`import('next/root-params').${name}()\` inside a Route Handler. Support for this API in Route Handlers is planned for a future version of Next.js.`);
 	return Promise.resolve(getState().rootParams?.[name]);
 }
+function runWithRootParamsUsage(usage, fn, controller) {
+	const state = {
+		...usage,
+		phase: "active"
+	};
+	if (controller) controller.transitionToRender = () => {
+		if (usage.kind === "server-action") state.phase = "render";
+	};
+	return _usageAls.run(state, fn);
+}
+function createRootParamsUsageController() {
+	return { transitionToRender() {} };
+}
 function runWithRootParamsScope(params, fn) {
 	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((ctx) => {
 		ctx.rootParams = params;
@@ -27,4 +47,4 @@ function runWithRootParamsScope(params, fn) {
 	else return _als.run({ rootParams: params }, fn);
 }
 //#endregion
-export { getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
+export { createRootParamsUsageController, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };

package/dist/shims/router.d.ts

@@ -1,4 +1,5 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
+import { PagesRouterComponentsMap } from "./internal/pages-router-components.js";
 import { UrlQuery } from "../utils/query.js";
 import { ComponentType, ReactElement } from "react";
 
@@ -174,11 +175,7 @@ type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
  */
 declare function withRouter<P extends WithRouterProps>(ComposedComponent: ComponentType<P>): ComponentType<ExcludeRouterProps<P>>;
 declare const RouterMethods: {
-  /** See `_components` comment above for the dual role this map plays. */components: {
-    [x: string]: {
-      __appRouter: true;
-    } | Record<string, unknown>;
-  };
+  /** See `_components` comment above for the dual role this map plays. */components: PagesRouterComponentsMap;
   push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;

package/dist/shims/router.js

@@ -1,22 +1,23 @@
 import { splitPathSegments } from "../routing/utils.js";
 import { removeTrailingSlash, stripBasePath } from "../utils/base-path.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 { fillRoutePatternSegments, matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { buildPagesDataHref } from "./internal/pages-data-url.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 { 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, 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";
@@ -186,6 +187,7 @@ function createPagesRouterRuntimeState() {
 		activeAbortController: null,
 		cancelPendingRenderCommit: null,
 		lastPathnameAndSearch: typeof window !== "undefined" ? window.location.pathname + window.location.search : "",
+		lastHash: typeof window !== "undefined" ? window.location.hash : "",
 		isFirstPopStateEvent: true,
 		routerDidNavigate: false,
 		deprecatedEventBridgeInstalled: false,
@@ -941,6 +943,7 @@ async function navigateClientData(url, initialTarget, controller, navId, assertS
 		if (!redirectedUrl) scheduleHardNavigationAndThrow(softRedirect, "Navigation redirected externally");
 		window.history.replaceState(window.history.state ?? {}, "", redirectedUrl);
 		routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+		routerRuntimeState.lastHash = window.location.hash;
 		await navigateClientHtml(redirectedUrl, redirectedUrl, controller, navId, assertStillCurrent);
 		return;
 	}
@@ -1099,6 +1102,7 @@ async function navigateClientHtml(url, fetchUrl, controller, navId, assertStillC
 	if (pendingRedirectHistoryUrl) {
 		window.history.replaceState(window.history.state ?? {}, "", pendingRedirectHistoryUrl);
 		routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+		routerRuntimeState.lastHash = window.location.hash;
 	}
 	window.__NEXT_DATA__ = nextData;
 	applyVinextLocaleGlobals(window, nextData);
@@ -1138,8 +1142,8 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 			let htmlFetchUrl = fetchUrl;
 			let dataTarget = resolvePagesDataNavigationTarget(routeUrl, __basePath);
 			let middlewareDataResponse;
-			if (!dataTarget) {
-				let middlewareEffect;
+			let middlewareEffect = null;
+			if (hasVinextMiddleware(window.__NEXT_DATA__)) {
 				try {
 					middlewareEffect = await resolveMiddlewareDataEffect(browserUrl, controller.signal);
 				} catch (err) {
@@ -1147,18 +1151,19 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 					throw err;
 				}
 				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;
-					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 (!dataTarget && middlewareEffect.rewriteTarget) dataTarget = resolvePagesDataNavigationTarget(middlewareEffect.rewriteTarget, __basePath);
 			}
 			if (dataTarget) await navigateClientData(browserUrl, dataTarget, controller, navId, assertStillCurrent, options, middlewareDataResponse);
 			else await navigateClientHtml(browserUrl, htmlFetchUrl, controller, navId, assertStillCurrent, options);
@@ -1263,6 +1268,7 @@ function updateHistory(mode, fullUrl, navState) {
 	else window.history.replaceState(state, "", fullUrl);
 	routerRuntimeState.currentHistoryKey = key;
 	routerRuntimeState.lastPathnameAndSearch = window.location.pathname + window.location.search;
+	routerRuntimeState.lastHash = window.location.hash;
 	routerRuntimeState.routerDidNavigate = true;
 }
 function createHistoryKey() {
@@ -1386,7 +1392,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) ? (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(() => {});
@@ -1434,7 +1447,7 @@ async function prefetchUrl(url) {
 		prefetchPagesData(dataTarget);
 		return;
 	}
-	markAppRouteDetectedOnPrefetch(url, __basePath);
+	await markAppRouteDetectedOnPrefetch(url, __basePath);
 	const link = document.createElement("link");
 	link.rel = "prefetch";
 	link.href = url;
@@ -1519,6 +1532,10 @@ function getRouterStateKey(state) {
 	if (!isNextRouterState(state)) return void 0;
 	return typeof state.key === "string" ? state.key : void 0;
 }
+function getTrackedPagesRouterAsPath() {
+	const trackedUrl = new URL(routerRuntimeState.lastPathnameAndSearch, window.location.href);
+	return removeNavigationLocalePrefix(stripBasePath(trackedUrl.pathname, __basePath) + trackedUrl.search);
+}
 function handlePagesRouterPopState(e) {
 	const browserUrl = window.location.pathname + window.location.search;
 	const appUrl = stripBasePath(window.location.pathname, __basePath) + window.location.search;
@@ -1528,9 +1545,10 @@ function handlePagesRouterPopState(e) {
 	if (state !== null && state !== void 0 && !isNextRouterState(state)) return;
 	if (wasFirst && !routerRuntimeState.routerDidNavigate && isNextRouterState(state)) {
 		const currentLocale = window.__VINEXT_LOCALE__;
-		if (state.options?.locale === currentLocale && typeof state.as === "string" && withBasePath(state.as, __basePath) === routerRuntimeState.lastPathnameAndSearch) return;
+		if (state.options?.locale === currentLocale && typeof state.as === "string" && state.as === getTrackedPagesRouterAsPath()) return;
 	}
-	const isHashOnly = browserUrl === routerRuntimeState.lastPathnameAndSearch;
+	const currentHash = window.location.hash;
+	const isHashOnly = browserUrl === routerRuntimeState.lastPathnameAndSearch && (currentHash !== routerRuntimeState.lastHash || currentHash !== "");
 	const targetKey = getRouterStateKey(state);
 	let forcedScroll;
 	if (manualScrollRestoration) {
@@ -1555,6 +1573,7 @@ function handlePagesRouterPopState(e) {
 	}
 	if (targetKey !== void 0) routerRuntimeState.currentHistoryKey = targetKey;
 	routerRuntimeState.lastPathnameAndSearch = browserUrl;
+	routerRuntimeState.lastHash = currentHash;
 	if (isHashOnly) {
 		const hashUrl = appUrl + window.location.hash;
 		routerEvents.emit("hashChangeStart", hashUrl, { shallow: false });

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/typegen.js

@@ -1,5 +1,6 @@
 import { findDir } from "./utils/project.js";
 import { decodeRouteSegment, isInvisibleSegment } from "./routing/utils.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { patternToNextFormat } from "./routing/route-validation.js";
 import { compareStrings } from "./utils/compare.js";
 import "./routing/app-route-graph.js";
@@ -15,17 +16,17 @@ import "./.next/types/routes.d.ts";
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
 `;
 async function generateRouteTypes(options) {
-	const root = path.resolve(options.root);
-	const appDir = options.appDir ? path.resolve(options.appDir) : findDir(root, "app", path.join("src", "app"));
-	const outPath = path.join(root, ".next", "types", "routes.d.ts");
+	const root = normalizePathSeparators(path.resolve(options.root));
+	const appDir = options.appDir ? normalizePathSeparators(path.resolve(options.appDir)) : findDir(root, "app", "src/app");
+	const outPath = path.posix.join(root, ".next", "types", "routes.d.ts");
 	const content = appDir ? renderRouteTypes(await collectRouteTypeModel(appDir, options.pageExtensions)) : renderRouteTypes(emptyRouteTypeModel());
-	await fs.mkdir(path.dirname(outPath), { recursive: true });
+	await fs.mkdir(path.posix.dirname(outPath), { recursive: true });
 	await fs.writeFile(outPath, content, "utf-8");
 	await ensureNextEnvFile(root);
 	return outPath;
 }
 async function ensureNextEnvFile(root) {
-	const envPath = path.join(root, "next-env.d.ts");
+	const envPath = path.posix.join(root, "next-env.d.ts");
 	try {
 		await fs.writeFile(envPath, NEXT_ENV_FILE_CONTENT, {
 			encoding: "utf-8",

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

package/dist/utils/client-runtime-metadata.js

@@ -1,10 +1,34 @@
-import { resolveAssetsDir } from "./asset-prefix.js";
+import { isAbsoluteAssetPrefix, resolveAssetsDir } from "./asset-prefix.js";
 import { manifestFileWithAssetPrefix, manifestFileWithBase } from "./manifest-paths.js";
 import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./client-build-manifest.js";
 import { findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./client-entry-manifest.js";
 import { computeDynamicImportPreloads, computeLazyChunks, dynamicImportPreloadsWithBase } from "./lazy-chunks.js";
 import path from "node:path";
 //#region src/utils/client-runtime-metadata.ts
+function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, applyBase) {
+	if (!appBrowserEntry) return void 0;
+	const entryKey = Object.keys(buildManifest).find((key) => buildManifest[key].file === appBrowserEntry);
+	if (!entryKey) return void 0;
+	const modules = [];
+	const seenFiles = /* @__PURE__ */ new Set();
+	const visitedChunks = /* @__PURE__ */ new Set();
+	function visit(key) {
+		if (visitedChunks.has(key)) return;
+		visitedChunks.add(key);
+		const chunk = buildManifest[key];
+		if (!chunk) return;
+		for (const importedKey of chunk.imports ?? []) {
+			const importedChunk = buildManifest[importedKey];
+			if (importedChunk?.file.endsWith(".js") && !seenFiles.has(importedChunk.file)) {
+				seenFiles.add(importedChunk.file);
+				modules.push(applyBase(importedChunk.file));
+			}
+			visit(importedKey);
+		}
+	}
+	visit(entryKey);
+	return modules.length > 0 ? modules : void 0;
+}
 /**
 * Read the client build manifest and compute runtime metadata used by
 * Cloudflare worker entry injection and Node production server startup.
@@ -21,9 +45,9 @@ import path from "node:path";
 */
 function computeClientRuntimeMetadata(opts) {
 	const buildManifest = readClientBuildManifest(path.join(opts.clientDir, ".vite", "manifest.json"));
+	const clientEntryManifest = readClientEntryManifest(opts.clientDir);
 	const metadata = {};
 	if (opts.includeClientEntry) {
-		const clientEntryManifest = readClientEntryManifest(opts.clientDir);
 		const entryOptions = {
 			buildManifest,
 			clientDir: opts.clientDir,
@@ -34,30 +58,15 @@ function computeClientRuntimeMetadata(opts) {
 		if (entry) metadata.clientEntryFile = entry;
 	}
 	if (!buildManifest) return metadata;
+	metadata.appBootstrapPreinitModules = collectAppBootstrapPreinitModules(buildManifest, clientEntryManifest?.appBrowserEntry, (file) => {
+		const url = manifestFileWithAssetPrefix(file, opts.assetBase, opts.assetPrefix);
+		return isAbsoluteAssetPrefix(opts.assetPrefix) ? url : "/" + url;
+	});
 	const lazyChunks = computeLazyChunks(buildManifest).map((file) => manifestFileWithBase(file, opts.assetBase));
 	if (lazyChunks.length > 0) metadata.lazyChunks = lazyChunks;
 	const dynamicPreloads = dynamicImportPreloadsWithBase(computeDynamicImportPreloads(buildManifest), (file) => manifestFileWithAssetPrefix(file, opts.assetBase, opts.assetPrefix));
 	if (Object.keys(dynamicPreloads).length > 0) metadata.dynamicPreloads = dynamicPreloads;
 	return metadata;
 }
-/**
-* 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.
-*/
-function buildRuntimeGlobalsScript(input) {
-	const globals = [];
-	if (input.clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(input.clientEntryFile)};`);
-	if (input.ssrManifest && Object.keys(input.ssrManifest).length > 0) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(input.ssrManifest)};`);
-	if (input.lazyChunks && input.lazyChunks.length > 0) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(input.lazyChunks)};`);
-	if (input.dynamicPreloads && Object.keys(input.dynamicPreloads).length > 0) globals.push(`globalThis.__VINEXT_DYNAMIC_PRELOADS__ = ${JSON.stringify(input.dynamicPreloads)};`);
-	return globals.join("\n");
-}
 //#endregion
-export { buildRuntimeGlobalsScript, computeClientRuntimeMetadata };
+export { computeClientRuntimeMetadata };

package/dist/utils/dev-stack-sourcemap-endpoint.d.ts

@@ -0,0 +1,4 @@
+//#region src/utils/dev-stack-sourcemap-endpoint.d.ts
+declare const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
+//#endregion
+export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/{server → utils}/dev-stack-sourcemap-endpoint.js

@@ -1,4 +1,4 @@
-//#region src/server/dev-stack-sourcemap-endpoint.ts
+//#region src/utils/dev-stack-sourcemap-endpoint.ts
 const VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT = "/__vinext_original-stack-trace";
 //#endregion
 export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };