vinext 1.4.0 → 1.4.1

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
 

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

@@ -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

@@ -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,56 @@ 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, (segment, offset) => paramRanges.some(([start, end]) => start <= offset + segment.length && end >= offset) ? segment.replace(/\.|%(?=2e)/gi, (char) => char === "." ? "%252E" : "%25") : 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
@@ -551,6 +552,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);
@@ -935,6 +940,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 +1023,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);
@@ -1124,7 +1135,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 +1155,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

@@ -1161,7 +1161,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,

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

@@ -21,6 +21,7 @@ const _pagesI18nPath = resolveEntryPath("../server/pages-i18n.js", import.meta.u
 const _pagesDataRoutePath = resolveEntryPath("../server/pages-data-route.js", import.meta.url);
 const _pagesDefault404Path = resolveEntryPath("../server/pages-default-404.js", import.meta.url);
 const _pagesApiRoutePath = resolveEntryPath("../server/pages-api-route.js", import.meta.url);
+const _requestErrorLogPath = resolveEntryPath("../server/request-error-log.js", import.meta.url);
 const _serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const _queryUtilsPath = resolveEntryPath("../utils/query.js", import.meta.url);
 const _pagesPageHandlerPath = resolveEntryPath("../server/pages-page-handler.js", import.meta.url);
@@ -370,6 +371,7 @@ import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSO
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
 import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
 import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_pagesApiRoutePath)};
+import { logRequestError as __logRequestError } from ${JSON.stringify(_requestErrorLogPath)};
 import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
