vinext 1.0.0 → 1.1.0

package/dist/build/prerender.js

@@ -1,15 +1,18 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { BLOCKED_PAGES } from "../shims/constants.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
-import { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER } from "../server/headers.js";
+import { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_PRERENDER_METADATA_ROUTES_PATH, VINEXT_PRERENDER_RENDER_ERROR_HEADER, VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "../server/headers.js";
+import { extractLocaleFromUrl } from "../server/pages-i18n.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
 import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cache-handler.js";
 import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
+import { createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { buildPregeneratedConcretePathTable } from "../server/prerender-manifest.js";
 import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
@@ -21,7 +24,6 @@ import { startProdServer } from "../server/prod-server.js";
 import { prerenderPoolAvailable, resolvePrerenderPoolSize, startPrerenderServerPool } from "./prerender-server-pool.js";
 import { enterPrerenderPhase } from "./prerender-phase.js";
 import { buildAppRouteCacheValue } from "../server/app-route-handler-response.js";
-import { isMetadataResponseCacheable } from "../server/metadata-route-cache-policy.js";
 import fs from "node:fs";
 import os from "node:os";
 //#region src/build/prerender.ts
@@ -337,6 +339,14 @@ function routeStaticParamSets(route, paramSets, options = {}) {
 function layoutOnlyParamSets(route, parentParamSets) {
 	return parentParamSets.length > 0 && parentParamSets.every((params) => route.params.every((name) => name in params)) ? parentParamSets : null;
 }
+function localizePagesPath(pathname, locale, i18n) {
+	if (!i18n || !locale) return pathname;
+	if (locale === i18n.defaultLocale) {
+		const firstSegment = pathname.split("/")[1]?.toLowerCase();
+		if (!i18n.locales.some((candidate) => candidate.toLowerCase() === firstSegment)) return pathname;
+	}
+	return pathname === "/" ? `/${locale}` : `/${locale}${pathname}`;
+}
 /**
 * Run the prerender phase for Pages Router.
 *
@@ -379,6 +389,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				port: 0,
 				host: "127.0.0.1",
 				outDir: path.dirname(path.dirname(pagesBundlePath)),
+				serverDir: path.dirname(pagesBundlePath),
+				serverEntryPath: pagesBundlePath,
 				noCompression: true,
 				purpose: "prerender"
 			});
@@ -428,7 +440,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		for (const route of bundlePageRoutes) {
 			if (BLOCKED_PAGES.includes(route.pattern)) continue;
 			if (route.pattern === "/404") continue;
-			const { type, revalidate: classifiedRevalidate } = classifyPagesRoute(route.filePath);
+			const { type, revalidate: classifiedRevalidate, hasStaticProps = false } = classifyPagesRoute(route.filePath);
 			if (type === "ssr") {
 				if (mode === "export") results.push({
 					route: route.pattern,
@@ -460,8 +472,8 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				let pathsResult;
 				try {
 					pathsResult = await route.module.getStaticPaths({
-						locales: [],
-						defaultLocale: ""
+						locales: [...config.i18n?.locales ?? []],
+						defaultLocale: config.i18n?.defaultLocale ?? ""
 					});
 				} catch (e) {
 					results.push({
@@ -483,21 +495,38 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				}
 				const paths = pathsResult?.paths ?? [];
 				let entryError = null;
+				const seenPaths = /* @__PURE__ */ new Set();
 				for (const item of paths) {
-					const normalized = normalizeStaticPathsEntry(item, route.pattern);
+					let locale = config.i18n?.defaultLocale;
+					let pathEntry = item;
+					if (config.i18n && typeof item === "string") {
+						const localized = extractLocaleFromUrl(item, config.i18n);
+						locale = localized.locale;
+						pathEntry = localized.url;
+					} else if (item && typeof item === "object" && item.locale !== void 0) locale = item.locale;
+					const normalized = normalizeStaticPathsEntry(pathEntry, route.pattern);
 					if ("error" in normalized) {
 						entryError = normalized.error;
 						break;
 					}
+					if (locale !== void 0 && !config.i18n?.locales.includes(locale)) {
+						entryError = `Invalid locale returned from getStaticPaths for ${route.pattern}: ${locale}`;
+						break;
+					}
 					const { params } = normalized;
 					try {
-						const urlPath = buildUrlFromParams(route.pattern, params);
-						pagesToRender.push({
-							route,
-							urlPath,
-							params,
-							revalidate
-						});
+						const urlPath = localizePagesPath(buildUrlFromParams(route.pattern, params), locale, config.i18n);
+						if (!seenPaths.has(urlPath)) {
+							seenPaths.add(urlPath);
+							pagesToRender.push({
+								route,
+								urlPath,
+								params,
+								revalidate,
+								hasStaticProps,
+								locale
+							});
+						}
 					} catch (e) {
 						entryError = e.message;
 						break;
@@ -511,25 +540,58 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					});
 					continue;
 				}
-			} else pagesToRender.push({
+			} else for (const locale of config.i18n?.locales ?? [void 0]) pagesToRender.push({
 				route,
-				urlPath: route.pattern,
+				urlPath: localizePagesPath(route.pattern, locale, config.i18n),
 				params: {},
-				revalidate
+				revalidate,
+				hasStaticProps,
+				locale
 			});
 		}
 		if (!options._prodServer && pagesBundlePath && prerenderPoolAvailable()) {
 			const poolSize = resolvePrerenderPoolSize(pagesToRender.length, concurrency);
 			if (poolSize > 1) {
-				renderPool = await startOptionalPrerenderServerPool(path.dirname(path.dirname(pagesBundlePath)), poolSize);
+				renderPool = await startOptionalPrerenderServerPool(path.dirname(path.dirname(pagesBundlePath)), poolSize, void 0, path.dirname(pagesBundlePath));
 				if (renderPool) renderPorts = renderPool.ports;
 			}
 		}
 		let completed = 0;
-		const pageResults = await runWithConcurrency(pagesToRender, concurrency, async ({ route, urlPath, revalidate }) => {
+		const pageResults = await runWithConcurrency(pagesToRender, concurrency, async ({ route, urlPath, revalidate, hasStaticProps, locale }) => {
 			let result;
 			try {
 				const response = await renderPage(urlPath);
+				if (mode === "default" && response.headers.get("x-vinext-prerender-rewritten") !== "0") {
+					response.body?.cancel().catch(() => {});
+					const skipped = {
+						route: route.pattern,
+						status: "skipped",
+						reason: "dynamic"
+					};
+					onProgress?.({
+						completed: ++completed,
+						total: pagesToRender.length,
+						route: urlPath,
+						status: skipped.status
+					});
+					return skipped;
+				}
+				const contentType = response.headers.get("content-type");
+				const isStaticPropsResponse = mode === "default" && hasStaticProps && response.headers.get("X-Vinext-Cache") === "MISS";
+				const notFound = isStaticPropsResponse && response.status === 404;
+				const redirect = isStaticPropsResponse && [
+					301,
+					302,
+					303,
+					307,
+					308
+				].includes(response.status);
+				let redirectProps;
+				if (redirect) {
+					const props = await response.json();
+					if (!isUnknownRecord(props) || !isUnknownRecord(props.pageProps) || typeof props.pageProps.__N_REDIRECT !== "string" || props.pageProps.__N_REDIRECT_STATUS !== response.status || props.pageProps.__N_REDIRECT_BASE_PATH !== void 0 && typeof props.pageProps.__N_REDIRECT_BASE_PATH !== "boolean") throw new Error(`Invalid prerendered Pages redirect props for ${urlPath}`);
+					redirectProps = props;
+				}
 				const outputFiles = [];
 				const htmlOutputPath = getOutputPath(urlPath, config.trailingSlash, mode === "export" ? config.basePath : "");
 				const htmlFullPath = path.join(outDir, htmlOutputPath);
@@ -539,7 +601,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
 					outputFiles.push(htmlOutputPath);
 				} else {
-					if (!response.ok) throw new Error(`renderPage returned ${response.status} for ${urlPath}`);
+					if (!response.ok && !notFound) throw new Error(`renderPage returned ${response.status} for ${urlPath}`);
 					const html = await response.text();
 					fs.mkdirSync(path.dirname(htmlFullPath), { recursive: true });
 					fs.writeFileSync(htmlFullPath, html, "utf-8");
@@ -552,7 +614,19 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					revalidate,
 					...typeof revalidate === "number" ? { expire: config.expireTime } : {},
 					router: "pages",
-					...urlPath !== route.pattern ? { path: urlPath } : {}
+					...urlPath !== route.pattern ? { path: urlPath } : {},
+					...locale ? { locale } : {},
+					...response.ok ? { responseStatus: response.status } : {},
+					...response.ok && contentType ? { headers: { "content-type": contentType } } : {},
+					...notFound ? {
+						notFound: true,
+						responseStatus: 404
+					} : {},
+					...redirect ? {
+						responseStatus: response.status,
+						redirectProps,
+						headers: { location: response.headers.get("location") ?? "/" }
+					} : {}
 				};
 			} catch (e) {
 				renderPool?.recordRenderError(e);
@@ -575,21 +649,41 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		renderPool?.assertHealthy();
 		const hasCustom404 = findFileWithExtensions(path.join(pagesDir, "404"), fileMatcher);
 		const hasErrorPage = findFileWithExtensions(path.join(pagesDir, "_error"), fileMatcher);
-		if (hasCustom404 || hasErrorPage) try {
-			const notFoundRes = await renderPage(hasCustom404 ? "/404" : NOT_FOUND_SENTINEL_PATH);
-			const contentType = notFoundRes.headers.get("content-type") ?? "";
-			if (notFoundRes.status === 404 && contentType.includes("text/html")) {
-				const html404 = await notFoundRes.text();
-				results.push({
-					route: "/404",
-					status: "rendered",
-					outputFiles: emitStatic404Files(outDir, html404, config.trailingSlash),
-					revalidate: false,
-					router: "pages"
-				});
+		for (const locale of config.i18n?.locales ?? [void 0]) {
+			if (!hasCustom404 && !hasErrorPage) break;
+			try {
+				const notFoundRes = await renderPage(localizePagesPath(hasCustom404 ? "/404" : NOT_FOUND_SENTINEL_PATH, locale, config.i18n));
+				if (mode === "default" && notFoundRes.headers.get("x-vinext-prerender-rewritten") !== "0") {
+					notFoundRes.body?.cancel().catch(() => {});
+					continue;
+				}
+				const contentType = notFoundRes.headers.get("content-type") ?? "";
+				if (notFoundRes.status === 404 && contentType.includes("text/html")) {
+					const html404 = await notFoundRes.text();
+					const pathname = localizePagesPath("/404", locale, config.i18n);
+					let outputFiles;
+					if (pathname === "/404") outputFiles = emitStatic404Files(outDir, html404, config.trailingSlash);
+					else {
+						const outputPath = getOutputPath(pathname, config.trailingSlash);
+						const fullPath = path.join(outDir, outputPath);
+						fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+						fs.writeFileSync(fullPath, html404, "utf8");
+						outputFiles = [outputPath];
+					}
+					results.push({
+						route: "/404",
+						status: "rendered",
+						outputFiles,
+						revalidate: false,
+						router: "pages",
+						headers: { "content-type": contentType },
+						...pathname !== "/404" ? { path: pathname } : {},
+						...locale ? { locale } : {}
+					});
+				}
+			} catch (e) {
+				renderPool?.recordRenderError(e);
 			}
-		} catch (e) {
-			renderPool?.recordRenderError(e);
 		}
 		renderPool?.assertHealthy();
 		if (!skipManifest) writePrerenderIndex(results, manifestDir, {
@@ -900,7 +994,8 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						};
 					}
 					const cacheControl = response.headers.get("cache-control") ?? "";
-					if (!isMetadataResponseCacheable(response)) {
+					const requestCacheLife = readPrerenderCacheLifeHeader(response.headers);
+					if (requestCacheLife?.revalidate === 0) {
 						await response.body?.cancel();
 						return {
 							route: routePattern,
@@ -908,15 +1003,14 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 							reason: "dynamic"
 						};
 					}
-					const requestCacheLife = readPrerenderCacheLifeHeader(response.headers);
 					const collectedTags = readPrerenderCacheTagsHeader(response.headers);
-					const cacheValue = await buildAppRouteCacheValue(response);
+					const cacheValue = await buildAppRouteCacheValue(response, cacheControl);
 					cacheValue.headers[VINEXT_METADATA_ROUTE_CACHE_HEADER] = "1";
 					const outputPath = getAppRouteOutputPath(urlPath);
 					const fullPath = path.join(outDir, outputPath);
 					fs.mkdirSync(path.dirname(fullPath), { recursive: true });
 					fs.writeFileSync(fullPath, new Uint8Array(cacheValue.body));
-					const renderedCacheControl = resolveRenderedCacheControl(requestCacheLife ?? {}, cacheControl, config.expireTime);
+					const renderedCacheControl = resolveRenderedCacheControl(requestCacheLife ?? {}, "", config.expireTime);
 					const renderedRevalidate = renderedCacheControl.revalidate ?? false;
 					const renderedStale = resolveClientStaleTimeSeconds(requestCacheLife ?? void 0);
 					return {
@@ -948,17 +1042,22 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					const responseCacheLife = readPrerenderCacheLifeHeader(response.headers);
 					const cacheTags = readPrerenderCacheTagsHeader(response.headers);
 					const fatal = response.headers.get(VINEXT_PRERENDER_RENDER_ERROR_HEADER) === "1";
-					if (!response.ok || cacheControl.includes("no-store")) {
+					const specialError = mode === "export" ? null : readPrerenderSpecialErrorHeader(response.headers);
+					const isSpecialError = specialError !== null;
+					const ok = response.ok || isSpecialError;
+					if (!ok || cacheControl.includes("no-store")) {
 						await response.body?.cancel();
 						return {
 							cacheControl,
 							linkHeader,
 							html: null,
-							ok: response.ok,
+							ok,
 							requestCacheLife: null,
 							tags: [],
 							status: response.status,
-							fatal
+							fatal,
+							specialErrorLocation: null,
+							isSpecialError
 						};
 					}
 					const html = await response.text();
@@ -971,7 +1070,9 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						requestCacheLife: responseCacheLife ?? processCacheLife,
 						status: response.status,
 						tags: cacheTags,
-						fatal: false
+						fatal: false,
+						specialErrorLocation: specialError?.location ?? null,
+						isSpecialError
 					};
 				});
 				const htmlCacheControl = htmlRender.cacheControl;
@@ -999,7 +1100,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					error: "RSC handler returned no prerender HTML"
 				};
 				const html = isFallback ? markAppPprDynamicFallbackShellHtml(htmlRender.html) : htmlRender.html;
-				let rscData = extractRscPayloadFromPrerenderedHtml(html);
+				let rscData = htmlRender.isSpecialError ? null : extractRscPayloadFromPrerenderedHtml(html);
 				if (rscData === null) {
 					const rscHeaders = new Headers({
 						Accept: "text/x-component",
@@ -1007,7 +1108,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					});
 					if (prerenderRouteParamsHeader !== null) rscHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
 					if (isSpeculative) rscHeaders.set(VINEXT_PRERENDER_SPECULATIVE_HEADER, "1");
-					const rscRequest = new Request(`http://localhost${requestPath}`, { headers: rscHeaders });
+					const rscRequest = new Request(`http://localhost${await createRscRequestUrl(requestPath, rscHeaders)}`, { headers: rscHeaders });
 					const rscRes = await runWithHeadersContext(headersContextFromRequest(rscRequest), () => rscHandler(rscRequest));
 					if (!rscRes.ok) {
 						await rscRes.body?.cancel();
@@ -1042,7 +1143,11 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					...renderedStale === void 0 ? {} : { stale: renderedStale },
 					router: "app",
 					...htmlRender.tags.length > 0 ? { tags: htmlRender.tags } : {},
-					...htmlRender.linkHeader ? { headers: { link: htmlRender.linkHeader } } : {},
+					...htmlRender.linkHeader || htmlRender.specialErrorLocation !== null ? { headers: {
+						...htmlRender.linkHeader ? { link: htmlRender.linkHeader } : {},
+						...htmlRender.specialErrorLocation !== null ? { location: htmlRender.specialErrorLocation } : {}
+					} } : {},
+					...htmlRender.isSpecialError ? { responseStatus: htmlRender.status } : {},
 					...urlPath !== routePattern ? { path: urlPath } : {},
 					...isFallback ? { fallback: true } : {}
 				};
@@ -1146,6 +1251,19 @@ function readPrerenderCacheLifeHeader(headers) {
 		return null;
 	}
 }
+/** Reads the special-error marker: the page's stored headers, or null. */
+function readPrerenderSpecialErrorHeader(headers) {
+	const value = headers.get(VINEXT_PRERENDER_SPECIAL_ERROR_HEADER);
+	if (!value) return null;
+	try {
+		const parsed = JSON.parse(value);
+		if (typeof parsed !== "object" || parsed === null) return null;
+		const location = parsed.location;
+		return { location: typeof location === "string" ? location : null };
+	} catch {
+		return null;
+	}
+}
 function readPrerenderCacheTagsHeader(headers) {
 	const value = headers.get(NEXT_CACHE_TAGS_HEADER);
 	if (!value) return [];
@@ -1187,6 +1305,9 @@ function writePrerenderIndex(routes, outDir, options) {
 			...r.routeSegments ? { routeSegments: r.routeSegments } : {},
 			...r.headers ? { headers: r.headers } : {},
 			...typeof r.responseStatus === "number" ? { responseStatus: r.responseStatus } : {},
+			...r.notFound ? { notFound: true } : {},
+			...r.redirectProps ? { redirectProps: r.redirectProps } : {},
+			...r.locale ? { locale: r.locale } : {},
 			...r.path ? { path: r.path } : {},
 			...r.fallback ? { fallback: true } : {}
 		};
@@ -1210,4 +1331,4 @@ function writePrerenderIndex(routes, outDir, options) {
 	fs.writeFileSync(path.join(outDir, "vinext-prerender.json"), JSON.stringify(index, null, 2), "utf-8");
 }
 //#endregion
-export { buildUrlFromParams, extractRscPayloadFromPrerenderedHtml, layoutOnlyParamSets, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, routeStaticParamSets, validateDiscoveredParams, writePrerenderIndex };
+export { buildUrlFromParams, extractRscPayloadFromPrerenderedHtml, layoutOnlyParamSets, localizePagesPath, prerenderApp, prerenderPages, readPrerenderSecret, resolveParentParams, routeStaticParamSets, validateDiscoveredParams, writePrerenderIndex };

package/dist/build/run-prerender.js

@@ -11,7 +11,7 @@ import { rememberCurrentServerEntryImportMtime, startProdServer } from "../serve
 import { enterPrerenderPhase } from "./prerender-phase.js";
 import { prerenderApp, prerenderPages, writePrerenderIndex } from "./prerender.js";
 import { injectPregeneratedConcretePaths } from "./inject-pregenerated-paths.js";
-import { resolveBuiltRscEntryPath } from "./server-entry.js";
+import { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath } from "./server-entry.js";
 import fs from "node:fs";
 //#region src/build/run-prerender.ts
 /**
@@ -112,10 +112,11 @@ async function runPrerender(options) {
 	const buildOutDir = path.resolve(root, "dist");
 	const configuredRscServerDir = path.resolve(root, options.routeRootConfig?.rscOutDir ?? path.join("dist", "server"));
 	const rscBundlePath = options.rscBundlePath ?? resolveBuiltRscEntryPath(configuredRscServerDir);
+	const pagesBundlePath = options.pagesBundlePath ?? resolveBuiltPagesEntryPath(path.resolve(root, options.routeRootConfig?.ssrOutDir ?? path.join("dist", "server")));
 	const relativeEntryPath = path.relative(configuredRscServerDir, rscBundlePath);
 	const serverDir = !relativeEntryPath.startsWith("../") && !path.isAbsolute(relativeEntryPath) ? configuredRscServerDir : path.dirname(rscBundlePath);
 	const config = options.nextConfig ? { ...options.nextConfig } : { ...await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root) };
-	const builtBuildId = readBuiltBuildId(manifestDir) ?? readBuiltBuildId(serverDir);
+	const builtBuildId = readBuiltBuildId(manifestDir) ?? readBuiltBuildId(appDir ? serverDir : path.dirname(pagesBundlePath));
 	if (builtBuildId) config.buildId = builtBuildId;
 	const mode = config.output === "export" ? "export" : "default";
 	const allRoutes = [];
@@ -183,7 +184,7 @@ async function runPrerender(options) {
 				...sharedProdServer ? {
 					_prodServer: sharedProdServer,
 					_prerenderSecret: sharedPrerenderSecret
-				} : { pagesBundlePath: options.pagesBundlePath ?? path.join(manifestDir, "entry.js") },
+				} : { pagesBundlePath },
 				onProgress: ({ total, route }) => {
 					if (pagesTotal === 0) {
 						pagesTotal = total;

package/dist/build/server-entry.d.ts

@@ -1,4 +1,6 @@
 //#region src/build/server-entry.d.ts
+/** Pages builds emit entry.js in Node or index.js when the host owns the Worker entry. */
+export declare function resolveBuiltPagesEntryPath(serverDir: string): string;
 /** Resolve the built App handler even when a deployment host owns index.js. */
 export declare function resolveBuiltRscEntryPath(serverDir: string): string;
 //#endregion

package/dist/build/server-entry.js

@@ -2,6 +2,12 @@ import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
 //#region src/build/server-entry.ts
 const RSC_ENTRY_MANIFEST_KEY = "virtual:vinext-rsc-entry";
+/** Pages builds emit entry.js in Node or index.js when the host owns the Worker entry. */
+function resolveBuiltPagesEntryPath(serverDir) {
+	const nodeEntryPath = path.join(serverDir, "entry.js");
+	const workerEntryPath = path.join(serverDir, "index.js");
+	return fs.existsSync(nodeEntryPath) || !fs.existsSync(workerEntryPath) ? nodeEntryPath : workerEntryPath;
+}
 /** Resolve the built App handler even when a deployment host owns index.js. */
 function resolveBuiltRscEntryPath(serverDir) {
 	const fallbackPath = path.join(serverDir, "index.js");
@@ -25,4 +31,4 @@ function resolveBuiltRscEntryPath(serverDir) {
 	return fs.existsSync(entryPath) ? entryPath : fallbackPath;
 }
 //#endregion
-export { resolveBuiltRscEntryPath };
+export { resolveBuiltPagesEntryPath, resolveBuiltRscEntryPath };

package/dist/build/server-manifest.d.ts

@@ -14,6 +14,13 @@
  * warn when this returns `undefined`.
  */
 export declare function readPrerenderSecret(serverDir: string): string | undefined;
+/**
+ * Read next.config `compress` from `vinext-server.json` in `serverDir`.
+ *
+ * Like `next start`, compression stays on unless the build recorded an
+ * explicit `compress: false`, so builds without the field keep compressing.
+ */
+export declare function readServerCompress(serverDir: string): boolean;
 /**
  * Read every server output root that contains a deployable response-stage
  * graph. Paths are stored relative to the project root so build artifacts stay

package/dist/build/server-manifest.js

@@ -20,6 +20,16 @@ function readPrerenderSecret(serverDir) {
 	return readJsonFile(manifestPath)?.prerenderSecret;
 }
 /**
+* Read next.config `compress` from `vinext-server.json` in `serverDir`.
+*
+* Like `next start`, compression stays on unless the build recorded an
+* explicit `compress: false`, so builds without the field keep compressing.
+*/
+function readServerCompress(serverDir) {
+	const manifestPath = path.join(serverDir, "vinext-server.json");
+	return readJsonFile(manifestPath)?.compress !== false;
+}
+/**
 * Read every server output root that contains a deployable response-stage
 * graph. Paths are stored relative to the project root so build artifacts stay
 * relocatable, then resolved for post-build sidecar updates.
@@ -31,4 +41,4 @@ function readServerRuntimeOutputDirs(serverDir, root) {
 	return manifest.runtimeOutputDirs.filter((outputDir) => typeof outputDir === "string").map((outputDir) => path.resolve(root, outputDir));
 }
 //#endregion
-export { readPrerenderSecret, readServerRuntimeOutputDirs };
+export { readPrerenderSecret, readServerCompress, readServerRuntimeOutputDirs };

package/dist/cache/cache-adapters-virtual.d.ts

@@ -74,7 +74,13 @@ export type CacheAdapterBuildOutput = {
 export type CacheAdapterDescriptor<O extends Record<string, unknown> = Record<string, unknown>> = {
   /**
    * Module specifier (or absolute path, e.g. from `require.resolve(...)`) whose
-   * default export is a cache adapter factory.
+   * default export creates the adapter from one `{ env, options }` argument:
+   * either a factory `({ env, options }) => adapter` or a class
+   * `new Adapter({ env, options })`. Class syntax is invoked with `new`; any
+   * other function is called. For a constructor that is not class syntax (an
+   * ES5-compiled, bound or Proxy-wrapped class), export
+   * `(args) => new Adapter(args)`. The result must be the adapter object
+   * itself, not a Promise.
    */
   adapter: string;
   /** JSON-serializable options forwarded to the factory at runtime. */

package/dist/cache/cache-adapters-virtual.js

@@ -103,7 +103,7 @@ function generateCacheAdaptersModule(cache) {
 		"export function registerConfiguredCacheAdapters() {}",
 		""
 	].join("\n");
-	const lines = ["// vinext: generated from the `cache` option in your vinext() plugin config."];
+	const lines = ["// vinext: generated from the `cache` option in your vinext() plugin config.", `import { instantiateCacheAdapter } from "vinext/shims/cache-adapter-instantiate";`];
 	if (data?.adapter) {
 		lines.push(`import __vinextDataAdapterFactory from ${JSON.stringify(data.adapter)};`);
 		lines.push(`import { registerDataCacheHandler } from "vinext/shims/cache-handler";`);
@@ -114,11 +114,11 @@ function generateCacheAdaptersModule(cache) {
 	} else if (dataProvidesBuildIdentity) lines.push(`import { DefaultCdnCacheAdapter } from "vinext/shims/cdn-cache";`, `import { registerCdnCacheAdapter } from "vinext/shims/cdn-cache-state";`);
 	lines.push("", "// A factory that throws (e.g. a missing binding on an incompatible runtime)", "// is logged and skipped so the default handler stays in place.", "function __vinextFormatAdapterError(error) {", "  if (error instanceof Error && error.message) return error.message;", "  try {", "    return String(error);", "  } catch {", "    return '<unknown error>';", "  }", "}", "", "let __vinextCacheAdaptersRegistered = false;", "", "export function registerConfiguredCacheAdapters(env) {", "  if (typeof process !== 'undefined' && process.env?.__VINEXT_PRERENDER_PATH_DISCOVERY === '1') return;", "  if (__vinextCacheAdaptersRegistered) return;", "  __vinextCacheAdaptersRegistered = true;");
 	if (data?.adapter) {
-		lines.push("  try {", `    registerDataCacheHandler(() => __vinextDataAdapterFactory({ env, options: ${inlineOptions(data.adapter, data.options)} }));`);
+		lines.push("  try {", `    registerDataCacheHandler(() => instantiateCacheAdapter(__vinextDataAdapterFactory, { env, options: ${inlineOptions(data.adapter, data.options)} }, "data"));`);
 		if (dataProvidesBuildIdentity) lines.push("    registerCdnCacheAdapter(() => new DefaultCdnCacheAdapter(", "      process.env.__VINEXT_RSC_BUILD_IDENTITY || process.env.__VINEXT_BUILD_ID,", "    ));");
 		lines.push("  } catch (error) {", "    console.warn(\"[vinext] failed to initialize the configured data cache adapter; using the default handler.\\n\" + __vinextFormatAdapterError(error));", "  }");
 	}
-	if (cdn?.adapter) lines.push("  try {", `    registerCdnCacheAdapter(() => __vinextCdnAdapterFactory({ env, options: ${inlineOptions(cdn.adapter, cdn.options)} }));`, "  } catch (error) {", "    console.warn(\"[vinext] failed to initialize the configured CDN cache adapter; using the default adapter.\\n\" + __vinextFormatAdapterError(error));", "  }");
+	if (cdn?.adapter) lines.push("  try {", `    registerCdnCacheAdapter(() => instantiateCacheAdapter(__vinextCdnAdapterFactory, { env, options: ${inlineOptions(cdn.adapter, cdn.options)} }, "cdn"));`, "  } catch (error) {", "    console.warn(\"[vinext] failed to initialize the configured CDN cache adapter; using the default adapter.\\n\" + __vinextFormatAdapterError(error));", "  }");
 	lines.push("}", "");
 	return lines.join("\n");
 }

package/dist/client/browser-globals.d.ts

@@ -0,0 +1,4 @@
+//#region src/client/browser-globals.d.ts
+export declare const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
+export declare const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
+//#endregion

package/dist/client/browser-globals.js

@@ -0,0 +1,5 @@
+//#region src/client/browser-globals.ts
+const RSC_FORM_STATE_GLOBAL = "__VINEXT_RSC_FORM_STATE__";
+const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
+//#endregion
+export { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, RSC_FORM_STATE_GLOBAL };

package/dist/client/navigation-runtime.d.ts

@@ -57,6 +57,17 @@ export type NavigationRuntimeFunctions = {
   preparePrefetchResponse?: (response: Response) => Promise<unknown>;
   claimCurrentHistoryTreeSnapshot?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
   commitAppOwnedHistoryStateWrite?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
+  /**
+   * Called after a raw (non-app-owned) history.pushState/replaceState with a
+   * URL so an App Router navigation that has not committed yet is discarded,
+   * matching Next.js' ACTION_RESTORE.
+   */
+  discardPendingNavigation?: () => void;
+  /**
+   * Called before any history.pushState/replaceState so a navigation React is
+   * committing writes its URL first, as Next.js does from an insertion effect.
+   */
+  flushCommittingNavigationUrl?: () => void;
 };
 export type NavigationRuntimeBootstrap = {
   routeManifest: RouteManifest | null;
@@ -66,7 +77,6 @@ export type NavigationRuntime = {
   bootstrap: NavigationRuntimeBootstrap;
   functions: NavigationRuntimeFunctions;
 };
-export declare const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
 export declare const NAVIGATION_RUNTIME_KEY: unique symbol;
 export declare function getNavigationRuntime(): NavigationRuntime | null;
 export declare function registerNavigationRuntimeBootstrap(bootstrap: Partial<NavigationRuntimeBootstrap>): NavigationRuntime;

package/dist/client/navigation-runtime.js

@@ -1,6 +1,6 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "./browser-globals.js";
 //#region src/client/navigation-runtime.ts
-const NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION = "vinext.navigationRuntime";
 const NAVIGATION_RUNTIME_KEY = Symbol.for(NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION);
 const ROUTE_MANIFEST_SEGMENT_GRAPH_MAP_KEYS = [
 	"boundaries",
@@ -31,7 +31,7 @@ function readRuntimeWindow() {
 }
 function isNavigationRuntimeFunctions(value) {
 	if (!isUnknownRecord(value)) return false;
-	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite"));
+	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite")) && isOptionalRuntimeFunction(Reflect.get(value, "discardPendingNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "flushCommittingNavigationUrl"));
 }
 function isNavigationRuntimeRscChunk(value) {
 	if (typeof value === "string") return true;
@@ -169,4 +169,4 @@ function hasAppNavigationRuntimeBootstrap() {
 	return getNavigationRuntime() !== null;
 }
 //#endregion
-export { NAVIGATION_RUNTIME_KEY, NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };
+export { NAVIGATION_RUNTIME_KEY, ensureNavigationRuntimeRscBootstrap, getNavigationRuntime, hasAppNavigationRuntime, hasAppNavigationRuntimeBootstrap, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions };

package/dist/config/config-matchers.js

@@ -307,6 +307,7 @@ function applyMiddlewareRequestHeaders(middlewareHeaders, request) {
 		method: request.method,
 		headers: nextHeaders,
 		body: request.body,
+		signal: request.signal,
 		duplex: request.body ? "half" : void 0
 	});
 	return {
@@ -859,9 +860,10 @@ async function proxyExternalRequest(request, externalUrl) {
 	try {
 		upstreamResponse = await fetch(targetUrl.href, {
 			...init,
-			signal: controller.signal
+			signal: AbortSignal.any([request.signal, controller.signal])
 		});
 	} catch (e) {
+		if (request.signal.aborted && !controller.signal.aborted) return new Response(null, { status: 499 });
 		if (e instanceof Error && e.name === "AbortError") {
 			console.error("[vinext] External rewrite proxy timeout:", targetUrl.href);
 			return new Response("Gateway Timeout", { status: 504 });