vinext 1.4.1 → 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`.
 
@@ -687,7 +690,7 @@ Every `next/*` import is shimmed to a Vite-compatible implementation.
 | `next.config.js` / `.ts` / `.mjs`                | ✅  | Function configs, phase argument                                                                                                                                                                                                                         |
 | `rewrites` / `redirects` / `headers`             | ✅  | All phases, param interpolation. A source Next.js rejects fails config loading, as it fails the Next.js build: missing, not starting with `/`, over the 4,096-character built-regex limit, or rejected by path-to-regexp, such as a header glob `/api/*` |
 | Environment variables (`.env*`, `NEXT_PUBLIC_*`) | ✅  | Auto-loads Next.js-style dotenv files; only public vars are inlined                                                                                                                                                                                      |
-| `images` config                                  | 🟡  | Parsed but not used for optimization                                                                                                                                                                                                                     |
+| `images` config                                  | 🟡  | Parsed but not used for optimization; the production image endpoint enforces `localPatterns` (dev serves any local source)                                                                                                                               |
 | `experimental.optimizePackageImports`            | ✅  | Rewrites barrel imports to direct sub-module imports in RSC/SSR environments. A default set (lucide-react, date-fns, radix-ui, antd, MUI, and others) are always optimized. Add package names here to extend the list.                                   |
 | `vinext({ nextConfig })`                         | ✅  | Inline Next-style config from `vite.config.*`. Supports object-form and function-form config. When provided, this overrides root `next.config.*`.                                                                                                        |
 | `vinext({ react: { compiler: true } })`          | ✅  | React Compiler auto memoization. Needs `@vitejs/plugin-react` 6.1+ and the optional `oxc-transform-react` package.                                                                                                                                       |

package/dist/build/action-owner-manifest.js

@@ -26,6 +26,7 @@ function actionOwnerRouteEntryIds(route) {
 			slot.loadingPath,
 			...slot.loadingPaths ?? [],
 			slot.errorPath,
+			...slot.errorPaths ?? [],
 			slot.notFoundPath,
 			...slot.notFoundPaths ?? [],
 			...slot.interceptingRoutes.flatMap((intercept) => [

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/check.js

@@ -197,7 +197,7 @@ const CONFIG_SUPPORT = {
 	env: { status: "supported" },
 	images: {
 		status: "partial",
-		detail: "remotePatterns, deviceSizes/imageSizes, qualities and SVG/CSP options honoured; resizing needs an optimizer via vinext({ images: { optimizer } }), images are served as-is otherwise; loader/loaderFile are ignored"
+		detail: "remotePatterns, deviceSizes/imageSizes, qualities, localPatterns (production only) and SVG/CSP options honoured; resizing needs an optimizer via vinext({ images: { optimizer } }), images are served as-is otherwise; loader/loaderFile are ignored"
 	},
 	allowedDevOrigins: {
 		status: "supported",

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.
@@ -719,7 +723,7 @@ function preserveRedirectDestinationQuery(destination, requestSearch, destinatio
 }
 const LOCATION_STRIPPED_RE = /^[\u0000- ]+|[\u0000- ]+$|[\t\n\r]/g;
 const LOCATION_UNSAFE_RE = /[\u0000-\u0008\u000A-\u001F\u007F]|[^\u0000-\u007F]/gu;
-const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+const SURROGATE_RE = /[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDFFF]/g;
 /**
 * Percent-encode what a config-redirect `Location` header cannot carry.
 *
@@ -731,7 +735,7 @@ const LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF
 * constructor throws the same way); vinext percent-encodes them instead.
 */
 function encodeRedirectLocation(location) {
-	return location.replace(LONE_SURROGATE_RE, "�").replace(LOCATION_UNSAFE_RE, encodeURIComponent);
+	return location.replace(SURROGATE_RE, (surrogate) => surrogate.length === 2 ? surrogate : "�").replace(LOCATION_UNSAFE_RE, encodeURIComponent);
 }
 function parseExternalRewriteUrl(externalUrl) {
 	try {

package/dist/config/destination-params.js

@@ -91,9 +91,12 @@ function substituteRewritePath(template, paramRe, params, absolute) {
 	const [path, hash] = substituted.split("#", 2);
 	const pathHash = hash === void 0 ? void 0 : hash ? `#${hash}` : "";
 	if (!absolute) return [path, pathHash];
-	return [path.replace(DOT_SEGMENT_RE, (segment, offset) => paramRanges.some(([start, end]) => start <= offset + segment.length && end >= offset) ? segment.replace(/\.|%(?=2e)/gi, (char) => char === "." ? "%252E" : "%25") : segment), pathHash];
+	return [path.replace(DOT_SEGMENT_RE, (_match, separator, segment, offset) => {
+		const start = offset + separator.length;
+		return paramRanges.some(([paramStart, end]) => paramStart <= start + segment.length && end >= start) ? separator + segment.replace(/\.|%(?=2e)/gi, (char) => char === "." ? "%252E" : "%25") : separator + segment;
+	}), pathHash];
 }
-const DOT_SEGMENT_RE = /(?<=^|[/\\])(?:\.|%2e){1,2}(?=[/\\]|$)/gi;
+const DOT_SEGMENT_RE = /(^|[/\\])((?:\.|%2e){1,2})(?=[/\\]|$)/gi;
 function encodePathQueryDelimiter(value) {
 	return value.replaceAll("?", "%3F");
 }

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

@@ -183,12 +183,27 @@ export type NextConfig = {
       search?: string;
     }>;
     domains?: string[];
+    /**
+     * Local sources the image optimization endpoint may serve. Statically
+     * imported images are allowed too, except under a basePath (the added
+     * pattern is unprefixed, as in Next.js). When unset, any local path
+     * without a query string is allowed (matches Next.js).
+     */
+    localPatterns?: Array<{
+      pathname?: string;
+      search?: string;
+    }>;
     unoptimized?: boolean;
     /** Allowed device widths for image optimization. Defaults to Next.js defaults: [640, 750, 828, 1080, 1200, 1920, 2048, 3840] */
     deviceSizes?: number[];
     /** Allowed image sizes for fixed-width images. Defaults to Next.js defaults: [32, 48, 64, 96, 128, 256, 384] */
     imageSizes?: number[];
-    /** Allowed image qualities. When unset, any quality from 1-100 is permitted (matches Next.js). */
+    /**
+     * Allowed image qualities. When set, the endpoint accepts only these and the
+     * default loader rounds `quality` to the closest entry, as in Next.js. When
+     * unset, any quality from 1-100 is permitted: a deliberate divergence from
+     * Next.js 16's `[75]` default that keeps Next.js 14/15 apps working.
+     */
     qualities?: number[];
     /** Allow SVG images through the image optimization endpoint. SVG can contain scripts, so only enable if you trust all image sources. */
     dangerouslyAllowSVG?: boolean;
@@ -198,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/config/next-config.js

@@ -507,6 +507,35 @@ async function resolveBuildId(generate) {
 	return trimmed;
 }
 /**
+* Mirror Next.js's config resolution of `images.localPatterns`: statically
+* imported images (`/_next/static/media/**`) stay allowed whatever the app
+* lists, though like Next.js the pattern is unprefixed, so it never matches
+* under a basePath. An unset list stays unset; the image endpoint then applies the
+* Next.js default.
+*/
+function resolveImageLocalPatterns(localPatterns) {
+	if (localPatterns === void 0) return void 0;
+	if (!Array.isArray(localPatterns)) throw new Error(`Specified images.localPatterns should be an Array received ${localPatterns === null ? "null" : typeof localPatterns}.\nSee more info here: https://nextjs.org/docs/messages/invalid-images-config`);
+	if (localPatterns.length > 25) throw new Error("Specified images.localPatterns can have at most 25 entries.");
+	const patterns = Array.from(localPatterns, (pattern, index) => {
+		const entry = pattern;
+		let valid = typeof pattern === "object" && pattern !== null && !Array.isArray(pattern) && !(pattern instanceof Date) && !(pattern instanceof Map) && !(pattern instanceof Set) && !(typeof entry.then === "function" && typeof pattern.catch === "function") && (entry.pathname === void 0 || typeof entry.pathname === "string") && (entry.search === void 0 || typeof entry.search === "string");
+		if (valid) {
+			for (const key in pattern) if (key !== "pathname" && key !== "search") valid = false;
+		}
+		if (!valid) throw new Error(`Specified images.localPatterns[${index}] should be an object with optional string \`pathname\` and \`search\` fields.`);
+		const resolved = {};
+		if (entry.pathname !== void 0) resolved.pathname = entry.pathname;
+		if (entry.search !== void 0) resolved.search = entry.search;
+		return resolved;
+	});
+	if (!patterns.some((pattern) => pattern.pathname === "/_next/static/media/**" && pattern.search === "")) patterns.push({
+		pathname: "/_next/static/media/**",
+		search: ""
+	});
+	return patterns;
+}
+/**
 * Normalize the `assetPrefix` option from next.config.
 *
 * Accepts both absolute URLs (`https://cdn.example.com[/subpath]`) and
@@ -1094,7 +1123,8 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			port: pattern.port,
 			pathname: pattern.pathname,
 			search: pattern.search
-		} : { ...pattern })
+		} : { ...pattern }),
+		localPatterns: resolveImageLocalPatterns(config.images.localPatterns)
 	} : void 0;
 	const resolved = {
 		env: config.env ?? {},

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

@@ -94,9 +94,10 @@ function appPageSegmentConfigPaths(route) {
 	];
 }
 /**
-* Patterns of the static App pages that answer a request whose raw pathname
-* reaches a dynamic sibling but whose segment-decoded pathname names them, so
-* `/%61` and `/caf%C3%A9` render `/a` and `/café` rather than `/[slug]`.
+* Patterns of the static App pages that may answer a request whose raw
+* pathname reaches a dynamic sibling but whose segment-decoded pathname names
+* them, so `/%61` and `/caf%C3%A9` can render `/a` and `/café` rather than
+* `/[slug]`.
 *
 * Next.js serves those requests from the response cached under the decoded
 * pathname, which exists only for a page it prerendered. The prerender listing
@@ -105,7 +106,10 @@ function appPageSegmentConfigPaths(route) {
 * runtime on any segment) and a Route Handler have no such entry, so the
 * dynamic sibling renders. So does a page whose sources can't be read here;
 * its sibling's render stays out of the shared caches. A cacheComponents
-* build lists every page route, as the prerender listing does.
+* build lists every page route, as the prerender listing does. Segment config
+* can't tell a page that reads request data, so the matcher renders the page
+* for another spelling (`/%61dmin`) only once the build recorded the decoded
+* pathname's prerender; the browser's own spelling needs none.
 */
 function buildAppDecodedPathnamePatterns(routes, config) {
 	const isPrerenderedPage = (route) => {
@@ -118,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";
@@ -130,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),
@@ -141,13 +150,17 @@ 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: [],
 		slots: Object.fromEntries(route.parallelSlots.map((slot) => [slot.key, {
 			id: slot.id ?? null,
 			name: slot.name,
+			__loadPage: slot.pagePath ? true : null,
+			__loadDefault: slot.defaultPath ? true : null,
+			slotPatternParts: slot.slotPatternParts ?? null,
+			slotParamNames: slot.slotParamNames ?? null,
 			intercepts: slot.interceptingRoutes.map((intercept) => ({
 				id: intercept.id ?? null,
 				targetPattern: intercept.targetPattern,
@@ -244,6 +257,8 @@ import { dispatchAppRequestStage as __dispatchAppRequestStage } from ${JSON.stri
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cdn-cache-adapter";
 import { clearAppRequestStageContext as __clearRequestContext, setAppRequestStageNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestStageContextPath)};
 import { matchRoutePattern as __matchRoutePattern } from ${JSON.stringify(routePatternPath)};
+import { initPregeneratedPathsFromGlobals as __initPregeneratedPathsFromGlobals } from ${JSON.stringify(pregeneratedConcretePathsPath)};
+import "virtual:vinext-pregenerated-concrete-paths";
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${middlewarePath ? `import { applyAppMiddleware as __applyAppMiddleware } from ${JSON.stringify(appMiddlewarePath)};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(toSlash(instrumentationPath))};
@@ -278,12 +293,18 @@ export { __basePath };
 export const __imageAllowedWidths = ${JSON.stringify([...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES])};
 export const __imageConfig = ${JSON.stringify({
 		qualities: config?.imageConfig?.qualities,
+		localPatterns: config?.imageConfig?.localPatterns,
 		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
+// response entry that also loads them.
+__initPregeneratedPathsFromGlobals();
 const __routes = ${JSON.stringify(requestRoutes)};
 const __routeMatcher = __createAppRscRouteMatcher(__routes, ${JSON.stringify(buildAppDecodedPathnamePatterns(routes, config))});
 const __metadataRouteMatchers = ${JSON.stringify(metadataRouteMatchers)};
@@ -354,20 +375,24 @@ const __requestHandler = createAppRscRequestHandler({
     const intercept = __routeMatcher.findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
     const route = __routes[intercept.sourceRouteIndex];
-    if (!route) return null;
-    const params = Object.create(null);
-    for (const name of route.params) {
-      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
-        params[name] = intercept.sourceMatchedParams[name];
+    const authorizationRoute = __routes[intercept.authorizationSourceRouteIndex];
+    if (!route || !authorizationRoute) return null;
+    const pickParams = (targetRoute, source) => {
+      const params = Object.create(null);
+      for (const name of targetRoute.params) {
+        if (Object.prototype.hasOwnProperty.call(source, name)) params[name] = source[name];
       }
-    }
+      return params;
+    };
     return {
+      authorizationParams: pickParams(authorizationRoute, intercept.authorizationSourceParams),
+      authorizationRoute,
       interceptionSourceIsConcrete: intercept.sourceRouteIsConcrete,
       route,
-      params,
+      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,
@@ -381,6 +406,7 @@ const __requestHandler = createAppRscRequestHandler({
       middlewareRequest,
       module: middlewareModule,
       request,
+      restoreLocaleRootTrailingSlash,
       skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
@@ -389,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) {
@@ -482,10 +508,13 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const imageAllowedWidths = [...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES];
 	const imageConfig = {
 		qualities: config?.imageConfig?.qualities,
+		localPatterns: config?.imageConfig?.localPatterns,
 		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),
@@ -1124,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,
@@ -1635,20 +1665,24 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     const intercept = findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
     const route = routes[intercept.sourceRouteIndex];
-    if (!route) return null;
-    const params = Object.create(null);
-    for (const name of route.params) {
-      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
-        params[name] = intercept.sourceMatchedParams[name];
+    const authorizationRoute = routes[intercept.authorizationSourceRouteIndex];
+    if (!route || !authorizationRoute) return null;
+    const pickParams = (targetRoute, source) => {
+      const params = Object.create(null);
+      for (const name of targetRoute.params) {
+        if (Object.prototype.hasOwnProperty.call(source, name)) params[name] = source[name];
       }
-    }
+      return params;
+    };
     return {
+      authorizationParams: pickParams(authorizationRoute, intercept.authorizationSourceParams),
+      authorizationRoute,
       interceptionSourceIsConcrete: intercept.sourceRouteIsConcrete,
       route,
-      params,
+      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,
@@ -1662,6 +1696,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       middlewareRequest,
       module: middlewareModule,
       request,
+      restoreLocaleRootTrailingSlash,
       skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
       trailingSlash: __trailingSlash,
       validateExternalRewriteRequest,
@@ -1672,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/app-rsc-manifest.js

@@ -108,6 +108,7 @@ function registerRouteModules(routes, imports) {
 			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
 			for (const loadingPath of slot.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
+			for (const errorPath of slot.errorPaths ?? []) imports.getLazyLoaderVar(errorPath);
 			if (slot.notFoundPath) imports.getLazyLoaderVar(slot.notFoundPath);
 			for (const notFoundPath of slot.notFoundPaths ?? []) imports.getLazyLoaderVar(notFoundPath);
 			for (const ir of slot.interceptingRoutes) {
@@ -240,6 +241,9 @@ function buildRouteEntries(routes, imports) {
         loadingTreePositions: ${JSON.stringify(slot.loadingTreePositions ?? [])},
         error: null,
         __loadError: ${slot.errorPath ? imports.getLazyLoaderVar(slot.errorPath) : "null"},
+        errors: ${moduleArray(slot.errorPaths?.length ?? 0)},
+        __loadErrors: ${lazyLoaderArray(slot.errorPaths ?? [], imports)},
+        errorTreePositions: ${JSON.stringify(slot.errorTreePositions ?? [])},
         notFound: null,
         __loadNotFound: ${slot.notFoundPath ? imports.getLazyLoaderVar(slot.notFoundPath) : "null"},
         notFoundTreePosition: ${slot.notFoundTreePosition ?? "null"},