vinext 1.0.0-beta.4 → 1.0.0-beta.6

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

@@ -1,6 +1,7 @@
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.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
 declare function usePathname(): never;
 declare function useSearchParams(): never;

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.

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

@@ -27,16 +27,20 @@
  */
 type ExecutionContextLike = {
   waitUntil(promise: Promise<unknown>): void;
-  passThroughOnException?(): void; /** Host runtime executing the current request. */
+  passThroughOnException?(): void;
+  /** Host runtime executing the current request. */
   hostRuntime?: "node" | "worker";
   /**
    * Optional host-provided cache handle that some runtimes expose on the
    * execution context. Typed as `unknown` to keep this module runtime-agnostic;
    * CDN cache adapters that know the concrete shape narrow it themselves.
    */
-  cache?: unknown; /** Server-owned origin for credential-bearing Pages revalidation loopbacks. */
-  trustedRevalidateOrigin?: string; /** Worker-owned in-process dispatcher for authenticated Pages revalidation. */
-  dispatchPagesRevalidate?: (request: Request) => Promise<Response>; /** Marks a request currently executing through the internal revalidation dispatcher. */
+  cache?: unknown;
+  /** Server-owned origin for credential-bearing Pages revalidation loopbacks. */
+  trustedRevalidateOrigin?: string;
+  /** Worker-owned in-process dispatcher for authenticated Pages revalidation. */
+  dispatchPagesRevalidate?: (request: Request) => Promise<Response>;
+  /** Marks a request currently executing through the internal revalidation dispatcher. */
   isInternalPagesRevalidation?: boolean;
 };
 /**

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

@@ -1,4 +1,5 @@
 import { NavigationContext } from "./navigation-context-state.js";
+import "./navigation.js";
 import { CacheLifeConfig, CacheState } from "./cache-request-state.js";
 import { RootParamsState } from "./root-params.js";
 import { ExecutionContextLike } from "./request-context.js";

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

@@ -17,10 +17,12 @@ type RootParamsUsageController = {
 declare function pickRootParams(params: RootParams, rootParamNames: readonly string[] | null | undefined): RootParams;
 declare function setRootParams(params: RootParams | null): void;
 declare function getRootParam(name: string): Promise<string | string[] | undefined>;
+/** @internal Current route root params for `"use cache"` key derivation. */
+declare function getCurrentRootParams(): RootParams | null;
 declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => Promise<T>, controller?: RootParamsUsageController): Promise<T>;
 declare function runWithRootParamsUsage<T>(usage: RootParamsUsage, fn: () => T | Promise<T>, controller?: RootParamsUsageController): T | Promise<T>;
 declare function createRootParamsUsageController(): RootParamsUsageController;
 declare function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;
 declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;
 //#endregion
-export { RootParams, RootParamsState, RootParamsUsage, RootParamsUsageController, createRootParamsUsageController, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };
+export { RootParams, RootParamsState, RootParamsUsage, RootParamsUsageController, createRootParamsUsageController, getCurrentRootParams, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };

package/dist/shims/root-params.js

