vinext 1.4.4 → 1.4.5

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

@@ -1,4 +1,3 @@
-//#region src/shims/app-router-scroll-state.d.ts
 export type AppRouterScrollIntent = Readonly<{
   commitId: number | null;
   hash: string | null;
@@ -12,5 +11,4 @@ export declare function getPendingAppRouterScrollIntent(): AppRouterScrollIntent
 export declare function isLatestAppRouterScrollIntent(expected: AppRouterScrollIntent | null | undefined): boolean;
 export declare function claimAppRouterScrollIntentForCommit(expected: AppRouterScrollIntent | null | undefined, commitId: number): void;
 export declare function markAppRouterScrollIntentHeadHoisted(expected: AppRouterScrollIntent | null | undefined, commitId: number): void;
-export declare function consumeAppRouterScrollIntent(expected: AppRouterScrollIntent | null | undefined, commitId?: number): AppRouterScrollIntent | null;
-//#endregion
+export declare function consumeAppRouterScrollIntent(expected: AppRouterScrollIntent | null | undefined, commitId?: number): AppRouterScrollIntent | null;

package/dist/shims/app-router-scroll-state.js

@@ -1,4 +1,4 @@
-//#region src/shims/app-router-scroll-state.ts
+// src/shims/app-router-scroll-state.ts
 const _SCROLL_INTENT_KEY = Symbol.for("vinext.appRouterScrollIntent");
 function getScrollIntentStore() {
 	const globalState = globalThis;
@@ -63,5 +63,4 @@ function consumeAppRouterScrollIntent(expected, commitId) {
 	store.pending = null;
 	return intent;
 }
-//#endregion
 export { beginAppRouterScrollIntent, claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted };

package/dist/shims/app-router-scroll.d.ts

@@ -1,5 +1,4 @@
 import * as React$1 from "react";
-//#region src/shims/app-router-scroll.d.ts
 export declare class AppRouterScrollTargetInner extends React$1.Component<{
   children: React$1.ReactNode;
   commitId: number | null;
@@ -18,5 +17,4 @@ export declare function AppRouterScrollCommitProvider({ children, commitId }: {
 }): React$1.JSX.Element;
 export declare function AppRouterScrollTarget({ children }: {
   children: React$1.ReactNode;
-}): React$1.JSX.Element;
-//#endregion
+}): React$1.JSX.Element;

package/dist/shims/app-router-scroll.js

@@ -1,11 +1,11 @@
 "use client";
+import { consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted } from "./app-router-scroll-state.js";
 import { disableSmoothScrollDuringRouteTransition } from "./disable-smooth-scroll.js";
 import { decodeHashFragment } from "./hash-scroll.js";
-import { consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, markAppRouterScrollIntentHeadHoisted } from "./app-router-scroll-state.js";
 import * as React$1 from "react";
 import { jsx } from "react/jsx-runtime";
 import * as ReactDOM from "react-dom";
-//#region src/shims/app-router-scroll.tsx
+// src/shims/app-router-scroll.tsx
 const AppRouterScrollCommitContext = React$1.createContext(null);
 const reactDomInternalsKey = "__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE";
 const rectProperties = [
@@ -142,5 +142,4 @@ function AppRouterScrollTarget({ children }) {
 		children
 	});
 }
-//#endregion
 export { AppRouterScrollCommitProvider, AppRouterScrollTarget, AppRouterScrollTargetInner };

package/dist/shims/app-router-tree-context.d.ts

@@ -1,5 +1,15 @@
 import React from "react";
-//#region src/shims/app-router-tree-context.d.ts
 export declare const AppRouterTreeContext: React.Context<boolean> | null;
 export declare function withAppRouterTree(children: React.ReactElement): React.ReactElement;
-//#endregion
+/**
+ * Whether the calling component renders in an App Router tree. RSC renders the
+ * App Router only, and react-server has no context support. On the server,
+ * the App Router SSR entry marks its tree; in the browser, App Router
+ * documents set `window.next.appDir` before anything renders, which also
+ * covers separate client roots (e.g. a modal rendered with createRoot).
+ * Everything else (Pages Router pages, `pages/_document`, ad-hoc
+ * react-dom/server renders) reads false: there, next/dynamic keeps its
+ * boundary (Pages next/dynamic is react-loadable, which never suspends) and
+ * next/head manages the document head.
+ */
+export declare function useIsAppRouterTree(): boolean;

package/dist/shims/app-router-tree-context.js

@@ -1,12 +1,13 @@
 import React from "react";
