vinext 1.4.2 → 1.4.4

package/dist/server/worker-image-optimization.js

@@ -2,7 +2,7 @@ import { VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "./headers.js";
 import { readStaticFileSignal, readStaticFileSignalRequestHeaders } from "./static-file-signal.js";
 import { attachRequestCfMetadata, cloneRequestWithUrl } from "./request-pipeline.js";
 import { isNextStaticPath } from "../utils/asset-prefix.js";
-import { handleConfiguredImageOptimization, invalidImageSourceResponse, isImageSourceBodyStatus } from "./image-optimization.js";
+import { handleConfiguredImageOptimization, invalidImageSourceResponse, isImageSourceBodyStatus, markImageBuildAsset } from "./image-optimization.js";
 import { createStaticAssetRequest, mergeHeaders } from "./worker-utils.js";
 import { resolveClientBuildFile } from "./client-build-files.js";
 //#region src/server/worker-image-optimization.ts
@@ -53,28 +53,47 @@ async function fetchWorkerImageSource(imageUrl, request, options) {
 	} catch {
 		return invalidImageSourceResponse();
 	}
-	const buildAssetPath = resolveNextStaticFile(decodedPathname, options) ?? resolveClientBuildFile(sourceUrl.pathname, options.basePath, options.clientBuildFiles);
-	if (buildAssetPath !== null) return options.assets.fetch(new Request(new URL(buildAssetPath, request.url)));
+	const nextStaticFile = resolveNextStaticFile(decodedPathname, options);
+	if (nextStaticFile !== null) return markImageBuildAsset(await options.assets.fetch(new Request(new URL(nextStaticFile, request.url))));
+	const clientBuildFile = resolveClientBuildFile(sourceUrl.pathname, options.basePath, options.clientBuildFiles);
+	if (clientBuildFile !== null) return options.assets.fetch(new Request(new URL(clientBuildFile, request.url)));
 	const sourceResponse = await options.fetchPublicFile(attachRequestCfMetadata(new Request(sourceUrl, { signal: request.signal }), request));
 	if (sourceResponse && isImageSourceBodyStatus(sourceResponse.status)) return sourceResponse;
 	if (sourceResponse) cancelResponseBody(sourceResponse);
 	return invalidImageSourceResponse();
 }
 /**
+* Give a public-file source the Cache-Control middleware or `headers()` staged
+* for it, which a direct request receives in place of the asset default and
+* Next.js' internal source fetch reads.
+*/
+function withStagedCacheControl(asset, cacheControl) {
+	if (cacheControl === null) return asset;
+	const headers = new Headers(asset.headers);
+	headers.set("Cache-Control", cacheControl);
+	return new Response(asset.body, {
+		status: asset.status,
+		statusText: asset.statusText,
+		headers
+	});
+}
+/**
 * Return the public file a framework static-file signal selects, provided the
 * pipeline answered with a body-bearing 2xx outcome. The file is fetched with middleware's
-* request header overrides, as resolveStaticAssetSignal fetches it.
+* request header overrides, as resolveStaticAssetSignal fetches it, and keeps
+* the Cache-Control the pipeline staged.
 */
 function fetchSignalledPublicFile(response, sourceRequest, assets) {
 	const signal = isImageSourceBodyStatus(response.status) ? readStaticFileSignal(response) : null;
 	const requestHeaders = readStaticFileSignalRequestHeaders(response);
+	const stagedCacheControl = response.headers.get("Cache-Control");
 	cancelResponseBody(response);
 	if (signal === null) return null;
 	let assetPath = signal;
 	try {
 		assetPath = decodeURIComponent(signal);
 	} catch {}
-	return Promise.resolve(assets.fetch(createStaticAssetRequest(assetPath, sourceRequest, requestHeaders)));
+	return Promise.resolve(assets.fetch(createStaticAssetRequest(assetPath, sourceRequest, requestHeaders))).then((asset) => withStagedCacheControl(asset, stagedCacheControl));
 }
 /**
 * Serve the App Router image endpoint once the request handler admitted it
@@ -111,4 +130,4 @@ async function serveWorkerImageOptimization(request, signal, allowedWidths, imag
 	});
 }
 //#endregion
-export { fetchSignalledPublicFile, fetchWorkerImageSource, serveWorkerImageOptimization };
+export { fetchSignalledPublicFile, fetchWorkerImageSource, serveWorkerImageOptimization, withStagedCacheControl };

package/dist/server/worker-revalidation-context.js

@@ -12,6 +12,7 @@ function deriveExecutionContext(base, dispatchPagesRevalidate, isInternalPagesRe
 		...base?.cache === void 0 ? {} : { cache: base.cache },
 		...base?.assets === void 0 ? {} : { assets: base.assets },
 		...base?.trustedRevalidateOrigin === void 0 ? {} : { trustedRevalidateOrigin: base.trustedRevalidateOrigin },
+		...base?.middlewareOrigin === void 0 ? {} : { middlewareOrigin: base.middlewareOrigin },
 		dispatchPagesRevalidate,
 		isInternalPagesRevalidation
 	};

package/dist/shims/cache-runtime.js

@@ -14,9 +14,9 @@ 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 "./fetch-cache.js";
-import { hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withoutUseCacheSegmentMarker } from "./internal/app-page-props-cache-key.js";
 import { isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { getFallbackParamsSnapshot, restoreThenableParams } from "./thenable-params.js";
+import { hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withoutUseCacheSegmentMarker } from "./internal/app-page-props-cache-key.js";
 import { getCurrentRootParams } from "./root-params.js";
 import { flightArgumentsKey, restoreFlightReply, snapshotFlightReply } from "./cache-flight-arguments.js";
 import { cache } from "react";

package/dist/shims/cache.js

@@ -334,7 +334,7 @@ function unstable_cacheTag(...tags) {
 	}
 	return cacheTag(...tags);
 }
-const UNSTABLE_CACHE_KEY_PREFIX = "unstable_cache:v3";
+const UNSTABLE_CACHE_KEY_PREFIX = "unstable_cache:v4";
 /**
 * AsyncLocalStorage to track whether we're inside an unstable_cache() callback.
 * Stored on globalThis via Symbol so headers.ts can detect the scope without
@@ -403,9 +403,12 @@ function scheduleUnstableCacheBackgroundRevalidation(cacheKey, refresh) {
 	pending.set(cacheKey, trackedRevalidation);
 	waitUntilUnstableCacheRevalidation(trackedRevalidation);
 }
+function runUnstableCacheCallback(fn, args) {
+	return _unstableCacheAls.run(true, () => _unstableCacheCallbackAls.run({ useCacheContext: _useCacheContextAls.getStore() }, () => fn(...args)));
+}
 async function refreshUnstableCacheResult(fn, args, keyedArgs, cacheKey, tags, revalidateSeconds, staleEntry, deferWrite) {
 	const argsUnchanged = serializeArgsOrNull(args) === keyedArgs;
-	const result = await _unstableCacheAls.run(true, () => _unstableCacheCallbackAls.run({ useCacheContext: _useCacheContextAls.getStore() }, () => fn(...args)));
+	const result = await runUnstableCacheCallback(fn, args);
 	if (!argsUnchanged) return result;
 	const cacheValue = {
 		kind: "FETCH",
@@ -478,7 +481,7 @@ function unstable_cache(fn, keyParts, options) {
 				}
 			}
 		}
-		if (isDraftMode) return await _unstableCacheAls.run(true, () => fn(...args));
+		if (isDraftMode) return await runUnstableCacheCallback(fn, args);
 		return await refreshUnstableCacheResult(fn, args, keyedArgs, cacheKey, tags, revalidateSeconds, staleEntry, !staleEntry && isInsideWorkStoreScope());
 	};
 	return cachedFn;

package/dist/shims/client-page-root.js

@@ -1,10 +1,10 @@
 "use client";
 import { searchParamsToRecord } from "../utils/query.js";
+import { isOwnPropertyCheck, isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { getNavigationContext } from "./navigation-context-state.js";
-import { getClientNavigationRenderContext, useSearchParams } from "./navigation.js";
 import "./navigation-server.js";
+import { getClientNavigationRenderContext, useSearchParams } from "./navigation.js";
 import { RenderedSearchContext } from "./slot.js";
-import { isOwnPropertyCheck, isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { createElement, use, useMemo } from "react";
 //#region src/shims/client-page-root.tsx
 /**

package/dist/shims/error-boundary.d.ts

@@ -6,6 +6,8 @@ export type ErrorBoundaryProps = {
     reset: () => void;
   }>;
   children: React.ReactNode;
+  /** Whether this boundary renders global-error, at the root of the page. */
+  isGlobalErrorBoundary?: boolean;
   resetKey?: string | null;
 };
 export type SerializedBoundaryError = {
@@ -38,6 +40,7 @@ type RedirectBoundaryProps = {
 type ErrorBoundaryInnerProps = {
   isImplicitRootErrorBoundary?: boolean;
   pathname: string | null;
+  wrapsGlobalErrorBoundary?: boolean;
 } & ErrorBoundaryProps;
 export type ErrorBoundaryState = {
   error: CapturedError | null;
@@ -66,13 +69,14 @@ export declare class ErrorBoundaryInner extends React.Component<ErrorBoundaryInn
   reset: () => void;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-export declare function ErrorBoundary({ fallback, children, resetKey }: ErrorBoundaryProps): React.JSX.Element;
-export declare function GlobalErrorBoundary({ fallback, children }: {
+export declare function ErrorBoundary({ fallback, children, isGlobalErrorBoundary, resetKey }: ErrorBoundaryProps): React.JSX.Element;
+export declare function GlobalErrorBoundary({ fallback, children, wrapsGlobalErrorBoundary }: {
   fallback: React.ComponentType<{
     error: unknown;
     reset: () => void;
   }>;
   children: React.ReactNode;
+  wrapsGlobalErrorBoundary?: boolean;
 }): React.JSX.Element;
 type NotFoundBoundaryProps = {
   fallback: React.ReactNode;

package/dist/shims/error-boundary.js

@@ -2,11 +2,11 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
+import { consumeCaughtNotFoundBoundary, useCaughtNotFoundBoundary } from "./caught-not-found-boundaries.js";
 import { decodeRedirectError, forbidden, isRedirectError, notFound, unauthorized } from "./navigation-errors.js";
 import "./navigation-server.js";
-import { isRedirectToCurrentUrl, useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import DefaultGlobalError from "./default-global-error.js";
-import { consumeCaughtNotFoundBoundary, useCaughtNotFoundBoundary } from "./caught-not-found-boundaries.js";
+import { isRedirectToCurrentUrl, useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/shims/error-boundary.tsx
@@ -174,21 +174,23 @@ var ErrorBoundaryInner = class extends React.Component {
 		return this.props.children;
 	}
 };
-function ErrorBoundary({ fallback, children, resetKey }) {
+function ErrorBoundary({ fallback, children, isGlobalErrorBoundary, resetKey }) {
 	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
 		pathname,
 		resetKey,
 		fallback,
+		isGlobalErrorBoundary,
 		children
 	});
 }
-function GlobalErrorBoundary({ fallback, children }) {
+function GlobalErrorBoundary({ fallback, children, wrapsGlobalErrorBoundary }) {
 	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
 		pathname,
 		fallback,
 		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
+		wrapsGlobalErrorBoundary,
 		children
 	});
 }

package/dist/shims/internal/navigation-untracked.js

@@ -1,5 +1,5 @@
-import { getPagesNavigationContext } from "./pages-router-accessor.js";
 import { getNavigationContext } from "../navigation-context-state.js";
+import { getPagesNavigationContext } from "./pages-router-accessor.js";
 import { getClientNavigationState, useClientNavigationRenderSnapshot } from "../navigation.js";
 //#region src/shims/internal/navigation-untracked.ts
 /**

package/dist/shims/metadata.js

@@ -1,6 +1,6 @@
 import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
-import { withUseCacheLayoutMarker, withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import { makeThenableParams } from "./thenable-params.js";
+import { withUseCacheLayoutMarker, withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/metadata.tsx

package/dist/shims/navigation-server.js

@@ -1,3 +1,3 @@
-import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow };

package/dist/shims/navigation.js

@@ -15,7 +15,9 @@ import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscR
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest } from "../client/navigation-runtime.js";
-import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
+import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
@@ -25,11 +27,9 @@ import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navig
 import { extractRscCompletionMetadata } from "../server/rsc-completion-metadata.js";
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
-import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
-import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { cancelAppPrefetchFetch, promoteAppPrefetchFetch, releaseAppPrefetchFetchSlot, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
+import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
 /**

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

@@ -1,8 +1,8 @@
-import { ReadonlyURLSearchParams } from "./readonly-url-search-params.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 { throwClientHookError } from "./client-hook-error.js";
 import { GLOBAL_ACCESSORS_KEY, 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";
-import { throwClientHookError } from "./client-hook-error.js";
+import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 //#region src/shims/navigation.react-server.ts
 function usePathname() {
 	throwClientHookError("usePathname()");

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

@@ -46,7 +46,9 @@ export type ExecutionContextLike = {
   requestSignal?: AbortSignal;
   /**
    * Server-owned origin middleware runs against. Set by the Node production
-   * server, whose request URL comes from the client's Host header. Without it
+   * server and by entries that srvx serves on Node (Nitro's Node presets,
+   * @vitejs/plugin-rsc's dev and preview handlers), whose request URL comes
+   * from the client's Host header. Without it
    * middleware uses the request URL's origin, which Workers can trust because
    * the platform routes by hostname.
    */

package/dist/shims/root-params.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _recordUseCacheRootParamRead } from "./internal/cache-context-accessor.js";
+import { _recordUseCacheRootParamRead, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
 //#region 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 = {

package/dist/shims/slot.js

@@ -1,10 +1,10 @@
 "use client";
+import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
+import { notFound } from "./navigation-errors.js";
+import "./navigation-server.js";
 import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, AppElementsWire, UNMATCHED_SLOT } from "../server/app-elements-wire.js";
 import { readOptimisticStateKeyRebinder } from "../server/app-elements.js";
 import { isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor } from "../server/bfcache-identity.js";
-import { notFound } from "./navigation-errors.js";
-import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
-import "./navigation-server.js";
 import * as React$1 from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/slot.tsx

package/dist/shims/url-utils.js

@@ -115,12 +115,17 @@ function normalizePathTrailingSlash(path, trailingSlash) {
 	if (!path.startsWith("/") || path.startsWith("//") || process.env.__VINEXT_MANUAL_TRAILING_SLASH === "true") return path;
 	const { pathname, query, hash } = parsePath(path);
 	if (trailingSlash) {
-		if (/\.[^/]+\/?$/.test(pathname)) return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
+		if (hasFileLikeLastSegment(pathname)) return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
 		if (pathname.endsWith("/")) return `${pathname}${query}${hash}`;
 		return `${pathname}/${query}${hash}`;
 	}
 	return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
 }
+function hasFileLikeLastSegment(pathname) {
+	const end = pathname.endsWith("/") ? pathname.length - 1 : pathname.length;
+	const dot = pathname.indexOf(".", pathname.lastIndexOf("/", end - 1) + 1);
+	return dot !== -1 && dot < end - 1;
+}
 /**
 * Prepend basePath to a local path for browser URLs / fetches.
 */

package/dist/utils/client-entry-manifest.d.ts

@@ -11,6 +11,11 @@ export declare const VINEXT_CLIENT_REFERENCE_SOURCES = ".vite/vinext-client-refe
 export type ClientEntryManifest = {
   pagesClientEntry?: string;
   appBrowserEntry?: string;
+  /**
+   * The chunk holding the App Router browser runtime, whose evaluation starts
+   * hydration. A user chunk group can move it out of `appBrowserEntry`.
+   */
+  appBrowserRuntime?: string;
   /** The App Router RouteManifest chunk, which the browser entry imports as it boots. */
   appRouteManifest?: string;
   /** What each App Router client reference loads in the browser. */

package/dist/utils/client-entry-manifest.js

@@ -20,6 +20,7 @@ function readClientEntryManifest(clientDir) {
 		const manifest = {};
 		if (typeof value.pagesClientEntry === "string") manifest.pagesClientEntry = value.pagesClientEntry;
 		if (typeof value.appBrowserEntry === "string") manifest.appBrowserEntry = value.appBrowserEntry;
+		if (typeof value.appBrowserRuntime === "string") manifest.appBrowserRuntime = value.appBrowserRuntime;
 		if (typeof value.appRouteManifest === "string") manifest.appRouteManifest = value.appRouteManifest;
 		if (isUnknownRecord(value.appClientReferenceChunks)) manifest.appClientReferenceChunks = value.appClientReferenceChunks;
 		return manifest.pagesClientEntry || manifest.appBrowserEntry ? manifest : void 0;

package/dist/utils/client-runtime-metadata.d.ts

@@ -3,6 +3,7 @@ import { ClientReferenceChunks } from "./client-reference-chunks.js";
 type ClientRuntimeMetadata = {
   clientEntryFile?: string;
   appBootstrapPreinitModules?: string[];
+  appBootstrapPreloadModules?: string[];
   appRouteManifestModule?: string;
   appClientReferenceChunks?: ClientReferenceChunks;
   cssGraph?: Record<string, {
@@ -17,6 +18,10 @@ type ClientRuntimeMetadata = {
  * Read the client build manifest and compute runtime metadata used by
  * Cloudflare worker entry injection and Node production server startup.
  *
+ * - `appBootstrapPreinitModules` — chunks the App Router browser entry imports,
+ *   preinitialized during SSR.
+ * - `appBootstrapPreloadModules` — those of them that would start hydration if
+ *   evaluated ahead of the shell, preloaded during SSR instead.
  * - `appRouteManifestModule` — the App Router RouteManifest chunk, which the
  *   browser entry imports as it boots, preloaded during SSR.
  * - `appClientReferenceChunks` — what each App Router client reference loads

package/dist/utils/client-runtime-metadata.js

@@ -41,11 +41,28 @@ function collectCssGraph(buildManifest, applyBase) {
 	}
 	return Object.keys(cssGraph).length > 0 ? cssGraph : void 0;
 }
-function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, applyBase) {
-	if (!appBrowserEntry) return void 0;
+/**
+* The chunks the App Router browser entry statically imports, split by whether
+* they can run ahead of the shell. A preinitialized module evaluates as soon as
+* it loads, which on a reload can be before `<body>` has streamed. Evaluating
+* the browser runtime starts hydration, so a chunk that holds or imports it is
+* only preloaded, and runs when React's bootstrap script does. A user chunk
+* group can put the runtime in one of these chunks.
+*/
+function collectAppBootstrapModules(buildManifest, appBrowserEntry, appBrowserRuntime, applyBase) {
+	if (!appBrowserEntry) return {};
 	const entryKey = Object.keys(buildManifest).find((key) => buildManifest[key].file === appBrowserEntry);
-	if (!entryKey) return void 0;
-	const modules = [];
+	if (!entryKey) return {};
+	function evaluatesRuntime(key, seen = /* @__PURE__ */ new Set()) {
+		if (seen.has(key)) return false;
+		seen.add(key);
+		const chunk = buildManifest[key];
+		if (!chunk) return false;
+		if (chunk.file === appBrowserRuntime) return true;
+		return (chunk.imports ?? []).some((importedKey) => evaluatesRuntime(importedKey, seen));
+	}
+	const preinit = [];
+	const preload = [];
 	const seenFiles = /* @__PURE__ */ new Set();
 	const visitedChunks = /* @__PURE__ */ new Set();
 	function visit(key) {
@@ -57,18 +74,25 @@ function collectAppBootstrapPreinitModules(buildManifest, appBrowserEntry, apply
 			const importedChunk = buildManifest[importedKey];
 			if (importedChunk?.file.endsWith(".js") && !seenFiles.has(importedChunk.file)) {
 				seenFiles.add(importedChunk.file);
-				modules.push(applyBase(importedChunk.file));
+				(evaluatesRuntime(importedKey) ? preload : preinit).push(applyBase(importedChunk.file));
 			}
 			visit(importedKey);
 		}
 	}
 	visit(entryKey);
-	return modules.length > 0 ? modules : void 0;
+	return {
+		...preinit.length > 0 ? { preinit } : {},
+		...preload.length > 0 ? { preload } : {}
+	};
 }
 /**
 * Read the client build manifest and compute runtime metadata used by
 * Cloudflare worker entry injection and Node production server startup.
 *
+* - `appBootstrapPreinitModules` — chunks the App Router browser entry imports,
+*   preinitialized during SSR.
+* - `appBootstrapPreloadModules` — those of them that would start hydration if
+*   evaluated ahead of the shell, preloaded during SSR instead.
 * - `appRouteManifestModule` — the App Router RouteManifest chunk, which the
 *   browser entry imports as it boots, preloaded during SSR.
 * - `appClientReferenceChunks` — what each App Router client reference loads
@@ -118,7 +142,9 @@ function computeClientRuntimeMetadata(opts) {
 		metadata.cssGraph = collectCssGraph(buildManifest, (file) => manifestFileWithBase(file, opts.assetBase));
 		metadata.sharedChunks = collectSharedChunkFiles(buildManifest, (file) => manifestFileWithBase(file, opts.assetBase));
 	}
-	metadata.appBootstrapPreinitModules = collectAppBootstrapPreinitModules(buildManifest, clientEntryManifest?.appBrowserEntry, appAssetUrl);
+	const appBootstrapModules = collectAppBootstrapModules(buildManifest, clientEntryManifest?.appBrowserEntry, clientEntryManifest?.appBrowserRuntime, appAssetUrl);
+	metadata.appBootstrapPreinitModules = appBootstrapModules.preinit;
+	metadata.appBootstrapPreloadModules = appBootstrapModules.preload;
 	if (clientEntryManifest?.appRouteManifest) metadata.appRouteManifestModule = appAssetUrl(clientEntryManifest.appRouteManifest);
 	const lazyChunks = computeLazyChunks(buildManifest).map((file) => manifestFileWithBase(file, opts.assetBase));
 	if (lazyChunks.length > 0) metadata.lazyChunks = lazyChunks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",