@@ -1,5 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
+import { _recordUseCacheRootParamRead } from "./cache-request-state.js";
 //#region src/shims/root-params.ts
 function createRootParamsUsageError(message) {
 	return new Error(message);
@@ -25,8 +26,13 @@ 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.`);
+	_recordUseCacheRootParamRead(name);
 	return Promise.resolve(getState().rootParams?.[name]);
 }
+/** @internal Current route root params for `"use cache"` key derivation. */
+function getCurrentRootParams() {
+	return getState().rootParams;
+}
 function runWithRootParamsUsage(usage, fn, controller) {
 	const state = {
 		...usage,
@@ -47,4 +53,4 @@ function runWithRootParamsScope(params, fn) {
 	else return _als.run({ rootParams: params }, fn);
 }
 //#endregion
-export { createRootParamsUsageController, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };
+export { createRootParamsUsageController, getCurrentRootParams, getRootParam, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage, setRootParams };

package/dist/shims/router.d.ts

@@ -1,11 +1,10 @@
-import { VinextNextData } from "../client/vinext-next-data.js";
 import { isExternalUrl } from "../utils/external-url.js";
+import { VinextNextData } from "../client/vinext-next-data.js";
 import { PagesRouterComponentsMap } from "./internal/pages-router-components.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;
@@ -13,26 +12,47 @@ type BeforePopStateCallback = (state: {
   options: TransitionOptions;
 }) => boolean;
 type NextRouter = {
-  /** Current pathname */pathname: string; /** Current route pattern (e.g., "/posts/[id]") */
-  route: string; /** Query parameters */
-  query: ParsedUrlQuery; /** Full URL including query string */
-  asPath: string; /** Base path */
-  basePath: string; /** Current locale */
-  locale?: string; /** Available locales */
-  locales?: readonly string[]; /** Default locale */
-  defaultLocale?: string; /** Configured domain locales */
-  domainLocales?: VinextNextData["domainLocales"]; /** Whether the active hostname matches a configured locale domain */
-  isLocaleDomain: boolean; /** Whether the router is ready */
-  isReady: boolean; /** Whether this is a preview */
-  isPreview: boolean; /** Whether this is a fallback page */
-  isFallback: boolean; /** Navigate to a new URL */
-  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Replace current URL */
-  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>; /** Go back */
-  back(): void; /** Go forward */
-  forward(): void; /** Reload the page */
-  reload(): void; /** Prefetch a page (injects <link rel="prefetch">) */
-  prefetch(url: string, as?: string): Promise<void>; /** Register a callback to run before popstate navigation */
-  beforePopState(cb: BeforePopStateCallback): void; /** Listen for route changes */
+  /** Current pathname */
+  pathname: string;
+  /** Current route pattern (e.g., "/posts/[id]") */
+  route: string;
+  /** Query parameters */
+  query: ParsedUrlQuery;
+  /** Full URL including query string */
+  asPath: string;
+  /** Base path */
+  basePath: string;
+  /** Current locale */
+  locale?: string;
+  /** Available locales */
+  locales?: readonly string[];
+  /** Default locale */
+  defaultLocale?: string;
+  /** Configured domain locales */
+  domainLocales?: VinextNextData["domainLocales"];
+  /** Whether the active hostname matches a configured locale domain */
+  isLocaleDomain: boolean;
+  /** Whether the router is ready */
+  isReady: boolean;
+  /** Whether this is a preview */
+  isPreview: boolean;
+  /** Whether this is a fallback page */
+  isFallback: boolean;
+  /** Navigate to a new URL */
+  push(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  /** Replace current URL */
+  replace(url: string | UrlObject$1, as?: string, options?: TransitionOptions): Promise<boolean>;
+  /** Go back */
+  back(): void;
+  /** Go forward */
+  forward(): void;
+  /** Reload the page */
+  reload(): void;
+  /** Prefetch a page (injects <link rel="prefetch">) */
+  prefetch(url: string, as?: string): Promise<void>;
+  /** Register a callback to run before popstate navigation */
+  beforePopState(cb: BeforePopStateCallback): void;
+  /** Listen for route changes */
   events: RouterEvents;
 };
 type UrlObject$1 = UrlObject;
@@ -176,7 +196,8 @@ declare function withRouter<P extends WithRouterProps, C extends BaseContext = N
 declare const RouterMethods: {
   router: null;
   readyCallbacks: Array<() => unknown>;
-  ready(callback: () => unknown): void; /** See `_components` comment above for the dual role this map plays. */
+  ready(callback: () => unknown): void;
+  /** See `_components` comment above for the dual role this map plays. */
   components: PagesRouterComponentsMap;
   sdc: Record<string, Promise<Response>>;
   push: (url: string | UrlObject$1, as?: string, options?: TransitionOptions) => Promise<boolean>;