vinext 0.1.2 → 0.1.4

package/dist/server/pages-page-response.js

@@ -5,8 +5,9 @@ import { fnv1a52 } from "../utils/hash.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
+import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
-import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr } from "./html.js";
+import { createNonceAttribute, escapeHtmlAttr } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
@@ -62,14 +63,14 @@ function requestsNoCache(cacheControl) {
 function buildPagesFontHeadHtml(fontLinks, fontPreloads, fontStyles, scriptNonce) {
 	let html = "";
 	const nonceAttr = createNonceAttribute(scriptNonce);
-	for (const link of fontLinks) html += `<link rel="stylesheet"${nonceAttr} href="${escapeHtmlAttr(link)}" />\n  `;
-	for (const preload of fontPreloads) html += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(preload.href)}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n  `;
+	for (const link of fontLinks) html += `<link rel="stylesheet"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(link))}" />\n  `;
+	for (const preload of fontPreloads) html += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(preload.href))}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n  `;
 	if (fontStyles.length > 0) html += `<style data-vinext-fonts${nonceAttr}>${fontStyles.join("\n")}</style>\n  `;
 	return html;
 }
 function buildPagesNextDataScript(options) {
 	const nextDataPayload = {
-		props: { pageProps: options.pageProps },
+		props: options.props ?? { pageProps: options.pageProps },
 		page: options.routePattern,
 		query: options.params,
 		buildId: options.buildId,
@@ -88,8 +89,7 @@ function buildPagesNextDataScript(options) {
 		...options.nextData?.__vinext,
 		...options.vinext
 	};
-	const localeGlobals = options.i18n.locales ? `;window.__VINEXT_LOCALE__=${options.safeJsonStringify(options.i18n.locale)};window.__VINEXT_LOCALES__=${options.safeJsonStringify(options.i18n.locales)};window.__VINEXT_DEFAULT_LOCALE__=${options.safeJsonStringify(options.i18n.defaultLocale)}` : "";
-	return createInlineScriptTag(`window.__NEXT_DATA__ = ${options.safeJsonStringify(nextDataPayload)}${localeGlobals}`, options.scriptNonce);
+	return `<script id="__NEXT_DATA__" type="application/json"${createNonceAttribute(options.scriptNonce)}>${options.safeJsonStringify(nextDataPayload)}<\/script>`;
 }
 async function buildPagesShellHtml(bodyMarker, fontHeadHTML, nextDataScript, options) {
 	if (options.DocumentComponent) {
@@ -171,6 +171,7 @@ function applyGsspHeaders(headers, gsspRes, statusCode) {
 	return statusCode ?? gsspRes.statusCode;
 }
 async function renderPagesPageResponse(options) {
+	const renderProps = options.props ?? { pageProps: options.pageProps };
 	options.resetSSRHead?.();
 	await options.flushPreloads?.();
 	const fontHeadHTML = buildPagesFontHeadHtml(options.getFontLinks(), options.fontPreloads, options.getFontStyles(), options.scriptNonce);
@@ -179,6 +180,7 @@ async function renderPagesPageResponse(options) {
 		i18n: options.i18n,
 		isFallback: options.isFallback,
 		pageProps: options.pageProps,
+		props: renderProps,
 		params: options.params,
 		routePattern: options.routePattern,
 		safeJsonStringify: options.safeJsonStringify,
@@ -194,8 +196,9 @@ async function renderPagesPageResponse(options) {
 		renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
 		scriptNonce: options.scriptNonce,
 		context: {
+			err: options.err,
 			pathname: options.routePattern,
-			query: options.params,
+			query: options.query ?? options.params,
 			asPath: options.routeUrl
 		}
 	});
@@ -205,7 +208,7 @@ async function renderPagesPageResponse(options) {
 		controller.close();
 	} });
 	else {
-		const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(options.pageProps)), options.scriptNonce);
+		const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce);
 		bodyStream = await options.renderToReadableStream(pageElement);
 	}
 	if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(options.DocumentComponent, options.setDocumentInitialHead);

package/dist/server/pages-readiness.js

@@ -10,7 +10,7 @@ function buildPagesReadinessNextData(options) {
 	const hasAppGip = typeof options.appComponent?.getInitialProps === "function";
 	return {
 		gssp: hasPageGssp,
-		gsp: hasPageGsp,
+		gsp: hasPageGsp ? true : void 0,
 		gip: hasPageGip,
 		appGip: hasAppGip,
 		autoExport: !hasPageGssp && !hasPageGsp && !hasPageGip && !hasAppGip,

package/dist/server/pages-request-pipeline.d.ts

@@ -5,7 +5,10 @@ import { HeaderRecord } from "./request-pipeline.js";
 type PagesRenderOptions = {
   isDataReq?: boolean;
   renderErrorPageOnMiss?: boolean;
+  originalUrl?: string;
 };
+type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
   redirectUrl?: string;
@@ -52,15 +55,13 @@ type PagesPipelineDeps = {
    */
   proxyExternal?: ((currentRequest: Request, externalUrl: string) => Promise<Response>) | null;
   /**
-   * Optional public-directory static file server (Node prod only).
+   * Optional filesystem/static-asset probe supplied by each runtime adapter.
    * Called post-middleware (so middleware can intercept/redirect public files) with the
    * original basePath-stripped pathname and the staged middleware response headers.
-   * The callback writes the file to its own output (Node `res`) and resolves `true` when
-   * it served the request; the pipeline then returns `{ type: "handled" }`. Resolves `false`
-   * to fall through to rewrites/render. Worker/dev adapters omit this — their public files
-   * are served by the asset binding / Vite respectively.
+   * Node may write directly to `res` and return true; dev/Workers return a Response.
+   * Resolves false to continue through rewrites, API routes, and page rendering.
    */
-  serveStaticFile?: ((requestPathname: string, stagedHeaders: HeaderRecord) => Promise<boolean>) | null;
+  serveFilesystemRoute?: ((requestPathname: string, stagedHeaders: HeaderRecord, phase: FilesystemRoutePhase) => Promise<boolean | Response>) | null;
 };
 /**
  * Wrap an adapter's `runMiddleware` callback so middleware receives the original
@@ -110,4 +111,4 @@ type PagesPipelineResult = {
  */
 declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
 //#endregion
-export { MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, runPagesRequest, wrapMiddlewareWithBasePath };
+export { FilesystemRoutePhase, MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath };

package/dist/server/pages-request-pipeline.js

@@ -1,10 +1,18 @@
 import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
 import { applyMiddlewareRequestHeaders, isExternalUrl, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
-import { applyConfigHeadersToHeaderRecord, normalizeTrailingSlash } from "./request-pipeline.js";
+import { applyConfigHeadersToHeaderRecord, cloneRequestWithUrl, normalizeTrailingSlash } from "./request-pipeline.js";
 import { mergeRewriteQuery } from "../utils/query.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";
 import { mergeHeaders } from "./worker-utils.js";
 //#region src/server/pages-request-pipeline.ts
+async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetchAsset) {
+	if (phase === "direct" || request.method !== "GET" && request.method !== "HEAD" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+	const assetUrl = new URL(request.url);
+	assetUrl.pathname = requestPathname;
+	assetUrl.search = "";
+	const response = await fetchAsset(new Request(assetUrl, request));
+	return response.status === 404 ? false : response;
+}
 /**
 * Wrap an adapter's `runMiddleware` callback so middleware receives the original
 * (pre-basePath-stripping) URL. Adapters strip the basePath before handing the
@@ -68,9 +76,19 @@ async function runPagesRequest(request, deps) {
 			};
 		}
 	}
-	let resolvedUrl = pathname + search;
+	const originalResolvedUrl = pathname + search;
+	let resolvedUrl = originalResolvedUrl;
 	const middlewareHeaders = {};
 	let middlewareStatus;
+	const serveFilesystemRoute = async (requestPathname, phase) => {
+		if (!deps.serveFilesystemRoute) return null;
+		const served = await deps.serveFilesystemRoute(requestPathname, middlewareHeaders, phase);
+		if (served instanceof Response) return {
+			type: "response",
+			response: mergeHeaders(served, middlewareHeaders, middlewareStatus)
+		};
+		return served ? { type: "handled" } : null;
+	};
 	if (typeof deps.runMiddleware === "function") {
 		const result = await deps.runMiddleware(request, deps.ctx ?? null, { isDataRequest });
 		if (result.waitUntilPromises && result.waitUntilPromises.length > 0) {
@@ -114,7 +132,12 @@ async function runPagesRequest(request, deps) {
 	}
 	const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, request, { preserveCredentialHeaders: isExternalUrl(resolvedUrl) });
 	request = postMwReq;
-	let resolvedPathname = resolvedUrl.split("?")[0];
+	const pathnameForResolvedUrl = (value) => value.split("#", 1)[0].split("?", 1)[0];
+	const rewriteRequestContext = () => ({
+		...postMwReqCtx,
+		query: new URL(resolvedUrl, url).searchParams
+	});
+	let resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 	const matchResolvedPathname = (p) => i18nConfig ? normalizeDefaultLocalePathname(p, i18nConfig, { hostname: requestHostname }) : p;
 	if (configHeaders.length) applyConfigHeadersToHeaderRecord(middlewareHeaders, {
 		configHeaders,
@@ -126,22 +149,25 @@ async function runPagesRequest(request, deps) {
 		type: "response",
 		response: mergeHeaders(await proxyExternal(request, resolvedUrl), middlewareHeaders, void 0)
 	};
-	if (deps.serveStaticFile) {
-		if (await deps.serveStaticFile(pathname, middlewareHeaders)) return { type: "handled" };
-	}
+	const directFilesystemResult = await serveFilesystemRoute(pathname, "direct");
+	if (directFilesystemResult) return directFilesystemResult;
 	let configRewriteFired = false;
-	if (configRewrites.beforeFiles?.length) {
-		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), configRewrites.beforeFiles, postMwReqCtx, basePathState);
+	for (const rewrite of configRewrites.beforeFiles ?? []) {
+		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
 		if (rewritten) {
 			if (isExternalUrl(rewritten)) return {
 				type: "response",
 				response: await proxyExternal(request, rewritten)
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-			resolvedPathname = resolvedUrl.split("?")[0];
+			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			configRewriteFired = true;
 		}
 	}
+	if (configRewriteFired) {
+		const beforeFilesResult = await serveFilesystemRoute(resolvedPathname, "beforeFiles");
+		if (beforeFilesResult) return beforeFilesResult;
+	}
 	if (basePath && !hadBasePath && !configRewriteFired) return {
 		type: "response",
 		response: new Response("This page could not be found", {
@@ -149,36 +175,77 @@ async function runPagesRequest(request, deps) {
 			headers: { "Content-Type": "text/html; charset=utf-8" }
 		})
 	};
-	const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, i18nConfig);
-	const apiLookupPathname = apiLookupUrl.split("?")[0];
-	if (apiLookupPathname.startsWith("/api/") || apiLookupPathname === "/api") if (typeof deps.handleApi === "function") return {
-		type: "response",
-		defaultContentType: "application/octet-stream",
-		response: mergeHeaders(await deps.handleApi(request, apiLookupUrl, deps.ctx ?? null), middlewareHeaders, middlewareStatus)
-	};
-	else return {
-		type: "api",
-		apiUrl: apiLookupUrl,
-		stagedHeaders: middlewareHeaders,
-		requestHeaders: request.headers,
-		middlewareStatus
+	const handleResolvedApiRoute = async () => {
+		const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, i18nConfig);
+		const apiLookupPathname = apiLookupUrl.split("?")[0];
+		if (!apiLookupPathname.startsWith("/api/") && apiLookupPathname !== "/api") return null;
+		if (typeof deps.handleApi === "function") {
+			let apiRequest = request;
+			if (basePath && hadBasePath) {
+				const apiRequestUrl = new URL(request.url);
+				apiRequestUrl.pathname = addBasePathToPathname(apiRequestUrl.pathname, basePath);
+				apiRequest = cloneRequestWithUrl(request, apiRequestUrl.toString());
+			}
+			return {
+				type: "response",
+				defaultContentType: "application/octet-stream",
+				response: mergeHeaders(await deps.handleApi(apiRequest, apiLookupUrl, deps.ctx ?? null), middlewareHeaders, middlewareStatus)
+			};
+		}
+		return {
+			type: "api",
+			apiUrl: apiLookupUrl,
+			stagedHeaders: middlewareHeaders,
+			requestHeaders: request.headers,
+			middlewareStatus
+		};
 	};
-	const pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
+	const apiResult = await handleResolvedApiRoute();
+	if (apiResult) return apiResult;
+	let pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
 	let resolvedPathnameChanged = false;
-	if ((!pageMatch || pageMatch.route.isDynamic) && configRewrites.afterFiles?.length) {
-		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), configRewrites.afterFiles, postMwReqCtx, basePathState);
+	if (!pageMatch || pageMatch.route.isDynamic) for (const rewrite of configRewrites.afterFiles ?? []) {
+		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
 		if (rewritten) {
 			if (isExternalUrl(rewritten)) return {
 				type: "response",
 				response: await proxyExternal(request, rewritten)
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-			resolvedPathname = resolvedUrl.split("?")[0];
+			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameChanged = true;
+			const afterFilesFilesystemResult = await serveFilesystemRoute(resolvedPathname, "afterFiles");
+			if (afterFilesFilesystemResult) return afterFilesFilesystemResult;
+			const afterFilesApiResult = await handleResolvedApiRoute();
+			if (afterFilesApiResult) return afterFilesApiResult;
+			pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
+			if (pageMatch) break;
 		}
 	}
+	const refreshDataRewriteHeader = () => {
+		if ((isDataReq || isDataRequest) && resolvedUrl !== originalResolvedUrl && !isExternalUrl(resolvedUrl)) middlewareHeaders["x-nextjs-rewrite"] = resolvedUrl;
+		else delete middlewareHeaders["x-nextjs-rewrite"];
+	};
+	refreshDataRewriteHeader();
 	if (typeof deps.renderPage === "function") {
-		const renderPageMatch = resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch;
+		let renderPageMatch = pageMatch;
+		if ((isDataReq || isDataRequest) && !renderPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+			const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
+			if (!fallbackRewrite) continue;
+			if (isExternalUrl(fallbackRewrite)) return {
+				type: "response",
+				response: await proxyExternal(request, fallbackRewrite)
+			};
+			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
+			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
+			if (fallbackFilesystemResult) return fallbackFilesystemResult;
+			const fallbackApiResult = await handleResolvedApiRoute();
+			if (fallbackApiResult) return fallbackApiResult;
+			renderPageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
+			refreshDataRewriteHeader();
+			if (renderPageMatch) break;
+		}
 		const shouldDeferErrorPageOnMiss = !isDataReq && !isDataRequest && !!deps.matchPageRoute && !renderPageMatch;
 		const initialRenderOptions = shouldDeferErrorPageOnMiss ? { renderErrorPageOnMiss: false } : isDataReq ? { isDataReq: true } : void 0;
 		const stagedHeaders = new Headers();
@@ -186,16 +253,22 @@ async function runPagesRequest(request, deps) {
 		else stagedHeaders.set(k, v);
 		let response = await deps.renderPage(request, resolvedUrl, initialRenderOptions, stagedHeaders);
 		let matchedFallbackRewrite = false;
-		if (response.status === 404 && shouldDeferErrorPageOnMiss && configRewrites.fallback?.length) {
-			const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), configRewrites.fallback, postMwReqCtx, basePathState);
-			if (fallbackRewrite) {
-				if (isExternalUrl(fallbackRewrite)) return {
-					type: "response",
-					response: await proxyExternal(request, fallbackRewrite)
-				};
-				response = await deps.renderPage(request, mergeRewriteQuery(resolvedUrl, fallbackRewrite), void 0, stagedHeaders);
-				matchedFallbackRewrite = true;
-			}
+		if (response.status === 404 && shouldDeferErrorPageOnMiss && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+			const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
+			if (!fallbackRewrite) continue;
+			if (isExternalUrl(fallbackRewrite)) return {
+				type: "response",
+				response: await proxyExternal(request, fallbackRewrite)
+			};
+			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
+			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
+			if (fallbackFilesystemResult) return fallbackFilesystemResult;
+			const fallbackApiResult = await handleResolvedApiRoute();
+			if (fallbackApiResult) return fallbackApiResult;
+			response = await deps.renderPage(request, resolvedUrl, void 0, stagedHeaders);
+			matchedFallbackRewrite = true;
+			if (response.status !== 404) break;
 		}
 		if (response.status === 404 && shouldDeferErrorPageOnMiss && !matchedFallbackRewrite) response = await deps.renderPage(request, resolvedUrl, void 0, stagedHeaders);
 		const merged = mergeHeaders(response, middlewareHeaders, middlewareStatus);
@@ -206,16 +279,22 @@ async function runPagesRequest(request, deps) {
 			defaultContentType: "text/html"
 		};
 	}
-	if (!(resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch) && configRewrites.fallback?.length) {
-		const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), configRewrites.fallback, postMwReqCtx, basePathState);
-		if (fallbackRewrite) {
-			if (isExternalUrl(fallbackRewrite)) return {
-				type: "response",
-				response: await proxyExternal(request, fallbackRewrite)
-			};
-			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
-		}
+	if (!(resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch) && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+		const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
+		if (!fallbackRewrite) continue;
+		if (isExternalUrl(fallbackRewrite)) return {
+			type: "response",
+			response: await proxyExternal(request, fallbackRewrite)
+		};
+		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
+		resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+		const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
+		if (fallbackFilesystemResult) return fallbackFilesystemResult;
+		const fallbackApiResult = await handleResolvedApiRoute();
+		if (fallbackApiResult) return fallbackApiResult;
+		if (deps.matchPageRoute?.(resolvedPathname, request)) break;
 	}
+	refreshDataRewriteHeader();
 	return {
 		type: "render",
 		resolvedUrl,
@@ -227,4 +306,4 @@ async function runPagesRequest(request, deps) {
 	};
 }
 //#endregion
-export { runPagesRequest, wrapMiddlewareWithBasePath };
+export { fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath };

package/dist/server/pregenerated-concrete-paths.d.ts

@@ -4,28 +4,12 @@ declare global {
 }
 declare function normalizePregeneratedPathname(pathname: string): string;
 declare function clearPregeneratedConcretePaths(): void;
-/**
- * Records a concrete URL path for a route pattern. The pathname is normalized
- * here so this is the single source of truth: every caller — the Worker global
- * table and the Node `seed-cache.ts` path — stores the canonical form that
- * matches the runtime `cleanPathname` lookup without having to pre-normalize.
- */
 declare function addPregeneratedConcretePath(routePattern: string, pathname: string): void;
-/**
- * Returns the live backing `Set` for a route pattern (not a copy) to keep
- * lookups allocation-free on the serving hot path. The `ReadonlySet` type
- * forbids mutation at compile time. Callers must treat the result as
- * point-in-time and must NOT retain it across a re-seed: each
- * `initPregeneratedPathsFromGlobals` call runs `clearPregeneratedConcretePaths`,
- * which empties the map, leaving any previously-returned reference stale. Read
- * it, use it, drop it — never cache the reference.
- */
 declare function getRenderedConcreteUrlPathsForRoute(routePattern: string): ReadonlySet<string> | undefined;
 /**
  * Populate the registry from `globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS`.
  * No-op when the global is not set (Node path — seed-cache handles it later).
- * `addPregeneratedConcretePath` normalizes each pathname so it matches the
- * runtime `cleanPathname`.
+ * Pathnames are normalised so they match the runtime `cleanPathname`.
  */
 declare function initPregeneratedPathsFromGlobals(): void;
 //#endregion

package/dist/server/pregenerated-concrete-paths.js

@@ -16,38 +16,21 @@ const concreteUrlPathsByRoute = /* @__PURE__ */ new Map();
 function clearPregeneratedConcretePaths() {
 	concreteUrlPathsByRoute.clear();
 }
-/**
-* Records a concrete URL path for a route pattern. The pathname is normalized
-* here so this is the single source of truth: every caller — the Worker global
-* table and the Node `seed-cache.ts` path — stores the canonical form that
-* matches the runtime `cleanPathname` lookup without having to pre-normalize.
-*/
 function addPregeneratedConcretePath(routePattern, pathname) {
-	const normalized = normalizePregeneratedPathname(pathname);
 	let paths = concreteUrlPathsByRoute.get(routePattern);
 	if (!paths) {
 		paths = /* @__PURE__ */ new Set();
 		concreteUrlPathsByRoute.set(routePattern, paths);
 	}
-	paths.add(normalized);
+	paths.add(normalizePregeneratedPathname(pathname));
 }
-/**
-* Returns the live backing `Set` for a route pattern (not a copy) to keep
-* lookups allocation-free on the serving hot path. The `ReadonlySet` type
-* forbids mutation at compile time. Callers must treat the result as
-* point-in-time and must NOT retain it across a re-seed: each
-* `initPregeneratedPathsFromGlobals` call runs `clearPregeneratedConcretePaths`,
-* which empties the map, leaving any previously-returned reference stale. Read
-* it, use it, drop it — never cache the reference.
-*/
 function getRenderedConcreteUrlPathsForRoute(routePattern) {
 	return concreteUrlPathsByRoute.get(routePattern);
 }
 /**
 * Populate the registry from `globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS`.
 * No-op when the global is not set (Node path — seed-cache handles it later).
-* `addPregeneratedConcretePath` normalizes each pathname so it matches the
-* runtime `cleanPathname`.
+* Pathnames are normalised so they match the runtime `cleanPathname`.
 */
 function initPregeneratedPathsFromGlobals() {
 	const raw = globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS;

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

@@ -0,0 +1,33 @@
+//#region src/server/prerender-manifest.d.ts
+type PrerenderManifestRoute = {
+  route: string;
+  status?: string;
+  revalidate?: number | false;
+  expire?: number;
+  path?: string;
+  router?: string;
+  fallback?: boolean;
+};
+type PrerenderManifest = {
+  buildId?: string;
+  trailingSlash?: boolean;
+  routes?: PrerenderManifestRoute[];
+};
+declare function readPrerenderManifest(manifestPath: string): PrerenderManifest | null;
+declare function getRenderedAppRoutes(routes: PrerenderManifestRoute[]): PrerenderManifestRoute[];
+/**
+ * Returns true when `pathname` contains bracket-delimited route params,
+ * indicating it is a fallback-shell placeholder (e.g. `/en/blog/[slug]`)
+ * rather than a concrete rendered URL.
+ */
+declare function isFallbackShellArtifactPath(pathname: string, route?: PrerenderManifestRoute): boolean;
+/**
+ * Build the pregenerated concrete-path payload table from a prerender manifest.
+ *
+ * Filters out fallback-shell placeholder paths and groups remaining concrete
+ * paths by route pattern. Returns an empty array when the manifest has no
+ * rendered App routes or all routes are fallback-shell artifacts.
+ */
+declare function buildPregeneratedConcretePathTable(manifest: PrerenderManifest): Array<[string, string[]]>;
+//#endregion
+export { buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prerender-manifest.js

@@ -0,0 +1,54 @@
+import fs from "node:fs";
+//#region src/server/prerender-manifest.ts
+function readPrerenderManifest(manifestPath) {
+	if (!fs.existsSync(manifestPath)) return null;
+	try {
+		return JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+	} catch (error) {
+		console.warn(`[vinext] Failed to read prerender manifest at ${manifestPath}:`, error);
+		return null;
+	}
+}
+function getRenderedAppRoutes(routes) {
+	return routes.filter((r) => r.status === "rendered" && r.router === "app");
+}
+function groupRoutesByPattern(routes) {
+	const byPattern = /* @__PURE__ */ new Map();
+	for (const r of routes) {
+		const pathname = r.path ?? r.route;
+		const existing = byPattern.get(r.route);
+		if (existing) existing.push(pathname);
+		else byPattern.set(r.route, [pathname]);
+	}
+	return byPattern;
+}
+/**
+* Returns true when `pathname` contains bracket-delimited route params,
+* indicating it is a fallback-shell placeholder (e.g. `/en/blog/[slug]`)
+* rather than a concrete rendered URL.
+*/
+function isFallbackShellArtifactPath(pathname, route) {
+	if (route?.fallback === true) return true;
+	if (route?.fallback === void 0) {
+		if (process.env.NODE_ENV !== "production") console.warn("[vinext] Legacy manifest detected: missing `fallback` flag for route. Using bracket heuristic for fallback-shell detection. A concrete URL containing literal brackets may be misclassified as a fallback shell.");
+		return pathname.includes("[") || pathname.includes("]");
+	}
+	return false;
+}
+/**
+* Build the pregenerated concrete-path payload table from a prerender manifest.
+*
+* Filters out fallback-shell placeholder paths and groups remaining concrete
+* paths by route pattern. Returns an empty array when the manifest has no
+* rendered App routes or all routes are fallback-shell artifacts.
+*/
+function buildPregeneratedConcretePathTable(manifest) {
+	const routes = manifest?.routes;
+	if (!routes?.length) return [];
+	const concreteRoutes = getRenderedAppRoutes(routes).filter((r) => {
+		return !isFallbackShellArtifactPath(r.path ?? r.route, r);
+	});
+	return Array.from(groupRoutesByPattern(concreteRoutes).entries());
+}
+//#endregion
+export { buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prerender-route-params.d.ts

@@ -5,7 +5,6 @@ type PrerenderRouteParamsPayload = {
   params: PrerenderRouteParams;
   routePattern: string;
 };
-/** @public exported for #1716 serving consumers; not yet referenced in-repo */
 type PrerenderRouteParamsRouteMatch = {
   kind: "exact";
   params: PrerenderRouteParams;
@@ -21,4 +20,4 @@ declare function prerenderRouteParamsPayloadMatchesRoute(payload: PrerenderRoute
 declare function matchPrerenderRouteParamsPayload(payload: PrerenderRouteParamsPayload | null, routePattern: string, params: PrerenderRouteParams): PrerenderRouteParamsRouteMatch | null;
 declare function encodePrerenderRouteParams(pattern: string, params: PrerenderRouteParams, fallbackParamNames?: readonly string[]): PrerenderRouteParamsPayload | null;
 //#endregion
-export { PrerenderRouteParams, PrerenderRouteParamsPayload, PrerenderRouteParamsRouteMatch, encodePrerenderRouteParams, matchPrerenderRouteParamsPayload, prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader };
+export { PrerenderRouteParams, PrerenderRouteParamsPayload, encodePrerenderRouteParams, matchPrerenderRouteParamsPayload, prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader };

package/dist/server/prod-server.d.ts

@@ -41,6 +41,8 @@ import { IncomingMessage, ServerResponse } from "node:http";
  */
 declare function resolveServerEntryImportUrl(entryPath: string): string;
 declare function importServerEntryModule(entryPath: string): Promise<any>;
+/** Convert a Node.js IncomingMessage into a ReadableStream for Web Request body. */
+declare function readNodeStream(req: IncomingMessage): ReadableStream<Uint8Array>;
 type ProdServerOptions = {
   /** Port to listen on */port?: number; /** Host to bind to */
   host?: string; /** Path to the build output directory */
@@ -143,4 +145,4 @@ declare function resolveAppRouterPrerenderSeeder(entryModule: unknown): AppRoute
  */
 declare function resolveAppRouterAssetPath(pathname: string, assetPathPrefix: string, assetPrefix: string): string | null;
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };