vinext 0.1.8 → 0.2.1

package/dist/build/prerender.js

@@ -1,18 +1,21 @@
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../server/headers.js";
-import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_PRERENDER_CACHE_LIFE_HEADER } from "../server/headers.js";
+import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.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 { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
+import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
 import { BLOCKED_PAGES } from "../shims/constants.js";
+import { buildPregeneratedConcretePathTable } from "../server/prerender-manifest.js";
 import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
 import { navigationRuntimeRscBootstrapExpression } from "../server/app-ssr-stream.js";
-import { createAppPprFallbackShells, markAppPprDynamicFallbackShellHtml } from "../server/app-ppr-fallback-shell.js";
 import { encodePrerenderRouteParams, serializePrerenderRouteParamsHeader } from "../server/prerender-route-params.js";
 import { readPrerenderSecret } from "./server-manifest.js";
+import { createAppPprFallbackShells, markAppPprDynamicFallbackShellHtml } from "../server/app-ppr-fallback-shell.js";
 import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
 import { startProdServer } from "../server/prod-server.js";
+import { prerenderPoolAvailable, resolvePrerenderPoolSize, startPrerenderServerPool } from "./prerender-server-pool.js";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
@@ -41,6 +44,14 @@ function isExperimentalPprFallbackShellGenerationEnabled(env = process.env) {
 function getErrorMessageWithStack(err) {
 	return err.stack || err.message;
 }
+async function startOptionalPrerenderServerPool(outDir, poolSize) {
+	try {
+		return await startPrerenderServerPool(outDir, poolSize);
+	} catch (e) {
+		console.warn(`[vinext] prerender render pool failed to start; falling back to single-process render: ${e instanceof Error ? e.message : String(e)}`);
+		return null;
+	}
+}
 var PrerenderUserFunctionError = class extends Error {};
 function parsePrerenderEndpointError(text) {
 	try {
@@ -80,7 +91,7 @@ function extractRscPayloadFromPrerenderedHtml(html) {
 	let match;
 	while ((match = scriptPattern.exec(html)) !== null) {
 		const script = (match[1] ?? "").trim().replace(/;$/, "");
-		if (script === RSC_RUNTIME_DONE_SCRIPT || script === RSC_LEGACY_DONE_SCRIPT) {
+		if (script === RSC_RUNTIME_DONE_SCRIPT || script === RSC_LEGACY_DONE_SCRIPT || script.endsWith(`;${RSC_RUNTIME_DONE_SCRIPT}`)) {
 			sawDone = true;
 			continue;
 		}
@@ -256,11 +267,12 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 	const previousPrerenderFlag = process.env.VINEXT_PRERENDER;
 	process.env.VINEXT_PRERENDER = "1";
 	let ownedProdServerHandle = null;
+	let renderPool = null;
 	try {
 		let prerenderSecret = options._prerenderSecret;
 		if (!prerenderSecret && pagesBundlePath) prerenderSecret = readPrerenderSecret(path.dirname(pagesBundlePath));
 		if (!prerenderSecret) console.warn("[vinext] Warning: prerender secret not found. /__vinext/prerender/* endpoints will return 403 and dynamic routes will produce no paths. Run `vinext build` to regenerate the secret.");
-		const baseUrl = `http://127.0.0.1:${(options._prodServer ? options._prodServer : await (async () => {
+		const prodServer = options._prodServer ? options._prodServer : await (async () => {
 			const srv = await startProdServer({
 				port: 0,
 				host: "127.0.0.1",
@@ -270,12 +282,18 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 			});
 			ownedProdServerHandle = srv;
 			return srv;
-		})()).port}`;
+		})();
+		const baseUrl = `http://127.0.0.1:${prodServer.port}`;
 		const secretHeaders = prerenderSecret ? { [VINEXT_PRERENDER_SECRET_HEADER]: prerenderSecret } : {};
-		const renderPage = (urlPath) => fetch(`${baseUrl}${urlPath}`, {
-			headers: secretHeaders,
-			redirect: "manual"
-		});
+		let renderPorts = [prodServer.port];
+		let renderRoundRobin = 0;
+		const renderPage = (urlPath) => {
+			const port = renderPorts[renderRoundRobin++ % renderPorts.length];
+			return fetch(`http://127.0.0.1:${port}${urlPath}`, {
+				headers: secretHeaders,
+				redirect: "manual"
+			});
+		};
 		const bundlePageRoutes = routes.map((r) => ({
 			pattern: r.pattern,
 			isDynamic: r.isDynamic ?? false,
@@ -396,6 +414,13 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 				revalidate
 			});
 		}
+		if (!options._prodServer && pagesBundlePath && prerenderPoolAvailable()) {
+			const poolSize = resolvePrerenderPoolSize(pagesToRender.length, concurrency);
+			if (poolSize > 1) {
+				renderPool = await startOptionalPrerenderServerPool(path.dirname(path.dirname(pagesBundlePath)), poolSize);
+				if (renderPool) renderPorts = renderPool.ports;
+			}
+		}
 		let completed = 0;
 		const pageResults = await runWithConcurrency(pagesToRender, concurrency, async ({ route, urlPath, revalidate }) => {
 			let result;
@@ -426,6 +451,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					...urlPath !== route.pattern ? { path: urlPath } : {}
 				};
 			} catch (e) {
+				renderPool?.recordRenderError(e);
 				const err = e;
 				result = {
 					route: route.pattern,
@@ -442,6 +468,7 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 			return result;
 		});
 		results.push(...pageResults);
+		renderPool?.assertHealthy();
 		const hasCustom404 = findFileWithExtensions(path.join(pagesDir, "404"), fileMatcher);
 		const hasErrorPage = findFileWithExtensions(path.join(pagesDir, "_error"), fileMatcher);
 		if (hasCustom404 || hasErrorPage) try {
@@ -459,13 +486,17 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 					router: "pages"
 				});
 			}
-		} catch {}
+		} catch (e) {
+			renderPool?.recordRenderError(e);
+		}
+		renderPool?.assertHealthy();
 		if (!skipManifest) writePrerenderIndex(results, manifestDir, {
 			buildId: config.buildId,
 			trailingSlash: config.trailingSlash
 		});
 		return { routes: results };
 	} finally {
+		if (renderPool) await renderPool.close();
 		setCacheHandler(previousHandler);
 		if (previousPrerenderFlag === void 0) delete process.env.VINEXT_PRERENDER;
 		else process.env.VINEXT_PRERENDER = previousPrerenderFlag;
@@ -504,10 +535,13 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 	let rscHandler;
 	let staticParamsMap = {};
 	let ownedProdServerHandle = null;
+	let renderPool = null;
+	let renderPorts = [];
+	let renderRoundRobin = 0;
 	try {
 		const prerenderSecret = readPrerenderSecret(serverDir);
 		if (!prerenderSecret) console.warn("[vinext] Warning: prerender secret not found. /__vinext/prerender/* endpoints will return 403 and generateStaticParams will not be called. Run `vinext build` to regenerate the secret.");
-		const baseUrl = `http://127.0.0.1:${(options._prodServer ? options._prodServer : await (async () => {
+		const prodServer = options._prodServer ? options._prodServer : await (async () => {
 			const srv = await startProdServer({
 				port: 0,
 				host: "127.0.0.1",
@@ -517,11 +551,13 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 			});
 			ownedProdServerHandle = srv;
 			return srv;
-		})()).port}`;
+		})();
+		const baseUrl = `http://127.0.0.1:${prodServer.port}`;
+		renderPorts = [prodServer.port];
 		const secretHeaders = prerenderSecret ? { [VINEXT_PRERENDER_SECRET_HEADER]: prerenderSecret } : {};
 		rscHandler = (req) => {
 			const parsed = new URL(req.url);
-			const url = `${baseUrl}${parsed.pathname}${parsed.search}`;
+			const url = `http://127.0.0.1:${renderPorts[renderRoundRobin++ % renderPorts.length]}${parsed.pathname}${parsed.search}`;
 			return fetch(url, {
 				method: req.method,
 				headers: {
@@ -717,25 +753,32 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 				const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParams);
 				const htmlHeaders = new Headers();
 				if (prerenderRouteParamsHeader !== null) htmlHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+				if (isSpeculative) htmlHeaders.set(VINEXT_PRERENDER_SPECULATIVE_HEADER, "1");
 				const htmlRequest = new Request(`http://localhost${urlPath}`, { headers: htmlHeaders });
 				const htmlRender = await runWithHeadersContext(headersContextFromRequest(htmlRequest), async () => {
 					const response = await rscHandler(htmlRequest);
 					const cacheControl = response.headers.get("cache-control") ?? "";
-					if (!response.ok || isSpeculative && cacheControl.includes("no-store")) {
+					const linkHeader = response.headers.get("link");
+					const responseCacheLife = readPrerenderCacheLifeHeader(response.headers);
+					if (!response.ok || cacheControl.includes("no-store")) {
 						await response.body?.cancel();
 						return {
 							cacheControl,
+							linkHeader,
 							html: null,
 							ok: response.ok,
 							requestCacheLife: null,
 							status: response.status
 						};
 					}
+					const html = await response.text();
+					const processCacheLife = _consumeRequestScopedCacheLife();
 					return {
 						cacheControl,
-						html: await response.text(),
+						linkHeader,
+						html,
 						ok: true,
-						requestCacheLife: _consumeRequestScopedCacheLife(),
+						requestCacheLife: responseCacheLife ?? processCacheLife,
 						status: response.status
 					};
 				});
@@ -752,13 +795,11 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						error: `RSC handler returned ${htmlRender.status}`
 					};
 				}
-				if (isSpeculative) {
-					if (htmlCacheControl.includes("no-store")) return {
-						route: routePattern,
-						status: "skipped",
-						reason: "dynamic"
-					};
-				}
+				if (htmlCacheControl.includes("no-store")) return {
+					route: routePattern,
+					status: "skipped",
+					reason: "dynamic"
+				};
 				if (htmlRender.html === null) return {
 					route: routePattern,
 					status: "error",
@@ -772,6 +813,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						RSC: "1"
 					});
 					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${urlPath}`, { headers: rscHeaders });
 					const rscRes = await runWithHeadersContext(headersContextFromRequest(rscRequest), () => rscHandler(rscRequest));
 					if (!rscRes.ok) {
@@ -800,10 +842,12 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					revalidate: renderedRevalidate,
 					...typeof renderedRevalidate === "number" ? { expire: renderedCacheControl.expire } : {},
 					router: "app",
+					...htmlRender.linkHeader ? { headers: { link: htmlRender.linkHeader } } : {},
 					...urlPath !== routePattern ? { path: urlPath } : {},
 					...isFallback ? { fallback: true } : {}
 				};
 			} catch (e) {
+				renderPool?.recordRenderError(e);
 				if (isSpeculative) return {
 					route: routePattern,
 					status: "skipped",
@@ -818,6 +862,13 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 				};
 			}
 		}
+		if (!options._prodServer && prerenderPoolAvailable()) {
+			const poolSize = resolvePrerenderPoolSize(urlsToRender.length, concurrency);
+			if (poolSize > 1) {
+				renderPool = await startOptionalPrerenderServerPool(path.dirname(serverDir), poolSize);
+				if (renderPool) renderPorts = renderPool.ports;
+			}
+		}
 		let completedApp = 0;
 		const appResults = await runWithConcurrency(urlsToRender, concurrency, async (urlToRender) => {
 			const result = await renderUrl(urlToRender);
@@ -830,6 +881,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 			return result;
 		});
 		results.push(...appResults);
+		renderPool?.assertHealthy();
 		const outputFiles = mode === "export" && metadataRoutes.length > 0 ? emitStaticMetadataFiles(metadataRoutes, outDir) : [];
 		try {
 			const notFoundRequest = new Request(`http://localhost${NOT_FOUND_SENTINEL_PATH}`);
@@ -847,7 +899,10 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					router: "app"
 				});
 			}