-//#region src/shims/app-router-tree-context.ts
+// src/shims/app-router-tree-context.ts
 /**
 * Marks an App Router server render tree. The App Router SSR entry provides
 * `true` at its root; every other server tree (Pages Router pages,
 * `pages/_document`, ad-hoc react-dom/server renders) reads the `false`
-* default. Lets shared shims such as next/dynamic apply App Router semantics
-* only where Next.js does. In the browser, `window.next.appDir` (installed
-* when the App Router browser entry loads) identifies App Router documents.
+* default. Lets shared shims such as next/dynamic and next/head apply App
+* Router semantics only where Next.js does. In the browser, `window.next.appDir`
+* (installed when the App Router browser entry loads) identifies App Router
+* documents.
 *
 * Stored on a global symbol so duplicate module instances share one context,
 * and null in react-server, which has no createContext (RSC is App Router
@@ -23,5 +24,19 @@ const AppRouterTreeContext = getAppRouterTreeContext();
 function withAppRouterTree(children) {
 	return AppRouterTreeContext ? React.createElement(AppRouterTreeContext.Provider, { value: true }, children) : children;
 }
-//#endregion
-export { AppRouterTreeContext, withAppRouterTree };
+/**
+* Whether the calling component renders in an App Router tree. RSC renders the
+* App Router only, and react-server has no context support. On the server,
+* the App Router SSR entry marks its tree; in the browser, App Router
+* documents set `window.next.appDir` before anything renders, which also
+* covers separate client roots (e.g. a modal rendered with createRoot).
+* Everything else (Pages Router pages, `pages/_document`, ad-hoc
+* react-dom/server renders) reads false: there, next/dynamic keeps its
+* boundary (Pages next/dynamic is react-loadable, which never suspends) and
+* next/head manages the document head.
+*/
+function useIsAppRouterTree() {
+	if (typeof window !== "undefined") return window.next?.appDir === true;
+	return AppRouterTreeContext ? React.use(AppRouterTreeContext) : true;
+}
+export { AppRouterTreeContext, useIsAppRouterTree, withAppRouterTree };

package/dist/shims/app.d.ts

@@ -1,5 +1,4 @@
 import React, { ComponentType } from "react";
-//#region src/shims/app.d.ts
 export type AppProps<P = any> = {
   Component: ComponentType<P> & {
     getInitialProps?: (ctx: any) => any;
@@ -34,5 +33,4 @@ export default class App<P = any, CP = any, S = any> extends React.Component<P &
   static getInitialProps: typeof appGetInitialProps;
   render(): React.ReactElement;
 }
-//#endregion
 export {};

package/dist/shims/app.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/shims/app.tsx
+// src/shims/app.tsx
 /**
 * next/app shim
 *
@@ -44,5 +44,4 @@ var App = class extends React.Component {
 		return /* @__PURE__ */ jsx(Component, { ...pageProps });
 	}
 };
-//#endregion
 export { App as default };

package/dist/shims/before-interactive-context.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/before-interactive-context.d.ts
 /**
  * A `<Script strategy="beforeInteractive">` captured during SSR.
  *
@@ -37,5 +36,4 @@ export type BeforeInteractiveInlineScript = {
 };
 export type RegisterBeforeInteractiveInlineScript = (script: BeforeInteractiveInlineScript) => void;
 export declare const BeforeInteractiveContext: React.Context<RegisterBeforeInteractiveInlineScript | null>;
-export declare function useBeforeInteractiveRegister(): RegisterBeforeInteractiveInlineScript | null;
-//#endregion
+export declare function useBeforeInteractiveRegister(): RegisterBeforeInteractiveInlineScript | null;

package/dist/shims/before-interactive-context.js

@@ -1,8 +1,7 @@
 import React from "react";
-//#region src/shims/before-interactive-context.tsx
+// src/shims/before-interactive-context.tsx
 const BeforeInteractiveContext = React.createContext(null);
 function useBeforeInteractiveRegister() {
 	return React.useContext(BeforeInteractiveContext);
 }
-//#endregion
 export { BeforeInteractiveContext, useBeforeInteractiveRegister };

package/dist/shims/cache-adapter-instantiate.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/cache-adapter-instantiate.d.ts
 /**
  * Instantiate a declaratively configured cache adapter from its module's
  * default export. The generated `virtual:vinext-cache-adapters` module calls
@@ -46,5 +45,4 @@ export declare function isConstructor(value: unknown): boolean;
  * also starts with that word.
  */
 export declare function isClassExport(value: unknown): boolean;
-export declare function instantiateCacheAdapter<T>(exported: unknown, args: CacheAdapterFactoryArgs, slot: CacheAdapterSlot): T;
-//#endregion
+export declare function instantiateCacheAdapter<T>(exported: unknown, args: CacheAdapterFactoryArgs, slot: CacheAdapterSlot): T;

