vinext 1.4.3 → 1.4.5

package/dist/shims/navigation.react-server.d.ts

@@ -1,8 +1,7 @@
-import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import "./navigation-server.js";
 import { GLOBAL_ACCESSORS_KEY, NavigationContext, SegmentMap, 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";
-//#region src/shims/navigation.react-server.d.ts
+import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 export declare function usePathname(): never;
 export declare function useSearchParams(): never;
 export declare function useParams(): never;
@@ -11,5 +10,4 @@ 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_rethrow };

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

@@ -1,9 +1,9 @@
-import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import { throwClientHookError } from "./client-hook-error.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 { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import "./navigation-server.js";
-import { throwClientHookError } from "./client-hook-error.js";
-//#region src/shims/navigation.react-server.ts
+import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+// src/shims/navigation.react-server.ts
 function usePathname() {
 	throwClientHookError("usePathname()");
 }
@@ -28,5 +28,4 @@ function useServerInsertedHTML() {
 function unstable_isUnrecognizedActionError() {
 	throw new Error("`unstable_isUnrecognizedActionError` can only be used on the client.");
 }
-//#endregion
 export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, ReadonlyURLSearchParams, RedirectType, 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 };

package/dist/shims/offline.d.ts

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

package/dist/shims/offline.js

@@ -1,5 +1,5 @@
 "use client";
-//#region src/shims/offline.ts
+// src/shims/offline.ts
 /**
 * next/offline shim
 *
@@ -11,5 +11,4 @@
 function useOffline() {
 	return false;
 }
-//#endregion
 export { useOffline };

package/dist/shims/og.d.ts

@@ -1,6 +1,5 @@
 import { ReactElement } from "react";
 import { ImageResponseOptions, ImageResponseOptions as ImageResponseOptions$1 } from "@vercel/og";
-//#region src/shims/og.d.ts
 /**
  * next/og shim.
  *
@@ -12,5 +11,4 @@ export declare class ImageResponse extends Response {
   static displayName: string;
   constructor(element: ReactElement, options?: ImageResponseOptions$1);
 }
-//#endregion
 export type { ImageResponseOptions };

package/dist/shims/og.js

@@ -1,5 +1,5 @@
 import { shareIsolatePromise } from "../server/isolate-shared-promise.js";
-//#region src/shims/og.tsx
+// src/shims/og.tsx
 let vercelOg;
 const CACHE_HEADERS = {
 	noCache: "no-cache, no-store",
@@ -69,5 +69,4 @@ var ImageResponse = class extends Response {
 		startRendering();
 	}
 };
-//#endregion
 export { ImageResponse };

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

@@ -1,4 +1,3 @@
-//#region src/shims/pages-router-runtime.d.ts
 type PagesRouterPopStateHandler = (event: PopStateEvent) => void;
 export declare function setPagesRouterPopStateHandler(handler: PagesRouterPopStateHandler): void;
 /**
@@ -8,5 +7,4 @@ export declare function setPagesRouterPopStateHandler(handler: PagesRouterPopSta
  */
 export declare function setStampInitialHistoryState(fn: () => void): void;
 export declare function installPagesRouterRuntime(): void;
-//#endregion
 export {};

package/dist/shims/pages-router-runtime.js

@@ -1,4 +1,4 @@
-//#region src/shims/pages-router-runtime.ts
+// src/shims/pages-router-runtime.ts
 let pagesRouterPopStateHandler;
 let stampInitialHistoryStateFn;
 let pagesRouterRuntimeInstalled = false;
@@ -20,5 +20,4 @@ function installPagesRouterRuntime() {
 	stampInitialHistoryStateFn?.();
 	window.addEventListener("popstate", pagesRouterPopStateHandler);
 }
-//#endregion
 export { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState };

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

@@ -1,4 +1,3 @@
-//#region src/shims/ppr-fallback-shell.d.ts
 export type PprFallbackShellState = {
   abortController: AbortController;
   reactAbortController: AbortController;
@@ -29,5 +28,4 @@ export declare function waitForPprFallbackShellCacheReady(state: PprFallbackShel
 export declare function preparePprFallbackShellFinalRender(state: PprFallbackShellState): void;
 export declare function beginPprFallbackShellFinalRender(state: PprFallbackShellState): void;
 export declare function isPprFallbackShellAbortError(error: unknown): boolean;
-//#endregion
 export {};

package/dist/shims/ppr-fallback-shell.js

@@ -1,6 +1,6 @@
-import { getOrCreateAls } from "./internal/als-registry.js";
 import { makeHangingPromise } from "./internal/make-hanging-promise.js";
-//#region src/shims/ppr-fallback-shell.ts
+import { getOrCreateAls } from "./internal/als-registry.js";
+// src/shims/ppr-fallback-shell.ts
 const pprFallbackShellAls = getOrCreateAls("vinext.pprFallbackShell.als");
 const pprFallbackShellCacheTaskStackAls = getOrCreateAls("vinext.pprFallbackShell.cacheTaskStack.als");
 function noop() {}
@@ -166,5 +166,4 @@ function isPprFallbackShellAbortError(error) {
 	if (typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError") return true;
 	return error instanceof Error && error.name === "HangingPromiseRejectionError";
 }
-//#endregion
 export { beginPprFallbackShellFinalRender, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, markPprFallbackShellDynamicBoundary, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };

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

@@ -1,4 +1,4 @@
-//#region src/shims/public-shim-map.json
+// src/shims/public-shim-map.json
 var public_shim_map_default = {
 	"next/link": {
 		"shim": "link",
@@ -99,5 +99,4 @@ var public_shim_map_default = {
 		"types": "upstream"
 	}
 };
-//#endregion
 export { public_shim_map_default as default };

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

@@ -1,4 +1,3 @@
-//#region src/shims/readonly-url-search-params.d.ts
 /**
  * Read-only URLSearchParams wrapper matching Next.js runtime behavior.
  * Mutation methods remain present for instanceof/API compatibility but throw.
@@ -8,5 +7,4 @@ export declare class ReadonlyURLSearchParams extends URLSearchParams {
   delete(): never;
   set(): never;
   sort(): never;
-}
-//#endregion
+}

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

@@ -1,4 +1,4 @@
-//#region src/shims/readonly-url-search-params.ts
+// src/shims/readonly-url-search-params.ts
 var ReadonlyURLSearchParamsError = class extends Error {
 	constructor() {
 		super("Method unavailable on `ReadonlyURLSearchParams`. Read more: https://nextjs.org/docs/app/api-reference/functions/use-search-params#updating-searchparams");
@@ -22,5 +22,4 @@ var ReadonlyURLSearchParams = class extends URLSearchParams {
 		throw new ReadonlyURLSearchParamsError();
 	}
 };
-//#endregion
 export { ReadonlyURLSearchParams };

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

@@ -1,4 +1,3 @@
-//#region src/shims/request-context.d.ts
 /**
  * Request ExecutionContext — AsyncLocalStorage-backed accessor.
  *
@@ -30,6 +29,12 @@ export type ExecutionContextLike = {
   passThroughOnException?(): void;
   /** Host runtime executing the current request. */
   hostRuntime?: "node" | "worker";
+  /**
+   * Set by the Node production server. A Pages API handler that outlives its
+   * response is not registered with waitUntil, so, as in `next start`, a
+   * graceful shutdown does not wait for it.
+   */
+  skipsPagesApiHandlerWaitUntil?: boolean;
   /**
    * Optional host-provided cache handle that some runtimes expose on the
    * execution context. Typed as `unknown` to keep this module runtime-agnostic;
@@ -89,5 +94,4 @@ export 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.
  */
-export declare function getRequestExecutionContext(): ExecutionContextLike | null;
-//#endregion
+export declare function getRequestExecutionContext(): ExecutionContextLike | null;

package/dist/shims/request-context.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-//#region src/shims/request-context.ts
+// src/shims/request-context.ts
 /**
 * Request ExecutionContext — AsyncLocalStorage-backed accessor.
 *
@@ -59,5 +59,4 @@ function getRequestExecutionContext() {
 	if (isInsideUnifiedScope()) return getRequestContext().executionContext;
 	return _als.getStore() ?? null;
 }
-//#endregion
 export { getRequestExecutionContext, runWithExecutionContext };

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

@@ -1,16 +1,16 @@
 import { CacheLifeConfig } from "../utils/cache-life-profiles.js";
 import { NavigationContext } from "./navigation-context-state.js";
+import { HeadersContext } from "./headers.js";
+import { I18nState } from "./i18n-state.js";
 import "./navigation.js";
-import { ExecutionContextLike } from "./request-context.js";
-import { RootParamsState } from "./root-params.js";
 import { FetchCacheState } from "./fetch-cache-state.js";
-import "./fetch-cache.js";
+import { NavigationState } from "./navigation-state.js";
 import { HeadersAccessPhase, VinextHeadersShimState } from "./internal/headers-state.js";
-import { HeadersContext } from "./headers.js";
 import { CacheState } from "./cache-request-state.js";
-import { RouterState, SSRContext } from "./router-state.js";
 import { PrivateCacheState } from "./cache-runtime.js";
+import "./fetch-cache.js";
+import { ExecutionContextLike } from "./request-context.js";
+import { RouterState, SSRContext } from "./router-state.js";
 import { HeadState } from "./head-state.js";
-import { I18nState } from "./i18n-state.js";
-import { NavigationState } from "./navigation-state.js";
+import { RootParamsState } from "./root-params.js";
 export type { CacheLifeConfig, CacheState, ExecutionContextLike, FetchCacheState, HeadState, HeadersAccessPhase, HeadersContext, I18nState, NavigationContext, NavigationState, PrivateCacheState, RootParamsState, RouterState, SSRContext, VinextHeadersShimState };

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

@@ -1,4 +1,3 @@
-//#region src/shims/root-params.d.ts
 export type RootParams = Record<string, string | string[] | undefined>;
 export type RootParamsState = {
   rootParams: RootParams | null;
@@ -23,5 +22,4 @@ export declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: ()
 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
+export declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;

package/dist/shims/root-params.js

@@ -1,7 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
+import { _recordUseCacheRootParamRead, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _recordUseCacheRootParamRead } from "./internal/cache-context-accessor.js";
-//#region src/shims/root-params.ts
+// src/shims/root-params.ts
 function createRootParamsUsageError(message) {
 	return new Error(message);
 }
@@ -9,6 +9,7 @@ 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 _unstableCacheCallbackAls = getOrCreateAls("vinext.unstableCache.callbackAls");
 const _fallbackState = _g[_FALLBACK_KEY] ??= { rootParams: null };
 function getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
@@ -19,6 +20,16 @@ function pickRootParams(params, rootParamNames) {
 	for (const name of rootParamNames ?? []) picked[name] = params[name];
 	return picked;
 }
+/**
+* Like Next.js's `unstable-cache` work unit, an unstable_cache() callback has
+* no root params, and neither does a "use cache" scope entered from it: the
+* callback's entry is keyed by its source and arguments alone.
+*/
+function getUnstableCacheScope() {
+	const callback = _unstableCacheCallbackAls.getStore();
+	if (!callback) return null;
+	return (callback.useCacheContext ?? null) === getRegisteredCacheContext() ? "callback" : "use-cache";
+}
 function setRootParams(params) {
 	getState().rootParams = params;
 }
@@ -26,12 +37,15 @@ 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.`);
+	const unstableCacheScope = getUnstableCacheScope();
+	if (unstableCacheScope === "callback") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside \`unstable_cache\`. This is not supported. Use \`"use cache"\` instead.`);
+	if (unstableCacheScope === "use-cache") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside \`"use cache"\` nested within \`unstable_cache\`. Root params are not available in this context.`);
 	_recordUseCacheRootParamRead(name);
 	return Promise.resolve(getState().rootParams?.[name]);
 }
 /** @internal Current route root params for `"use cache"` key derivation. */
 function getCurrentRootParams() {
-	return getState().rootParams;
+	return getUnstableCacheScope() ? null : getState().rootParams;
 }
 function runWithRootParamsUsage(usage, fn, controller) {
 	const state = {
@@ -52,5 +66,4 @@ function runWithRootParamsScope(params, fn) {
 	}, fn);
 	else return _als.run({ rootParams: params }, fn);
 }
-//#endregion
 export { createRootParamsUsageController, getCurrentRootParams, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };

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

@@ -1,4 +1,3 @@
-//#region src/shims/router-state.d.ts
 /**
  * Server-only Pages Router state backed by AsyncLocalStorage.
  *
@@ -28,5 +27,4 @@ export type RouterState = {
  * on concurrent runtimes.
  */
 export declare function runWithRouterState<T>(fn: () => Promise<T>): Promise<T>;
-export declare function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
+export declare function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;

package/dist/shims/router-state.js

@@ -1,8 +1,8 @@
+import { _registerRouterStateAccessors } from "./router.js";
+import { registerRoutePatternForWarningAccessor } from "./internal/route-pattern-for-warning.js";
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { registerRoutePatternForWarningAccessor } from "./internal/route-pattern-for-warning.js";
-import { _registerRouterStateAccessors } from "./router.js";
-//#region src/shims/router-state.ts
+// src/shims/router-state.ts
 /**
 * Server-only Pages Router state backed by AsyncLocalStorage.
 *
@@ -35,5 +35,4 @@ _registerRouterStateAccessors({
 	}
 });
 registerRoutePatternForWarningAccessor(() => _getState().ssrContext?.pathname ?? null);
-//#endregion
 export { runWithRouterState };

package/dist/shims/router.d.ts

@@ -1,11 +1,10 @@
-import { isExternalUrl } from "../utils/external-url.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
 import { PagesRouterComponentsMap } from "./internal/pages-router-components.js";
+import { isExternalUrl } from "../utils/external-url.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: {
   url: string;
   as: string;
@@ -243,5 +242,4 @@ export declare class Router {
   prefetch(url: string, as?: string): Promise<void>;
   beforePopState(cb: BeforePopStateCallback): void;
 }
-//#endregion
 export { initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, singletonRouter as default, isExternalUrl };

package/dist/shims/router.js

@@ -1,37 +1,37 @@
-import { isUnknownRecord } from "../utils/record.js";
-import { execConfigSource } from "../config/config-source.js";
-import { parseCookieHeader } from "../utils/parse-cookie.js";
-import { isExternalUrl } from "../utils/external-url.js";
-import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
-import { substituteDestinationParams } from "../config/destination-params.js";
-import { sortRoutes, splitPathSegments } from "../routing/utils.js";
-import { assertSafeNavigationUrl } from "./url-safety.js";
-import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.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 { matchRoutePattern, routePattern, routePatternParts } from "../routing/route-pattern.js";
-import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../utils/deployment-id.js";
-import { dedupedPagesDataFetch, evictPagesDataCache, fetchCachedPagesData, fetchStaticPagesData, getPagesStaticDataCache } from "./internal/pages-data-fetch-dedup.js";
 import { getPagesMiddlewareDataHref, matchesPagesMiddlewarePath, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { getPagesRouterComponentsMap } from "./internal/pages-router-components.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
+import { dedupedPagesDataFetch, evictPagesDataCache, fetchCachedPagesData, fetchStaticPagesData, getPagesStaticDataCache } from "./internal/pages-data-fetch-dedup.js";
 import { resolveDirectHybridClientRouteOwner } from "./internal/hybrid-client-route-owner-direct.js";
 import { installWindowNext } from "../client/window-next.js";
+import { isUnknownRecord } from "../utils/record.js";
+import { isExternalUrl } from "../utils/external-url.js";
+import { sortRoutes, splitPathSegments } from "../routing/utils.js";
 import { getWindowOrigin, isAbsoluteOrProtocolRelativeUrl, isAbsoluteUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, toSameOriginPath, withBasePath } from "./url-utils.js";
+import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { parseCookieHeader } from "../utils/parse-cookie.js";
+import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
 import { addQueryParam, mergeRewriteQuery, mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
+import { getPagesRouterComponentsMap } from "./internal/pages-router-components.js";
+import { matchRoutePattern, routePattern, routePatternParts } from "../routing/route-pattern.js";
 import { disableSmoothScrollDuringRouteTransition } from "./disable-smooth-scroll.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { installPagesRouterRuntime, setPagesRouterPopStateHandler, setStampInitialHistoryState } from "./pages-router-runtime.js";
+import { assertSafeNavigationUrl } from "./url-safety.js";
 import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
 import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/format-url-object.js";
 import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
+import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../utils/deployment-id.js";
+import { substituteDestinationParams } from "../config/destination-params.js";
+import { execConfigSource } from "../config/config-source.js";
 import { clientRewriteAppendsParams } from "../client/client-rewrite-params.js";
 import { Component, Fragment, StrictMode, createElement, useContext, useEffect, useLayoutEffect, useMemo, useState } from "react";
-//#region src/shims/router.ts
+// src/shims/router.ts
 /**
 * next/router shim
 *
@@ -971,10 +971,6 @@ function hasClientRewriteRules() {
 	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
 	return Boolean(rewrites && (rewrites.beforeFiles.length > 0 || rewrites.afterFiles.length > 0 || rewrites.fallback.length > 0));
 }
-function hasClientRedirectRules() {
-	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
-	return Array.isArray(redirects) && redirects.length > 0;
-}
 function hasClientAppRouteManifest() {
 	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
 	const routeHandlers = window.__VINEXT_APP_ROUTE_HANDLERS__;
@@ -1017,20 +1013,17 @@ function configRedirectLeavesBasePath(location) {
 	if (!__basePath || !location.startsWith("/") || location.startsWith("//")) return false;
 	return !hasBasePath(new URL(location, "http://vinext.local").pathname, __basePath);
 }
-async function resolveClientConfigRedirect(href) {
+async function resolveClientConfigRedirect(routeContext) {
 	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
 	if (!redirects || redirects.length === 0) return null;
-	const routeContext = getClientConfigRouteContext(href);
-	if (!routeContext) return null;
 	const [{ matchClientRedirect }, { encodeRedirectLocation, preserveRedirectDestinationQuery }] = await Promise.all([import("../client/client-redirect-matcher.js"), import("../config/config-matchers.js")]);
 	const redirect = matchClientRedirect(routeContext.pathname, redirects, routeContext.context, routeContext.basePathState);
 	if (!redirect) return null;
 	return encodeRedirectLocation(preserveRedirectDestinationQuery(redirect.destination, routeContext.search, redirect.destinationQuery));
 }
-async function applyClientConfigRewrite(href, rewrite) {
+function applyClientConfigRewrite(href, rewrite, matchClientRewrite) {
 	const routeContext = getClientConfigRouteContext(href);
 	if (!routeContext) return null;
-	const { matchClientRewrite } = await import("../client/client-rewrite-matcher.js");
 	const result = matchClientRewrite(routeContext.pathname, rewrite, routeContext.context, routeContext.basePathState);
 	if (result === null) return null;
 	if (result.kind === "server") return { kind: "document" };
@@ -1055,16 +1048,21 @@ function isSerializedRewriteDestination(destination) {
 function isExternalClientConfigUrl(url) {
 	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
 }
-function clientConfigRedirectCouldMatch(href) {
+/**
+* The route context of `href` when some config redirect source matches it, so
+* resolveClientConfigRedirect can reuse it instead of parsing the URL and
+* cookies again. Null when no redirect can match.
+*/
+function getClientConfigRedirectRouteContext(href) {
 	const redirects = window.__VINEXT_CLIENT_REDIRECTS__;
-	if (!redirects || redirects.length === 0) return false;
+	if (!redirects || redirects.length === 0) return null;
 	const routeContext = getClientConfigRouteContext(href);
-	if (!routeContext) return false;
+	if (!routeContext) return null;
 	for (const redirect of redirects) {
 		if (!shouldEvaluateClientConfigRule(redirect.basePath, routeContext.basePathState)) continue;
-		if (execConfigSource(routeContext.pathname, redirect.source) !== null) return true;
+		if (execConfigSource(routeContext.pathname, redirect.source) !== null) return routeContext;
 	}
-	return false;
+	return null;
 }
 function resolveClientConfigRewriteSync(href) {
 	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
@@ -1112,7 +1110,7 @@ function reusesMountedConfigRewritePage(href) {
 	}
 	if (target.origin !== current.origin || target.pathname !== current.pathname) return false;
 	if (target.search === current.search) return false;
-	if (clientConfigRedirectCouldMatch(href)) return false;
+	if (getClientConfigRedirectRouteContext(href)) return false;
 	const rewrite = resolveClientConfigRewriteSync(href);
 	if (rewrite?.kind !== "rewrite") return false;
 	const dataTarget = resolvePagesDataNavigationTarget(rewrite.href, __basePath);
@@ -1122,11 +1120,12 @@ function reusesMountedConfigRewritePage(href) {
 }
 async function resolveClientConfigRewrite(href) {
 	const rewrites = window.__VINEXT_CLIENT_REWRITES__;
-	if (!rewrites) return null;
+	if (!rewrites || rewrites.beforeFiles.length === 0) return null;
+	const { matchClientRewrite } = await import("../client/client-rewrite-matcher.js");
 	let currentHref = href;
 	let matched = false;
 	for (const rewrite of rewrites.beforeFiles) {
-		const result = await applyClientConfigRewrite(currentHref, rewrite);
+		const result = applyClientConfigRewrite(currentHref, rewrite, matchClientRewrite);
 		if (result?.kind === "document") return result;
 		if (result?.kind !== "rewrite") continue;
 		currentHref = result.href;
@@ -1578,7 +1577,8 @@ async function navigateClient(url, fetchUrl = url, options = {}, routeUrl = url)
 			let browserUrl = url;
 			let htmlFetchUrl = fetchUrl;
 			const routeMasked = options.routeMasked ?? routeUrl !== url;
-			const configRedirect = hasClientRedirectRules() && clientConfigRedirectCouldMatch(browserUrl) ? await resolveClientConfigRedirect(browserUrl) : null;
+			const redirectRouteContext = getClientConfigRedirectRouteContext(browserUrl);
+			const configRedirect = redirectRouteContext ? await resolveClientConfigRedirect(redirectRouteContext) : null;
 			if (configRedirect) {
 				const redirectedUrl = configRedirectLeavesBasePath(configRedirect) ? null : resolveLocalRedirectUrl(configRedirect);
 				if (!redirectedUrl) scheduleHardNavigationAndThrow(configRedirect, "Navigation redirected externally");
@@ -2548,5 +2548,4 @@ var Router = class {
 		singletonRouter.beforePopState(cb);
 	}
 };
-//#endregion
 export { Router, initializePagesRouterReadyFromNextData as _initializePagesRouterReadyFromNextData, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, singletonRouter as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };

package/dist/shims/script-nonce-context.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/script-nonce-context.d.ts
 export declare const ScriptNonceContext: React.Context<string | undefined> | null;
 export declare const InitialStylesheetContext: React.Context<ReadonlySet<string> | undefined> | null;
 export declare function ScriptNonceProvider(props: React.PropsWithChildren<{
@@ -8,5 +7,4 @@ export declare function ScriptNonceProvider(props: React.PropsWithChildren<{
 }>): React.ReactElement;
 export declare function withScriptNonce(element: React.ReactElement, nonce?: string, initialStylesheetHrefs?: ReadonlySet<string>): React.ReactElement;
 export declare function useScriptNonce(): string | undefined;
-export declare function useInitialStylesheetHrefs(): ReadonlySet<string> | undefined;
-//#endregion
+export declare function useInitialStylesheetHrefs(): ReadonlySet<string> | undefined;

package/dist/shims/script-nonce-context.js

@@ -1,5 +1,5 @@
 import React from "react";
-//#region src/shims/script-nonce-context.tsx
+// src/shims/script-nonce-context.tsx
 const ScriptNonceContext = typeof React.createContext === "function" ? React.createContext(void 0) : null;
 const InitialStylesheetContext = typeof React.createContext === "function" ? React.createContext(void 0) : null;
 function ScriptNonceProvider(props) {
@@ -28,5 +28,4 @@ function useScriptNonce() {
 function useInitialStylesheetHrefs() {
 	return useInitialStylesheetsFromContext();
 }
-//#endregion
 export { InitialStylesheetContext, ScriptNonceContext, ScriptNonceProvider, useInitialStylesheetHrefs, useScriptNonce, withScriptNonce };

package/dist/shims/script.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/script.d.ts
 export type ScriptProps = React.ScriptHTMLAttributes<HTMLScriptElement> & {
   /** Script source URL */
   src?: string;
@@ -47,5 +46,4 @@ export declare function handleClientScriptLoad(props: ScriptProps): void;
  */
 export declare function initScriptLoader(scripts: ScriptProps[]): void;
 declare function Script(props: ScriptProps): React.ReactElement | null;
-//#endregion
 export { Script as default };

package/dist/shims/script.js

@@ -1,11 +1,11 @@
 "use client";
-import { useScriptNonce } from "./script-nonce-context.js";
 import { hasAppNavigationRuntimeBootstrap } from "../client/navigation-runtime.js";
-import { useBeforeInteractiveRegister } from "./before-interactive-context.js";
 import { escapeInlineContent } from "./head.js";
+import { useScriptNonce } from "./script-nonce-context.js";
+import { useBeforeInteractiveRegister } from "./before-interactive-context.js";
 import React, { useEffect, useRef } from "react";
 import * as ReactDOM from "react-dom";
-//#region src/shims/script.tsx
+// src/shims/script.tsx
 /**
 * next/script shim
 *
@@ -371,5 +371,4 @@ function Script(props) {
 	}
 	return null;
 }
-//#endregion
 export { Script as default, handleClientScriptLoad, initScriptLoader };

package/dist/shims/search-params-gate.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/search-params-gate.d.ts
 /**
  * Per-request gate for SSR `useSearchParams()` in a cache-candidate render.
  *
@@ -31,5 +30,4 @@ export type SearchParamsGateController = {
 export declare function createSearchParamsGate(options: {
   /** Runs when the gate opens, so real values always mark the render dynamic. */
   onOpen: () => void;
-}): SearchParamsGateController;
-//#endregion
+}): SearchParamsGateController;

package/dist/shims/search-params-gate.js

@@ -1,4 +1,4 @@
-//#region src/shims/search-params-gate.ts
+// src/shims/search-params-gate.ts
 function createSearchParamsGate(options) {
 	let resolve;
 	const decided = new Promise((resolvePromise) => {
@@ -28,5 +28,4 @@ function createSearchParamsGate(options) {
 		}
 	};
 }
-//#endregion
 export { createSearchParamsGate };

package/dist/shims/server.d.ts

@@ -1,5 +1,4 @@
 import { UserAgent, userAgent, userAgentFromString } from "./user-agent.js";
-//#region src/shims/server.d.ts
 /**
  * next/server shim
  *
@@ -359,5 +358,4 @@ export declare function connection(): Promise<void>;
  * Falls back to urlpattern-polyfill if the global is not available.
  */
 export declare const URLPattern: typeof globalThis.URLPattern;
-//#endregion
 export { type UserAgent, userAgent, userAgentFromString };