vinext 1.4.2 → 1.4.3

package/README.md

@@ -137,10 +137,13 @@ files to `.cjs`) when an unambiguous default Vite config requires the ESM migrat
 `"type": "commonjs"` is never changed. Direct `vite dev` and `vite build` do not perform these
 wrapper compatibility steps.
 
-`@vinext/cloudflare deploy` options: `--preview`, `--env <name>`, `--name <name>`, `--vite-config <path>`, `--skip-build`, `--dry-run`, `--warm-cache`, `--traffic-aware-warm-cache`.
+`@vinext/cloudflare deploy` options: `--preview`, `--env <name>`, `--name <name>` (Wrangler config projects only), `--vite-config <path>`, `--skip-build`, `--dry-run`, `--warm-cache`, `--traffic-aware-warm-cache`.
 
 `vinext init` prompts for a deployment target, defaulting to Cloudflare. Agents must ask the
 user which target they want, then pass `--platform=cloudflare` or `--platform=node`.
+For Cloudflare, agents and CI must also pass `--cdn-cache`, `--data-cache`, and
+`--image-optimization`; see
+[Run init without prompts](https://vinext.dev/docs/deploying/cloudflare#run-init-without-prompts).
 
 Other options: `--port <port>` (default: 3001), `--skip-check`, `--force`.
 

package/dist/build/prerender-paths.d.ts

@@ -91,7 +91,17 @@ type PrerenderPathDiscoveryOptions = {
   };
 };
 /** @internal Match the pathname forms and locale provenance used by middleware runtime. */
-export declare function matchesMiddlewareWarmPath(pathname: string, matcher: MatcherConfig | undefined, i18n: ResolvedNextConfig["i18n"]): boolean;
+export declare function matchesMiddlewareWarmPath(pathname: string, matcher: MatcherConfig | undefined, i18n: ResolvedNextConfig["i18n"], options?: {
+  basePath?: string;
+  /**
+   * Whether the path's Pages data request reaches middleware slashed
+   * (`shouldAddTrailingSlashToPagesDataPath`). Omit for a path without a
+   * Pages data target.
+   */
+  pagesDataTrailingSlash?: boolean;
+  skipProxyUrlNormalize?: boolean;
+  trailingSlash?: boolean;
+}): boolean;
 export declare function discoverPrerenderPathManifest(options: PrerenderPathDiscoveryOptions): Promise<PrerenderPathManifest | null>;
 export declare function emitPrerenderPathManifest(options: PrerenderPathDiscoveryOptions): Promise<PrerenderPathManifest | null>;
 //#endregion

package/dist/build/prerender-paths.js

@@ -10,6 +10,7 @@ import { appRouteHasMainTreeLoadingBoundary, appRouter, matchAppRoute } from "..
 import { apiRouter, matchRoute, pagesRouter } from "../routing/pages-router.js";
 import { matchesMiddlewarePathname } from "../server/middleware-matcher.js";
 import { extractLocaleFromUrl, normalizeDefaultLocalePathname, shouldRestoreLocaleRootTrailingSlash } from "../server/pages-i18n.js";
+import { normalizeNextDataPagePathname, shouldAddTrailingSlashToPagesDataPath } from "../server/pages-data-route.js";
 import { classifyAppRoute, classifyAppRouteHandler, classifyPagesRoute, extractExportConstString, extractMiddlewareMatcherConfig, getAppRouteRenderEntryPath } from "./report.js";
 import { normalizeStaticPathname, normalizeStaticPathsEntry } from "../routing/route-pattern.js";
 import { buildPagesDataHref } from "../shims/internal/pages-data-url.js";
@@ -684,19 +685,37 @@ function findMiddlewareConventionFile(root, appDir, pagesDir, pageExtensions) {
 	return null;
 }
 /** @internal Match the pathname forms and locale provenance used by middleware runtime. */
