vinext 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/shims/navigation.d.ts

@@ -6,8 +6,12 @@ import { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, Segm
 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 { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
+import { Params } from "@vinext/types/next/upstream/dist/server/request/params";
 
 //#region src/shims/navigation.d.ts
+/** Load rewrite-aware hybrid route ownership before navigation becomes interactive. */
+declare function preloadHybridClientRouteOwner(): Promise<void>;
+declare function resolveLoadedHybridClientRewriteHref(href: string, basePath: string): string | null;
 /** basePath from next.config.js, injected by the plugin at build time */
 declare const __basePath: string;
 /** Maximum buffered bytes in the RSC prefetch cache. Mirrors Next.js' 50 MB LRU. */
@@ -203,7 +207,7 @@ declare function clearPendingPathname(navId: number): void;
  * Returns the current pathname.
  * Server: from request context. Client: from window.location.
  */
-declare function usePathname(): string | null;
+declare function usePathname(): string;
 /**
  * Returns the current search params as a read-only URLSearchParams.
  */
@@ -211,7 +215,7 @@ declare function useSearchParams(): ReadonlyURLSearchParams;
 /**
  * Returns the dynamic params for the current route.
  */
-declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T | null;
+declare function useParams<T extends Params = Params>(): T | null;
 /**
  * Commit pending client navigation state to committed snapshots.
  *
@@ -299,4 +303,4 @@ declare function useSelectedLayoutSegments(parallelRoutesKey?: string): string[]
  */
 declare function useServerInsertedHTML(callback: () => unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.js

@@ -1,15 +1,17 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
+import { isExternalUrl } from "../utils/external-url.js";
 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 { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
+import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
+import { toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.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, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
@@ -22,7 +24,6 @@ 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 { releaseAppPrefetchFetchSlot, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
@@ -34,6 +35,22 @@ import * as React$1 from "react";
 * Server-side: reads from a request context set by the RSC handler.
 * Client-side: reads from browser Location API and provides navigation.
 */
+const HAS_PAGES_ROUTER = process.env.__VINEXT_HAS_PAGES_ROUTER !== "false";
+let hybridClientRouteOwnerModule = null;
+let hybridClientRouteOwnerModulePromise = null;
+/** Load rewrite-aware hybrid route ownership before navigation becomes interactive. */
+async function preloadHybridClientRouteOwner() {
+	if (hybridClientRouteOwnerModule) return;
+	hybridClientRouteOwnerModulePromise ??= import("./internal/hybrid-client-route-owner.js");
+	hybridClientRouteOwnerModule = await hybridClientRouteOwnerModulePromise;
+}
+function resolveLoadedHybridClientRewriteHref(href, basePath) {
+	return hybridClientRouteOwnerModule?.resolveHybridClientRewriteHref(href, basePath) ?? null;
+}
+function resolveHybridClientRouteOwner(href) {
+	if (!HAS_PAGES_ROUTER) return null;
+	return hybridClientRouteOwnerModule ? hybridClientRouteOwnerModule.resolveHybridClientRouteOwner(href, __basePath) : resolveDirectHybridClientRouteOwner(href, __basePath);
+}
 /**
 * Read the child segments for a parallel route below the current layout.
 * Returns [] if no context is available (RSC environment, outside React tree)
@@ -941,12 +958,6 @@ function useParams() {
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.params;
 	return params;
 }
-/**
-* Check if a href is an external URL (any URL scheme per RFC 3986, or protocol-relative).
-*/
-function isExternalUrl(href) {
-	return isAbsoluteOrProtocolRelativeUrl(href);
-}
 function withSuppressedUrlNotifications(fn) {
 	const state = getClientNavigationState();
 	if (!state) return fn();
@@ -1094,7 +1105,7 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		}
 		normalizedHref = localPath;
 	}
-	const hybridOwner = resolveHybridClientRouteOwner(normalizedHref, __basePath);
+	const hybridOwner = resolveHybridClientRouteOwner(normalizedHref);
 	if (hybridOwner === "pages" || hybridOwner === "document") {
 		const fullHref = toBrowserNavigationHref(normalizedHref, window.location.href, __basePath);
 		notifyAppRouterTransitionStart(fullHref, mode);
@@ -1238,12 +1249,12 @@ const _appRouter = {
 		}
 		(async () => {
 			let prefetchHref = href;
-			if (isAbsoluteOrProtocolRelativeUrl(href)) {
+			if (isExternalUrl(href)) {
 				const localPath = toSameOriginAppPath(href, __basePath);
 				if (localPath == null) return;
 				prefetchHref = localPath;
 			}
-			const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
+			const hybridOwner = resolveHybridClientRouteOwner(prefetchHref);
 			if (hybridOwner === "pages" || hybridOwner === "document") return;
 			const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
 			const interceptionContext = getPrefetchInterceptionContext(fullHref);
@@ -1273,7 +1284,7 @@ if (process.env.__NEXT_GESTURE_TRANSITION) _appRouter.experimental_gesturePush =
 	if (isServer) return;
 	if (!getNavigationRuntime()?.functions.navigate) return;
 	let appHref = href;
-	if (isAbsoluteOrProtocolRelativeUrl(href)) {
+	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
 		if (localPath === null) return;
 		appHref = localPath;
@@ -1401,4 +1412,4 @@ if (!isServer) {
 	}
 }
 //#endregion
-export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.react-server.js

@@ -1,8 +1,8 @@
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import "./navigation-server.js";
-import { throwClientHookError } from "./client-hook-error.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import { throwClientHookError } from "./client-hook-error.js";
 //#region src/shims/navigation.react-server.ts
 function usePathname() {
 	throwClientHookError("usePathname()");

package/dist/shims/next-shims-augmentations.d.ts

@@ -0,0 +1 @@
+import "@vinext/types/next/augmentations";

package/dist/shims/next-shims-public.d.ts

@@ -0,0 +1 @@
+import "@vinext/types/next";

package/dist/shims/public-shim-map.json.js

@@ -0,0 +1,103 @@
+//#region src/shims/public-shim-map.json
+var public_shim_map_default = {
+	"next/link": {
+		"shim": "link",
+		"types": "upstream"
+	},
+	"next/head": {
+		"shim": "head",
+		"types": "upstream"
+	},
+	"next/router": {
+		"shim": "router",
+		"types": "upstream"
+	},
+	"next/compat/router": {
+		"shim": "compat-router",
+		"types": "upstream"
+	},
+	"next/image": {
+		"shim": "image",
+		"types": "upstream"
+	},
+	"next/legacy/image": {
+		"shim": "legacy-image",
+		"types": "upstream"
+	},
+	"next/dynamic": {
+		"shim": "dynamic",
+		"types": "upstream"
+	},
+	"next/app": {
+		"shim": "app",
+		"types": "upstream"
+	},
+	"next/document": {
+		"shim": "document",
+		"types": "upstream"
+	},
+	"next/config": {
+		"shim": "config",
+		"types": "vinext"
+	},
+	"next/script": {
+		"shim": "script",
+		"types": "upstream"
+	},
+	"next/server": {
+		"shim": "server",
+		"types": "upstream"
+	},
+	"next/navigation": {
+		"shim": "navigation",
+		"types": "upstream",
+		"reactServer": true
+	},
+	"next/headers": {
+		"shim": "headers",
+		"types": "upstream"
+	},
+	"next/font/google": {
+		"shim": "font-google",
+		"types": "upstream"
+	},
+	"next/font/local": {
+		"shim": "font-local",
+		"types": "upstream"
+	},
+	"next/cache": {
+		"shim": "cache",
+		"types": "upstream"
+	},
+	"next/form": {
+		"shim": "form",
+		"types": "upstream"
+	},
+	"next/og": {
+		"shim": "og",
+		"types": "upstream"
+	},
+	"next/web-vitals": {
+		"shim": "web-vitals",
+		"types": "vinext"
+	},
+	"next/amp": {
+		"shim": "amp",
+		"types": "vinext"
+	},
+	"next/offline": {
+		"shim": "offline",
+		"types": "vinext"
+	},
+	"next/error": {
+		"shim": "error",
+		"types": "upstream",
+		"reactServer": true
+	},
+	"next/constants": {
+		"shim": "constants",
+		"types": "upstream"
+	}
+};
+//#endregion
+export { public_shim_map_default as default };

package/dist/shims/readonly-url-search-params.d.ts

@@ -4,9 +4,9 @@
  * Mutation methods remain present for instanceof/API compatibility but throw.
  */
 declare class ReadonlyURLSearchParams extends URLSearchParams {
-  append(_name: string, _value: string): never;
-  delete(_name: string, _value?: string): never;
-  set(_name: string, _value: string): never;
+  append(): never;
+  delete(): never;
+  set(): never;
   sort(): never;
 }
 //#endregion

package/dist/shims/readonly-url-search-params.js

@@ -9,13 +9,13 @@ var ReadonlyURLSearchParamsError = class extends Error {
 * Mutation methods remain present for instanceof/API compatibility but throw.
 */
 var ReadonlyURLSearchParams = class extends URLSearchParams {
-	append(_name, _value) {
+	append() {
 		throw new ReadonlyURLSearchParamsError();
 	}
-	delete(_name, _value) {
+	delete() {
 		throw new ReadonlyURLSearchParamsError();
 	}
-	set(_name, _value) {
+	set() {
 		throw new ReadonlyURLSearchParamsError();
 	}
 	sort() {

package/dist/shims/request-context.d.ts

@@ -33,7 +33,10 @@ type ExecutionContextLike = {
    * execution context. Typed as `unknown` to keep this module runtime-agnostic;
    * CDN cache adapters that know the concrete shape narrow it themselves.
    */
-  cache?: unknown;
+  cache?: unknown; /** Server-owned origin for credential-bearing Pages revalidation loopbacks. */
+  trustedRevalidateOrigin?: string; /** Worker-owned in-process dispatcher for authenticated Pages revalidation. */
+  dispatchPagesRevalidate?: (request: Request) => Promise<Response>; /** Marks a request currently executing through the internal revalidation dispatcher. */
+  isInternalPagesRevalidation?: boolean;
 };
 /**
  * Run `fn` with the given `ExecutionContext` available via

package/dist/shims/request-state-types.d.ts

@@ -1,6 +1,6 @@
 import { NavigationContext } from "./navigation-context-state.js";
-import { RootParamsState } from "./root-params.js";
 import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
+import { RootParamsState } from "./root-params.js";
 import { ExecutionContextLike } from "./request-context.js";
 import { FetchCacheState } from "./fetch-cache.js";
 import { HeadersAccessPhase, HeadersContext, VinextHeadersShimState } from "./headers.js";

package/dist/shims/router.d.ts

@@ -1,7 +1,10 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { PagesRouterComponentsMap } from "./internal/pages-router-components.js";
-import { UrlQuery } from "../utils/query.js";
+import { UrlObject } from "node:url";
 import { ComponentType, ReactElement } from "react";
+import { ParsedUrlQuery } from "node:querystring";
+import { BaseContext, NextComponentType, NextPageContext } from "@vinext/types/next/upstream/dist/shared/lib/utils";
 
 //#region src/shims/router.d.ts
 type BeforePopStateCallback = (state: {
@@ -12,30 +15,27 @@ type BeforePopStateCallback = (state: {
 type NextRouter = {
   /** Current pathname */pathname: string; /** Current route pattern (e.g., "/posts/[id]") */
   route: string; /** Query parameters */
-  query: Record<string, string | string[]>; /** Full URL including query string */
+  query: ParsedUrlQuery; /** Full URL including query string */
   asPath: string; /** Base path */
   basePath: string; /** Current locale */
   locale?: string; /** Available locales */
-  locales?: string[]; /** Default locale */
+  locales?: readonly string[]; /** Default locale */
   defaultLocale?: string; /** Configured domain locales */
-  domainLocales?: VinextNextData["domainLocales"]; /** Whether the router is ready */
+  domainLocales?: VinextNextData["domainLocales"]; /** Whether the active hostname matches a configured locale domain */
+  isLocaleDomain: boolean; /** Whether the router is ready */
   isReady: boolean; /** Whether this is a preview */
   isPreview: boolean; /** Whether this is a fallback page */
   isFallback: boolean; /** Navigate to a new URL */
-  push(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>; /** Replace current URL */
-  replace(url: string | UrlObject, as?: string, options?: TransitionOptions): Promise<boolean>; /** Go back */
-  back(): void; /** Reload the page */
+  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Replace current URL */
+  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Go back */
+  back(): void; /** Go forward */
+  forward(): void; /** Reload the page */
   reload(): void; /** Prefetch a page (injects <link rel="prefetch">) */
   prefetch(url: string, as?: string): Promise<void>; /** Register a callback to run before popstate navigation */
   beforePopState(cb: BeforePopStateCallback): void; /** Listen for route changes */
   events: RouterEvents;
 };
-type UrlObject = {
-  pathname?: string;
-  query?: UrlQuery;
-  search?: string;
-  hash?: string;
-};
+type UrlObject$1 = UrlObject;
 type TransitionOptions = {
   _h?: 1;
   shallow?: boolean;
@@ -53,8 +53,6 @@ type RouterEvents = {
  * Same logic as Link's applyLocaleToHref but reads from window globals.
  */
 declare function applyNavigationLocale(url: string, locale?: string, replaceExistingLocale?: boolean): string;
-/** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
-declare function isExternalUrl(url: string): boolean;
 /** Check if a href is only a hash change relative to the current URL */
 declare function isHashOnlyChange(href: string): boolean;
 /**
@@ -174,18 +172,54 @@ type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
  *   composed component so `_app` parity holds for class components that
  *   define `getInitialProps`.
  */
-declare function withRouter<P extends WithRouterProps>(ComposedComponent: ComponentType<P>): ComponentType<ExcludeRouterProps<P>>;
+declare function withRouter<P extends WithRouterProps, C extends BaseContext = NextPageContext>(ComposedComponent: NextComponentType<C, any, P>): ComponentType<ExcludeRouterProps<P>>;
 declare const RouterMethods: {
-  /** See `_components` comment above for the dual role this map plays. */components: PagesRouterComponentsMap;
+  router: null;
+  readyCallbacks: Array<() => unknown>;
+  ready(callback: () => unknown): void; /** See `_components` comment above for the dual role this map plays. */
+  components: PagesRouterComponentsMap;
   sdc: Record<string, Promise<Response>>;
-  push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
-  replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  push: (url: string | UrlObject$1, as?: string, options?: TransitionOptions) => Promise<boolean>;
+  replace: (url: string | UrlObject$1, as?: string, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
+  forward: () => void;
   reload: () => void;
   prefetch: (url: string, as?: string) => Promise<void>;
   beforePopState: (cb: BeforePopStateCallback) => void;
   events: RouterEvents;
 };
-declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
+declare const singletonRouter: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
+/**
+ * Constructible named export matching `next/router`'s Router class surface.
+ * Vinext owns one browser history runtime, so instances delegate to that
+ * shared runtime while preserving the class/static-events API used by apps.
+ */
+declare class Router {
+  static events: RouterEvents;
+  constructor(..._args: unknown[]);
+  get route(): string;
+  get pathname(): string;
+  get query(): ParsedUrlQuery;
+  get asPath(): string;
+  get basePath(): string;
+  get locale(): string | undefined;
+  get locales(): readonly string[] | undefined;
+  get defaultLocale(): string | undefined;
+  get domainLocales(): VinextNextData["domainLocales"];
+  get isLocaleDomain(): boolean;
+  get isReady(): boolean;
+  get isPreview(): boolean;
+  get isFallback(): boolean;
+  get events(): RouterEvents;
+  get components(): PagesRouterComponentsMap;
+  get sdc(): Record<string, Promise<Response>>;
+  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  reload(): void;
+  back(): void;
+  forward(): void;
+  prefetch(url: string, as?: string): Promise<void>;
+  beforePopState(cb: BeforePopStateCallback): void;
+}
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, Router, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, singletonRouter as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };