vinext 1.4.3 → 1.4.5

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

@@ -1,6 +1,4 @@
 import { ErrorInfo } from "./error.js";
-//#region src/shims/error.react-server.d.ts
 export declare function unstable_catchError(): never;
 export declare function catchError(): never;
-//#endregion
 export type { ErrorInfo };

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

@@ -1,9 +1,8 @@
-//#region src/shims/error.react-server.ts
+// src/shims/error.react-server.ts
 function unstable_catchError() {
 	throw new Error("`unstable_catchError` can only be used in Client Components.");
 }
 function catchError() {
 	throw new Error("`catchError` can only be used in Client Components.");
 }
-//#endregion
 export { catchError, unstable_catchError };

package/dist/shims/fetch-cache-state.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/fetch-cache-state.d.ts
 /**
  * Request-scoped fetch cache state, kept apart from the fetch patching in
  * fetch-cache.ts so modules that only read or update it, like next/cache,
@@ -66,5 +65,4 @@ export declare function getCurrentFetchSoftTags(): string[];
  * URLs its fetches touch, so work done on the request's behalf after the fact
  * (a background regeneration) leaves the request's response untouched.
  */
-export declare function runWithDetachedFetchObservations<T>(fn: () => Promise<T>): Promise<T>;
-//#endregion
+export declare function runWithDetachedFetchObservations<T>(fn: () => Promise<T>): Promise<T>;

package/dist/shims/fetch-cache-state.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-//#region src/shims/fetch-cache-state.ts
+// src/shims/fetch-cache-state.ts
 /**
 * Request-scoped fetch cache state, kept apart from the fetch patching in
 * fetch-cache.ts so modules that only read or update it, like next/cache,
@@ -86,5 +86,4 @@ function runWithDetachedFetchObservations(fn) {
 		dynamicFetchUrls: /* @__PURE__ */ new Set()
 	}, fn);
 }
-//#endregion
 export { addCollectedRequestTags, fallbackFetchCacheState, fetchCacheAls, getCurrentFetchSoftTags, getFetchCacheState, resetFallbackFetchCacheState, runWithDetachedFetchObservations };

package/dist/shims/fetch-cache.d.ts

@@ -1,5 +1,4 @@
 import { FetchCacheMode, FetchCacheState, addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
-//#region src/shims/fetch-cache.d.ts
 type NextFetchOptions = {
   revalidate?: number | false;
   tags?: string[];
@@ -79,5 +78,4 @@ export declare function ensureFetchPatch(): void;
  * Useful for internal code that should bypass caching.
  */
 export declare function getOriginalFetch(): typeof globalThis.fetch;
-//#endregion
 export { type FetchCacheMode, type FetchCacheState, addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations };

package/dist/shims/fetch-cache.js

@@ -1,15 +1,15 @@
-import { isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { getRequestExecutionContext } from "./request-context.js";
 import { getDataCacheHandler } from "./cache-handler.js";
 import { encodeCacheTags } from "../utils/encode-cache-tag.js";
 import { sha256Hex } from "../utils/hash.js";
 import { traceAppFetch } from "../server/app-fetch-tracing.js";
 import { addCollectedRequestTags, fallbackFetchCacheState, fetchCacheAls, getCurrentFetchSoftTags, getFetchCacheState, resetFallbackFetchCacheState, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
-import { isInsideAnyCacheScope, markDynamicUsage } from "./internal/headers-state.js";
 import { getHeadersContext, isDraftModeEnabled } from "./headers.js";
 import { _hasPendingRevalidatedTag, _isOnDemandRevalidate, _setRequestScopedCacheLife } from "./cache-request-state.js";
+import { isInsideAnyCacheScope, markDynamicUsage } from "./internal/headers-state.js";
+import { getRequestExecutionContext } from "./request-context.js";
+import { isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { Buffer } from "node:buffer";
-//#region src/shims/fetch-cache.ts
+// src/shims/fetch-cache.ts
 /**
 * Extended fetch() with Next.js caching semantics.
 *
@@ -963,5 +963,4 @@ function ensureFetchPatch() {
 function getOriginalFetch() {
 	return originalFetch;
 }
-//#endregion
 export { _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getCurrentFetchSoftTags, getOriginalFetch, peekDynamicFetchObservations, runWithDetachedFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchDraftMode, setCurrentFetchRevalidate, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground, withFetchCache };

package/dist/shims/font-google-base.d.ts

@@ -1,5 +1,4 @@
 import { FontStyle } from "./font-utils.js";
-//#region src/shims/font-google-base.d.ts
 type CssVariable = `--${string}`;
 export type FontOptions<T extends CssVariable | undefined = CssVariable | undefined> = {
   weight?: string | string[];
@@ -85,5 +84,4 @@ type NextFontWithVariable = Omit<NextFont, "variable"> & {
 export type FontLoader = <T extends CssVariable | undefined = undefined>(options?: FontLoaderOptions<T>) => T extends undefined ? NextFont : NextFontWithVariable;
 export declare function createFontLoader(family: string): FontLoader;
 declare const googleFonts: Record<string, FontLoader>;
-//#endregion
 export { googleFonts as default };

package/dist/shims/font-google-base.js

@@ -1,6 +1,6 @@
-import { escapeCSSString, formatFontClassRule, getFontMimeType, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback } from "./font-utils.js";
 import { buildGoogleFontsUrl as buildGoogleFontsUrl$1 } from "../build/google-fonts/build-url.js";
-//#region src/shims/font-google-base.ts
+import { escapeCSSString, formatFontClassRule, getFontMimeType, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback } from "./font-utils.js";
+// src/shims/font-google-base.ts
 /**
 * next/font/google shim
 *
@@ -296,5 +296,4 @@ const googleFonts = new Proxy({}, { get(_target, prop) {
 	if (prop === "default") return googleFonts;
 	return createFontLoader(prop.replace(/_/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2"));
 } });
-//#endregion
 export { buildGoogleFontsUrl, createFontLoader, googleFonts as default, getSSRFontLinks, getSSRFontPreloads, getSSRFontStyles };

package/dist/shims/font-local.d.ts

@@ -1,5 +1,4 @@
 import { FontStyle } from "./font-utils.js";
-//#region src/shims/font-local.d.ts
 type LocalFontSrc = {
   path: string;
   weight?: string;
@@ -52,5 +51,4 @@ export declare function getSSRFontPreloads(): Array<{
   type: string;
 }>;
 declare function localFont<T extends CssVariable | undefined = undefined>(options: LocalFontOptions<T>): T extends undefined ? NextFont : NextFontWithVariable;
-//#endregion
 export { localFont as default };

package/dist/shims/font-local.js

@@ -1,6 +1,6 @@
-import { escapeCSSString, formatFontClassRule, getFontMimeType, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback, sanitizeFontDescriptorValue } from "./font-utils.js";
 import { fnv1a64 } from "../utils/hash.js";
-//#region src/shims/font-local.ts
+import { escapeCSSString, formatFontClassRule, getFontMimeType, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback, sanitizeFontDescriptorValue } from "./font-utils.js";
+// src/shims/font-local.ts
 /**
 * next/font/local shim
 *
@@ -222,5 +222,4 @@ function localFont(options) {
 		...cssVarName ? { variable: variableClassName } : {}
 	};
 }
-//#endregion
 export { localFont as default, getSSRFontPreloads, getSSRFontStyles };

package/dist/shims/font-utils.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/font-utils.d.ts
 export type FontStyle = {
   fontFamily: string;
   fontWeight?: number;
@@ -52,5 +51,4 @@ export declare function formatFontClassRule(className: string, style: FontStyle)
  * (e.g. ".woff" matching ".woff2"). Matches Next.js, which emits
  * `font/${ext}` for every font preload (including `font/eot`).
  */
-export declare function getFontMimeType(pathOrUrl: string): string;
-//#endregion
+export declare function getFontMimeType(pathOrUrl: string): string;

package/dist/shims/font-utils.js

@@ -1,4 +1,4 @@
-//#region src/shims/font-utils.ts
+// src/shims/font-utils.ts
 /**
 * Escape a string for safe interpolation inside a CSS single-quoted string.
 *
@@ -105,5 +105,4 @@ function getFontMimeType(pathOrUrl) {
 	if (pathOrUrl.endsWith(".eot")) return "font/eot";
 	return "font/woff2";
 }
-//#endregion
 export { escapeCSSString, formatFontClassRule, getFontMimeType, resolveFontStyle, resolveFontWeight, resolveGoogleFontStyle, resolveSingleFaceStyle, sanitizeCSSVarName, sanitizeFallback, sanitizeFontDescriptorValue, singleFontOptionValue };

package/dist/shims/form.d.ts

@@ -1,5 +1,4 @@
 import { FormHTMLAttributes, useActionState } from "react";
-//#region src/shims/form.d.ts
 type FormSubmitter = HTMLButtonElement | HTMLInputElement;
 export declare function createFormSubmitDestinationUrl(action: string, form: HTMLFormElement, submitter: FormSubmitter | null): string;
 declare const Form: import("react").ForwardRefExoticComponent<{
@@ -19,5 +18,4 @@ declare const Form: import("react").ForwardRefExoticComponent<{
    */
   prefetch?: false | null;
 } & Omit<FormHTMLAttributes<HTMLFormElement>, "encType" | "method" | "target"> & import("react").RefAttributes<HTMLFormElement>>;
-//#endregion
 export { Form as default, useActionState };

package/dist/shims/form.js

@@ -1,19 +1,19 @@
 "use client";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest } from "../client/navigation-runtime.js";
 import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/app-rsc-vary.js";
-import "../server/headers.js";
+import { useMergedRef } from "./use-merged-ref.js";
+import { getMountedSlotsHeader, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./app-router-navigation.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
 import { withBasePath } from "./url-utils.js";
 import { createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
-import { hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest } from "../client/navigation-runtime.js";
+import { 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 { getMountedSlotsHeader, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
-import { useMergedRef } from "./use-merged-ref.js";
+import "../server/headers.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { forwardRef, useActionState, useCallback, useEffect, useRef } from "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/shims/form.tsx
+// src/shims/form.tsx
 /**
 * next/form shim
 *
@@ -234,5 +234,4 @@ const Form = forwardRef(function Form(props, ref) {
 		...cleanRest
 	});
 });
-//#endregion
 export { createFormSubmitDestinationUrl, Form as default, useActionState };

package/dist/shims/hash-scroll.d.ts

@@ -1,9 +1,7 @@
-//#region src/shims/hash-scroll.d.ts
 export declare function decodeHashFragment(fragment: string): string;
 export declare function scrollToHashTarget(hash: string): void;
 export declare function scrollToHashTargetOnNextFrame(hash: string, shouldScroll?: () => boolean): void;
 export declare function retryScrollTo(x: number, y: number, opts?: {
   minFrames?: number;
   shouldContinue?: () => boolean;
-}): void;
-//#endregion
+}): void;

package/dist/shims/hash-scroll.js

@@ -1,4 +1,4 @@
-//#region src/shims/hash-scroll.ts
+// src/shims/hash-scroll.ts
 function decodeHashFragment(fragment) {
 	try {
 		return decodeURIComponent(fragment);
@@ -44,5 +44,4 @@ function retryScrollTo(x, y, opts) {
 	};
 	restore();
 }
-//#endregion
 export { decodeHashFragment, retryScrollTo, scrollToHashTarget, scrollToHashTargetOnNextFrame };

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

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/head-state.d.ts
 export type HeadState = {
   ssrHeadChildren: React.ReactNode[];
   documentInitialHead: React.ReactNode[];
@@ -10,5 +9,4 @@ export type HeadState = {
  * on concurrent runtimes.
  */
 export declare function runWithHeadState<T>(fn: () => Promise<T>): Promise<T>;
-export declare function runWithHeadState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
+export declare function runWithHeadState<T>(fn: () => T | Promise<T>): T | Promise<T>;

package/dist/shims/head-state.js

@@ -1,7 +1,7 @@
+import { _registerHeadStateAccessors } from "./head.js";
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _registerHeadStateAccessors } from "./head.js";
-//#region src/shims/head-state.ts
+// src/shims/head-state.ts
 const _FALLBACK_KEY = Symbol.for("vinext.head.fallback");
 const _g = globalThis;
 const _als = getOrCreateAls("vinext.head.als");
@@ -39,5 +39,4 @@ _registerHeadStateAccessors({
 		_getState().documentInitialHead = head;
 	}
 });
-//#endregion
 export { runWithHeadState };

package/dist/shims/head.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/head.d.ts
 type HeadProps = {
   children?: React.ReactNode;
 };
@@ -41,7 +40,7 @@ export declare function defaultHead(): React.ReactElement[];
 /** Get collected head HTML. Call after render. */
 export declare function getSSRHeadHTML(): string;
 type HeadDOMElement = Pick<HTMLElement, "innerHTML" | "setAttribute" | "textContent">;
-export declare function reduceHeadChildren(headChildren: React.ReactNode[]): React.ReactElement[];
+export declare function reduceHeadChildren(headChildren: React.ReactNode[], defaults?: React.ReactElement[]): React.ReactElement[];
 export declare function isSafeAttrName(name: string): boolean;
 export declare function escapeAttr(s: string): string;
 /**
@@ -89,12 +88,18 @@ export declare function _removeClientHeadInstance(instanceId: symbol): void;
  * tags — matching the SSR path in getSSRHeadHTML() and Next.js's
  * reduceComponents(), which always concatenates defaultHead() on both server
  * and client. Without it the first <Head> mount after hydration would drop the
- * server-rendered defaults. Users can still override via key="charset" /
- * key="viewport" through the dedupe pipeline.
+ * server-rendered defaults. A user <meta charSet> or <meta name="viewport">
+ * still replaces the matching default through the dedupe pipeline.
  *
  * @internal — exported for unit tests; called from the Head client effect.
  */
 export declare function _syncClientHead(): void;
-declare function Head({ children }: HeadProps): React.ReactElement;
-//#endregion
+/**
+ * Next.js ignores next/head in the App Router. Server components import a
+ * no-op Head, and client components get a HeadManagerContext without
+ * `mountedInstances`, so their tags never reach the document. Skip both the
+ * SSR collection and the client head sync there, so a client component
+ * shared with the Pages Router cannot override the Metadata API's tags.
+ */
+declare function Head(props: HeadProps): React.ReactElement;
 export { Head as default };

package/dist/shims/head.js

@@ -1,5 +1,6 @@
+import { useIsAppRouterTree } from "./app-router-tree-context.js";
 import React, { Children, isValidElement, useEffect, useRef } from "react";
-//#region src/shims/head.ts
+// src/shims/head.ts
 /**
 * next/head shim
 *
@@ -8,6 +9,9 @@ import React, { Children, isValidElement, useEffect, useRef } from "react";
 *   dev-server reads after render and injects into the HTML <head>.
 * - On the client: reduces all mounted <Head> instances into one deduped
 *   document.head projection and applies it with DOM manipulation.
+*
+* In the App Router, <Head> renders nothing and leaves the document head to
+* the Metadata API, as in Next.js.
 */
 let _ssrHeadChildren = [];
 let _documentInitialHead = [];
@@ -71,11 +75,7 @@ function defaultHead() {
 }
 /** Get collected head HTML. Call after render. */
 function getSSRHeadHTML() {
-	return reduceHeadChildren([
-		...defaultHead(),
-		..._getSSRHeadChildren(),
-		..._getDocumentInitialHead()
-	]).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("");
+	return reduceHeadChildren([..._getSSRHeadChildren(), ..._getDocumentInitialHead()], defaultHead()).map((child) => headChildToHTML(child.type, child.props)).filter(Boolean).join("");
 }
 /**
 * Tags allowed inside <head>. Anything else is silently dropped.
@@ -171,8 +171,8 @@ function createUniqueHeadFilter() {
 		return isUnique;
 	};
 }
-function reduceHeadChildren(headChildren) {
-	return headChildren.reduce((flattenedChildren, child) => flattenedChildren.concat(Children.toArray(child)), []).reduce(collectHeadElements, []).reverse().filter(createUniqueHeadFilter()).reverse();
+function reduceHeadChildren(headChildren, defaults = []) {
+	return headChildren.reduce((flattenedChildren, child) => flattenedChildren.concat(Children.toArray(child)), []).reduce(collectHeadElements, []).reverse().concat(defaults.slice().reverse()).filter(createUniqueHeadFilter()).reverse();
 }
 /**
 * Validate an HTML attribute name. Rejects names that could break out of
@@ -334,8 +334,8 @@ function _removeClientHeadInstance(instanceId) {
 * tags — matching the SSR path in getSSRHeadHTML() and Next.js's
 * reduceComponents(), which always concatenates defaultHead() on both server
 * and client. Without it the first <Head> mount after hydration would drop the
-* server-rendered defaults. Users can still override via key="charset" /
-* key="viewport" through the dedupe pipeline.
+* server-rendered defaults. A user <meta charSet> or <meta name="viewport">
+* still replaces the matching default through the dedupe pipeline.
 *
 * @internal — exported for unit tests; called from the Head client effect.
 */
@@ -345,7 +345,7 @@ function _syncClientHead() {
 	const oldTags = new Set(headEl.querySelectorAll("[data-next-head]"));
 	const charsetEl = headEl.querySelector("meta[charset]");
 	if (charsetEl) oldTags.add(charsetEl);
-	const desiredHead = reduceHeadChildren([...defaultHead(), ..._clientHeadChildren.values()]);
+	const desiredHead = reduceHeadChildren([..._clientHeadChildren.values()], defaultHead());
 	const titleChildren = (desiredHead.find((child) => child.type === "title")?.props)?.children;
 	const titleText = typeof titleChildren === "string" ? titleChildren : Array.isArray(titleChildren) ? titleChildren.join("") : "";
 	if (document.title !== titleText) document.title = titleText;
@@ -382,7 +382,7 @@ function _syncClientHead() {
 	for (const newTag of newTags) if (newTag.tagName.toLowerCase() === "meta" && newTag.getAttribute("charset") !== null) headEl.prepend(newTag);
 	else headEl.appendChild(newTag);
 }
-function Head({ children }) {
+function PagesRouterHead({ children }) {
 	const headInstanceIdRef = useRef(null);
 	if (headInstanceIdRef.current === null) headInstanceIdRef.current = Symbol("vinext-head");
 	if (typeof window === "undefined") {
@@ -401,5 +401,15 @@ function Head({ children }) {
 	});
 	return React.createElement(React.Fragment);
 }
-//#endregion
+/**
+* Next.js ignores next/head in the App Router. Server components import a
+* no-op Head, and client components get a HeadManagerContext without
+* `mountedInstances`, so their tags never reach the document. Skip both the
+* SSR collection and the client head sync there, so a client component
+* shared with the Pages Router cannot override the Metadata API's tags.
+*/
+function Head(props) {
+	if (useIsAppRouterTree()) return React.createElement(React.Fragment);
+	return React.createElement(PagesRouterHead, props);
+}
 export { _applyHeadPropsToElement, _clientHeadChildren, _registerHeadStateAccessors, _removeClientHeadInstance, _syncClientHead, _updateClientHeadInstance, Head as default, defaultHead, escapeAttr, escapeInlineContent, getSSRHeadHTML, isEqualHeadNode, isSafeAttrName, reduceHeadChildren, resetSSRHead, setDocumentInitialHead };

package/dist/shims/headers.d.ts

@@ -2,11 +2,16 @@ import { RenderRequestApiKind } from "../server/cache-proof.js";
 import { ConnectionProbeResult, HeadersAccessPhase, RenderDynamicLatch, VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 import { ReadonlyRequestCookies } from "@vinext/types/next/upstream/dist/server/web/spec-extension/adapters/request-cookies";
 import { ResponseCookie } from "@vinext/types/next/upstream/dist/compiled/@edge-runtime/cookies/index";
-//#region src/shims/headers.d.ts
 export type HeadersContext = {
   headers: Headers;
   cookies: Map<string, string>;
   accessError?: Error;
+  /**
+   * The route whose `generateStaticParams` runs. There is no HTTP request, so
+   * `connection()` and `draftMode()` reject with `accessError` too, and
+   * revalidation throws, also from a cached function the generator calls.
+   */
+  staticParamsRoute?: string;
   draftModeEnabled?: boolean;
   forceStatic?: boolean;
   mutableCookies?: RequestCookies;
@@ -23,6 +28,13 @@ type HeadersContextFromRequestOptions = {
  * whether a page is dynamic and how long it is cached.
  */
 export declare function runWithDetachedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<T>;
+/**
+ * Run a `dynamicParams` check's `generateStaticParams` apart from the request,
+ * as Next.js runs it in a work store of its own. Unlike a layout probe, it
+ * also memoizes its own fetches, so the render that follows fetches anew, and
+ * reads cached data even during an on-demand revalidation.
+ */
+export declare function runStaticParamsCheckDetached<T>(fn: () => Promise<T>): Promise<T>;
 export declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
 export declare function suspendConnectionProbe(): Promise<never> | null;
 export declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
@@ -158,6 +170,8 @@ export declare function getAndClearPendingCookies(): string[];
 /** Check a pending draft transition without consuming its outgoing cookie. */
 export declare function hasDraftModeCookieHeader(): boolean;
 export declare function getDraftModeCookieHeader(): string | null;
+/** Put back a draft-mode `Set-Cookie` header a dispatch took for a response it won't send. */
+export declare function restoreDraftModeCookieHeader(header: string): void;
 export declare function isDraftModeRequest(request: Request, draftModeSecret: string): boolean;
 /**
  * Read draft mode from the live request context without recording request API
@@ -223,5 +237,4 @@ declare class RequestCookies {
   [APPLY_RESPONSE_COOKIE](cookie: ResponseCookie): void;
   [SYNCHRONIZE_REQUEST_COOKIES](): void;
 }
-//#endregion
 export { type HeadersAccessPhase, type RenderDynamicLatch, type RequestCookies, type VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/headers.js

@@ -1,12 +1,12 @@
-import { ensureRenderDynamicLatch, getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
+import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
-import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
-import { FLIGHT_HEADERS, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER } from "../server/headers.js";
 import { serializeSetCookie, validateCookieName } from "./internal/cookie-serialize.js";
+import { parseEdgeRequestCookieHeader } from "../utils/parse-cookie.js";
+import { ensureRenderDynamicLatch, getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { createPprFallbackShellSuspensePromise } from "./ppr-fallback-shell.js";
 import { createRenderDynamicLatch, getHeadersAccessPhase, getHeadersShimState, headersShimAls, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
-//#region src/shims/headers.ts
+// src/shims/headers.ts
 /**
 * next/headers shim
 *
@@ -106,6 +106,22 @@ async function runWithDetachedDynamicUsage(fn) {
 	};
 	return await headersShimAls.run(childState, fn);
 }
+/**
+* Run a `dynamicParams` check's `generateStaticParams` apart from the request,
+* as Next.js runs it in a work store of its own. Unlike a layout probe, it
+* also memoizes its own fetches, so the render that follows fetches anew, and
+* reads cached data even during an on-demand revalidation.
+*/
+async function runStaticParamsCheckDetached(fn) {
+	return await runWithDetachedDynamicUsage(() => {
+		if (!isInsideUnifiedScope()) return fn();
+		return runWithUnifiedStateMutation((context) => {
+			context.currentFetchDedupeEntries = /* @__PURE__ */ new Map();
+			context.nextFetchId = 1;
+			context.isOnDemandRevalidate = false;
+		}, fn);
+	});
+}
 async function runWithConnectionProbe(fn) {
 	const parentState = getHeadersShimState();
 	const parentInvalidDynamicUsageError = parentState.invalidDynamicUsageError;
@@ -603,6 +619,10 @@ function getDraftModeCookieHeader() {
 	state.draftModeCookieHeader = null;
 	return header;
 }
+/** Put back a draft-mode `Set-Cookie` header a dispatch took for a response it won't send. */
+function restoreDraftModeCookieHeader(header) {
+	getHeadersShimState().draftModeCookieHeader = header;
+}
 function validateDraftModeSecret(secret) {
 	if (secret.length === 0) throw new Error("[vinext] draft mode secret must be a non-empty string.");
 	return secret;
@@ -673,6 +693,7 @@ async function draftMode() {
 	const state = getHeadersShimState();
 	const context = state.headersContext;
 	if (!context) throw createDraftModeScopeError("draftMode()");
+	if (context.staticParamsRoute !== void 0 && context.accessError && !isInsideAnyCacheScope()) throw context.accessError;
 	const secret = ensureContextDraftModeSecret(context);
 	return {
 		get isEnabled() {
@@ -828,5 +849,4 @@ function serializeMutableCookie(cookie) {
 		expires: typeof cookie.expires === "number" ? new Date(cookie.expires) : cookie.expires
 	});
 }
-//#endregion
-export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeTransition, runWithConnectionProbe, runWithDetachedDynamicUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeCookieHeader, restoreDraftModeTransition, runStaticParamsCheckDetached, runWithConnectionProbe, runWithDetachedDynamicUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/http-access-error-fallback.d.ts

@@ -1,7 +1,5 @@
 import React from "react";
-//#region src/shims/http-access-error-fallback.d.ts
 export declare function HTTPAccessErrorFallback({ status, message }: {
   status: number;
   message: string;
-}): React.ReactElement;
-//#endregion
+}): React.ReactElement;

package/dist/shims/http-access-error-fallback.js

@@ -1,5 +1,5 @@
 import React from "react";
-//#region src/shims/http-access-error-fallback.tsx
+// src/shims/http-access-error-fallback.tsx
 /**
 * Ported from Next.js's built-in HTTP access fallback UI:
 *   https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/http-access-fallback/error-fallback.tsx
@@ -43,5 +43,4 @@ function HTTPAccessErrorFallback({ status, message }) {
 		style: styles.h1
 	}, status), React.createElement("div", { style: styles.desc }, React.createElement("h2", { style: styles.h2 }, message)))));
 }
-//#endregion
 export { HTTPAccessErrorFallback };

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

@@ -1,5 +1,4 @@
 import { DomainLocale } from "../utils/domain-locale.js";
-//#region src/shims/i18n-context.d.ts
 export type I18nContext = {
   locale?: string;
   locales?: string[];
@@ -16,5 +15,4 @@ export declare function _registerI18nStateAccessors(accessors: {
   setI18nContext: (ctx: I18nContext | null) => void;
 }): void;
 export declare function getI18nContext(): I18nContext | null;
-export declare function setI18nContext(ctx: I18nContext | null): void;
-//#endregion
+export declare function setI18nContext(ctx: I18nContext | null): void;

package/dist/shims/i18n-context.js

@@ -1,4 +1,4 @@
-//#region src/shims/i18n-context.ts
+// src/shims/i18n-context.ts
 let _getI18nContext = () => {
 	if (globalThis.__VINEXT_DEFAULT_LOCALE__ == null && globalThis.__VINEXT_LOCALE__ == null) return null;
 	return {
@@ -38,5 +38,4 @@ function getI18nContext() {
 function setI18nContext(ctx) {
 	_setI18nContextImpl(ctx);
 }
-//#endregion
 export { _registerI18nStateAccessors, getI18nContext, setI18nContext };

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

@@ -1,5 +1,4 @@
 import { I18nContext } from "./i18n-context.js";
-//#region src/shims/i18n-state.d.ts
 export type I18nState = {
   i18nContext: I18nContext | null;
 };
@@ -8,5 +7,4 @@ export type I18nState = {
  * Ensures per-request isolation for i18n context on concurrent runtimes.
  */
 export declare function runWithI18nState<T>(fn: () => Promise<T>): Promise<T>;
-export declare function runWithI18nState<T>(fn: () => T | Promise<T>): T | Promise<T>;
-//#endregion
+export declare function runWithI18nState<T>(fn: () => T | Promise<T>): T | Promise<T>;

package/dist/shims/i18n-state.js

@@ -1,7 +1,7 @@
+import { _registerI18nStateAccessors } from "./i18n-context.js";
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _registerI18nStateAccessors } from "./i18n-context.js";
-//#region src/shims/i18n-state.ts
+// src/shims/i18n-state.ts
 /**
 * Server-only i18n state backed by AsyncLocalStorage.
 *
@@ -34,5 +34,4 @@ _registerI18nStateAccessors({
 		_getState().i18nContext = ctx;
 	}
 });
-//#endregion
 export { runWithI18nState };

package/dist/shims/image-config.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/image-config.d.ts
 /**
  * Image remote pattern validation.
  *
@@ -40,5 +39,4 @@ export declare function hasRemoteMatch(domains: string[], remotePatterns: Remote
  *
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/is-private-ip.ts
  */
-export declare function isPrivateIp(ip: string): boolean;
-//#endregion
+export declare function isPrivateIp(ip: string): boolean;

package/dist/shims/image-config.js

@@ -1,5 +1,5 @@
 import ipaddr from "ipaddr.js";
-//#region src/shims/image-config.ts
+// src/shims/image-config.ts
 const globRegexCache = /* @__PURE__ */ new Map();
 /**
 * Convert a glob pattern (with `*` and `**`) to a RegExp.
@@ -83,5 +83,4 @@ function isPrivateIp(ip) {
 		return false;
 	}
 }
-//#endregion
 export { hasRemoteMatch, isPrivateIp, matchRemotePattern };

package/dist/shims/image-props.d.ts

@@ -1,6 +1,5 @@
 import React from "react";
 import { ImageProps, ImgProps, StaticImport } from "@vinext/types/next/upstream/dist/shared/lib/get-img-props";
-//#region src/shims/image-props.d.ts
 export declare const __isDev: boolean;
 /**
  * Whether dangerouslyAllowSVG is enabled in next.config.js.
@@ -95,5 +94,4 @@ export declare function generateImageAttributes(src: string, width: number, qual
  */
 export declare function getImageProps(props: ImageProps): {
   props: ImgProps;
-};
-//#endregion
+};