vinext 0.0.53 → 0.0.55

package/dist/shims/router.js

@@ -1,16 +1,19 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { 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 { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
+import { getPagesRouterComponentsMap, markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { dedupedPagesDataFetch } from "./internal/pages-data-fetch-dedup.js";
 import { installWindowNext } from "../client/window-next.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
+import { addQueryParam, appendSearchParamsToUrl, mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { setPagesRouterPopStateHandler } from "./pages-router-runtime.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
@@ -218,6 +221,7 @@ function _buildClientPagesNavigationContext(routePattern, resolvedPath, searchSt
 	_cachedClientPagesNavCtxKey = cacheKey;
 	return ctx;
 }
+const _ssrPagesNavCtxCache = /* @__PURE__ */ new WeakMap();
 /**
 * Cross-router compat shim source for `next/navigation` hooks.
 *
@@ -238,6 +242,8 @@ function getPagesNavigationContext() {
 	if (typeof window === "undefined") {
 		const ssrCtx = _getSSRContext();
 		if (!ssrCtx) return null;
+		const cached = _ssrPagesNavCtxCache.get(ssrCtx);
+		if (cached) return cached;
 		let searchParams;
 		let resolvedPath;
 		try {
@@ -249,11 +255,13 @@ function getPagesNavigationContext() {
 			resolvedPath = ssrCtx.pathname;
 		}
 		const params = extractRouteParamsFromPath(ssrCtx.pathname, resolvedPath) ?? {};
-		return {
+		const ctx = {
 			pathname: resolvedPath,
 			searchParams,
 			params
 		};
+		_ssrPagesNavCtxCache.set(ssrCtx, ctx);
+		return ctx;
 	}
 	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
 	return _buildClientPagesNavigationContext(window.__NEXT_DATA__?.page ?? "", resolvedPath, window.location.search);
@@ -430,16 +438,13 @@ function getMiddlewarePagesDataFetchUrl(browserUrl) {
 async function resolveMiddlewareDataRedirect(browserUrl, signal) {
 	const dataUrl = getMiddlewarePagesDataFetchUrl(browserUrl);
 	if (!dataUrl) return null;
+	if (signal.aborted) throw new DOMException("Aborted", "AbortError");
 	try {
-		return (await fetch(dataUrl, {
-			headers: {
-				Accept: "application/json",
-				"x-nextjs-data": "1"
-			},
-			signal
-		})).headers.get("x-nextjs-redirect");
-	} catch (err) {
-		if (err instanceof DOMException && err.name === "AbortError") throw err;
+		return (await dedupedPagesDataFetch(dataUrl, { headers: {
+			Accept: "application/json",
+			"x-nextjs-data": "1"
+		} })).headers.get("x-nextjs-redirect");
+	} catch {
 		return null;
 	}
 }
@@ -462,15 +467,13 @@ async function navigateClientData(url, target, controller, navId, assertStillCur
 		window.location.href = url;
 		return;
 	}
+	if (controller.signal.aborted) throw new NavigationCancelledError(url);
 	let res;
 	try {
-		res = await fetch(target.dataHref, {
-			headers: {
-				Accept: "application/json",
-				"x-nextjs-data": "1"
-			},
-			signal: controller.signal
-		});
+		res = await dedupedPagesDataFetch(target.dataHref, { headers: {
+			Accept: "application/json",
+			"x-nextjs-data": "1"
+		} });
 	} catch (err) {
 		if (err instanceof DOMException && err.name === "AbortError") throw new NavigationCancelledError(url);
 		throw err;
@@ -859,6 +862,7 @@ async function prefetchUrl(url) {
 		prefetchPagesData(dataTarget);
 		return;
 	}
+	markAppRouteDetectedOnPrefetch(url, __basePath);
 	const link = document.createElement("link");
 	link.rel = "prefetch";
 	link.href = url;
@@ -897,7 +901,30 @@ function PagesRouterProvider({ children }) {
 		query,
 		asPath
 	]);
-	return createElement(RouterContext.Provider, { value: router }, children);
+	const appRouter = useMemo(() => ({
+		bfcacheId: "0",
+		back() {
+			Router.back();
+		},
+		forward() {
+			if (typeof window === "undefined") throwNoRouterInstance();
+			window.history.forward();
+		},
+		refresh() {
+			Router.reload();
+		},
+		push(href, options) {
+			Router.push(href, void 0, { scroll: options?.scroll });
+		},
+		replace(href, options) {
+			Router.replace(href, void 0, { scroll: options?.scroll });
+		},
+		prefetch(href) {
+			Router.prefetch(href);
+		}
+	}), []);
+	const content = createElement(RouterContext.Provider, { value: router }, children);
+	return AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouter }, content) : content;
 }
 let _beforePopStateCb;
 let _lastPathnameAndSearch = typeof window !== "undefined" ? window.location.pathname + window.location.search : "";
@@ -976,7 +1003,9 @@ function withRouter(ComposedComponent) {
 	if (process.env.NODE_ENV !== "production") WithRouterWrapper.displayName = `withRouter(${composed.displayName || composed.name || "Unknown"})`;
 	return WithRouterWrapper;
 }
-const Router = Object.defineProperties({
+const RouterMethods = {
+	/** See `_components` comment above for the dual role this map plays. */
+	components: getPagesRouterComponentsMap(),
 	push: (url, as, options) => {
 		if (typeof window === "undefined") throwNoRouterInstance();
 		assertSafeNavigationUrl(resolveUrl(url));
@@ -1006,7 +1035,8 @@ const Router = Object.defineProperties({
 		_beforePopStateCb = cb;
 	},
 	events: routerEvents
-}, {
+};
+const Router = Object.defineProperties(RouterMethods, {
 	pathname: {
 		enumerable: true,
 		get() {