vinext 1.4.1 → 1.4.3

package/dist/server/app-pages-bridge.js

@@ -1,5 +1,7 @@
+import { stripBasePath } from "../utils/base-path.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
+import { isLocaleRedirect, markLocaleRedirect } from "./pages-i18n.js";
 import { beginRouteCacheability, markRouteCacheabilityDynamic } from "../shims/cacheability-classification.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { pagesRouteHasPriorityOverAppRoute } from "./hybrid-route-priority.js";
@@ -18,7 +20,7 @@ function applyPagesMiddlewareContext(response, middlewareContext) {
 * Fallback handler to route App Router requests to the Pages Router when no App Router route matches.
 */
 async function renderPagesFallback(options, dependencies) {
-	const { allowRscDocumentFallback = false, appRouteMatch = null, isDataRequest = false, isRscRequest, initialResponseHeaders, matchKind, middlewareContext, pathname = options.url.pathname, pagesDataRequest = null, request, sharedAcrossHosts = false, url } = options;
+	const { allowRscDocumentFallback = false, appRouteMatch = null, isDataRequest = false, isRscRequest, initialResponseHeaders, matchKind, middlewareContext, pathname = options.url.pathname, pagesDataRequest = null, request, requestBasePath = "", sharedAcrossHosts = false, url } = options;
 	const { loadPagesEntry, buildRequestHeaders, applyRouteHandlerMiddlewareContext, getDraftModeCookieHeader } = dependencies;
 	if (isRscRequest && !allowRscDocumentFallback) return null;
 	const pagesEntry = await loadPagesEntry();
@@ -67,8 +69,10 @@ async function renderPagesFallback(options, dependencies) {
 		if (runtimeDataKind === "server" || runtimeDataKind === "initial") markRouteCacheabilityDynamic("getInitialProps render shares a cache entry across hosts");
 	}
 	const pagesRequest = claimPagesRequest();
+	const renderRequestUrl = new URL(pagesDataRequest?.url ?? pagesRequest.url);
+	if (!pagesDataRequest) renderRequestUrl.pathname = stripBasePath(renderRequestUrl.pathname, requestBasePath);
 	const renderArgs = [
-		pagesDataRequest ? cloneRequestWithUrl(pagesRequest, pagesDataRequest.url) : pagesRequest,
+		renderRequestUrl.href === pagesRequest.url ? pagesRequest : cloneRequestWithUrl(pagesRequest, renderRequestUrl.href),
 		pagesUrl,
 		{},
 		getRequestExecutionContext() ?? void 0,
@@ -76,7 +80,8 @@ async function renderPagesFallback(options, dependencies) {
 	];
 	const pagesRes = isDataRequest ? await (initialResponseHeaders ? pagesEntry.renderPage(...renderArgs, { isDataReq: true }, initialResponseHeaders) : pagesEntry.renderPage(...renderArgs, { isDataReq: true })) : await (initialResponseHeaders ? pagesEntry.renderPage(...renderArgs, void 0, initialResponseHeaders) : pagesEntry.renderPage(...renderArgs));
 	if (pagesRes.status === 404 && pageMatch === null) return null;
-	return applyDraftModeCookie(applyPagesMiddlewareContext(pagesRes, middlewareContext), getDraftModeCookieHeader());
+	const response = applyDraftModeCookie(applyPagesMiddlewareContext(pagesRes, middlewareContext), getDraftModeCookieHeader());
+	return isLocaleRedirect(pagesRes) ? markLocaleRedirect(response) : response;
 }
 /**
 * Append a middleware-emitted `__prerender_bypass` Set-Cookie header to a Pages

package/dist/server/app-request-stage-independent-entry.js

@@ -9,7 +9,7 @@ import "./server-globals.js";
 import { getExplicitCdnCacheAdapter } from "../shims/cdn-cache-state.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
-import { getImageOptimizer, readImageOptimizationSignal } from "./image-optimization.js";
+import { readImageOptimizationSignal } from "./image-optimization.js";
 import { consumeFrameworkRequestRoute, traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderStateFromHeaders } from "./prerender-route-params.js";
@@ -75,7 +75,6 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 		if (cdnValidationResponse) return cdnValidationResponse;
 	}
 	const url = new URL(request.url);
-	const servesImages = Boolean(assets) && getImageOptimizer() !== null;
 	const protocolRelativeGuard = guardProtocolRelativeUrl(url.pathname, url.search);
 	if (protocolRelativeGuard) return protocolRelativeGuard;
 	try {
@@ -104,7 +103,7 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 	};
 	const handle = () => requestRscHandler(request, ctx, trackedDispatchResponseStage, probeMode, ctx.isPrerenderPathDiscovery === true, trustedPrerenderState);
 	let response = await runWithExecutionContext(ctx, handle);
-	const imageSignal = servesImages ? readImageOptimizationSignal(response) : null;
+	const imageSignal = assets ? readImageOptimizationSignal(response) : null;
 	if (imageSignal && assets) {
 		const { fetchSignalledPublicFile, serveWorkerImageOptimization } = await import("./worker-image-optimization.js");
 		response = await serveWorkerImageOptimization(request, imageSignal, __imageAllowedWidths, __imageConfig, {

package/dist/server/app-response-stage-entry.js

@@ -58,6 +58,7 @@ async function handleResponseStage(request, env, platformCtx, props, dispatchReq
 		probeMode: props.cacheability.probeMode,
 		rawManifest: __cacheabilityManifest,
 		recomposesRequestScopedHeaders: props.kind === "app-page" && props.isRscRequest,
+		keepsParamsHeader: props.kind === "app-page" && props.interceptionContext !== null,
 		registerCacheAdapters: () => registerConfiguredCacheAdapters(env),
 		request,
 		representation: props.cacheability.representation,

package/dist/server/app-route-module-loader.d.ts

@@ -67,6 +67,7 @@ type LazyLoadableSlot = {
   loading?: unknown;
   loadings?: readonly unknown[];
   error?: unknown;
+  errors?: readonly unknown[];
   notFound?: unknown;
   notFounds?: readonly unknown[];
   __loadPage?: LazyModuleThunk | null;
@@ -76,6 +77,7 @@ type LazyLoadableSlot = {
   __loadLoading?: LazyModuleThunk | null;
   __loadLoadings?: LazyModuleLoaderArray | null;
   __loadError?: LazyModuleThunk | null;
+  __loadErrors?: LazyModuleLoaderArray | null;
   __loadNotFound?: LazyModuleThunk | null;
   __loadNotFounds?: LazyModuleLoaderArray | null;
   /** Hydrated only after an intercept matches, not with the slot's base modules. */

package/dist/server/app-route-module-loader.js

@@ -145,6 +145,7 @@ function ensureAppRouteModulesLoaded(route) {
 		pushFieldLoad(loads, slot, "loading", slot.__loadLoading);
 		pushArrayLoads(loads, slot.loadings, slot.__loadLoadings);
 		pushFieldLoad(loads, slot, "error", slot.__loadError);
+		pushArrayLoads(loads, slot.errors, slot.__loadErrors);
 		pushFieldLoad(loads, slot, "notFound", slot.__loadNotFound);
 		pushArrayLoads(loads, slot.notFounds, slot.__loadNotFounds);
 	}

package/dist/server/app-router-entry.js

@@ -8,7 +8,7 @@ import { runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
-import { getImageOptimizer, readImageOptimizationSignal } from "./image-optimization.js";
+import { readImageOptimizationSignal } from "./image-optimization.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { createStaticAssetRequest, resolveStaticAssetSignal } from "./worker-utils.js";
 import { readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
@@ -83,7 +83,6 @@ async function handleRequest(request, env, platformCtx) {
 	const cdnValidationResponse = await validateCdnRequest(request);
 	if (cdnValidationResponse) return cdnValidationResponse;
 	const url = new URL(request.url);
-	const servesImages = Boolean(assets) && getImageOptimizer() !== null;
 	const protocolRelativeGuard = guardProtocolRelativeUrl(url.pathname, url.search);
 	if (protocolRelativeGuard) return protocolRelativeGuard;
 	try {
@@ -109,7 +108,7 @@ async function handleRequest(request, env, platformCtx) {
 	const result = await (ctx ? runWithExecutionContext(ctx, handleFn) : handleFn());
 	if (result instanceof Response) {
 		let response = result;
-		const imageSignal = servesImages ? readImageOptimizationSignal(response) : null;
+		const imageSignal = assets ? readImageOptimizationSignal(response) : null;
 		if (imageSignal && assets) {
 			const { fetchSignalledPublicFile, serveWorkerImageOptimization } = await import("./worker-image-optimization.js");
 			response = await serveWorkerImageOptimization(request, imageSignal, __imageAllowedWidths, __imageConfig, {

package/dist/server/app-rsc-cache-busting.d.ts

@@ -78,6 +78,14 @@ export declare function createRscRequestHeaders(options?: CreateRscRequestHeader
  * their bytes can legitimately differ from the destination's full route.
  */
 export declare function canonicalizePrewarmableRscRequestHeaders(headers: Headers): boolean;
+/**
+ * Convert a search-param shell prefetch to the canonical navigation of its
+ * page. The shell renders the page with an empty query (app-page-dispatch.ts),
+ * which is what the query-free navigation renders, as Next.js's static
+ * prefetch of a page segment never varies on search params. The caller drops
+ * the query from the URL.
+ */
+export declare function canonicalizeDynamicShellRscRequestHeaders(headers: Headers): boolean;
 /**
  * Convert an ordinary loading-boundary prefetch to the shared loading-shell
  * variant. The payload is selected by the three retained mode headers; visible

package/dist/server/app-rsc-cache-busting.js

@@ -199,6 +199,18 @@ function canonicalizePrewarmableRscRequestHeaders(headers) {
 	return true;
 }
 /**
+* Convert a search-param shell prefetch to the canonical navigation of its
+* page. The shell renders the page with an empty query (app-page-dispatch.ts),
+* which is what the query-free navigation renders, as Next.js's static
+* prefetch of a page segment never varies on search params. The caller drops
+* the query from the URL.
+*/
+function canonicalizeDynamicShellRscRequestHeaders(headers) {
+	if (headers.get("X-Vinext-Rsc-Render-Mode") !== "prefetch-dynamic-shell" || headers.has("X-Vinext-Interception-Context") || headers.has("X-Vinext-Interception-Id") || headers.has("X-Vinext-Mounted-Slots")) return false;
+	headers.delete(VINEXT_RSC_RENDER_MODE_HEADER);
+	return canonicalizePrewarmableRscRequestHeaders(headers);
+}
+/**
 * Convert an ordinary loading-boundary prefetch to the shared loading-shell
 * variant. The payload is selected by the three retained mode headers; visible
 * router state is transport context and must not fragment the shared response.
@@ -285,4 +297,4 @@ async function resolveInvalidRscCacheBustingRequest(options) {
 	});
 }
 //#endregion
-export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, toPathAbsolutePathname };
+export { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, canonicalizeDynamicShellRscRequestHeaders, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, computeRscCacheBustingSearchParam, createCanonicalLoadingShellRscRequestHeaders, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, formatRscRequestPath, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, keepOnlyValidatedRscCacheBustingSearchParam, parseRscRequestPath, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, toPathAbsolutePathname };

package/dist/server/app-rsc-combined-handler.js

@@ -1,13 +1,14 @@
 import { getRequestExecutionContext, runWithExecutionContext } from "../shims/request-context.js";
 import { createWorkerRevalidationContext } from "./worker-revalidation-context.js";
 import { createAppRscRequestHandler } from "./app-rsc-handler.js";
+import { resolveSrvxMiddlewareOrigin } from "./srvx-middleware-origin.js";
 //#region src/server/app-rsc-combined-handler.ts
 /** Combined request/response handler used by default single-stage App entries. */
 function createAppRscHandler(options) {
 	const appRscRequestHandler = createAppRscRequestHandler(options);
 	const appRscHandler = (request, ctx, ...rest) => {
 		if (ctx != null || getRequestExecutionContext()) return appRscRequestHandler(request, ctx, ...rest);
-		const executionContext = createWorkerRevalidationContext(void 0, (internalRequest, internalCtx) => runWithExecutionContext(internalCtx, () => appRscRequestHandler(internalRequest, internalCtx)), "node");
+		const executionContext = createWorkerRevalidationContext({ middlewareOrigin: resolveSrvxMiddlewareOrigin(request) }, (internalRequest, internalCtx) => runWithExecutionContext(internalCtx, () => appRscRequestHandler(internalRequest, internalCtx)), "node");
 		return runWithExecutionContext(executionContext, () => appRscRequestHandler(request, ctx, ...rest));
 	};
 	return Object.assign(appRscHandler, { handleResponseStage(request, ctx, props, stageOptions) {

package/dist/server/app-rsc-handler.d.ts

@@ -6,6 +6,7 @@ import { ExecutionContextLike } from "../shims/request-context.js";
 import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
+import { AppPageNavigationParamSlot } from "./app-page-navigation-params.js";
 import { PagesRouteDataKind } from "./pages-route-data-kind.js";
 import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
 import { TrustedPrerenderState } from "./prerender-route-params.js";
@@ -25,6 +26,8 @@ type RunAppMiddlewareOptions = {
   isDataRequest: boolean;
   middlewareRequest?: Request;
   request: Request;
+  /** `shouldRestoreLocaleRootTrailingSlash` for the raw request pathname. */
+  restoreLocaleRootTrailingSlash?: boolean;
   validateExternalRewriteRequest: () => Promise<Response | null>;
 };
 export type AppRscHandlerRoute = {
@@ -41,9 +44,17 @@ export type AppRscHandlerRoute = {
   rootParamNames?: readonly string[];
   routeHandler?: unknown;
   routeSegments: readonly string[];
-  slots?: AppRouteTreePrefetchRoute["slots"];
+  slots?: Readonly<Record<string, NonNullable<AppRouteTreePrefetchRoute["slots"]>[string] & AppPageNavigationParamSlot>> | null;
 };
 type AppRscRouteMatch<TRoute> = {
+  /**
+   * For an interception match, the source route and params the interception
+   * context names, when they differ from the rendered `route` and `params`:
+   * a sibling intercept opened from a deeper source renders the intercepting
+   * route itself, while the deeper source is what gets authorized.
+   */
+  authorizationParams?: AppPageParams;
+  authorizationRoute?: TRoute;
   interceptionSourceIsConcrete?: boolean;
   params: AppPageParams;
   route: TRoute;
@@ -177,6 +188,8 @@ type RenderPagesFallbackOptions = {
   pathname?: string;
   pagesDataRequest?: Request | null;
   request: Request;
+  /** The basePath `request.url` still carries, removed before the page renders. */
+  requestBasePath?: string;
   /** The shared cache entry answers every host; a request-time render is not stored. */
   sharedAcrossHosts?: boolean;
   url: URL;