@qzsy/vinext 0.1.12 → 0.1.81

package/dist/shims/internal/app-route-detection.js

@@ -1,22 +1,7 @@
 import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
-import { resolveHybridClientRouteOwner } from "./hybrid-client-route-owner.js";
+import { getPagesRouterComponentsMap } from "./pages-router-components.js";
 //#region src/shims/internal/app-route-detection.ts
-const _COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
-/**
-* Get-or-create the Pages Router `components` map. Returns the same object
-* on every call so `router.components` and `window.next.router.components`
-* have referential identity.
-*/
-function getPagesRouterComponentsMap() {
-	const globalState = globalThis;
-	let components = globalState[_COMPONENTS_KEY];
-	if (!components) {
-		components = {};
-		globalState[_COMPONENTS_KEY] = components;
-	}
-	return components;
-}
 /**
 * Resolve a prefetch href to a same-origin pathname (basePath-stripped),
 * suitable as the key used by Next.js for `router.components[urlPathname]`.
@@ -50,8 +35,10 @@ function resolveSameOriginPathname(href, basePath) {
 * first (e.g. `link.tsx` normalises to match `trailingSlash` config before
 * calling, while `router.prefetch()` passes the raw user-supplied URL).
 */
-function markAppRouteDetectedOnPrefetch(href, basePath) {
+async function markAppRouteDetectedOnPrefetch(href, basePath) {
 	if (typeof window === "undefined") return;
+	if (!window.__VINEXT_LINK_PREFETCH_ROUTES__?.length) return;
+	const { resolveHybridClientRouteOwner } = await import("./hybrid-client-route-owner.js");
 	if (resolveHybridClientRouteOwner(href, basePath) !== "app") return;
 	const rawPathname = resolveSameOriginPathname(href, basePath);
 	if (rawPathname === null) return;

package/dist/shims/internal/hybrid-client-route-owner-direct.d.ts

@@ -0,0 +1,23 @@
+import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+
+//#region src/shims/internal/hybrid-client-route-owner-direct.d.ts
+type HybridClientOwner = "app" | "document" | "pages";
+type HybridClientRouteMatches = {
+  appMatch: VinextLinkPrefetchRoute | null;
+  pagesMatch: VinextPagesLinkPrefetchRoute | null;
+};
+declare global {
+  interface Window {
+    __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
+    __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
+  }
+}
+declare function resolveSameOriginPathname(href: string, basePath: string): string | null;
+declare function matchDirectHybridClientRoutes(href: string, basePath: string): HybridClientRouteMatches;
+declare function resolveMatchedHybridClientRouteOwner({
+  appMatch,
+  pagesMatch
+}: HybridClientRouteMatches): HybridClientOwner | null;
+declare function resolveDirectHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
+//#endregion
+export { HybridClientOwner, matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname };

package/dist/shims/internal/hybrid-client-route-owner-direct.js

@@ -0,0 +1,51 @@
+import { compareHybridRoutePatterns } from "../../routing/utils.js";
+import { stripBasePath } from "../../utils/base-path.js";
+import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
+import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+//#region src/shims/internal/hybrid-client-route-owner-direct.ts
+const appRouteTrieCache = createRouteTrieCache();
+const pagesRouteTrieCache = createRouteTrieCache();
+function patternFromParts(parts) {
+	return "/" + parts.join("/");
+}
+function resolveSameOriginPathname(href, basePath) {
+	if (typeof window === "undefined") return null;
+	let url;
+	try {
+		url = new URL(href, window.location.href);
+	} catch {
+		return null;
+	}
+	if (url.origin !== window.location.origin) return null;
+	const pathname = stripBasePath(url.pathname, basePath);
+	const locale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
+	if (!locale) return pathname;
+	const localePrefixLength = locale.length + 1;
+	return pathname.length === localePrefixLength ? "/" : pathname.slice(localePrefixLength);
+}
+function matchDirectHybridClientRoutes(href, basePath) {
+	const pathname = resolveSameOriginPathname(href, basePath);
+	if (pathname === null) return {
+		appMatch: null,
+		pagesMatch: null
+	};
+	const appRoutes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
+	const pagesRoutes = window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__;
+	return {
+		appMatch: appRoutes ? matchRouteWithTrie(pathname, appRoutes, appRouteTrieCache)?.route ?? null : null,
+		pagesMatch: pagesRoutes ? matchRouteWithTrie(pathname, pagesRoutes, pagesRouteTrieCache)?.route ?? null : null
+	};
+}
+function resolveMatchedHybridClientRouteOwner({ appMatch, pagesMatch }) {
+	if (appMatch === null && pagesMatch === null) return null;
+	if (pagesMatch === null) return appMatch.documentOnly ? "document" : "app";
+	if (appMatch === null) return pagesMatch.documentOnly ? "document" : "pages";
+	const owner = compareHybridRoutePatterns(patternFromParts(pagesMatch.patternParts), pagesMatch.isDynamic, patternFromParts(appMatch.patternParts), appMatch.isDynamic);
+	return (owner === "app" ? appMatch : pagesMatch).documentOnly ? "document" : owner;
+}
+function resolveDirectHybridClientRouteOwner(href, basePath) {
+	if (typeof window === "undefined") return null;
+	return resolveMatchedHybridClientRouteOwner(matchDirectHybridClientRoutes(href, basePath));
+}
+//#endregion
+export { matchDirectHybridClientRoutes, resolveDirectHybridClientRouteOwner, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname };

package/dist/shims/internal/hybrid-client-route-owner.d.ts

@@ -1,12 +1,9 @@
 import { NextRewrite } from "../../config/next-config.js";
-import { VinextLinkPrefetchRoute, VinextPagesLinkPrefetchRoute } from "../../client/vinext-next-data.js";
+import { HybridClientOwner } from "./hybrid-client-route-owner-direct.js";
 
 //#region src/shims/internal/hybrid-client-route-owner.d.ts
-type HybridClientOwner = "app" | "document" | "pages";
 declare global {
   interface Window {
-    __VINEXT_LINK_PREFETCH_ROUTES__?: VinextLinkPrefetchRoute[];
-    __VINEXT_PAGES_LINK_PREFETCH_ROUTES__?: VinextPagesLinkPrefetchRoute[];
     __VINEXT_CLIENT_REWRITES__?: {
       afterFiles: NextRewrite[];
       beforeFiles: NextRewrite[];
@@ -28,4 +25,4 @@ declare global {
  */
 declare function resolveHybridClientRouteOwner(href: string, basePath: string): HybridClientOwner | null;
 //#endregion
-export { HybridClientOwner, resolveHybridClientRouteOwner };
+export { type HybridClientOwner, resolveHybridClientRouteOwner };

package/dist/shims/internal/hybrid-client-route-owner.js

@@ -1,8 +1,5 @@
-import { compareHybridRoutePatterns } from "../../routing/utils.js";
-import { stripBasePath } from "../../utils/base-path.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "../../routing/route-matching.js";
 import { isExternalUrl, matchRewrite, parseCookies } from "../../config/config-matchers.js";
-import { getLocalePathPrefix } from "../../utils/domain-locale.js";
+import { matchDirectHybridClientRoutes, resolveMatchedHybridClientRouteOwner, resolveSameOriginPathname } from "./hybrid-client-route-owner-direct.js";
 import { mergeRewriteQuery } from "../../utils/query.js";
 //#region src/shims/internal/hybrid-client-route-owner.ts
 /**
@@ -52,45 +49,6 @@ function resolveClientRewrite(href, basePath, rewrites, continueAfterMatch = fal
 		kind: "rewrite"
 	} : null;
 }
-const appRouteTrieCache = createRouteTrieCache();
-const pagesRouteTrieCache = createRouteTrieCache();
-/**
-* Build a `/`-joined pattern from a manifest's `patternParts`. Mirrors the
-* server-side route-graph shape (`{ pattern: string }`) so the
-* `compareHybridRoutePatterns` segment-rank comparator can score both Pages
-* and App patterns. The
-* `patternParts` array never includes an empty string for the static `/`
-* route (the App catch-all handles the bare path), so the simple join is
-* safe for everything the route trie actually matches.
-*/
-function patternFromParts(parts) {
-	return "/" + parts.join("/");
-}
-function resolveSameOriginPathname(href, basePath) {
-	if (typeof window === "undefined") return null;
-	let url;
-	try {
-		url = new URL(href, window.location.href);
-	} catch {
-		return null;
-	}
-	if (url.origin !== window.location.origin) return null;
-	const pathname = stripBasePath(url.pathname, basePath);
-	const locale = getLocalePathPrefix(pathname, window.__VINEXT_LOCALES__);
-	if (!locale) return pathname;
-	const localePrefixLength = locale.length + 1;
-	return pathname.length === localePrefixLength ? "/" : pathname.slice(localePrefixLength);
-}
-function matchAppRoute(href, basePath, routes) {
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return null;
-	return matchRouteWithTrie(pathname, routes, appRouteTrieCache)?.route ?? null;
-}
-function matchPagesRoute(href, basePath, routes) {
-	const pathname = resolveSameOriginPathname(href, basePath);
-	if (pathname === null) return null;
-	return matchRouteWithTrie(pathname, routes, pagesRouteTrieCache)?.route ?? null;
-}
 /**
 * Decide which router should own a soft-navigated URL. Returns:
 *   - "app"    → the App Router runtime handles the navigation (RSC fetch).
@@ -105,39 +63,30 @@ function matchPagesRoute(href, basePath, routes) {
 */
 function resolveHybridClientRouteOwner(href, basePath) {
 	if (typeof window === "undefined") return null;
-	const appRoutes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	const pagesRoutes = window.__VINEXT_PAGES_LINK_PREFETCH_ROUTES__;
 	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
 	if (rewrites) {
 		const beforeFilesRewrite = resolveClientRewrite(href, basePath, rewrites.beforeFiles, true);
 		if (beforeFilesRewrite?.kind === "document") return "document";
 		if (beforeFilesRewrite?.kind === "rewrite") href = beforeFilesRewrite.href;
 	}
-	let appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-	let pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-	if (rewrites && (appMatch === null || appMatch.isDynamic) && (pagesMatch === null || pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
+	let matches = matchDirectHybridClientRoutes(href, basePath);
+	if (rewrites && (matches.appMatch === null || matches.appMatch.isDynamic) && (matches.pagesMatch === null || matches.pagesMatch.isDynamic)) for (const rewrite of rewrites.afterFiles) {
 		const afterFilesRewrite = resolveClientRewrite(href, basePath, [rewrite]);
 		if (afterFilesRewrite?.kind === "document") return "document";
 		if (afterFilesRewrite?.kind !== "rewrite") continue;
 		href = afterFilesRewrite.href;
-		appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-		pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-		if (appMatch || pagesMatch) break;
+		matches = matchDirectHybridClientRoutes(href, basePath);
+		if (matches.appMatch || matches.pagesMatch) break;
 	}
-	if (rewrites && appMatch === null && pagesMatch === null) for (const rewrite of rewrites.fallback) {
+	if (rewrites && matches.appMatch === null && matches.pagesMatch === null) for (const rewrite of rewrites.fallback) {
 		const fallbackRewrite = resolveClientRewrite(href, basePath, [rewrite]);
 		if (fallbackRewrite?.kind === "document") return "document";
 		if (fallbackRewrite?.kind !== "rewrite") continue;
 		href = fallbackRewrite.href;
-		appMatch = appRoutes ? matchAppRoute(href, basePath, appRoutes) : null;
-		pagesMatch = pagesRoutes ? matchPagesRoute(href, basePath, pagesRoutes) : null;
-		if (appMatch || pagesMatch) break;
+		matches = matchDirectHybridClientRoutes(href, basePath);
+		if (matches.appMatch || matches.pagesMatch) break;
 	}
-	if (appMatch === null && pagesMatch === null) return null;
-	if (pagesMatch === null) return appMatch.documentOnly ? "document" : "app";
-	if (appMatch === null) return pagesMatch.documentOnly ? "document" : "pages";
-	const owner = compareHybridRoutePatterns(patternFromParts(pagesMatch.patternParts), pagesMatch.isDynamic, patternFromParts(appMatch.patternParts), appMatch.isDynamic);
-	return (owner === "app" ? appMatch : pagesMatch).documentOnly ? "document" : owner;
+	return resolveMatchedHybridClientRouteOwner(matches);
 }
 //#endregion
 export { resolveHybridClientRouteOwner };

package/dist/shims/internal/pages-router-components.d.ts

@@ -0,0 +1,7 @@
+//#region src/shims/internal/pages-router-components.d.ts
+type PagesRouterComponentsMap = Record<string, {
+  __appRouter: true;
+} | Record<string, unknown>>;
+declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
+//#endregion
+export { PagesRouterComponentsMap, getPagesRouterComponentsMap };

package/dist/shims/internal/pages-router-components.js

@@ -0,0 +1,13 @@
+//#region src/shims/internal/pages-router-components.ts
+const COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
+function getPagesRouterComponentsMap() {
+	const globalState = globalThis;
+	let components = globalState[COMPONENTS_KEY];
+	if (!components) {
+		components = {};
+		globalState[COMPONENTS_KEY] = components;
+	}
+	return components;
+}
+//#endregion
+export { getPagesRouterComponentsMap };

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;