package/dist/shims/cache-adapter-instantiate.js

@@ -1,4 +1,4 @@
-//#region src/shims/cache-adapter-instantiate.ts
+// src/shims/cache-adapter-instantiate.ts
 const REQUIREMENTS = {
 	data: {
 		methods: [
@@ -114,5 +114,4 @@ function instantiateCacheAdapter(exported, args, slot) {
 	if (problems.length > 0) throw new TypeError(`${label}: the adapter produced by the default export is missing ${problems.join(", ")}. ${requirements.description}`);
 	return adapter;
 }
-//#endregion
 export { instantiateCacheAdapter, isClassExport, isConstructor };

package/dist/shims/cache-callable-runtime.d.ts

@@ -1,6 +1,5 @@
-import { VinextCacheFunctionInvocation } from "../server/multi-stage.js";
 import { RegisterCachedFunctionOptions } from "./cache-runtime.js";
-//#region src/shims/cache-callable-runtime.d.ts
+import { VinextCacheFunctionInvocation } from "../server/multi-stage.js";
 declare const CACHE_CAPTURE_TYPE = "use-cache-captures";
 type CacheCaptureEnvelope = {
   type: typeof CACHE_CAPTURE_TYPE;
@@ -12,5 +11,4 @@ export declare function registerCachedFunction<TArgs extends unknown[], TResult>
 }): (...args: TArgs) => Promise<TResult>;
 /** Replay the persisted payload without re-reading or re-encoding caller objects. */
 export declare function invokeCacheFunction(invocation: VinextCacheFunctionInvocation, loadServerAction: (id: string) => Promise<unknown>): Promise<void>;
-//#endregion
 export {};

package/dist/shims/cache-callable-runtime.js

@@ -1,8 +1,8 @@
-import { restoreFlightReply, snapshotFlightReply } from "./cache-flight-arguments.js";
 import { isUseCacheFunction, memoizeInCacheScope, registerCachedFunction as registerCachedFunction$1, replayCachedFunction } from "./cache-runtime.js";
+import { restoreFlightReply, snapshotFlightReply } from "./cache-flight-arguments.js";
 import { decryptActionBoundArgs, encryptActionBoundArgs } from "@vitejs/plugin-rsc/utils/encryption-runtime";
 import { createFromReadableStream, renderToReadableStream } from "@vitejs/plugin-rsc/react/rsc";
-//#region src/shims/cache-callable-runtime.ts
+// src/shims/cache-callable-runtime.ts
 const CACHE_CAPTURE_TYPE = "use-cache-captures";
 async function encryptArguments(value) {
 	return encryptActionBoundArgs(JSON.stringify(value));
@@ -77,5 +77,4 @@ async function invokeCacheFunction(invocation, loadServerAction) {
 	if (!isUseCacheFunction(fn)) throw new Error(`Server reference ${invocation.referenceId} is not a cache function`);
 	await replayCachedFunction(fn, await decryptArguments(invocation.encryptedArgs));
 }
-//#endregion
 export { encryptCacheCaptures, invokeCacheFunction, registerCachedFunction };

package/dist/shims/cache-flight-arguments.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/cache-flight-arguments.d.ts
 /** The persisted argument transport. React owns the object graph and wire protocol. */
 export type CacheFlightArguments = {
   version: 1;
@@ -18,5 +17,4 @@ export declare function restoreFlightReply(args: CacheFlightArguments): string |
  * cache hit must resolve before React flushes the shell, and an async digest
  * waits for a later event-loop turn.
  */
-export declare function flightArgumentsKey(args: CacheFlightArguments): string;
-//#endregion
+export declare function flightArgumentsKey(args: CacheFlightArguments): string;

package/dist/shims/cache-flight-arguments.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-//#region src/shims/cache-flight-arguments.ts
+// src/shims/cache-flight-arguments.ts
 const blobType = Object.getOwnPropertyDescriptor(Blob.prototype, "type").get;
 const fileName = Object.getOwnPropertyDescriptor(File.prototype, "name").get;
 const fileTime = Object.getOwnPropertyDescriptor(File.prototype, "lastModified").get;
@@ -52,5 +52,4 @@ function flightArgumentsKey(args) {
 		reply
 	})).digest("base64url");
 }
-//#endregion
 export { flightArgumentsKey, restoreFlightReply, snapshotFlightReply };

package/dist/shims/cache-for-request.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/cache-for-request.d.ts
 /**
  * Cache a factory function's result for the duration of a request.
  *
@@ -52,5 +51,4 @@
  *   factories. Async factories that reject have their cache cleared, allowing retry.
  * @returns A function with the same return type that caches the result per request.
  */
-export declare function cacheForRequest<T>(factory: () => T): () => T;
-//#endregion
+export declare function cacheForRequest<T>(factory: () => T): () => T;

package/dist/shims/cache-for-request.js

@@ -1,5 +1,5 @@
 import { getRequestContext, isInsideUnifiedScope } from "./unified-request-context.js";
-//#region src/shims/cache-for-request.ts
+// src/shims/cache-for-request.ts
 /**
 * Cache a factory function's result for the duration of a request.
 *
@@ -68,5 +68,4 @@ function cacheForRequest(factory) {
 		return value;
 	};
 }
-//#endregion
 export { cacheForRequest };

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

@@ -1,5 +1,4 @@
 import { RenderObservation } from "../server/cache-proof.js";
-//#region src/shims/cache-handler.d.ts
 export type CacheHandlerValue = {
   lastModified: number;
   age?: number;
@@ -125,5 +124,4 @@ export declare function registerLazyDataCacheHandler(load: () => Promise<void>):
 export declare function getDataCacheHandler(): CacheHandler;
 export declare function setCacheHandler(handler: CacheHandler): void;
 export declare function getCacheHandler(): CacheHandler;
-//#endregion
 export {};

package/dist/shims/cache-handler.js

@@ -1,6 +1,6 @@
 import { shareIsolatePromise } from "../server/isolate-shared-promise.js";
 import { readCacheControlNumberField, readCacheControlRevalidateField, readCacheTimestamp } from "../utils/cache-control-metadata.js";
-//#region src/shims/cache-handler.ts
+// src/shims/cache-handler.ts
 var NoOpCacheHandler = class {
 	async get(_key, _ctx) {
 		return null;
@@ -256,5 +256,4 @@ function setCacheHandler(handler) {
 function getCacheHandler() {
 	return getDataCacheHandler();
 }
-//#endregion
 export { MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, registerDataCacheHandler, registerLazyDataCacheHandler, setCacheHandler, setDataCacheHandler };

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

@@ -1,6 +1,5 @@
 import { CacheLifeConfig } from "../utils/cache-life-profiles.js";
 import { _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
-//#region src/shims/cache-request-state.d.ts
 /**
  * The built-in profiles merged with next.config `cacheLife`, baked in at
  * build time like Next.js's `process.env.__NEXT_CACHE_LIFE` define.
@@ -120,5 +119,4 @@ export declare function _captureRequestScopedCacheLifeAccessors(): {
  */
 export declare function runWithDetachedCacheObservations<T>(fn: () => Promise<T>): Promise<T>;
 export declare function shouldServeStaleUnstableCacheEntry(): boolean;
-//#endregion
 export { type CacheLifeConfig, _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext };

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

@@ -1,10 +1,10 @@
-import { getOrCreateAls } from "./internal/als-registry.js";
-import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { parseCacheLifeProfiles } from "../utils/cache-life-profiles.js";
 import { getCdnCacheAdapter } from "./cdn-cache.js";
+import { parseCacheLifeProfiles } from "../utils/cache-life-profiles.js";
 import { getHeadersAccessPhase } from "./internal/headers-state.js";
+import { getOrCreateAls } from "./internal/als-registry.js";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
-//#region src/shims/cache-request-state.ts
+// src/shims/cache-request-state.ts
 /**
 * The built-in profiles merged with next.config `cacheLife`, baked in at
 * build time like Next.js's `process.env.__NEXT_CACHE_LIFE` define.
@@ -249,5 +249,4 @@ function runWithDetachedCacheObservations(fn) {
 function shouldServeStaleUnstableCacheEntry() {
 	return getCacheState().unstableCacheRevalidation === "background";
 }
-//#endregion
 export { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _recordUseCacheRootParamRead, _registerCacheContextAccessor, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry };

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

@@ -1,6 +1,5 @@
 import { CacheLifeConfig } from "../utils/cache-life-profiles.js";
 import { CacheFlightArguments } from "./cache-flight-arguments.js";
-//#region src/shims/cache-runtime.d.ts
 export declare function replayCachedFunction(fn: object, args: CacheFlightArguments): Promise<unknown>;
 /**
  * Used purely as `cause` for the nested-dynamic cache error: its captured stack
@@ -101,5 +100,4 @@ export declare function registerCachedFunction<TArgs extends unknown[], TResult>
 /** Memoize in one React render without skipping cache guards or scoped serialization. */
 export declare function memoizeInCacheScope<TArgs extends unknown[], TResult>(fn: (...args: TArgs) => TResult): (...args: TArgs) => TResult;
 /** Whether a loaded server reference is a transformed `"use cache"` function. */
-export declare function isUseCacheFunction(value: unknown): value is (...args: unknown[]) => Promise<unknown>;
-//#endregion
+export declare function isUseCacheFunction(value: unknown): value is (...args: unknown[]) => Promise<unknown>;

package/dist/shims/cache-runtime.js

@@ -1,26 +1,26 @@
-import { getOrCreateAls } from "./internal/als-registry.js";
-import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { VINEXT_RSC_MARKER_HEADER } from "../server/headers.js";
-import { isInsideWorkStoreScope } from "./internal/work-store-scope.js";
-import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
-import { isRouteCacheabilityProbe, recordRouteCacheabilityProbeBailout } from "./cacheability-classification.js";
-import { shareIsolatePromise } from "../server/isolate-shared-promise.js";
 import { getDataCacheHandler } from "./cache-handler.js";
-import { addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
-import { suppressHangingPromiseAbortRejections } from "./internal/make-hanging-promise.js";
-import { createPprFallbackShellSuspensePromise, trackPprFallbackShellCacheTask } from "./ppr-fallback-shell.js";
-import { createUseCacheAccessError, markDynamicUsage, recordInvalidDynamicUsageError } from "./internal/headers-state.js";
-import { isDraftModeEnabled } from "./headers.js";
-import { _registerCacheContextAccessor } from "./internal/cache-context-accessor.js";
 import { _hasPendingRevalidatedTag, _isOnDemandRevalidate, _setRequestScopedCacheLife, cacheLifeProfiles, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
+import { VINEXT_RSC_MARKER_HEADER } from "../server/headers.js";
 import "./fetch-cache.js";
+import { getOrCreateAls } from "./internal/als-registry.js";
 import { isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
+import { createUseCacheAccessError, markDynamicUsage, recordInvalidDynamicUsageError } from "./internal/headers-state.js";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
+import { addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
+import { isDraftModeEnabled } from "./headers.js";
 import { getFallbackParamsSnapshot, restoreThenableParams } from "./thenable-params.js";
+import { createPprFallbackShellSuspensePromise, trackPprFallbackShellCacheTask } from "./ppr-fallback-shell.js";
 import { hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withoutUseCacheSegmentMarker } from "./internal/app-page-props-cache-key.js";
+import { _registerCacheContextAccessor } from "./internal/cache-context-accessor.js";
 import { getCurrentRootParams } from "./root-params.js";
+import { isRouteCacheabilityProbe, recordRouteCacheabilityProbeBailout } from "./cacheability-classification.js";
+import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
+import { suppressHangingPromiseAbortRejections } from "./internal/make-hanging-promise.js";
+import { shareIsolatePromise } from "../server/isolate-shared-promise.js";
+import { isInsideWorkStoreScope } from "./internal/work-store-scope.js";
 import { flightArgumentsKey, restoreFlightReply, snapshotFlightReply } from "./cache-flight-arguments.js";
 import { cache } from "react";
-//#region src/shims/cache-runtime.ts
+// src/shims/cache-runtime.ts
 /**
 * "use cache" runtime
 *
@@ -324,6 +324,7 @@ function registerCachedFunction(fn, id, variant, options = {}) {
 			const parentCtx = cacheContextStorage.getStore();
 			if (parentCtx && parentCtx.variant !== "private") throwPrivateUseCacheInsidePublicUseCacheError();
 			if (unstableCacheContextStorage.getStore() === true) throwPrivateUseCacheInsideUnstableCacheError();
+			if (workUnitAsyncStorage.getStore()?.type === "generate-static-params") throwPrivateUseCacheOutsideRequestError();
 			markDynamicUsage();
 			const expression = "\"use cache: private\"";
 			const workUnit = workUnitAsyncStorage.getStore();
@@ -560,6 +561,12 @@ function throwPrivateUseCacheInsideUnstableCacheError() {
 	if (ctx) ctx.invalidDynamicUsageError = error;
 	throw error;
 }
+function throwPrivateUseCacheOutsideRequestError() {
+	const error = /* @__PURE__ */ new Error("\"use cache: private\" cannot be used outside of a request context.");
+	const ctx = getRequestContext();
+	if (ctx) ctx.invalidDynamicUsageError = error;
+	throw error;
+}
 function recordRequestScopedCacheControl(cacheControl) {
 	if (cacheControl === void 0) return;
 	const life = {
@@ -718,5 +725,4 @@ function makeErroringPageSearchParams() {
 		return typeof value === "function" ? value.bind(target) : value;
 	} });
 }
-//#endregion
 export { NestedDynamicUseCacheError, buildUseCacheKey, cacheContextStorage, clearPrivateCache, getCacheContext, isUseCacheFunction, memoizeInCacheScope, registerCachedFunction, replayCachedFunction, runWithPrivateCache };

package/dist/shims/cache.d.ts

@@ -1,9 +1,8 @@
 import { CacheLifeConfig } from "../utils/cache-life-profiles.js";
-import { ExecutionContextLike, getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, ActionRevalidationKind, CacheState, PendingCdnTagInvalidation, UnstableCacheRevalidationMode, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, markActionRevalidation, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
 import { CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, registerDataCacheHandler, registerLazyDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
 import { _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
-import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, ActionRevalidationKind, CacheState, PendingCdnTagInvalidation, UnstableCacheRevalidationMode, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, markActionRevalidation, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
-//#region src/shims/cache.d.ts
+import { ExecutionContextLike, getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
 /**
  * Revalidate cached data associated with a specific cache tag.
  *
@@ -147,5 +146,4 @@ type UnstableCacheOptions = {
  * digest of the callback source, keyParts and serialized arguments.
  */
 export declare function unstable_cache<T extends (...args: any[]) => Promise<any>>(fn: T, keyParts?: string[], options?: UnstableCacheOptions): T;
-//#endregion
 export { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, ActionRevalidationKind, CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, type CacheLifeConfig, CacheState, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, type ExecutionContextLike, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, PendingCdnTagInvalidation, UnstableCacheRevalidationMode, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _recordUseCacheRootParamRead, _registerCacheContextAccessor, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, configureMemoryCacheHandler, getAndClearActionRevalidationKind, getCacheHandler, getDataCacheHandler, getRegisteredCacheContext, getRequestExecutionContext, markActionRevalidation, unstable_noStore as noStore, registerDataCacheHandler, registerLazyDataCacheHandler, runWithDetachedCacheObservations, runWithExecutionContext, setCacheHandler, setDataCacheHandler, shouldServeStaleUnstableCacheEntry };

package/dist/shims/cache.js

@@ -1,20 +1,20 @@
+import { isDraftModeEnabled } from "./headers.js";
 import { getOrCreateAls } from "./internal/als-registry.js";
+import { sha256Hex } from "../utils/hash.js";
 import { getRequestContext, isInsideUnifiedScope } from "./unified-request-context.js";
-import { getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
-import { isInsideWorkStoreScope } from "./internal/work-store-scope.js";
 import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
-import { isStagedCacheabilityProbeActive } from "./cacheability-classification.js";
-import { MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, registerDataCacheHandler, registerLazyDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
-import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
-import { sha256Hex } from "../utils/hash.js";
-import { addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
 import { makeHangingPromise } from "./internal/make-hanging-promise.js";
+import { isInsideWorkStoreScope } from "./internal/work-store-scope.js";
+import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
+import { MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, registerDataCacheHandler, registerLazyDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
+import { getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { isStagedCacheabilityProbeActive } from "./cacheability-classification.js";
 import { getHeadersAccessPhase, markDynamicUsage } from "./internal/headers-state.js";
-import { isDraftModeEnabled } from "./headers.js";
+import { isPathKnownNotEdgeCached } from "./cdn-purge-routes.js";
 import { _recordUseCacheRootParamRead, _registerCacheContextAccessor, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
+import { addCollectedRequestTags, getCurrentFetchSoftTags, runWithDetachedFetchObservations } from "./fetch-cache-state.js";
 import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, markActionRevalidation, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
-import { isPathKnownNotEdgeCached } from "./cdn-purge-routes.js";
-//#region src/shims/cache.ts
+// src/shims/cache.ts
 /**
 * next/cache shim
 *
@@ -43,6 +43,12 @@ function scheduleRevalidation(promise) {
 		console.error("[vinext] cache revalidation failed:", error);
 	});
 }
+function throwIfGeneratingStaticParams(expression) {
+	if (!isInsideUnifiedScope()) return;
+	const route = getRequestContext().headersContext?.staticParamsRoute;
+	if (route === void 0) return;
+	throw new Error(`Route ${route} used "${expression}" inside \`generateStaticParams\` which is unsupported. To ensure revalidation is performed consistently it must always happen outside of renders and cached functions. See more info here: https://nextjs.org/docs/app/building-your-application/rendering/static-and-dynamic#dynamic-rendering`);
+}
 /**
 * Revalidate cached data associated with a specific cache tag.
 *
@@ -57,6 +63,7 @@ function scheduleRevalidation(promise) {
 * @param profile - cacheLife profile name (e.g. 'max', 'hours') or inline { expire: number }
 */
 function revalidateTag(tag, profile) {
+	throwIfGeneratingStaticParams(`revalidateTag ${tag}`);
 	if (isStagedCacheabilityProbeActive()) {
 		markDynamicUsage();
 		return;
@@ -108,6 +115,7 @@ async function invalidateDataCacheTag(encoded, durations) {
 * layout/page hierarchy tags, so only no-type invalidation applies there.
 */
 function revalidatePath(path, type) {
+	throwIfGeneratingStaticParams(`revalidatePath ${path}`);
 	if (isStagedCacheabilityProbeActive()) {
 		markDynamicUsage();
 		return;
@@ -486,5 +494,4 @@ function unstable_cache(fn, keyParts, options) {
 	};
 	return cachedFn;
 }
-//#endregion
 export { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, MemoryCacheHandler, NoOpCacheHandler, _captureRequestScopedCacheLifeAccessors, _consumeRequestScopedCacheLife, _drainPendingRevalidations, _hasPendingRevalidatedTag, _initRequestScopedCacheState, _isOnDemandRevalidate, _markPendingRevalidatedTag, _peekRequestScopedCacheLife, _queuePendingCdnTagInvalidation, _queuePendingRevalidation, _recordUseCacheRootParamRead, _registerCacheContextAccessor, _revalidateCdnTags, _runWithCacheState, _setRequestScopedCacheLife, cacheLife, cacheLifeProfiles, cacheTag, configureMemoryCacheHandler, getAndClearActionRevalidationKind, getCacheHandler, getDataCacheHandler, getRegisteredCacheContext, getRequestExecutionContext, io, isInsideUnstableCacheScope, markActionRevalidation, unstable_noStore as noStore, unstable_noStore, refresh, registerDataCacheHandler, registerLazyDataCacheHandler, revalidatePath, revalidateTag, runWithDetachedCacheObservations, runWithExecutionContext, setCacheHandler, setDataCacheHandler, shouldServeStaleUnstableCacheEntry, unstable_cache, unstable_cacheLife, unstable_cacheTag, unstable_io, updateTag };

package/dist/shims/cacheability-classification.d.ts

@@ -1,4 +1,3 @@
-//#region src/shims/cacheability-classification.d.ts
 export declare const CACHEABILITY_REQUEST_STATE: unique symbol;
 export type RouteCacheabilityOutcome = {
   cacheControl?: string;
@@ -79,6 +78,8 @@ export declare function recordRouteCacheabilityClientTraceMetadataMarker(marker:
 export declare function preserveRouteCacheabilityResponsePolicy(): void;
 export declare function readRouteCacheabilityState(): RouteCacheabilityState | null;
 export declare function beginRouteCacheability(kind: "app-page" | "app-route" | "pages-api" | "pages-page", pattern: string): boolean;
+/** Forget the route a dispatch began classifying when routing resumes after rejecting it. */
+export declare function resetRouteCacheability(): void;
 /** Prevent shared caching when request processing before route dispatch was request-specific. */
 export declare function markRouteCacheabilityDynamic(reason: string): void;
 /** Mark an effective route configuration that makes the whole pattern dynamic. */
@@ -111,5 +112,4 @@ export declare function isRouteCacheabilityIdentityProbe(): boolean;
 export declare function isStagedCacheabilityProbeActive(): boolean;
 export declare function deferRouteCacheability(): ((outcome: RouteCacheabilityOutcome) => void) | null;
 export declare function recordRouteCacheability(outcome: RouteCacheabilityOutcome): void;
-export declare function recordRouteCacheabilityProbeBailout(kind: "private-cache", outcome: RouteCacheabilityOutcome): void;
-//#endregion
+export declare function recordRouteCacheabilityProbeBailout(kind: "private-cache", outcome: RouteCacheabilityOutcome): void;

package/dist/shims/cacheability-classification.js

@@ -1,5 +1,5 @@
 import { getRequestExecutionContext } from "./request-context.js";
-//#region src/shims/cacheability-classification.ts
+// src/shims/cacheability-classification.ts
 const CACHEABILITY_REQUEST_STATE = Symbol.for("vinext.cacheabilityRequestState");
 /** Retain canonical tags across completed-response admission and adapter header shaping. */
 function recordRouteCacheabilityCdnTags(tags) {
@@ -36,6 +36,13 @@ function beginRouteCacheability(kind, pattern) {
 	if (kind === "pages-page") state.preserveResponseCachePolicy = false;
 	return true;
 }
+/** Forget the route a dispatch began classifying when routing resumes after rejecting it. */
+function resetRouteCacheability() {
+	const state = readRouteCacheabilityState();
+	if (!state) return;
+	state.route = void 0;
+	state.patternDynamicReason = void 0;
+}
 /** Prevent shared caching when request processing before route dispatch was request-specific. */
 function markRouteCacheabilityDynamic(reason) {
 	const state = readRouteCacheabilityState();
@@ -157,5 +164,4 @@ function recordRouteCacheabilityProbeBailout(kind, outcome) {
 	state.outcome = outcome;
 	state.complete?.(outcome);
 }
-//#endregion
-export { CACHEABILITY_REQUEST_STATE, beginRouteCacheability, captureRouteCacheabilityResponsePolicy, deferRouteCacheability, getRouteCacheabilityCaptureOptions, getRouteCacheabilityDynamicReason, isRouteCacheabilityEvaluation, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, isStagedCacheabilityProbeActive, markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityExplicitConfigPolicy, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, markRouteCacheabilityPatternDynamic, markRouteCacheabilityResponseBodyComplete, preserveRouteCacheabilityResponsePolicy, readRouteCacheabilityState, recordConfigCdnCachePolicyHeader, recordRouteCacheability, recordRouteCacheabilityCdnTags, recordRouteCacheabilityClientTraceMetadataMarker, recordRouteCacheabilityProbeBailout };
+export { CACHEABILITY_REQUEST_STATE, beginRouteCacheability, captureRouteCacheabilityResponsePolicy, deferRouteCacheability, getRouteCacheabilityCaptureOptions, getRouteCacheabilityDynamicReason, isRouteCacheabilityEvaluation, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, isStagedCacheabilityProbeActive, markRouteCacheabilityConfigCdnCachePolicy, markRouteCacheabilityDynamic, markRouteCacheabilityExplicitConfigPolicy, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, markRouteCacheabilityPatternDynamic, markRouteCacheabilityResponseBodyComplete, preserveRouteCacheabilityResponsePolicy, readRouteCacheabilityState, recordConfigCdnCachePolicyHeader, recordRouteCacheability, recordRouteCacheabilityCdnTags, recordRouteCacheabilityClientTraceMetadataMarker, recordRouteCacheabilityProbeBailout, resetRouteCacheability };

package/dist/shims/caught-not-found-boundaries.d.ts

@@ -1,5 +1,4 @@
 import React from "react";
-//#region src/shims/caught-not-found-boundaries.d.ts
 export declare const CAUGHT_NOT_FOUND_BOUNDARIES_GLOBAL = "__VINEXT_CAUGHT_NOT_FOUND__";
 /** The boundaries that caught, and those of them the document rendered. */
 export type CaughtNotFoundBoundaries = {
@@ -11,5 +10,4 @@ export declare function withCaughtNotFoundBoundaries(boundaries: CaughtNotFoundB
 /** Whether the boundary with this id caught a notFound() in the document. */
 export declare function useCaughtNotFoundBoundary(id: string | undefined): boolean;
 /** A hydrated boundary consumes its id, so a later mount renders its children. */
-export declare function consumeCaughtNotFoundBoundary(id: string | undefined): void;
-//#endregion
+export declare function consumeCaughtNotFoundBoundary(id: string | undefined): void;

package/dist/shims/caught-not-found-boundaries.js

@@ -1,5 +1,5 @@
 import React from "react";
-//#region src/shims/caught-not-found-boundaries.ts
+// src/shims/caught-not-found-boundaries.ts
 /**
 * The parallel slot not-found boundaries that caught a slot's notFound() in
 * the document. Fizz has no error boundaries, so a slot page's notFound()
@@ -44,5 +44,4 @@ function consumeCaughtNotFoundBoundary(id) {
 	const index = ids?.indexOf(id) ?? -1;
 	if (index !== -1) ids.splice(index, 1);
 }
-//#endregion
 export { CAUGHT_NOT_FOUND_BOUNDARIES_GLOBAL, CaughtNotFoundBoundariesContext, consumeCaughtNotFoundBoundary, useCaughtNotFoundBoundary, withCaughtNotFoundBoundaries };

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

@@ -1,5 +1,4 @@
 import { CdnCacheAdapter } from "./cdn-cache.js";
-//#region src/shims/cdn-cache-state.d.ts
 /** Register an adapter without loading the origin cache implementation. */
 export declare function setCdnCacheAdapter(adapter: CdnCacheAdapter): void;
 /**
@@ -9,5 +8,4 @@ export declare function setCdnCacheAdapter(adapter: CdnCacheAdapter): void;
  */
 export declare function registerCdnCacheAdapter(factory: () => CdnCacheAdapter): void;
 /** Read only an explicitly registered adapter; defaults belong to cdn-cache. */
-export declare function getExplicitCdnCacheAdapter(): CdnCacheAdapter | null;
-//#endregion
+export declare function getExplicitCdnCacheAdapter(): CdnCacheAdapter | null;