vinext 1.4.0 → 1.4.2

package/README.md

@@ -659,26 +659,26 @@ Every `next/*` import is shimmed to a Vite-compatible implementation.
 
 ### Server features
 
-| Feature                                    |     | Notes                                                                                       |
-| ------------------------------------------ | --- | ------------------------------------------------------------------------------------------- |
-| SSR (Pages Router)                         | ✅  | Streaming, `_app`/`_document`, `__NEXT_DATA__`, hydration                                   |
-| SSR (App Router)                           | ✅  | RSC pipeline, nested layouts, streaming, nav context for client components                  |
-| `getStaticProps`                           | ✅  | Props, redirect, notFound, revalidate                                                       |
-| `getStaticPaths`                           | ✅  | `fallback: false`, `true`, `"blocking"`                                                     |
-| `getServerSideProps`                       | ✅  | Full context including locale                                                               |
-| ISR                                        | ✅  | Stale-while-revalidate, pluggable `CacheHandler`, background regeneration                   |
-| Server Actions (`"use server"`)            | ✅  | Action execution, FormData, re-render after mutation, `redirect()` in actions               |
-| React Server Components                    | ✅  | Via `@vitejs/plugin-rsc`. `"use client"` boundaries work correctly                          |
-| Streaming SSR                              | ✅  | Both routers                                                                                |
-| Metadata API                               | ✅  | `metadata`, `generateMetadata`, `viewport`, `generateViewport`, title templates             |
-| `generateStaticParams`                     | ✅  | With `dynamicParams` enforcement                                                            |
-| Metadata file routes                       | ✅  | sitemap.xml, robots.txt, manifest, favicon, OG images (static + dynamic)                    |
-| Static export (`output: 'export'`)         | ✅  | Generates static HTML/JSON for all routes                                                   |
-| Standalone output (`output: 'standalone'`) | ✅  | Generates `dist/standalone` with `server.js`, build artifacts, and runtime deps             |
-| `connection()`                             | ✅  | Forces dynamic rendering                                                                    |
-| `"use cache"` directive                    | ✅  | File-level and function-level. `cacheLife()` profiles, `cacheTag()`, stale-while-revalidate |
-| `instrumentation.ts`                       | ✅  | `register()`, `onRequestError()`, and [framework tracing](docs/tracing.mdx)                 |
-| Route segment config                       | 🟡  | `revalidate`, `dynamic`, `dynamicParams`, `runtime` (not placement). No `preferredRegion`   |
+| Feature                                    |     | Notes                                                                                                                                                                      |
+| ------------------------------------------ | --- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| SSR (Pages Router)                         | ✅  | Streaming, `_app`/`_document`, `__NEXT_DATA__`, hydration                                                                                                                  |
+| SSR (App Router)                           | ✅  | RSC pipeline, nested layouts, streaming, nav context for client components                                                                                                 |
+| `getStaticProps`                           | ✅  | Props, redirect, notFound, revalidate                                                                                                                                      |
+| `getStaticPaths`                           | ✅  | `fallback: false`, `true`, `"blocking"`                                                                                                                                    |
+| `getServerSideProps`                       | ✅  | Full context including locale                                                                                                                                              |
+| ISR                                        | ✅  | Stale-while-revalidate, pluggable `CacheHandler`, background regeneration                                                                                                  |
+| Server Actions (`"use server"`)            | ✅  | Action execution, FormData, re-render after mutation, `redirect()` in actions                                                                                              |
+| React Server Components                    | ✅  | Via `@vitejs/plugin-rsc`. `"use client"` boundaries work correctly                                                                                                         |
+| Streaming SSR                              | ✅  | Both routers                                                                                                                                                               |
+| Metadata API                               | ✅  | `metadata`, `generateMetadata`, `viewport`, `generateViewport`, title templates                                                                                            |
+| `generateStaticParams`                     | ✅  | With `dynamicParams` enforcement                                                                                                                                           |
+| Metadata file routes                       | ✅  | sitemap.xml, robots.txt, manifest, favicon, OG images (static + dynamic)                                                                                                   |
+| Static export (`output: 'export'`)         | ✅  | Generates static HTML/JSON for all routes                                                                                                                                  |
+| Standalone output (`output: 'standalone'`) | ✅  | Generates `dist/standalone` with `server.js`, build artifacts, and runtime deps                                                                                            |
+| `connection()`                             | ✅  | Forces dynamic rendering                                                                                                                                                   |
+| `"use cache"` directive                    | ✅  | File-level and function-level. `cacheLife()` with built-in and next.config `cacheLife` (or legacy `experimental.cacheLife`) profiles, `cacheTag()`, stale-while-revalidate |
+| `instrumentation.ts`                       | ✅  | `register()`, `onRequestError()`, and [framework tracing](docs/tracing.mdx)                                                                                                |
+| Route segment config                       | 🟡  | `revalidate`, `dynamic`, `dynamicParams`, `runtime` (not placement). No `preferredRegion`                                                                                  |
 
 ### Configuration
 