-		} catch {}
+		} catch (e) {
+			renderPool?.recordRenderError(e);
+		}
+		renderPool?.assertHealthy();
 		if (!skipManifest) writePrerenderIndex(results, manifestDir, {
 			buildId: config.buildId,
 			trailingSlash: config.trailingSlash
@@ -857,6 +912,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 			...outputFiles.length > 0 ? { outputFiles } : {}
 		};
 	} finally {
+		if (renderPool) await renderPool.close();
 		setCacheHandler(previousHandler);
 		if (previousPrerenderFlag === void 0) delete process.env.VINEXT_PRERENDER;
 		else process.env.VINEXT_PRERENDER = previousPrerenderFlag;
@@ -876,6 +932,19 @@ function resolveRenderedCacheControl(requestCacheLife, cacheControl, fallbackExp
 		...revalidate === void 0 ? {} : { revalidate }
 	};
 }
+function readPrerenderCacheLifeHeader(headers) {
+	const value = headers.get(VINEXT_PRERENDER_CACHE_LIFE_HEADER);
+	if (!value) return null;
+	try {
+		const parsed = JSON.parse(value);
+		const cacheLife = {};
+		if (typeof parsed.revalidate === "number" && Number.isFinite(parsed.revalidate)) cacheLife.revalidate = parsed.revalidate;
+		if (typeof parsed.expire === "number" && Number.isFinite(parsed.expire)) cacheLife.expire = parsed.expire;
+		return cacheLife.revalidate === void 0 && cacheLife.expire === void 0 ? null : cacheLife;
+	} catch {
+		return null;
+	}
+}
 function resolveRenderedExpireSeconds(options) {
 	const { fallbackExpireSeconds, sMaxage, staleWhileRevalidate } = options;
 	if (sMaxage === void 0 || staleWhileRevalidate === void 0) return fallbackExpireSeconds;
@@ -907,6 +976,7 @@ function writePrerenderIndex(routes, outDir, options) {
 			revalidate: r.revalidate,
 			...typeof r.revalidate === "number" ? { expire: r.expire } : {},
 			router: r.router,
+			...r.headers ? { headers: r.headers } : {},
 			...r.path ? { path: r.path } : {},
 			...r.fallback ? { fallback: true } : {}
 		};
@@ -924,7 +994,8 @@ function writePrerenderIndex(routes, outDir, options) {
 	const index = {
 		...buildId ? { buildId } : {},
 		...typeof trailingSlash === "boolean" ? { trailingSlash } : {},
-		routes: indexRoutes
+		routes: indexRoutes,
+		pregeneratedConcretePaths: buildPregeneratedConcretePathTable({ routes: indexRoutes })
 	};
 	fs.writeFileSync(path.join(outDir, "vinext-prerender.json"), JSON.stringify(index, null, 2), "utf-8");
 }

package/dist/build/report.d.ts

@@ -17,6 +17,13 @@ type RouteRow = {
   prerendered?: boolean;
 };
 type AppRouteRenderEntry = Pick<AppRoute, "pagePath" | "routePath" | "parallelSlots">;
+type StaticMiddlewareMatcherObject = {
+  source: string;
+  locale?: false;
+  has?: Array<Record<string, string>>;
+  missing?: Array<Record<string, string>>;
+};
+type StaticMiddlewareMatcher = string | Array<string | StaticMiddlewareMatcherObject>;
 declare function getAppRouteRenderEntryPath(route: AppRouteRenderEntry): string | null;
 /**
  * Returns true if the source code contains an export declaration with the given name.
@@ -28,12 +35,15 @@ declare function getAppRouteRenderEntryPath(route: AppRouteRenderEntry): string
  *   export { foo }
  */
 declare function hasNamedExport(code: string, name: string): boolean;
+/** Returns true when Next.js' analyzer recognizes the requested export name. */
+declare function hasExportedName(code: string, name: string): boolean;
 /**
  * Extracts the string value of `export const <name> = "value"`.
  * Handles TypeScript annotations/assertions and no-substitution template literals.
  * Returns null if the export is absent or not a string literal.
  */
 declare function extractExportConstString(code: string, name: string): string | null;
+declare function extractMiddlewareMatcherConfig(filePath: string): StaticMiddlewareMatcher | undefined;
 /**
  * Extracts the numeric value of `export const <name> = <number|false>`.
  * Supports integers, decimals, negative values, `Infinity`, and `false`.
@@ -121,7 +131,8 @@ declare function formatBuildReport(rows: RouteRow[], routerLabel?: string): stri
  * Scans the project at `root`, classifies all routes, and prints the
  * Next.js-style build report to stdout.
  *
- * Called at the end of `vinext build` in cli.ts.
+ * `root` must be forward-slash — it is passed to `findDir`. The caller (the
+ * `vinext build` entry in cli.ts) normalizes it.
  */
 declare function printBuildReport(options: {
   root: string;
@@ -129,4 +140,4 @@ declare function printBuildReport(options: {
   prerenderResult?: PrerenderResult;
 }): Promise<void>;
 //#endregion
-export { RouteRow, RouteType, buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };
+export { RouteRow, RouteType, StaticMiddlewareMatcher, buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, extractMiddlewareMatcherConfig, formatBuildReport, getAppRouteRenderEntryPath, hasExportedName, hasNamedExport, printBuildReport };

package/dist/build/report.js

@@ -22,6 +22,7 @@ import { parseSync } from "vite";
 * `export const revalidate` are classified as "unknown" rather than "static"
 * to avoid false confidence.
 */
+const UNSUPPORTED_STATIC_VALUE = Symbol("unsupported static value");
 function getAppRouteRenderEntryPath(route) {
 	if (route.pagePath) return route.pagePath;
 	if (route.routePath) return null;
@@ -72,6 +73,21 @@ function hasNamedExport(code, name) {
 	if (!program) return false;
 	return hasNamedExportInProgram(program, name);
 }
+/** Returns true when Next.js' analyzer recognizes the requested export name. */
+function hasExportedName(code, name) {
+	const program = parseRouteModule(code);
+	if (!program) return false;
+	for (const node of program.body) {
+		if (node.type !== "ExportNamedDeclaration") continue;
+		if (node.exportKind === "type") continue;
+		if (declarationHasBindingName(node.declaration, name)) return true;
+		for (const specifier of node.specifiers) {
+			if (specifier.exportKind === "type") continue;
+			if (moduleExportNameValue(specifier.local) === name) return true;
+		}
+	}
+	return false;
+}
 function hasNamedExportInProgram(program, name) {
 	for (const node of program.body) {
 		if (node.type !== "ExportNamedDeclaration") continue;
@@ -117,6 +133,86 @@ function extractStringFromConstInitializer(initializer) {
 	if (expression.type === "TemplateLiteral" && expression.expressions.length === 0) return expression.quasis[0]?.value.cooked ?? expression.quasis[0]?.value.raw ?? null;
 	return null;
 }
+function extractMiddlewareMatcherConfig(filePath) {
+	let code;
+	try {
+		code = fs.readFileSync(filePath, "utf8");
+	} catch {
+		return;
+	}
+	const initializer = findExportedConstInitializer(code, "config");
+	if (!initializer) return void 0;
+	const config = unwrapStaticExpression(initializer);
+	if (config.type !== "ObjectExpression") return void 0;
+	const matcherExpression = objectPropertyValue(config, "matcher");
+	if (!matcherExpression) return void 0;
+	const value = extractStaticJsonValue(matcherExpression);
+	return isStaticMiddlewareMatcher(value) ? value : void 0;
+}
+function objectPropertyValue(object, key) {
+	for (const property of object.properties) {
+		if (property.type !== "Property" || property.computed) continue;
+		if (propertyKeyName(property.key) !== key) continue;
+		return property.value;
+	}
+	return null;
+}
+function propertyKeyName(key) {
+	if (key.type === "Identifier") return key.name;
+	if (key.type === "Literal" && typeof key.value === "string") return key.value;
+	return null;
+}
+function extractStaticJsonValue(expression) {
+	const value = unwrapStaticExpression(expression);
+	if (value.type === "Literal") {
+		if (typeof value.value === "string" || typeof value.value === "number" || typeof value.value === "boolean" || value.value === null) return value.value;
+		return UNSUPPORTED_STATIC_VALUE;
+	}
+	if (value.type === "TemplateLiteral" && value.expressions.length === 0) return value.quasis[0]?.value.cooked ?? value.quasis[0]?.value.raw ?? "";
+	if (value.type === "ArrayExpression") {
+		const items = [];
+		for (const element of value.elements) {
+			if (!element || element.type === "SpreadElement") return UNSUPPORTED_STATIC_VALUE;
+			const item = extractStaticJsonValue(element);
+			if (item === UNSUPPORTED_STATIC_VALUE) return UNSUPPORTED_STATIC_VALUE;
+			items.push(item);
+		}
+		return items;
+	}
+	if (value.type === "ObjectExpression") {
+		const object = {};
+		for (const property of value.properties) {
+			if (property.type !== "Property" || property.computed) return UNSUPPORTED_STATIC_VALUE;
+			const key = propertyKeyName(property.key);
+			if (!key) return UNSUPPORTED_STATIC_VALUE;
+			const propertyValue = extractStaticJsonValue(property.value);
+			if (propertyValue === UNSUPPORTED_STATIC_VALUE) return UNSUPPORTED_STATIC_VALUE;
+			object[key] = propertyValue;
+		}
+		return object;
+	}
+	return UNSUPPORTED_STATIC_VALUE;
+}
+function isStaticMiddlewareMatcher(value) {
+	if (typeof value === "string") return true;
+	if (!Array.isArray(value)) return false;
+	return value.every((item) => typeof item === "string" || isStaticMiddlewareMatcherObject(item));
+}
+function isStaticMiddlewareMatcherObject(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+	const record = value;
+	if (typeof record.source !== "string") return false;
+	if (record.locale !== void 0 && record.locale !== false) return false;
+	return isStaticMatcherConditions(record.has) && isStaticMatcherConditions(record.missing);
+}
+function isStaticMatcherConditions(value) {
+	if (value === void 0) return true;
+	if (!Array.isArray(value)) return false;
+	return value.every((item) => {
+		if (!item || typeof item !== "object" || Array.isArray(item)) return false;
+		return Object.values(item).every((entry) => typeof entry === "string");
+	});
+}
 /**
 * Extracts the numeric value of `export const <name> = <number|false>`.
 * Supports integers, decimals, negative values, `Infinity`, and `false`.
@@ -474,7 +570,8 @@ function formatBuildReport(rows, routerLabel = "app") {
 * Scans the project at `root`, classifies all routes, and prints the
 * Next.js-style build report to stdout.
 *
-* Called at the end of `vinext build` in cli.ts.
+* `root` must be forward-slash — it is passed to `findDir`. The caller (the
+* `vinext build` entry in cli.ts) normalizes it.
 */
 async function printBuildReport(options) {
 	const { root } = options;
@@ -501,4 +598,4 @@ async function printBuildReport(options) {
 	}
 }
 //#endregion
-export { buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, formatBuildReport, getAppRouteRenderEntryPath, hasNamedExport, printBuildReport };
+export { buildReportRows, classifyAppRoute, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, extractMiddlewareMatcherConfig, formatBuildReport, getAppRouteRenderEntryPath, hasExportedName, hasNamedExport, printBuildReport };

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

@@ -56,6 +56,13 @@ type RunPrerenderOptions = {
  * `output: 'export'`. Exported for direct unit testing. Refs cloudflare/vinext#1982
  */
 declare function assertNoFatalPrerenderRoutes(routes: readonly PrerenderRouteResult[]): void;
+/**
+ * Statically generate routes and return the prerender result.
+ *
+ * `options.root` must be forward-slash — it is passed to `findDir` and flows
+ * into the route model. The caller (the `vinext build` entry in cli.ts)
+ * normalizes it.
+ */
 declare function runPrerender(options: RunPrerenderOptions): Promise<PrerenderResult | null>;
 //#endregion
 export { assertNoFatalPrerenderRoutes, runPrerender };

package/dist/build/run-prerender.js

@@ -4,14 +4,15 @@ import { appRouter } from "../routing/app-router.js";
 import { scanMetadataFiles } from "../server/metadata-routes.js";
 import { loadNextConfig, resolveNextConfig } from "../config/next-config.js";
 import { readPrerenderSecret } from "./server-manifest.js";
-import { startProdServer } from "../server/prod-server.js";
+import { rememberCurrentServerEntryImportMtime, startProdServer } from "../server/prod-server.js";
 import { prerenderApp, prerenderPages, writePrerenderIndex } from "./prerender.js";
+import { injectPregeneratedConcretePaths } from "./inject-pregenerated-paths.js";
 import fs from "node:fs";
 import path from "node:path";
 //#region src/build/run-prerender.ts
 /**
 * Shared prerender runner used by both `vinext build` (cli.ts) and
-* `vinext deploy --prerender-all` (deploy.ts).
+* `vinext-cloudflare deploy --prerender-all` (deploy.ts).
 *
 * `runPrerender` handles route scanning, dynamic imports, progress reporting,
 * and result summarisation.
@@ -95,6 +96,13 @@ function assertNoFatalPrerenderRoutes(routes) {
 	const fatalList = fatalRoutes.map((r) => `  ${r.route}: ${r.error}`).join("\n");
 	throw new Error(`Prerender failed: ${fatalRoutes.length} route${fatalRoutes.length !== 1 ? "s" : ""} errored during static generation.\n${fatalList}`);
 }
+/**
+* Statically generate routes and return the prerender result.
+*
+* `options.root` must be forward-slash — it is passed to `findDir` and flows
+* into the route model. The caller (the `vinext build` entry in cli.ts)
+* normalizes it.
+*/
 async function runPrerender(options) {
 	const { root } = options;
 	const appDir = findDir(root, "app", "src/app");
@@ -215,6 +223,8 @@ async function runPrerender(options) {
 		const errorRoutes = allRoutes.filter((r) => r.status === "error").map((r) => `  ${r.route}: ${r.error}`).join("\n");
 		throw new Error(`Static export failed: ${errors} route${errors !== 1 ? "s" : ""} cannot be statically exported.\n${errorRoutes}\n\nRemove server-side data fetching (getServerSideProps, force-dynamic, revalidate) from these routes, or remove \`output: "export"\` from next.config.js.`);
 	}
+	injectPregeneratedConcretePaths(root);
+	if (fs.existsSync(rscBundlePath)) rememberCurrentServerEntryImportMtime(rscBundlePath);
 	return {
 		routes: allRoutes,
 		...allOutputFiles.length > 0 ? { outputFiles: allOutputFiles } : {}

package/dist/build/standalone.js

@@ -167,6 +167,8 @@ function emitStandaloneOutput(options) {
 		dereference: true,
 		filter: (src) => !path.relative(serverDir, src).split(path.sep).includes("node_modules")
 	});
+	const clientAssetsSidecar = path.join(outDir, "vinext-client-assets.js");
+	if (fs.existsSync(clientAssetsSidecar)) fs.copyFileSync(clientAssetsSidecar, path.join(standaloneDistDir, "vinext-client-assets.js"));
 	const publicDir = path.join(root, "public");
 	if (fs.existsSync(publicDir)) fs.cpSync(publicDir, path.join(standaloneDir, "public"), {
 		recursive: true,

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

@@ -35,9 +35,9 @@ function generateCacheAdaptersModule(cache) {
 		lines.push(`import __vinextCdnAdapterFactory from ${JSON.stringify(cdn.adapter)};`);
 		lines.push(`import { setCdnCacheAdapter } from "vinext/shims/cdn-cache";`);
 	}
-	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.", "let __vinextCacheAdaptersRegistered = false;", "", "export function registerConfiguredCacheAdapters(env) {", "  if (__vinextCacheAdaptersRegistered) return;", "  __vinextCacheAdaptersRegistered = true;");
-	if (data?.adapter) lines.push("  try {", `    setDataCacheHandler(__vinextDataAdapterFactory({ env, options: ${inlineOptions(data.adapter, data.options)} }));`, "  } catch (error) {", "    console.warn(\"[vinext] failed to initialize the configured data cache adapter; using the default handler.\", error);", "  }");
-	if (cdn?.adapter) lines.push("  try {", `    setCdnCacheAdapter(__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.\", error);", "  }");
+	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 (__vinextCacheAdaptersRegistered) return;", "  __vinextCacheAdaptersRegistered = true;");
+	if (data?.adapter) lines.push("  try {", `    setDataCacheHandler(__vinextDataAdapterFactory({ env, options: ${inlineOptions(data.adapter, data.options)} }));`, "  } 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 {", `    setCdnCacheAdapter(__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));", "  }");
 	lines.push("}", "");
 	return lines.join("\n");
 }

package/dist/check.d.ts

@@ -60,9 +60,8 @@ declare function hasFreeCjsGlobal(content: string): boolean;
 /**
  * Scan source files for `import ... from 'next/...'` statements.
  *
- * `root` must be forward-slash: it is passed to `findSourceFiles` (which
- * requires it) and used as the base of `path.posix.relative`, which only yields
- * a canonical relative path when both operands are forward-slash.
+ * `root` must be forward-slash: it is passed to `findSourceFiles`, which
+ * requires it.
  */
 declare function scanImports(root: string): CheckItem[];
 /**
@@ -82,9 +81,8 @@ declare function checkLibraries(root: string): CheckItem[];
 /**
  * Check file conventions (pages, app directory, middleware, etc.)
  *
- * `root` must be forward-slash — joined with `path.posix.join`, passed to
- * `findDir`, and used as the base of `path.posix.relative`. Only called from
- * `runCheck`, which normalizes it.
+ * `root` must be forward-slash — joined with `path.posix.join` and passed to
+ * `findDir`. Only called from `runCheck`, which normalizes it.
  */
 declare function checkConventions(root: string): CheckItem[];
 /**