-function matchesMiddlewareWarmPath(pathname, matcher, i18n) {
+function matchesMiddlewareWarmPath(pathname, matcher, i18n, options = {}) {
 	const encodedPathname = new URL(pathname, "https://vinext.invalid").pathname;
+	const trailingSlash = options.trailingSlash ?? false;
+	const htmlRequestPathname = normalizePathTrailingSlash(options.basePath ? `${options.basePath}${encodedPathname === "/" ? "" : encodedPathname}` : encodedPathname, trailingSlash);
 	const firstSegment = encodedPathname.split("/", 3)[1]?.toLowerCase();
 	const localeContexts = i18n ? i18n.locales.some((locale) => locale.toLowerCase() === firstSegment) ? [{ kind: "literal" }] : Array.from(/* @__PURE__ */ new Set([i18n.defaultLocale, ...i18n.domains?.map((domain) => domain.defaultLocale) ?? []]), (defaultLocale) => ({
 		defaultLocale,
 		kind: "defaulted"
 	})) : [void 0];
-	const matchPathnames = [encodedPathname];
-	try {
-		const decodedPathname = decodeURIComponent(encodedPathname);
-		if (decodedPathname !== encodedPathname) matchPathnames.push(decodedPathname);
-	} catch {}
-	return matchPathnames.some((matchPathname) => localeContexts.some((localeContext) => matchesMiddlewarePathname(matchPathname, matcher, i18n, localeContext)));
+	const requestSpellings = [{
+		localeContexts: shouldRestoreLocaleRootTrailingSlash(htmlRequestPathname, options) ? localeContexts.map((localeContext) => localeContext?.kind === "defaulted" ? {
+			...localeContext,
+			restoreRootTrailingSlash: true
+		} : localeContext) : localeContexts,
+		pathname: normalizePathTrailingSlash(encodedPathname, trailingSlash)
+	}];
+	if (options.pagesDataTrailingSlash !== void 0) {
+		const dataLocaleContexts = [i18n ? { kind: "literal" } : void 0];
+		requestSpellings.push({
+			localeContexts: dataLocaleContexts,
+			pathname: normalizeNextDataPagePathname(localizePagesDataPath(encodedPathname, i18n), options.pagesDataTrailingSlash)
+		});
+	}
+	return requestSpellings.some((spelling) => {
+		const matchPathnames = [spelling.pathname];
+		try {
+			const decodedPathname = decodeURIComponent(spelling.pathname);
+			if (decodedPathname !== spelling.pathname) matchPathnames.push(decodedPathname);
+		} catch {}
+		return matchPathnames.some((matchPathname) => spelling.localeContexts.some((localeContext) => matchesMiddlewarePathname(matchPathname, matcher, i18n, localeContext)));
+	});
 }
 async function startPathDiscoveryServer(options) {
 	return startProdServer({
@@ -822,10 +841,7 @@ async function discoverPrerenderPathManifest(options) {
 	const hasStagedRequestRouting = options.requestRouting === "uncached-stage";
 	const middlewarePath = hasStagedRequestRouting ? findMiddlewareConventionFile(root, appDir, pagesDir, config.pageExtensions) : null;
 	const configuredMatcher = middlewarePath ? extractMiddlewareMatcherConfig(middlewarePath) : void 0;
-	const middlewareMayRouteWarmPath = (pathname) => middlewarePath !== null && matchesMiddlewareWarmPath(pathname, configuredMatcher, config.i18n);
 	const routedWarmPaths = [...paths, ...discoveredRouteHandlerPaths];
-	const routeMayResolveWarmPathSet = new Set(hasStagedRequestRouting ? routedWarmPaths.filter((pathname) => middlewareMayRouteWarmPath(pathname) || configuredRewritesCanReplaceWarmPath(pathname, config.rewrites, discoveredNonDynamicPathSet.has(pathname), config, (rewrite) => !isExternalUrl(rewrite.destination))) : []);
-	const requestStageMayTerminateWarmPathSet = new Set(hasStagedRequestRouting ? routedWarmPaths.filter((pathname) => middlewareMayRouteWarmPath(pathname) || configuredRulesAffectWarmPath(pathname, config.redirects, config) || configuredRewritesCanReplaceWarmPath(pathname, config.rewrites, discoveredNonDynamicPathSet.has(pathname), config, (rewrite) => isExternalUrl(rewrite.destination))) : []);
 	const excludedWarmPathSet = new Set(options.responseVary && !hasStagedRequestRouting ? routedWarmPaths.filter((pathname) => configuredRulesAffectWarmPath(pathname, config.redirects, config) || configuredRewritesCanReplaceWarmPath(pathname, config.rewrites, discoveredNonDynamicPathSet.has(pathname), config, () => true)) : []);
 	const configuredPagesWarmPaths = discoveredPagesPaths.filter((pathname) => !excludedWarmPathSet.has(pathname));
 	const resolvedPagesWarmPaths = !appDir && pagesDir ? await excludePagesApiWarmPaths({
@@ -864,6 +880,16 @@ async function discoverPrerenderPathManifest(options) {
 		routePatterns: pagesWarmMetadata.routePatterns,
 		rscPaths: []
 	};
+	const pagesDataRequestsGetTrailingSlash = shouldAddTrailingSlashToPagesDataPath(true, config.trailingSlash, config.skipProxyUrlNormalize);
+	const pagesOwnedPathSet = appDir ? new Set(appOwnedWarmPaths.pagesPaths) : null;
+	const middlewareMatchesWarmPath = (pathname) => middlewarePath !== null && matchesMiddlewareWarmPath(pathname, configuredMatcher, config.i18n, {
+		basePath: config.basePath,
+		pagesDataTrailingSlash: discoveredPagesDataPathSet.has(pathname) && (pagesOwnedPathSet?.has(pathname) ?? true) ? pagesDataRequestsGetTrailingSlash : void 0,
+		skipProxyUrlNormalize: config.skipProxyUrlNormalize,
+		trailingSlash: config.trailingSlash
+	});
+	const routeMayResolveWarmPathSet = new Set(hasStagedRequestRouting ? routedWarmPaths.filter((pathname) => middlewareMatchesWarmPath(pathname) || configuredRewritesCanReplaceWarmPath(pathname, config.rewrites, discoveredNonDynamicPathSet.has(pathname), config, (rewrite) => !isExternalUrl(rewrite.destination))) : []);
+	const requestStageMayTerminateWarmPathSet = new Set(hasStagedRequestRouting ? routedWarmPaths.filter((pathname) => middlewareMatchesWarmPath(pathname) || configuredRulesAffectWarmPath(pathname, config.redirects, config) || configuredRewritesCanReplaceWarmPath(pathname, config.rewrites, discoveredNonDynamicPathSet.has(pathname), config, (rewrite) => isExternalUrl(rewrite.destination))) : []);
 	for (const pathname of configuredCandidatePaths) {
 		if (appOwnedWarmPaths.routePatterns[pathname] || !routeMayResolveWarmPathSet.has(pathname) && !requestStageMayTerminateWarmPathSet.has(pathname)) continue;
 		appOwnedWarmPaths.htmlPaths.push(pathname);

package/dist/cli.js

@@ -281,7 +281,7 @@ function printHelp(cmd) {
     --prerender          Configure Vite builds to pre-render static routes
                          (Cloudflare deploy won't serve them unless using Static Assets)
     --warm-cache         Add cache warming to the Cloudflare deploy script
-                         (Response Store or Workers Cache, default: prompt with No)
+                         (requires a --cdn-cache other than none, default: prompt with No)
     --legacy-wrangler-cloudflare-init
                          Use the legacy Wrangler setup instead of cf
     --ignore-wrangler-config

package/dist/client/dev-error-overlay.d.ts

@@ -5,7 +5,8 @@ export declare const DEV_ERROR_OVERLAY_HOST_ID = "__vinext_dev_error_overlay_roo
 export declare const DEV_ERROR_OVERLAY_MOUNT_ID = "__vinext_dev_error_overlay_mount";
 export declare function installDevErrorOverlay(): void;
 export declare function installReactRefreshErrorRecovery(): void;
-export declare function selectUnreportedInitialDevServerErrors(payloads: readonly InitialDevServerErrorPayload[], reported: readonly ReportedError[]): InitialDevServerErrorPayload[];
+export declare function reportRootErrorBoundaryCatch(): void;
+export declare function selectUnreportedInitialDevServerErrors(payloads: readonly InitialDevServerErrorPayload[], reported: readonly ReportedError[], rootBoundaryCaught?: boolean): InitialDevServerErrorPayload[];
 export declare function reportInitialDevServerErrors(): void;
 type ViteHmrErrorPayload = {
   err?: ViteHmrError;

package/dist/client/dev-error-overlay.js

@@ -82,7 +82,12 @@ function tryInstallReactRefreshErrorRecovery() {
 	});
 	return true;
 }
-function selectUnreportedInitialDevServerErrors(payloads, reported) {
+let rootErrorBoundaryCaught = false;
+function reportRootErrorBoundaryCatch() {
+	rootErrorBoundaryCaught = true;
+}
+function selectUnreportedInitialDevServerErrors(payloads, reported, rootBoundaryCaught = false) {
+	if (rootBoundaryCaught) return [];
 	const rethrownErrors = reported.filter((error) => error.source === "caught" || error.source === "uncaught" || error.source === "window-error");
 	return payloads.filter((payload) => {
 		const rethrownIndex = rethrownErrors.findIndex((error) => error.message === payload.message && (error.name || "Error") === (payload.name || "Error"));
@@ -96,7 +101,7 @@ function reportInitialDevServerErrors() {
 	const errors = window.__VINEXT_INITIAL_DEV_ERRORS__;
 	if (!errors || errors.length === 0) return;
 	window.__VINEXT_INITIAL_DEV_ERRORS__ = [];
-	for (const payload of selectUnreportedInitialDevServerErrors(errors, getOverlaySnapshot().errors)) {
+	for (const payload of selectUnreportedInitialDevServerErrors(errors, getOverlaySnapshot().errors, rootErrorBoundaryCaught)) {
 		const error = new Error(payload.message);
 		if (payload.name) error.name = payload.name;
 		if (payload.stack) error.stack = payload.stack;
@@ -1358,4 +1363,4 @@ const componentStackStyle = {
 	color: "var(--vinext-overlay-muted)"
 };
 //#endregion
-export { DEV_ERROR_OVERLAY_HOST_ID, DEV_ERROR_OVERLAY_MOUNT_ID, createDevErrorOverlayMountNode, createViteOpenInEditorUrl, devOnCaughtError, devOnUncaughtError, dismissOverlay, formatErrorInfoForClipboard, formatOverlayDisplayFile, formatViteOpenInEditorFile, installDevErrorOverlay, installReactRefreshErrorRecovery, installViteHmrErrorHandler, normalizeViteHmrError, reportInitialDevServerErrors, selectUnreportedInitialDevServerErrors };
+export { DEV_ERROR_OVERLAY_HOST_ID, DEV_ERROR_OVERLAY_MOUNT_ID, createDevErrorOverlayMountNode, createViteOpenInEditorUrl, devOnCaughtError, devOnUncaughtError, dismissOverlay, formatErrorInfoForClipboard, formatOverlayDisplayFile, formatViteOpenInEditorFile, installDevErrorOverlay, installReactRefreshErrorRecovery, installViteHmrErrorHandler, normalizeViteHmrError, reportInitialDevServerErrors, reportRootErrorBoundaryCatch, selectUnreportedInitialDevServerErrors };

package/dist/config/config-matchers.js

@@ -179,10 +179,14 @@ const REQUEST_HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
 	"transfer-encoding",
 	"upgrade"
 ]);
+/**
+* Strip the fixed request hop-by-hop list. Fields the client nominates in
+* `Connection` are forwarded, like Next.js: the headers here already include
+* middleware's request overrides, so honouring the client's list would let it
+* drop headers middleware set.
+*/
 function stripHopByHopRequestHeaders(headers) {
-	const connectionTokens = (headers.get("connection") || "").split(",").map((value) => value.trim().toLowerCase()).filter(Boolean);
 	for (const header of REQUEST_HOP_BY_HOP_HEADERS) headers.delete(header);
-	for (const token of connectionTokens) headers.delete(token);
 }
 /**
 * Compile a regex from next.config, or return null when it is invalid.

package/dist/config/next-config.d.ts

@@ -213,6 +213,15 @@ export type NextConfig = {
     contentDispositionType?: "inline" | "attachment";
     /** Content-Security-Policy header for image responses. Defaults to "script-src 'none'; frame-src 'none'; sandbox;" */
     contentSecurityPolicy?: string;
+    /** Least max-age, in seconds, of an image the endpoint serves as-is. Defaults to 14400. */
+    minimumCacheTTL?: number;
+    /**
+     * Most bytes the endpoint reads of a GIF, PNG or WebP source bound for an
+     * image optimizer (while detecting animation and while streaming to the
+     * optimizer) before answering 413. Other sources stream unbounded.
+     * Defaults to 50000000.
+     */
+    maximumResponseBody?: number;
   };
   /**
    * Enable React Strict Mode. When `true`, the client root is wrapped in

package/dist/entries/app-rsc-entry.js

@@ -122,8 +122,7 @@ function buildAppDecodedPathnamePatterns(routes, config) {
 	};
 	return routes.filter((route) => !route.isDynamic && !route.routePath && getAppRouteRenderEntryPath(route) !== null && isPrerenderedPage(route)).map((route) => route.pattern);
 }
-function createForcesDynamicReader() {
-	const readSource = createSegmentSourceReader();
+function createForcesDynamicReader(readSource = createSegmentSourceReader()) {
 	return (filePath) => {
 		const source = readSource(filePath);
 		return source !== null && extractExportConstString(source, "dynamic") === "force-dynamic";
@@ -134,7 +133,13 @@ function directRequestForcesDynamic(route, forcesDynamic) {
 	return route.routePath ? forcesDynamic(route.routePath) : appPageSegmentConfigPaths(route).some(forcesDynamic);
 }
 function buildAppRequestRouteMetadata(routes) {
-	const forcesDynamic = createForcesDynamicReader();
+	const readSource = createSegmentSourceReader();
+	const forcesDynamic = createForcesDynamicReader(readSource);
+	const routeHandlerMetadata = (filePath) => {
+		const source = readSource(filePath);
+		const runtime = source === null ? null : extractExportConstString(source, "runtime");
+		return runtime ? { runtime } : true;
+	};
 	return routes.map((route) => ({
 		canUseCanonicalLoadingShell: appRouteHasMainTreeLoadingBoundary(route),
 		forceDynamic: directRequestForcesDynamic(route, forcesDynamic) || [...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])), ...route.siblingIntercepts.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])].some(forcesDynamic),
@@ -145,7 +150,7 @@ function buildAppRequestRouteMetadata(routes) {
 		params: route.params,
 		rootParamNames: route.rootParamNames ?? [],
 		page: route.pagePath ? true : null,
-		routeHandler: route.routePath ? true : null,
+		routeHandler: route.routePath ? routeHandlerMetadata(route.routePath) : null,
 		routeSegments: route.routeSegments,
 		layouts: [],
 		layoutTreePositions: [],
@@ -292,7 +297,9 @@ export const __imageConfig = ${JSON.stringify({
 		dangerouslyAllowSVG: config?.imageConfig?.dangerouslyAllowSVG,
 		dangerouslyAllowLocalIP: config?.imageConfig?.dangerouslyAllowLocalIP,
 		contentDispositionType: config?.imageConfig?.contentDispositionType,
-		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy
+		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy,
+		minimumCacheTTL: config?.imageConfig?.minimumCacheTTL,
+		maximumResponseBody: config?.imageConfig?.maximumResponseBody
 	})};
 export const __clientBuildFiles = __pagesClientAssets.clientBuildFiles ?? [];
 // The matcher reads recorded prerenders, and this stage can run without the
@@ -385,7 +392,7 @@ const __requestHandler = createAppRscRequestHandler({
       params: pickParams(route, intercept.sourceMatchedParams),
     };
   },
-  ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {
+  ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, restoreLocaleRootTrailingSlash, validateExternalRewriteRequest }) {
     return __applyAppMiddleware({
       basePath: __basePath,
       cleanPathname,
@@ -399,6 +406,7 @@ const __requestHandler = createAppRscRequestHandler({
       middlewareRequest,
       module: middlewareModule,
       request,
+      restoreLocaleRootTrailingSlash,
       skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
@@ -407,9 +415,9 @@ const __requestHandler = createAppRscRequestHandler({
   publicFiles: new Set(${JSON.stringify(config?.publicFiles ?? [])}),
   registerCacheAdapters: __registerConfiguredCacheAdapters,
   renderNotFound: async () => null,
-  ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, dispatchPagesResponseStage, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, sharedAcrossHosts, url }) {
+  ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, dispatchPagesResponseStage, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, requestBasePath, sharedAcrossHosts, url }) {
     return __renderPagesFallback(
-      { allowRscDocumentFallback, appRouteMatch, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, sharedAcrossHosts, url },
+      { allowRscDocumentFallback, appRouteMatch, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, requestBasePath, sharedAcrossHosts, url },
       {
         async loadPagesEntry() {
           if (!dispatchPagesResponseStage) {
@@ -504,7 +512,9 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 		dangerouslyAllowSVG: config?.imageConfig?.dangerouslyAllowSVG,
 		dangerouslyAllowLocalIP: config?.imageConfig?.dangerouslyAllowLocalIP,
 		contentDispositionType: config?.imageConfig?.contentDispositionType,
-		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy
+		contentSecurityPolicy: config?.imageConfig?.contentSecurityPolicy,
+		minimumCacheTTL: config?.imageConfig?.minimumCacheTTL,
+		maximumResponseBody: config?.imageConfig?.maximumResponseBody
 	};
 	const { imports, importInitializers, routeEntries, metaRouteEntries, generateStaticParamsEntries, rootParamNameEntries, rootNotFoundVar, rootForbiddenVar, rootUnauthorizedVar, rootLayoutVars, globalErrorVar, globalNotFoundImportSpecifier } = buildAppRscManifestCode({
 		deferEagerImports: Boolean(instrumentationPath),
@@ -1143,6 +1153,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
           observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
           isForceStatic: buildOptions?.isForceStatic === true,
           isUncacheableRender: buildOptions?.isUncacheableRender === true,
+          routeTreeOnlyPrefetchShell: buildOptions?.routeTreeOnlyPrefetchShell === true,
           mountedLayouts: buildOptions?.mountedLayouts ?? null,
           serveStreamingMetadata: buildOptions?.serveStreamingMetadata,
           placeStreamedMetadataInHead: buildOptions?.placeStreamedMetadataInHead === true,
@@ -1671,7 +1682,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       params: pickParams(route, intercept.sourceMatchedParams),
     };
   },
-  ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {
+  ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, restoreLocaleRootTrailingSlash, validateExternalRewriteRequest }) {
     return __applyAppMiddleware({
       basePath: __basePath,
       cleanPathname,
@@ -1685,6 +1696,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       middlewareRequest,
       module: middlewareModule,
       request,
+      restoreLocaleRootTrailingSlash,
       skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
@@ -1695,9 +1707,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     const __isEdge = route ? __isEdgeRuntime(__resolveRouteRuntime(route)) : false;
     return __fallbackRenderer.renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdge });
   },
-  ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, dispatchPagesResponseStage, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, sharedAcrossHosts, url }) {
+  ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, dispatchPagesResponseStage, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, requestBasePath, sharedAcrossHosts, url }) {
     return __renderPagesFallback(
-      { allowRscDocumentFallback, appRouteMatch, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, sharedAcrossHosts, url },
+      { allowRscDocumentFallback, appRouteMatch, initialResponseHeaders, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, requestBasePath, sharedAcrossHosts, url },
       {
         async loadPagesEntry() {
           const __pagesEntry = await __ensureHybridPagesApplication();

package/dist/entries/pages-server-entry.js

@@ -108,7 +108,9 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 			contentDispositionType: nextConfig?.images?.contentDispositionType,
-			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+			minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+			maximumResponseBody: nextConfig?.images?.maximumResponseBody
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
@@ -135,6 +137,7 @@ export function __ensureInstrumentation(ctx) {
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    restoreLocaleRootTrailingSlash: options?.restoreLocaleRootTrailingSlash === true,
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
@@ -165,11 +168,14 @@ export const vinextConfig = ${vinextConfigJson};
 export const publicFiles = new Set(${JSON.stringify(publicFiles)});
 export const clientBuildFiles = new Set(__pagesClientAssets.clientBuildFiles ?? []);
 
+// The Worker request stage strips basePath before calling this, so the data
+// path must not lose it again: with basePath "/docs", "/docs/docs/_next/data/..."
+// is the page path "/docs/_next/data/...", not a data request.
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
     request,
     buildId,
-    vinextConfig.basePath,
+    "",
     __shouldAddTrailingSlashToPagesDataPath(
       hasMiddleware,
       vinextConfig.trailingSlash,
@@ -286,7 +292,9 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 			contentDispositionType: nextConfig?.images?.contentDispositionType,
-			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+			minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+			maximumResponseBody: nextConfig?.images?.maximumResponseBody
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
@@ -333,6 +341,7 @@ export async function runMiddleware(request, ctx, options) {
     isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
     module: middlewareModule,
     request,
+    restoreLocaleRootTrailingSlash: options?.restoreLocaleRootTrailingSlash === true,
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
@@ -400,11 +409,14 @@ export const buildId = ${buildIdJson};
 // Per-build capability used by Worker entries to authorize remote path
 // discovery. It is never included in responses or exposed to user modules.
 export const prerenderSecret = ${JSON.stringify(prerenderSecret ?? null)};
+// The Worker request stage strips basePath before calling this, so the data
+// path must not lose it again: with basePath "/docs", "/docs/docs/_next/data/..."
+// is the page path "/docs/_next/data/...", not a data request.
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
     request,
     buildId,
-    vinextConfig.basePath,
+    "",
     __shouldAddTrailingSlashToPagesDataPath(
       hasMiddleware,
       vinextConfig.trailingSlash,
@@ -439,6 +451,7 @@ export const pageRoutes = [
 ${pageRouteEntries.join(",\n")}
 ];
 export const publicFiles = new Set(${JSON.stringify(publicFiles)});
+export const clientBuildFiles = new Set(__pagesClientAssets.clientBuildFiles ?? []);
 const _pageRouteTrie = _buildRouteTrie(pageRoutes);
 const _errorPageRoute = {
   pattern: "/_error",

package/dist/index.js

@@ -19,7 +19,7 @@ import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS,
 import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
@@ -31,7 +31,7 @@ import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./rout
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash } from "./server/pages-i18n.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
@@ -78,6 +78,7 @@ import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { traceFrameworkRequest } from "./server/request-tracing.js";
+import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
 import { hasReactCompilerPlugin, isReactCompilerPlugin, isReactCompilerRequested, reactCompilerUnsupportedMessage } from "./utils/react-compiler-support.js";
@@ -134,7 +135,6 @@ import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
-import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes, scanPublicFiles } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
@@ -844,6 +844,7 @@ const PAGES_REQUEST_STAGE_ENTRY = resolveRuntimeEntryModule("pages-request-stage
 const PAGES_RESPONSE_STAGE_ENTRY = resolveRuntimeEntryModule("pages-response-stage-entry");
 const NITRO_PUBLIC_FILES_ENTRY = resolveRuntimeEntryModule("nitro-public-files");
 const NITRO_PUBLIC_FILES_PLUGIN = resolveRuntimeEntryModule("nitro-public-files-plugin");
+const SRVX_MIDDLEWARE_ORIGIN_ENTRY = resolveRuntimeEntryModule("srvx-middleware-origin");
 const WORKER_ROUTER_ENTRIES = /* @__PURE__ */ new Set([resolveRuntimeEntryModule("app-router-entry"), resolveRuntimeEntryModule("pages-router-entry")]);
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
@@ -2359,9 +2360,14 @@ function vinext(options = {}) {
 						const entry = hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry";
 						if (!hasAppDir && hasNitroPlugin) return [
 							`import pagesWorker from ${JSON.stringify(entry)};`,
+							`import { resolveSrvxMiddlewareOrigin } from ${JSON.stringify(SRVX_MIDDLEWARE_ORIGIN_ENTRY)};`,
 							...nitroPublicFiles ? [`import { withNitroPagesPublicFiles } from ${JSON.stringify(NITRO_PUBLIC_FILES_ENTRY)};`, "const worker = withNitroPagesPublicFiles(pagesWorker);"] : ["const worker = pagesWorker;"],
 							"export default { fetch(request, env, ctx) {",
-							`  return worker.fetch(request, env, { ...ctx, hostRuntime: ${JSON.stringify(nitroHostRuntime)} });`,
+							"  return worker.fetch(request, env, {",
+							"    ...ctx,",
+							`    hostRuntime: ${JSON.stringify(nitroHostRuntime)},`,
+							"    middlewareOrigin: resolveSrvxMiddlewareOrigin(request),",
+							"  });",
 							"} };"
 						].join("\n");
 						return `export { default } from ${JSON.stringify(entry)};`;
@@ -2453,7 +2459,9 @@ function vinext(options = {}) {
 								dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 								dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
 								contentDispositionType: nextConfig?.images?.contentDispositionType,
-								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy,
+								minimumCacheTTL: nextConfig?.images?.minimumCacheTTL,
+								maximumResponseBody: nextConfig?.images?.maximumResponseBody
 							},
 							hasPagesDir,
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
@@ -2734,9 +2742,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				handler(_options, bundle) {
 					if (this.environment?.name !== "client") return;
 					const manifest = {};
+					const appBrowserRuntimeModule = toSlash(resolveRuntimeEntryModule("app-browser-entry"));
 					for (const chunk of Object.values(bundle)) {
 						if (chunk.type !== "chunk") continue;
 						if (chunk.isDynamicEntry && isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_ROUTE_MANIFEST)) manifest.appRouteManifest = chunk.fileName;
+						if (chunk.moduleIds.some((id) => toSlash(id) === appBrowserRuntimeModule)) manifest.appBrowserRuntime = chunk.fileName;
 						if (!chunk.isEntry) continue;
 						if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
 						else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
@@ -3441,25 +3451,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									});
 								}
 							}
-							const filePathMatchesRewrite = [
-								...nextConfig?.rewrites.beforeFiles ?? [],
-								...nextConfig?.rewrites.afterFiles ?? [],
-								...nextConfig?.rewrites.fallback ?? []
-							].some((rewrite) => matchesRewriteSource(pathname, rewrite, {
-								basePath: bp,
-								hadBasePath: true
-							}));
-							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
-							const isExistingPublicMutation = req.method !== "GET" && req.method !== "HEAD" && isExistingDevPublicFile(pathname);
-							let filePathMatchesPagesRoute = false;
-							const requestHostname = getUrlHostname(requestOrigin);
-							if (isFilePathRequest && !filePathMatchesRewrite && !isDataReq) {
-								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
-								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
-								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
-								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
-							}
-							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isNextStaticPath(pathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? "")) && !isExistingPublicMutation) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
@@ -3489,7 +3480,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									headers: nodeRequestHeaders,
 									signal: webRequest.signal
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect, opts.restoreLocaleRootTrailingSlash);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -4120,6 +4111,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				nitroHostRuntime = nitro.options.exportConditions?.includes("workerd") ? "worker" : "node";
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
+				if (!nitro.options.dev) {
+					const requestTargetPlugin = resolveRuntimeEntryModule("nitro-request-target-plugin");
+					nitro.options.plugins ??= [];
+					if (!nitro.options.plugins.includes(requestTargetPlugin)) nitro.options.plugins.push(requestTargetPlugin);
+				}
 				nitroPublicFiles = registerNitroPublicFiles(nitro.options, NITRO_PUBLIC_FILES_PLUGIN, () => scanPublicFiles(root, nitroPublicDir));
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
 			} }
@@ -4266,6 +4262,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						pagesClientAssetsModule = buildPagesClientAssetsModule({
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							appBootstrapPreloadModules: runtimeMetadata.appBootstrapPreloadModules,
 							appRouteManifestModule: runtimeMetadata.appRouteManifestModule,
 							appClientReferenceChunks: runtimeMetadata.appClientReferenceChunks,
 							ssrManifest,

package/dist/init-platform.js

@@ -148,9 +148,9 @@ async function resolveInitOptions(args, options = {}) {
 	if (name && platform !== "cloudflare") throw new Error("--name requires --platform=cloudflare.");
 	const explicitPrerender = parsePrerenderArg(args);
 	if (platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" && explicitPrerender === false) throw new Error("--no-prerender cannot be used with --cdn-cache=static-assets, which requires build-time prerendering.");
-	const supportsWarmCdnCache = platformOptions?.cdnCache === "response-store" || platformOptions?.cdnCache === "workers-cache";
+	const supportsWarmCdnCache = platformOptions?.cdnCache !== void 0 && platformOptions.cdnCache !== "none";
 	if (platform === "cloudflare" && !supportsWarmCdnCache) {
-		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires --cdn-cache=response-store or workers-cache.");
+		if (explicitWarmCdnCache === true) throw new Error("--warm-cache requires a cache: pass --cdn-cache=response-store, workers-cache, data-cache, or static-assets.");
 	}
 	const prerender = platform === "cloudflare" && platformOptions?.cdnCache === "static-assets" ? false : explicitPrerender ?? await resolveInitPrerender(args, options, platform);
 	const warmCdnCache = platform === "cloudflare" && supportsWarmCdnCache ? await resolveInitWarmCdnCache(args, options) : false;