@@ -687,7 +687,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.js

@@ -608,12 +608,13 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
 					outputFiles.push(htmlOutputPath);
 				}
+				const renderedRevalidate = isStaticPropsResponse ? readPrerenderCacheLifeHeader(response.headers)?.revalidate ?? false : revalidate;
 				result = {
 					route: route.pattern,
 					status: "rendered",
 					outputFiles,
-					revalidate,
-					...typeof revalidate === "number" ? { expire: config.expireTime } : {},
+					revalidate: renderedRevalidate,
+					...typeof renderedRevalidate === "number" ? { expire: config.expireTime } : {},
 					router: "pages",
 					...urlPath !== route.pattern ? { path: urlPath } : {},
 					...locale ? { locale } : {},

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",
@@ -243,13 +243,10 @@ const CONFIG_SUPPORT = {
 		status: "unsupported",
 		detail: "ignored; configure cache adapters with vinext({ cache }) in vite.config"
 	},
-	cacheLife: {
-		status: "unsupported",
-		detail: "custom cacheLife profiles are ignored; only the built-in profiles are available"
-	},
+	cacheLife: { status: "supported" },
 	"experimental.cacheLife": {
-		status: "unsupported",
-		detail: "custom cacheLife profiles are ignored; only the built-in profiles are available"
+		status: "supported",
+		detail: "legacy alias of cacheLife"
 	},
 	skipTrailingSlashRedirect: { status: "supported" },
 	"experimental.skipTrailingSlashRedirect": {

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

@@ -3,6 +3,7 @@ export type Source = "server" | "vite" | "uncaught" | "caught" | "window-error"
 export type ReportedError = {
   id: number;
   source: Source;
+  name: string | undefined;
   message: string;
   stack: string | undefined;
   ignoredStackFrames: boolean[] | undefined;

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

@@ -1,9 +1,11 @@
 import { ReportedError, dismissOverlay } from "./dev-error-overlay-store.js";
+import { InitialDevServerErrorPayload } from "../server/dev-initial-server-error.js";
 //#region src/client/dev-error-overlay.d.ts
 export declare const DEV_ERROR_OVERLAY_HOST_ID = "__vinext_dev_error_overlay_root";
 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 reportInitialDevServerErrors(): void;
 type ViteHmrErrorPayload = {
   err?: ViteHmrError;

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

@@ -11,6 +11,7 @@ const DEV_ERROR_OVERLAY_MOUNT_ID = "__vinext_dev_error_overlay_mount";
 const VITE_ERROR_HANDLER_DATA_KEY = "__vinext_vite_error_handler__";
 const REACT_REFRESH_RECOVERY_RETRY_DELAY_MS = 16;
 let reactRoot = null;
+let overlayHost = null;
 let installed = false;
 const reportedErrors = /* @__PURE__ */ new WeakSet();
 function rememberReported(error) {
@@ -81,12 +82,21 @@ function tryInstallReactRefreshErrorRecovery() {
 	});
 	return true;
 }
+function selectUnreportedInitialDevServerErrors(payloads, reported) {
+	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"));
+		if (rethrownIndex === -1) return true;
+		rethrownErrors.splice(rethrownIndex, 1);
+		return false;
+	});
+}
 function reportInitialDevServerErrors() {
 	if (typeof window === "undefined") return;
 	const errors = window.__VINEXT_INITIAL_DEV_ERRORS__;
 	if (!errors || errors.length === 0) return;
 	window.__VINEXT_INITIAL_DEV_ERRORS__ = [];
-	for (const payload of errors) {
+	for (const payload of selectUnreportedInitialDevServerErrors(errors, getOverlaySnapshot().errors)) {
 		const error = new Error(payload.message);
 		if (payload.name) error.name = payload.name;
 		if (payload.stack) error.stack = payload.stack;
@@ -130,6 +140,7 @@ function reportDevError(error, options) {
 	ensureMounted();
 	const id = reportToOverlay({
 		source: options.source,
+		name: error instanceof Error ? error.name : void 0,
 		message,
 		stack,
 		ignoredStackFrames: void 0,
@@ -176,8 +187,13 @@ function stringValue(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 function ensureMounted() {
-	if (reactRoot) return;
+	if (reactRoot) {
+		const host = overlayHost;
+		if (host && !host.isConnected) (document.body ?? document.documentElement).appendChild(host);
+		return;
+	}
 	const node = createDevErrorOverlayMountNode(document);
+	overlayHost = document.getElementById(DEV_ERROR_OVERLAY_HOST_ID);
 	reactRoot = createRoot(node);
 	reactRoot.render(/* @__PURE__ */ jsx(DevErrorOverlayApp, {}));
 }
@@ -1342,4 +1358,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 };
+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 };

package/dist/config/config-matchers.js

@@ -719,7 +719,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 +731,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 {
@@ -759,8 +759,10 @@ async function proxyExternalRequest(request, externalUrl) {
 	const destinationKeys = new Set(targetUrl.searchParams.keys());
 	for (const [key, value] of originalUrl.searchParams) if (!destinationKeys.has(key)) targetUrl.searchParams.append(key, value);
 	const headers = new Headers(request.headers);
+	const requestHost = headers.get("host") ?? "";
 	headers.set("host", targetUrl.host);
 	stripHopByHopRequestHeaders(headers);
+	headers.set("x-forwarded-host", requestHost);
 	const keysToDelete = [];
 	for (const key of headers.keys()) if (key.startsWith("x-middleware-") && !key.startsWith("x-middleware-request-")) keysToDelete.push(key);
 	for (const key of keysToDelete) headers.delete(key);

package/dist/config/destination-params.d.ts

@@ -25,7 +25,8 @@
  * `%XX` escapes a raw path capture already carries. A decoded `has` capture
  * carrying `#`, `/`, `?`, `@` or `:` then makes the host invalid instead of
  * moving the proxy to another host. Next.js substitutes the hostname verbatim
- * and can be retargeted this way; vinext is stricter.
+ * and can be retargeted this way; vinext is stricter. Params in a rewrite's
+ * path follow substituteRewritePath.
  *
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/server-route-utils.ts

package/dist/config/destination-params.js

@@ -33,7 +33,8 @@ const _compiledDestinationParamCache = /* @__PURE__ */ new Map();
 * `%XX` escapes a raw path capture already carries. A decoded `has` capture
 * carrying `#`, `/`, `?`, `@` or `:` then makes the host invalid instead of
 * moving the proxy to another host. Next.js substitutes the hostname verbatim
-* and can be retargeted this way; vinext is stricter.
+* and can be retargeted this way; vinext is stricter. Params in a rewrite's
+* path follow substituteRewritePath.
 *
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/server-route-utils.ts
@@ -49,7 +50,59 @@ function substituteDestinationParams(destination, params, kind) {
 	const queryIndex = beforeHash.indexOf("?");
 	const beforeQuery = queryIndex === -1 ? beforeHash : beforeHash.slice(0, queryIndex);
 	const authorityEnd = getAbsoluteUrlAuthorityEnd(beforeQuery.replace(paramRe, (token) => "x".repeat(token.length)));
-	return `${`${replaceParams(beforeQuery.slice(0, authorityEnd), encodeAuthorityParam)}${replaceParams(beforeQuery.slice(authorityEnd), (value) => value)}`}${queryIndex === -1 ? "" : `?${replaceParams(beforeHash.slice(queryIndex + 1), encodeRewriteQueryParamValue)}`}${replaceParams(hash, (value) => value)}`;
+	const [path, pathHash] = substituteRewritePath(beforeQuery.slice(authorityEnd), paramRe, params, authorityEnd > 0);
+	const query = queryIndex === -1 ? "" : `?${replaceParams(beforeHash.slice(queryIndex + 1), encodeRewriteQueryParamValue)}`;
+	return `${replaceParams(beforeQuery.slice(0, authorityEnd), encodeAuthorityParam)}${path}${query}${pathHash ?? replaceParams(hash, (value) => value)}`;
+}
+/**
+* Substitute params into a rewrite destination's path, returning the path and,
+* when a param carried a `#`, the hash it starts.
+*
+* Next.js inserts path params verbatim, splits the result at the first `#`
+* and escapes a `?` when it formats the URL. A decoded `has` capture can end
+* the path with `#`, but neither `?` nor `#` can displace the destination's
+* own query.
+*
+* An absolute destination is proxied with the URL parser, which removes tab
+* and newlines, trims trailing control characters and spaces, and resolves
+* `.`/`..` segments against the destination's literal path. Next.js sends a
+* param's control characters and spaces percent-encoded, as vinext does, and
+* its dot segments as written. A parsed URL cannot carry a `..` segment, so a
+* dot segment that a param is in or next to is escaped once more (`.` as
+* `%252E`, `%2e` as `%252e`) and stays inside the destination's path. The
+* destination's own dot segments still resolve.
+*
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/router/utils/format-url.ts
+*/
+function substituteRewritePath(template, paramRe, params, absolute) {
+	const encodeParam = absolute ? encodeAbsoluteUrlPathParam : encodePathQueryDelimiter;
+	const paramRanges = [];
+	let substituted = "";
+	let templateIndex = 0;
+	for (const match of template.matchAll(paramRe)) {
+		substituted += template.slice(templateIndex, match.index);
+		const value = encodeParam(params[match[1]]);
+		paramRanges.push([substituted.length, substituted.length + value.length]);
+		substituted += value;
+		templateIndex = match.index + match[0].length;
+	}
+	substituted += template.slice(templateIndex);
+	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, (_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;
+function encodePathQueryDelimiter(value) {
+	return value.replaceAll("?", "%3F");
+}
+const ABSOLUTE_URL_PATH_PARAM_UNSAFE_RE = /[?\u0000- ]/g;
+function encodeAbsoluteUrlPathParam(value) {
+	return value.replace(ABSOLUTE_URL_PATH_PARAM_UNSAFE_RE, encodeURIComponent);
 }
 function getAbsoluteUrlAuthorityEnd(value) {
 	const scheme = /^[a-z][a-z0-9+.-]*:[/\\\t\n\r]*/i.exec(value);

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

@@ -1,3 +1,4 @@
+import { CacheLifeConfig } from "../utils/cache-life-profiles.js";
 import { PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
 import { PluginOption } from "vite";
 //#region src/config/next-config.d.ts
@@ -182,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;
@@ -551,6 +567,11 @@ export type ResolvedNextConfig = {
     dynamic: number;
     static: number;
   };
+  /**
+   * `cacheLife` profiles (or legacy `experimental.cacheLife`) merged over the
+   * built-ins with Next.js's rules; read by the `cacheLife()` shim.
+   */
+  cacheLife: Record<string, CacheLifeConfig>;
   /**
    * Mirrors Next.js `experimental.useLightningcss`. When `true`, switch
    * Vite's CSS pipeline from PostCSS to lightningcss for both transforms

package/dist/config/next-config.js

@@ -6,6 +6,7 @@ import { isUnknownRecord } from "../utils/record.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "../shims/constants.js";
 import { getHtmlLimitedBotRegex } from "../utils/html-limited-bots.js";
 import { flattenPluginOptions } from "../utils/plugin-options.js";
+import { resolveCacheLifeProfiles } from "../utils/cache-life-profiles.js";
 import { configSourceError } from "./config-source.js";
 import { isExternalUrl } from "../utils/external-url.js";
 import { applyLocaleToRoutes } from "./config-matchers.js";
@@ -376,7 +377,11 @@ function warnDeprecatedConfigOptions(config, root) {
 	];
 	for (const [propertyPath, warning] of warnings) if (hasConfigProperty(config, propertyPath)) warnConfigOnce(warning);
 	const experimental = readOptionalRecord(config.experimental);
-	for (const key of ["skipTrailingSlashRedirect", "cacheComponents"]) if (experimental?.[key] != null) warnConfigOnce(`\`experimental.${key}\` has been moved to \`${key}\`. Please update your ${configFileName} file accordingly.`);
+	for (const key of [
+		"skipTrailingSlashRedirect",
+		"cacheComponents",
+		"cacheLife"
+	]) if (experimental?.[key] != null) warnConfigOnce(`\`experimental.${key}\` has been moved to \`${key}\`. Please update your ${configFileName} file accordingly.`);
 }
 async function resolveNextConfigInput(config, phase = PHASE_DEVELOPMENT_SERVER) {
 	return await resolveConfigValue(config, phase);
@@ -502,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
@@ -935,6 +969,10 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			instrumentationServerValueInjections: {},
 			clientTraceMetadata: void 0,
 			staleTimes: { ...DEFAULT_STALE_TIMES },
+			cacheLife: resolveCacheLifeProfiles(void 0, {
+				expireTime: DEFAULT_EXPIRE_TIME,
+				staticStaleTime: DEFAULT_STALE_TIMES.static
+			}, warnConfigOnce),
 			useLightningcss: false,
 			lightningCssFeatures: {
 				include: 0,
@@ -1014,6 +1052,8 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 	const allowedDevOrigins = Array.isArray(config.allowedDevOrigins) ? config.allowedDevOrigins : [];
 	const experimental = readOptionalRecord(config.experimental);
 	const cacheComponents = (experimental?.cacheComponents ?? config.cacheComponents) === true;
+	const expireTime = typeof config.expireTime === "number" ? config.expireTime : DEFAULT_EXPIRE_TIME;
+	const staleTimes = resolveStaleTimes(experimental);
 	const serverActionsConfig = readOptionalRecord(experimental?.serverActions);
 	const serverActionsAllowedOrigins = readStringArray(serverActionsConfig?.allowedOrigins);
 	const serverActionsBodySizeLimitConfig = readOptionalBodySizeLimit(serverActionsConfig?.bodySizeLimit);
@@ -1083,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 ?? {},
@@ -1124,7 +1165,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		globalNotFound,
 		serverActionsBodySizeLimit,
 		serverActionsBodySizeLimitLabel,
-		expireTime: typeof config.expireTime === "number" ? config.expireTime : DEFAULT_EXPIRE_TIME,
+		expireTime,
 		reactMaxHeadersLength: typeof config.reactMaxHeadersLength === "number" ? config.reactMaxHeadersLength : DEFAULT_REACT_MAX_HEADERS_LENGTH,
 		htmlLimitedBots,
 		serverExternalPackages,
@@ -1144,7 +1185,11 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		compilerDefine: serializeCompilerDefine(config.compiler?.define),
 		compilerDefineServer: serializeCompilerDefine(config.compiler?.defineServer),
 		clientTraceMetadata: Array.isArray(experimental?.clientTraceMetadata) ? experimental.clientTraceMetadata.filter((value) => typeof value === "string") : void 0,
-		staleTimes: resolveStaleTimes(experimental),
+		staleTimes,
+		cacheLife: resolveCacheLifeProfiles(experimental?.cacheLife ?? config.cacheLife, {
+			expireTime,
+			staticStaleTime: staleTimes.static
+		}, warnConfigOnce),
 		useLightningcss,
 		lightningCssFeatures
 	};

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) => {
@@ -148,6 +152,10 @@ function buildAppRequestRouteMetadata(routes) {
 		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 +252,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 +288,16 @@ 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
 	})};
 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,17 +368,21 @@ 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 }) {
@@ -482,6 +500,7 @@ 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,
@@ -1161,7 +1180,6 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       getSourceRoute(sourceRouteIndex) {
         return routes[sourceRouteIndex];
       },
-      hasCustomGlobalError: ${globalErrorVar ? `Boolean(${globalErrorVar}?.default)` : "false"},
       hasAnyGenerateStaticParams: __generateStaticParams.length > 0,
       hasGenerateStaticParams: __staticGeneration.hasGenerateStaticParams,
       hasPageDefaultExport: !!PageComponent,
@@ -1636,17 +1654,21 @@ ${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 }) {

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"},