@@ -618,7 +620,7 @@ export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin,
     trustedRevalidateOrigin,
     url,
     reportRequestError(error, routePattern) {
-      console.error("[vinext] API error:", error);
+      __logRequestError("[vinext] API error:", error);
       return _reportRequestError(
         error,
         { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) },

package/dist/index.js

@@ -11,6 +11,7 @@ import { getReactUpgradeDeps, reactUpgradeRequiredMessage } from "./utils/react-
 import { resolvePluginReactPath } from "./utils/plugin-react-version.js";
 import { loadDotenv } from "./config/dotenv.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
+import { serializeCacheLifeProfiles } from "./utils/cache-life-profiles.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
 import { hasBasePath, stripBasePath } from "./utils/base-path.js";
@@ -1373,6 +1374,29 @@ function vinext(options = {}) {
 	});
 	const plugins = [
 		buildLifecyclePlugins[0],
+		{
+			name: "vinext:dev-origin-check",
+			apply: "serve",
+			enforce: "pre",
+			configureServer(server) {
+				server.middlewares.use((req, res, next) => {
+					const blockReason = validateDevRequest({
+						origin: req.headers.origin,
+						host: req.headers.host,
+						"x-forwarded-host": req.headers["x-forwarded-host"],
+						"sec-fetch-site": req.headers["sec-fetch-site"],
+						"sec-fetch-mode": req.headers["sec-fetch-mode"]
+					}, nextConfig?.allowedDevOrigins);
+					if (blockReason) {
+						console.warn(`[vinext] Blocked dev request: ${blockReason} (${req.url})`);
+						res.writeHead(403, { "Content-Type": "text/plain" });
+						res.end("Forbidden");
+						return;
+					}
+					next();
+				});
+			}
+		},
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
 		reactPluginPromise,
@@ -1595,6 +1619,7 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_MANUAL_TRAILING_SLASH"] = JSON.stringify(nextConfig.skipTrailingSlashRedirect ? "true" : "false");
 				defines["process.env.__NEXT_CONFIG_OUTPUT"] = JSON.stringify(nextConfig.output ?? "");
+				defines["process.env.__VINEXT_CACHE_LIFE_PROFILES"] = JSON.stringify(serializeCacheLifeProfiles(nextConfig.cacheLife));
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
 				{
@@ -3147,22 +3172,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					return isExistingDevPublicFile(pathname);
 				};
-				server.middlewares.use((req, res, next) => {
-					const blockReason = validateDevRequest({
-						origin: req.headers.origin,
-						host: req.headers.host,
-						"x-forwarded-host": req.headers["x-forwarded-host"],
-						"sec-fetch-site": req.headers["sec-fetch-site"],
-						"sec-fetch-mode": req.headers["sec-fetch-mode"]
-					}, nextConfig?.allowedDevOrigins);
-					if (blockReason) {
-						console.warn(`[vinext] Blocked dev request: ${blockReason} (${req.url})`);
-						res.writeHead(403, { "Content-Type": "text/plain" });
-						res.end("Forbidden");
-						return;
-					}
-					next();
-				});
 				server.middlewares.use((req, res, next) => {
 					if (!sendRepeatedSlashRedirect(req.url ?? "/", res)) next();
 				});
@@ -3253,7 +3262,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasAppDir) server.middlewares.use((req, res, next) => {
 						const url = req.url ?? "/";
 						const [pathname] = url.split("?");
-						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html") && !pathname.endsWith(".rsc")) return next();
+						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html")) return next();
 						const _reqStart = now();
 						const _reqWallStart = Date.now();
 						let _compileMs;
@@ -3287,12 +3296,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							return _origWriteHead(statusCode, ...args);
 						};
 						res.on("finish", () => {
-							const logUrl = url.replace(/\.rsc(\?|$)/, "$1");
 							const totalMs = now() - _reqStart;
 							const resolvedRenderMs = _renderMs !== void 0 ? _renderMs : _compileMs !== void 0 ? Math.max(0, Math.round(totalMs - _compileMs)) : void 0;
 							logRequest({
 								method: req.method ?? "GET",
-								url: logUrl,
+								url,
 								status: res.statusCode,
 								totalMs,
 								compileMs: _compileMs,
@@ -3468,6 +3476,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								removeForwardedMiddlewareContext(req);
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
+								const setCookies = nextRequestHeaders.getSetCookie();
+								if (setCookies.length > 1) req.headers["set-cookie"] = setCookies;
 							};
 							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
@@ -3662,7 +3672,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const url = req.url ?? "/";
 						if (!hasPagesDir) return next();
 						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules")) return next();
-						if (url.split("?")[0].endsWith(".rsc")) return next();
 						if (hasCloudflarePlugin) return next();
 						await pagesInstrumentationReady;
 						const traceHeaders = new Headers();

package/dist/plugins/strip-server-exports.js

@@ -89,7 +89,8 @@ function isReferenceIdentifier(node, parent) {
 	if (parent.type === "ImportSpecifier" || parent.type === "ImportDefaultSpecifier" || parent.type === "ImportNamespaceSpecifier") return false;
 	if (parent.type === "ExportSpecifier") return false;
 	if (parent.type === "MemberExpression" && parent.property === node && !parent.computed) return false;
-	if ((parent.type === "Property" || parent.type === "MethodDefinition") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if ((parent.type === "Property" || parent.type === "MethodDefinition" || parent.type === "PropertyDefinition" || parent.type === "AccessorProperty" || parent.type === "ImportAttribute") && parent.key === node && !parent.computed && !(parent.type === "Property" && parent.shorthand)) return false;
+	if (parent.type === "MetaProperty") return false;
 	if ((parent.type === "LabeledStatement" || parent.type === "BreakStatement" || parent.type === "ContinueStatement") && parent.label === node) return false;
 	const parameters = "params" in parent ? parent.params : void 0;
 	if (Array.isArray(parameters) && parameters.includes(node)) return false;

package/dist/server/api-handler.js

@@ -4,6 +4,7 @@ import "./server-globals.js";
 import { resolveRequestHost, resolveRequestProtocol } from "./proxy-trust.js";
 import { NextRequest } from "../shims/server.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
+import { logRequestError } from "./request-error-log.js";
 import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } from "../utils/query.js";
 import { tracePagesApiHandler } from "./pages-execution-tracing.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, resolveBodyParserConfig } from "./pages-body-parser-config.js";
@@ -287,7 +288,7 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			res.end(e.message);
 			return true;
 		}
-		console.error(e);
+		logRequestError(e);
 		await reportRequestError(e, {
 			path: url,
 			method: req.method ?? "GET",

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

@@ -45,7 +45,7 @@ import { createHydrationCachePublication } from "./app-hydration-cache-publicati
 import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
 import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, createOptimisticRouteTemplateStore, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
-import { createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { Fragment, createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { flushSync } from "react-dom";
@@ -1000,6 +1000,10 @@ function registerServerActionCallback() {
 		})).finally(releaseCacheInvalidationGuard);
 	});
 }
+function ReplayInitialDevServerErrors({ report }) {
+	useEffect(report, [report]);
+	return null;
+}
 async function main() {
 	if (!claimInitialAppRouterBootstrap()) return;
 	loadNavigationRuntimeRouteManifest();
@@ -1011,7 +1015,7 @@ async function main() {
 		devErrorOverlay = await import("../client/dev-error-overlay.js");
 		devErrorOverlay.installDevErrorOverlay();
 		devErrorOverlay.installViteHmrErrorHandler(import.meta.hot);
-		devErrorOverlay.reportInitialDevServerErrors();
+		if (document.documentElement.id !== "__next_error__") devErrorOverlay.reportInitialDevServerErrors();
 	}
 	const initialRscBootstrap = getNavigationRuntime()?.bootstrap.rsc;
 	const rscStream = await readInitialRscStream();
@@ -1098,7 +1102,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 		for (const style of errorShellStyles) style.remove();
 		startTransition(() => {
 			const clientRoot = createRoot(document, createRootOptions);
-			clientRoot.render(children);
+			clientRoot.render(import.meta.env.DEV && devErrorOverlay ? createElement(Fragment, null, children, createElement(ReplayInitialDevServerErrors, { report: devErrorOverlay.reportInitialDevServerErrors })) : children);
 			window.__VINEXT_RSC_ROOT__ = clientRoot;
 		});
 	} else window.__VINEXT_RSC_ROOT__ = hydrateRootInTransition({

package/dist/server/app-browser-rsc-redirect.js

@@ -1,5 +1,5 @@
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "../shims/url-safety.js";
-import { resolveHardNavigationTargetFromRscResponse, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { resolveHardNavigationTargetFromRscResponse, stripRscCacheBustingSearchParam, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
 //#region src/server/app-browser-rsc-redirect.ts
 const MAX_RSC_REDIRECT_DEPTH = 10;
 function blockDangerousStreamedRscRedirect(response, streamedRedirectTarget) {
@@ -11,10 +11,10 @@ function blockDangerousStreamedRscRedirect(response, streamedRedirectTarget) {
 function toVisibleAppHref(href, origin) {
 	const url = new URL(href, origin);
 	stripRscCacheBustingSearchParam(url);
-	return `${stripRscSuffix(url.pathname)}${url.search}${url.hash}`;
+	return `${toPathAbsolutePathname(url.pathname)}${url.search}${url.hash}`;
 }
 function toStreamedRedirectVisibleAppHref(url) {
-	return `${url.pathname}${url.search}${url.hash}`;
+	return `${toPathAbsolutePathname(url.pathname)}${url.search}${url.hash}`;
 }
 function resolveRedirectLifecycleHopFromTarget(options) {
 	if (options.targetUrl.origin !== options.origin) return {

package/dist/server/app-browser-server-action-client.js

@@ -1,7 +1,7 @@
 import { hasBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
-import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
 import { throwOnServerActionNotFound } from "./server-action-not-found.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
@@ -49,7 +49,7 @@ var ServerActionRedirectError = class extends Error {
 	constructor(target) {
 		super("NEXT_REDIRECT");
 		const redirectUrl = new URL(target.href, window.location.href);
-		const redirectHref = redirectUrl.pathname + redirectUrl.search + redirectUrl.hash;
+		const redirectHref = toPathAbsolutePathname(redirectUrl.pathname) + redirectUrl.search + redirectUrl.hash;
 		const redirectType = target.type === "push" ? "push" : "replace";
 		this.digest = `NEXT_REDIRECT;${redirectType};${redirectHref};${target.status};`;
 	}

package/dist/server/app-browser-visible-commit.js

@@ -87,11 +87,11 @@ function reduceApprovedVisibleCommitState(state, commit) {
 			const hmrUniquePreserveElementIds = hmrPreserveElementIds.length > 1 ? [...new Set(hmrPreserveElementIds)] : hmrPreserveElementIds;
 			const preserveElementIds = action.operation.lane === "hmr" ? hmrUniquePreserveElementIds : bfcacheCompatiblePreserveElementIds;
 			const preserveTemplateIds = action.reuseCurrentBfcacheIds && (action.operation.lane === "navigation" || action.operation.lane === "traverse" || action.operation.lane === "server-action") ? Object.keys(state.elements).filter((id) => Object.hasOwn(action.elements, id) && hasSameServerTemplateSeedIdentity(id, state.navigationSnapshot, action.navigationSnapshot)) : [];
-			const mergedPreserveElementIds = preserveTemplateIds.length === 0 ? preserveElementIds : [.../* @__PURE__ */ new Set([...preserveElementIds, ...preserveTemplateIds])];
 			const mergedElements = mergeElements(state.elements, action.elements, {
 				clearAbsentSlots: action.type === "traverse" || !action.reuseCurrentBfcacheIds,
 				preserveAbsentSlots: action.reuseCurrentBfcacheIds && commit.decision.preserveAbsentSlots,
-				preserveElementIds: mergedPreserveElementIds,
+				preserveElementIds,
+				preserveElementSeedIds: preserveTemplateIds,
 				preservePreviousSlotIds: effectivePreservePreviousSlotIds
 			});
 			return commitVisibleRouterState(state, {