vinext 1.0.0-beta.9 → 1.0.1

package/dist/shims/navigation.js

@@ -1,27 +1,28 @@
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STALE_TIME_PENDING_HEADER } from "../server/headers.js";
+import { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_RENDER_MODE_HEADER } from "../server/app-rsc-vary.js";
+import { NEXT_ROUTER_STALE_TIME_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_STALE_TIME_PENDING_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 { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
+import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { getPprFallbackShellState, markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
 import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { isHashOnlyBrowserUrlChange, toCanonicalBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget, scrollToHashTargetOnNextFrame } 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 { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
-import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
+import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
-import { createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, isAppOwnedHistoryState } from "../server/app-history-state.js";
 import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
+import { createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, isAppOwnedHistoryState } from "../server/app-history-state.js";
 import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navigation.js";
 import { extractRscCompletionMetadata } from "../server/rsc-completion-metadata.js";
 import { navigationPlanner } from "../server/navigation-planner.js";
@@ -80,7 +81,7 @@ const __trailingSlash = process.env.__VINEXT_TRAILING_SLASH === "true";
 /** prefetch inlining (Segment Cache wire mode), injected by the plugin at build time */
 const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
 /** Maximum buffered bytes in the RSC prefetch cache. Mirrors Next.js' 50 MB LRU. */
-const MAX_PREFETCH_CACHE_SIZE = 50 * 1024 * 1024;
+const MAX_PREFETCH_CACHE_SIZE = 52428800;
 const PREFETCH_CACHE_EVICTION_TARGET_SIZE = MAX_PREFETCH_CACHE_SIZE * .9;
 /**
 * TTL for prefetch cache entries in ms.
@@ -243,7 +244,8 @@ function normalizeRscCacheLookupUrl(rscUrl) {
 }
 function normalizeRscCacheLookupPathname(rscUrl) {
 	try {
-		return stripRscSuffix(new URL(rscUrl, "http://vinext.local").pathname);
+		const url = new URL(rscUrl, "http://vinext.local");
+		return stripRscSuffix(url.pathname);
 	} catch {
 		return null;
 	}
@@ -686,6 +688,7 @@ function parseServerStaleTimeHeaders(headers) {
 		seconds
 	};
 }
+/** Decode an `X-Vinext-Rendered-Path-And-Search` header value. */
 function parseRenderedPathAndSearchHeader(value) {
 	if (value === null || value === "") return null;
 	try {
@@ -1091,14 +1094,19 @@ function useClientNavigationRenderSnapshot() {
 		return null;
 	}
 }
-function createClientNavigationRenderSnapshot(href, params) {
+/**
+* @param renderedPathAndSearch The path and query the server rendered for this
+* navigation (`X-Vinext-Rendered-Path-And-Search`), when known.
+*/
+function createClientNavigationRenderSnapshot(href, params, renderedPathAndSearch) {
 	const origin = typeof window !== "undefined" ? window.location.origin : "http://localhost";
 	const url = new URL(href, origin);
 	return {
 		pathname: stripBasePath(url.pathname, __basePath),
 		search: url.search,
 		searchParams: new ReadonlyURLSearchParams(url.search),
-		params
+		params,
+		...renderedPathAndSearch != null ? { renderedSearch: new URL(renderedPathAndSearch, origin).search } : {}
 	};
 }
 function createSnapshotPathAndSearch(snapshot) {
@@ -1215,6 +1223,11 @@ function useSearchParams() {
 	if (isServer) {
 		const ctx = getNavigationContext();
 		if (ctx?.isStaticGeneration === true && ctx.isForceStatic !== true && getPprFallbackShellState() === null) throw new BailoutToCSRError("useSearchParams()");
+		const gate = ctx?.searchParamsGate;
+		if (gate) {
+			React$1.use(gate.decided);
+			if (gate.decision === "bailout") throw new BailoutToCSRError("useSearchParams()");
+		}
 		markPprFallbackShellDynamicBoundary();
 		return getServerSearchParamsSnapshot();
 	}
@@ -1593,14 +1606,9 @@ const _appRouter = {
 				headers.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
 				headers.set(VINEXT_RSC_RENDER_MODE_HEADER, hasSearchParams ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL);
 			}
-			const { additionalRscUrls, rscUrl, usesCanonicalPrewarmedRequest } = await resolveAppPrefetchRscRequest({
-				canUseCanonicalLoadingShell: policy.canUseCanonicalLoadingShell === true,
+			const { additionalRscUrls, rscUrl } = await resolveAppPrefetchRscRequest({
 				fullHref,
 				headers,
-				interceptionContext,
-				mountedSlotsHeader,
-				prefetchInlining: __prefetchInlining,
-				requiresRouteTreePrefetch,
 				rewrittenPrefetchHref
 			});
 			if (setup.cancelled) return;
@@ -1623,7 +1631,7 @@ const _appRouter = {
 				priority: "low",
 				signal
 			}), "low");
-			prefetchRscResponse(rscUrl, !usesCanonicalPrewarmedRequest && reusable && kind === "auto" && requiresRouteTreePrefetch ? fetchRouteTreeGatedPrefetch({
+			prefetchRscResponse(rscUrl, reusable && kind === "auto" && requiresRouteTreePrefetch ? fetchRouteTreeGatedPrefetch({
 				fetchFullRscPayload,
 				fetchRouteTree: (routeTreeRscUrl, routeTreeHeaders) => scheduleAppPrefetchFetch((signal) => fetch(routeTreeRscUrl, {
 					headers: routeTreeHeaders,
@@ -1805,4 +1813,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, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getFreshPrefetchCacheEntry, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasFreshLearningOnlyPrefetchCacheEntry, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, prepareNavigationPrefetchSnapshot, 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 };
+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, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getFreshPrefetchCacheEntry, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasFreshLearningOnlyPrefetchCacheEntry, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, parseRenderedPathAndSearchHeader, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, prepareNavigationPrefetchSnapshot, 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.d.ts

@@ -3,13 +3,13 @@ import { GLOBAL_ACCESSORS_KEY, NavigationContext, SegmentMap, ServerInsertedHTML
 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";
 //#region src/shims/navigation.react-server.d.ts
-declare function usePathname(): never;
-declare function useSearchParams(): never;
-declare function useParams(): never;
-declare function useRouter(): never;
-declare function useSelectedLayoutSegment(): never;
-declare function useSelectedLayoutSegments(): never;
-declare function useServerInsertedHTML(): never;
-declare function unstable_isUnrecognizedActionError(): boolean;
+export declare function usePathname(): never;
+export declare function useSearchParams(): never;
+export declare function useParams(): never;
+export declare function useRouter(): never;
+export declare function useSelectedLayoutSegment(): never;
+export declare function useSelectedLayoutSegments(): never;
+export declare function useServerInsertedHTML(): never;
+export declare function unstable_isUnrecognizedActionError(): boolean;
 //#endregion
-export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, type NavigationContext, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, type NavigationContext, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow };

package/dist/shims/offline.d.ts

@@ -1,4 +1,3 @@
 //#region src/shims/offline.d.ts
-declare function useOffline(): boolean;
-//#endregion
-export { useOffline };
+export declare function useOffline(): boolean;
+//#endregion

package/dist/shims/og.d.ts

@@ -8,9 +8,9 @@ import { ImageResponseOptions, ImageResponseOptions as ImageResponseOptions$1 }
  * asset fetches so this wrapper can delegate image generation while preserving
  * Next.js's public ImageResponse headers and option merging semantics.
  */
-declare class ImageResponse extends Response {
+export declare class ImageResponse extends Response {
   static displayName: string;
   constructor(element: ReactElement, options?: ImageResponseOptions$1);
 }
 //#endregion
-export { ImageResponse, type ImageResponseOptions };
+export type { ImageResponseOptions };

package/dist/shims/pages-router-runtime.d.ts

@@ -1,12 +1,11 @@
 //#region src/shims/pages-router-runtime.d.ts
 type PagesRouterPopStateHandler = (event: PopStateEvent) => void;
-declare function setPagesRouterPopStateHandler(handler: PagesRouterPopStateHandler): void;
+export declare function setPagesRouterPopStateHandler(handler: PagesRouterPopStateHandler): void;
 /**
  * Register the function that stamps Next.js-shaped state onto the initial
  * document entry (called once at install time). Router.ts registers this so
  * the runtime module stays free of router internals.
  */
-declare function setStampInitialHistoryState(fn: () => void): void;
-declare function installPagesRouterRuntime(): void;
-//#endregion
-export { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState };
+export declare function setStampInitialHistoryState(fn: () => void): void;
+export declare function installPagesRouterRuntime(): void;
+//#endregion

package/dist/shims/ppr-fallback-shell.d.ts

@@ -1,5 +1,5 @@
 //#region src/shims/ppr-fallback-shell.d.ts
-type PprFallbackShellState = {
+export type PprFallbackShellState = {
   abortController: AbortController;
   reactAbortController: AbortController;
   cacheEpoch: number;
@@ -18,16 +18,15 @@ type CreatePprFallbackShellStateOptions = {
   fallbackParamNames: readonly string[];
   routePattern: string;
 };
-declare function createPprFallbackShellState(options: CreatePprFallbackShellStateOptions): PprFallbackShellState;
-declare function runWithPprFallbackShellState<T>(state: PprFallbackShellState, fn: () => T): T;
-declare function getPprFallbackShellState(): PprFallbackShellState | null;
-declare function trackPprFallbackShellCacheTask<T>(fn: () => Promise<T>, cacheVariant: string): Promise<T>;
-declare function createPprFallbackShellSuspensePromiseForState<T>(state: PprFallbackShellState, expression: string): Promise<T>;
-declare function markPprFallbackShellDynamicBoundary(): void;
-declare function createPprFallbackShellSuspensePromise<T>(expression: string): Promise<T> | null;
-declare function waitForPprFallbackShellCacheReady(state: PprFallbackShellState): Promise<void>;
-declare function preparePprFallbackShellFinalRender(state: PprFallbackShellState): void;
-declare function beginPprFallbackShellFinalRender(state: PprFallbackShellState): void;
-declare function isPprFallbackShellAbortError(error: unknown): boolean;
-//#endregion
-export { PprFallbackShellState, beginPprFallbackShellFinalRender, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, markPprFallbackShellDynamicBoundary, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };
+export declare function createPprFallbackShellState(options: CreatePprFallbackShellStateOptions): PprFallbackShellState;
+export declare function runWithPprFallbackShellState<T>(state: PprFallbackShellState, fn: () => T): T;
+export declare function getPprFallbackShellState(): PprFallbackShellState | null;
+export declare function trackPprFallbackShellCacheTask<T>(fn: () => Promise<T>, cacheVariant: string): Promise<T>;
+export declare function createPprFallbackShellSuspensePromiseForState<T>(state: PprFallbackShellState, expression: string): Promise<T>;
+export declare function markPprFallbackShellDynamicBoundary(): void;
+export declare function createPprFallbackShellSuspensePromise<T>(expression: string): Promise<T> | null;
+export declare function waitForPprFallbackShellCacheReady(state: PprFallbackShellState): Promise<void>;
+export declare function preparePprFallbackShellFinalRender(state: PprFallbackShellState): void;
+export declare function beginPprFallbackShellFinalRender(state: PprFallbackShellState): void;
+export declare function isPprFallbackShellAbortError(error: unknown): boolean;
+//#endregion

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

@@ -3,11 +3,10 @@
  * Read-only URLSearchParams wrapper matching Next.js runtime behavior.
  * Mutation methods remain present for instanceof/API compatibility but throw.
  */
-declare class ReadonlyURLSearchParams extends URLSearchParams {
+export declare class ReadonlyURLSearchParams extends URLSearchParams {
   append(): never;
   delete(): never;
   set(): never;
   sort(): never;
 }
-//#endregion
-export { ReadonlyURLSearchParams };
+//#endregion

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

@@ -25,7 +25,7 @@
  * Minimal structural ExecutionContext interface, kept free of any host-runtime
  * dependency.
  */
-type ExecutionContextLike = {
+export type ExecutionContextLike = {
   waitUntil(promise: Promise<unknown>): void;
   passThroughOnException?(): void;
   /** Host runtime executing the current request. */
@@ -54,8 +54,8 @@ type ExecutionContextLike = {
  * delegation to vinext so the context propagates through the entire
  * request pipeline.
  */
-declare function runWithExecutionContext<T>(ctx: ExecutionContextLike, fn: () => Promise<T>): Promise<T>;
-declare function runWithExecutionContext<T>(ctx: ExecutionContextLike, fn: () => T | Promise<T>): T | Promise<T>;
+export declare function runWithExecutionContext<T>(ctx: ExecutionContextLike, fn: () => Promise<T>): Promise<T>;
+export declare function runWithExecutionContext<T>(ctx: ExecutionContextLike, fn: () => T | Promise<T>): T | Promise<T>;
 /**
  * Get the `ExecutionContext` for the current request, or `null` when called
  * outside a `runWithExecutionContext()` scope (e.g. on Node.js dev server).
@@ -63,6 +63,5 @@ declare function runWithExecutionContext<T>(ctx: ExecutionContextLike, fn: () =>
  * Use `ctx?.waitUntil(promise)` to schedule background work that must
  * complete before the Worker isolate is torn down.
  */
-declare function getRequestExecutionContext(): ExecutionContextLike | null;
-//#endregion
-export { ExecutionContextLike, getRequestExecutionContext, runWithExecutionContext };
+export declare function getRequestExecutionContext(): ExecutionContextLike | null;
+//#endregion

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

@@ -4,7 +4,8 @@ import "./navigation.js";
 import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
 import { RootParamsState } from "./root-params.js";
 import { FetchCacheState } from "./fetch-cache.js";
-import { HeadersAccessPhase, HeadersContext, VinextHeadersShimState } from "./headers.js";
+import { HeadersAccessPhase, VinextHeadersShimState } from "./internal/headers-state.js";
+import { HeadersContext } from "./headers.js";
 import { RouterState, SSRContext } from "./router-state.js";
 import { PrivateCacheState } from "./cache-runtime.js";
 import { HeadState } from "./head-state.js";

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

@@ -1,9 +1,9 @@
 //#region src/shims/root-params.d.ts
-type RootParams = Record<string, string | string[] | undefined>;
-type RootParamsState = {
+export type RootParams = Record<string, string | string[] | undefined>;
+export type RootParamsState = {
   rootParams: RootParams | null;
 };
-type RootParamsUsage = {
+export type RootParamsUsage = {
   kind: "route";
 } | {
   kind: "server-action";
@@ -11,18 +11,17 @@ type RootParamsUsage = {
   kind: "route-handler";
   routePattern: string;
 };
-type RootParamsUsageController = {
+export 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>;
+export declare function pickRootParams(params: RootParams, rootParamNames: readonly string[] | null | undefined): RootParams;
+export declare function setRootParams(params: RootParams | null): void;
+export declare function getRootParam(name: string): Promise<string | string[] | undefined>;
 /** @internal Current route root params for `"use cache"` key derivation. */
-declare function getCurrentRootParams(): RootParams | null;
-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, RootParamsUsage, RootParamsUsageController, createRootParamsUsageController, getCurrentRootParams, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };
+export declare function getCurrentRootParams(): RootParams | null;
+export declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => Promise<T>, controller?: RootParamsUsageController): Promise<T>;
+export declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => T | Promise<T>, controller?: RootParamsUsageController): T | Promise<T>;
+export declare function createRootParamsUsageController(): RootParamsUsageController;
+export declare function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;
+export declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;
+//#endregion

package/dist/shims/root-params.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _recordUseCacheRootParamRead } from "./cache-request-state.js";
+import { _recordUseCacheRootParamRead } from "./internal/cache-context-accessor.js";
 //#region src/shims/root-params.ts
 function createRootParamsUsageError(message) {
 	return new Error(message);

package/dist/shims/router-state.d.ts

@@ -8,7 +8,7 @@
  * This module is server-only — it imports node:async_hooks and must NOT
  * be bundled for the browser.
  */
-type SSRContext = {
+export type SSRContext = {
   pathname: string;
   query: Record<string, string | string[]>;
   asPath: string;
@@ -19,7 +19,7 @@ type SSRContext = {
   isPreview?: boolean;
   isFallback?: boolean;
 };
-type RouterState = {
+export type RouterState = {
   ssrContext: SSRContext | null;
 };
 /**
@@ -27,7 +27,6 @@ type RouterState = {
  * Ensures per-request isolation for Pages Router SSR context
  * on concurrent runtimes.
  */
-declare function runWithRouterState<T>(fn: () => Promise<T>): Promise<T>;
-declare function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
-export { RouterState, SSRContext, runWithRouterState };
+export declare function runWithRouterState<T>(fn: () => Promise<T>): Promise<T>;
+export declare function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;
+//#endregion

package/dist/shims/router-state.js

@@ -1,7 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _registerRouterStateAccessors } from "./router.js";
 import { registerRoutePatternForWarningAccessor } from "./internal/route-pattern-for-warning.js";
+import { _registerRouterStateAccessors } from "./router.js";
 //#region src/shims/router-state.ts
 /**
 * Server-only Pages Router state backed by AsyncLocalStorage.

package/dist/shims/router.d.ts

@@ -11,7 +11,9 @@ type BeforePopStateCallback = (state: {
   as: string;
   options: TransitionOptions;
 }) => boolean;
-type NextRouter = {
+type UrlObject$1 = UrlObject;
+type Url = string | UrlObject$1;
+export type NextRouter = {
   /** Current pathname */
   pathname: string;
   /** Current route pattern (e.g., "/posts/[id]") */
@@ -39,9 +41,9 @@ type NextRouter = {
   /** Whether this is a fallback page */
   isFallback: boolean;
   /** Navigate to a new URL */
-  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  push(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   /** Replace current URL */
-  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  replace(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   /** Go back */
   back(): void;
   /** Go forward */
@@ -55,7 +57,6 @@ type NextRouter = {
   /** Listen for route changes */
   events: RouterEvents;
 };
-type UrlObject$1 = UrlObject;
 type TransitionOptions = {
   _h?: 1;
   shallow?: boolean;
@@ -72,9 +73,9 @@ type RouterEvents = {
  * Apply locale prefix to a URL for client-side navigation.
  * Same logic as Link's applyLocaleToHref but reads from window globals.
  */
-declare function applyNavigationLocale(url: string, locale?: string, replaceExistingLocale?: boolean): string;
+export declare function applyNavigationLocale(url: string, locale?: string, replaceExistingLocale?: boolean): string;
 /** Check if a href is only a hash change relative to the current URL */
-declare function isHashOnlyChange(href: string): boolean;
+export declare function isHashOnlyChange(href: string): boolean;
 /**
  * SSR context - set by the dev server before rendering each page.
  */
@@ -102,11 +103,11 @@ type SSRContext = {
  * Register ALS-backed state accessors. Called by router-state.ts on import.
  * @internal
  */
-declare function _registerRouterStateAccessors(accessors: {
+export declare function _registerRouterStateAccessors(accessors: {
   getSSRContext: () => SSRContext | null;
   setSSRContext: (ctx: SSRContext | null) => void;
 }): void;
-declare function setSSRContext(ctx: SSRContext | null): void;
+export declare function setSSRContext(ctx: SSRContext | null): void;
 type PagesNavigationContextShape = {
   pathname: string | null;
   searchParams: URLSearchParams;
@@ -128,8 +129,8 @@ type PagesNavigationContextShape = {
  * Router pages, RSC-only renders, or pre-router renders. Callers should
  * treat null as "App Router context, use normal app-router state".
  */
-declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
-declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
+export declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
+export declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
 declare function markPagesRouterReady(): boolean;
 declare function initializePagesRouterReadyFromNextData(nextData: VinextNextData, forceReady?: boolean): void;
 /**
@@ -138,7 +139,7 @@ declare function initializePagesRouterReadyFromNextData(nextData: VinextNextData
  * Ported from Next.js: packages/next/src/client/router.ts
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/client/router.ts
  */
-declare function useRouter(): NextRouter;
+export declare function useRouter(): NextRouter;
 /**
  * Wrap a React element in a RouterContext.Provider so that
  * next/compat/router's useRouter() returns the real Pages Router value.
@@ -156,14 +157,14 @@ declare function useRouter(): NextRouter;
  * here (React still console.error's it) instead of propagating, matching the
  * navigation-path containment.
  */
-declare function wrapWithRouterContext(element: ReactElement, onCommit?: () => void, onError?: (error: Error) => void): ReactElement;
+export declare function wrapWithRouterContext(element: ReactElement, onCommit?: () => void, onError?: (error: Error) => void): ReactElement;
 /**
  * Props injected by `withRouter` into the wrapped component.
  *
  * Ported from Next.js: packages/next/src/client/with-router.tsx
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/client/with-router.tsx
  */
-type WithRouterProps = {
+export type WithRouterProps = {
   router: NextRouter;
 };
 /**
@@ -172,7 +173,7 @@ type WithRouterProps = {
  *
  * Ported from Next.js: packages/next/src/client/with-router.tsx
  */
-type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
+export type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
 /**
  * Higher-order component that injects the Pages Router `router` instance as
  * a `router` prop into a wrapped component. Primarily used by class
@@ -192,7 +193,7 @@ 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, C extends BaseContext = NextPageContext>(ComposedComponent: NextComponentType<C, any, P>): ComponentType<ExcludeRouterProps<P>>;
+export declare function withRouter<P extends WithRouterProps, C extends BaseContext = NextPageContext>(ComposedComponent: NextComponentType<C, any, P>): ComponentType<ExcludeRouterProps<P>>;
 declare const RouterMethods: {
   router: null;
   readyCallbacks: Array<() => unknown>;
@@ -200,8 +201,8 @@ declare const RouterMethods: {
   /** See `_components` comment above for the dual role this map plays. */
   components: PagesRouterComponentsMap;
   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>;
+  push: (url: Url, as?: Url, options?: TransitionOptions) => Promise<boolean>;
+  replace: (url: Url, as?: Url, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
   forward: () => void;
   reload: () => void;
@@ -215,7 +216,7 @@ declare const singletonRouter: typeof RouterMethods & Omit<NextRouter, keyof typ
  * 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 {
+export declare class Router {
   static events: RouterEvents;
   constructor(..._args: unknown[]);
   get route(): string;
@@ -234,8 +235,8 @@ declare class Router {
   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>;
+  push(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
+  replace(url: Url, as?: Url, options?: TransitionOptions): Promise<boolean>;
   reload(): void;
   back(): void;
   forward(): void;
@@ -243,4 +244,4 @@ declare class Router {
   beforePopState(cb: BeforePopStateCallback): void;
 }
 //#endregion
-export { ExcludeRouterProps, NextRouter, Router, WithRouterProps, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, singletonRouter as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, singletonRouter as default, isExternalUrl };