vinext 0.2.0 → 0.2.1

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

@@ -264,6 +264,12 @@ async function resolvePagesPageData(options) {
 	}
 	let pageProps = {};
 	let gsspRes = null;
+	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
+	const previewContext = previewData === false ? {} : {
+		draftMode: true,
+		preview: true,
+		previewData
+	};
 	let sharedReqRes = null;
 	function getSharedReqRes() {
 		sharedReqRes ??= options.createGsspReqRes();
@@ -317,7 +323,8 @@ async function resolvePagesPageData(options) {
 			resolvedUrl: options.resolvedUrl ?? options.routeUrl,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
-			defaultLocale: options.i18n.defaultLocale
+			defaultLocale: options.i18n.defaultLocale,
+			...previewContext
 		});
 		if (isResponseSent(res)) return {
 			kind: "response",
@@ -338,7 +345,7 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
 		gsspRes = res;
 	}
 	let isrRevalidateSeconds = null;
@@ -347,7 +354,7 @@ async function resolvePagesPageData(options) {
 		const cacheKey = options.isrCacheKey("pages", pathname);
 		const cached = await options.isrGet(cacheKey);
 		const cachedValue = cached?.value.value;
-		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			const hitResponse = buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status);
 			const hitBotResult = applyBotETagAndCheck(hitResponse, cachedValue.html, options);
 			if (hitBotResult) return hitBotResult;
@@ -356,7 +363,7 @@ async function resolvePagesPageData(options) {
 				response: hitResponse
 			};
 		}
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			options.triggerBackgroundRegeneration(cacheKey, async function() {
 				return options.runInFreshUnifiedContext(async () => {
 					options.applyRequestContexts();
@@ -413,7 +420,7 @@ async function resolvePagesPageData(options) {
 				response: staleResponse
 			};
 		}
-		const generatedPageData = !options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
+		const generatedPageData = !options.isOnDemandRevalidate && previewData === false && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
 		if (!generatedPageData) {
 			const shortCircuit = await loadForegroundAppInitialRenderProps();
 			if (shortCircuit) return shortCircuit;
@@ -423,6 +430,7 @@ async function resolvePagesPageData(options) {
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
+			...previewContext,
 			revalidateReason: options.isOnDemandRevalidate ? "on-demand" : options.isBuildTimePrerendering ? "build" : "stale"
 		});
 		if (generatedPageData) {
@@ -444,10 +452,10 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
-		if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
-		else if (cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
-		if (shouldPersistFallbackData) {
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
+		if (previewData === false && typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
+		else if (previewData === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
+		if (shouldPersistFallbackData && previewData === false) {
 			const revalidateSeconds = isrRevalidateSeconds ?? 31536e3;
 			await options.isrSet(cacheKey, {
 				kind: "PAGES",

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

@@ -3,8 +3,8 @@ import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
-import { NEVER_CACHE_CONTROL } from "./cache-control.js";
-import "./isr-decision.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { PRERENDER_REVALIDATE_HEADER, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
@@ -18,8 +18,8 @@ import { renderPagesPageResponse } from "./pages-page-response.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { resolvePagesPageData } from "./pages-page-data.js";
-import { createPagesReqRes } from "./pages-node-compat.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
+import { createPagesReqRes, getPagesPreviewData } from "./pages-node-compat.js";
 //#region src/server/pages-page-handler.ts
 function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
 	if (typeof pageModule.getServerSideProps === "function") return true;
@@ -61,7 +61,7 @@ function createPagesPageHandler(opts) {
 		const originalRequestPathAndSearch = originalRequestUrl.pathname + originalRequestUrl.search;
 		let dataRequestPathname = null;
 		let dataRequestSearch = "";
-		const initialDataNorm = normalizePagesDataRequest(request, buildId);
+		const initialDataNorm = normalizePagesDataRequest(request, buildId, vinextConfig.basePath, hasMiddleware && vinextConfig.trailingSlash);
 		if (!isDataReq) {
 			if (initialDataNorm.notFoundResponse) return initialDataNorm.notFoundResponse;
 			if (initialDataNorm.isDataReq) {
@@ -133,6 +133,7 @@ function createPagesPageHandler(opts) {
 				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
 				const query = mergeRouteParamsIntoQuery(parseQueryString(routeUrl), params);
 				const pageModule = route.module;
+				const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
 				const pagesNextData = buildPagesReadinessNextData({
 					pageModule,
 					appComponent: AppComponent,
@@ -177,7 +178,8 @@ function createPagesPageHandler(opts) {
 						...pagesNextData.__vinext,
 						pageModuleUrl,
 						appModuleUrl,
-						hasMiddleware
+						hasMiddleware,
+						routeUrl
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
@@ -194,6 +196,7 @@ function createPagesPageHandler(opts) {
 					request,
 					url: originalRequestPathAndSearch
 				});
+				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
@@ -217,7 +220,9 @@ function createPagesPageHandler(opts) {
 					isrSet,
 					expireSeconds: vinextConfig.expireTime,
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
-					isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER)),
+					validatePropsSerialization: process.env.NODE_ENV !== "production" || process.env.VINEXT_PRERENDER === "1",
+					isOnDemandRevalidate,
+					previewData: getPagesPreviewData(request, { isOnDemandRevalidate }),
 					pageModule,
 					AppComponent,
 					params,
@@ -300,6 +305,12 @@ function createPagesPageHandler(opts) {
 							break;
 						}
 						if (!hasUserCacheControl) init.headers["Cache-Control"] = NEVER_CACHE_CONTROL;
+					} else if (isStaticPropsRoute) {
+						if (isrRevalidateSeconds) {
+							const headers = new Headers(init.headers);
+							applyCdnResponseHeaders(headers, { cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime) });
+							for (const [key, value] of headers) init.headers[key] = value;
+						} else if (shouldUseNextDeployCacheControl()) init.headers["Cache-Control"] = BROWSER_REVALIDATE_CACHE_CONTROL;
 					}
 					if (routePattern !== "/_error" && routePattern !== "/500") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -308,8 +319,8 @@ function createPagesPageHandler(opts) {
 					return buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init);
 				}
 				const pageModuleIds = [];
-				if (route.filePath) pageModuleIds.push(route.filePath);
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
+				if (route.filePath) pageModuleIds.push(route.filePath);
 				return await renderPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
@@ -346,6 +357,7 @@ function createPagesPageHandler(opts) {
 					isrCacheKey: pageIsrCacheKey,
 					expireSeconds: vinextConfig.expireTime,
 					isrRevalidateSeconds,
+					isStaticPropsRoute,
 					isrSet,
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
 					isFallback: isFallbackRender,

package/dist/server/pages-page-response.d.ts

@@ -91,6 +91,7 @@ type RenderPagesPageResponseOptions = {
   isrCacheKey: (router: string, pathname: string) => string;
   expireSeconds?: number;
   isrRevalidateSeconds: number | null;
+  isStaticPropsRoute?: boolean;
   isrSet: (key: string, data: CachedPagesValue, revalidateSeconds: number, tags?: string[], expireSeconds?: number) => Promise<void>;
   i18n: PagesI18nRenderContext;
   /**

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

@@ -1,7 +1,7 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { fnv1a52 } from "../utils/hash.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
@@ -264,7 +264,8 @@ async function renderPagesPageResponse(options) {
 			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
 		});
 		setCacheStateHeaders(responseHeaders, "MISS");
-	} else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
+	} else if (options.isStaticPropsRoute && shouldUseNextDeployCacheControl()) responseHeaders.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+	else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
 	if (options.fontLinkHeader) responseHeaders.set("Link", options.fontLinkHeader);
 	if (options.userAgent && isPagesStreamingBot(options.userAgent)) {
 		const fullHtml = await readStreamAsText(compositeStream);

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

@@ -8,6 +8,13 @@ type PagesRenderOptions = {
   originalUrl?: string;
 };
 type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+type PageRouteMatch = {
+  route: {
+    isDynamic: boolean;
+    pattern?: string;
+    dataKind?: "static" | "server" | "none";
+  };
+};
 declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
@@ -37,12 +44,7 @@ type PagesPipelineDeps = {
   hasMiddleware: boolean;
   ctx?: unknown;
   rawSearch?: string;
-  matchPageRoute?: ((pathname: string, request: Request) => {
-    route: {
-      isDynamic: boolean;
-      pattern?: string;
-    };
-  } | null) | null;
+  matchPageRoute?: ((pathname: string, request: Request) => PageRouteMatch | null) | null;
   runMiddleware?: ((request: Request, ctx: unknown, opts: {
     isDataRequest: boolean;
   }) => Promise<MiddlewareResult>) | null;

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

@@ -4,6 +4,7 @@ import { applyMiddlewareRequestHeaders, isExternalUrl, matchRedirect, matchRewri
 import { applyConfigHeadersToHeaderRecord, cloneRequestWithUrl, normalizeTrailingSlash } from "./request-pipeline.js";
 import { mergeRewriteQuery } from "../utils/query.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";
+import { buildMiddlewarePrefetchSkipResponse } from "./pages-data-route.js";
 import { mergeHeaders } from "./worker-utils.js";
 //#region src/server/pages-request-pipeline.ts
 async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetchAsset) {
@@ -149,6 +150,15 @@ async function runPagesRequest(request, deps) {
 		if (resolvedLocale && i18nConfig.locales.includes(resolvedLocale)) return matchedPathname === "/" ? `/${resolvedLocale}` : `/${resolvedLocale}${matchedPathname}`;
 		return matchResolvedPathname(matchedPathname);
 	};
+	const buildMiddlewarePrefetchSkipResult = (match) => {
+		if (!match) return null;
+		if (match.route.dataKind !== "server" || !isDataRequest || !deps.hasMiddleware || request.headers.get("x-middleware-prefetch") !== "1") return null;
+		return {
+			type: "response",
+			response: mergeHeaders(buildMiddlewarePrefetchSkipResponse(matchedPathnameForRoute(match.route.pattern)), middlewareHeaders, void 0),
+			defaultContentType: "application/json"
+		};
+	};
 	if (configHeaders.length) applyConfigHeadersToHeaderRecord(middlewareHeaders, {
 		configHeaders,
 		pathname: matchPathname,
@@ -178,14 +188,16 @@ async function runPagesRequest(request, deps) {
 		const beforeFilesResult = await serveFilesystemRoute(resolvedPathname, "beforeFiles");
 		if (beforeFilesResult) return beforeFilesResult;
 	}
-	if (basePath && !hadBasePath && !configRewriteFired) return {
+	const isOutsideBasePathUnclaimed = () => basePath && !hadBasePath && !configRewriteFired;
+	const outOfBasePathNotFound = () => ({
 		type: "response",
 		response: new Response("This page could not be found", {
 			status: 404,
 			headers: { "Content-Type": "text/html; charset=utf-8" }
 		})
-	};
+	});
 	const handleResolvedApiRoute = async () => {
+		if (isOutsideBasePathUnclaimed()) return null;
 		const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, i18nConfig);
 		const apiLookupPathname = apiLookupUrl.split("?")[0];
 		if (!apiLookupPathname.startsWith("/api/") && apiLookupPathname !== "/api") return null;
@@ -212,7 +224,7 @@ async function runPagesRequest(request, deps) {
 	};
 	const apiResult = await handleResolvedApiRoute();
 	if (apiResult) return apiResult;
-	let pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
+	let pageMatch = !isOutsideBasePathUnclaimed() && deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
 	let resolvedPathnameChanged = false;
 	if (!pageMatch || pageMatch.route.isDynamic) for (const rewrite of configRewrites.afterFiles ?? []) {
 		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
@@ -223,6 +235,7 @@ async function runPagesRequest(request, deps) {
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			configRewriteFired = true;
 			resolvedPathnameChanged = true;
 			const afterFilesFilesystemResult = await serveFilesystemRoute(resolvedPathname, "afterFiles");
 			if (afterFilesFilesystemResult) return afterFilesFilesystemResult;
@@ -239,7 +252,7 @@ async function runPagesRequest(request, deps) {
 	refreshDataRewriteHeader();
 	if (typeof deps.renderPage === "function") {
 		let renderPageMatch = pageMatch;
-		if ((isDataReq || isDataRequest) && !renderPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+		if ((isOutsideBasePathUnclaimed() || 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 {
@@ -248,6 +261,7 @@ async function runPagesRequest(request, deps) {
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			configRewriteFired = true;
 			const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
 			if (fallbackFilesystemResult) return fallbackFilesystemResult;
 			const fallbackApiResult = await handleResolvedApiRoute();
@@ -256,6 +270,9 @@ async function runPagesRequest(request, deps) {
 			refreshDataRewriteHeader();
 			if (renderPageMatch) break;
 		}
+		const prefetchSkipResult = buildMiddlewarePrefetchSkipResult(renderPageMatch);
+		if (prefetchSkipResult) return prefetchSkipResult;
+		if (isOutsideBasePathUnclaimed()) return outOfBasePathNotFound();
 		const shouldDeferErrorPageOnMiss = !isDataReq && !isDataRequest && !!deps.matchPageRoute && !renderPageMatch;
 		const initialRenderOptions = shouldDeferErrorPageOnMiss ? { renderErrorPageOnMiss: false } : isDataReq ? { isDataReq: true } : void 0;
 		const stagedHeaders = new Headers();
@@ -272,6 +289,7 @@ async function runPagesRequest(request, deps) {
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			configRewriteFired = true;
 			const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
 			if (fallbackFilesystemResult) return fallbackFilesystemResult;
 			const fallbackApiResult = await handleResolvedApiRoute();
@@ -305,7 +323,8 @@ async function runPagesRequest(request, deps) {
 			defaultContentType: "text/html"
 		};
 	}
-	if (!(resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch) && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+	let devPageMatch = isOutsideBasePathUnclaimed() ? null : resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch;
+	if (!devPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
 		const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
 		if (!fallbackRewrite) continue;
 		if (isExternalUrl(fallbackRewrite)) return {
@@ -314,12 +333,17 @@ async function runPagesRequest(request, deps) {
 		};
 		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 		resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+		configRewriteFired = true;
 		const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
 		if (fallbackFilesystemResult) return fallbackFilesystemResult;
 		const fallbackApiResult = await handleResolvedApiRoute();
 		if (fallbackApiResult) return fallbackApiResult;
-		if (deps.matchPageRoute?.(resolvedPathname, request)) break;
+		devPageMatch = deps.matchPageRoute?.(resolvedPathname, request) ?? null;
+		if (devPageMatch) break;
 	}
+	const prefetchSkipResult = buildMiddlewarePrefetchSkipResult(devPageMatch);
+	if (prefetchSkipResult) return prefetchSkipResult;
+	if (isOutsideBasePathUnclaimed()) return outOfBasePathNotFound();
 	refreshDataRewriteHeader();
 	return {
 		type: "render",

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

@@ -2,8 +2,8 @@ import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders } from "./request-pipeline.js";
-import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { finalizeMissingStaticAssetResponse } from "./worker-utils.js";
 import { fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
 import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";

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

@@ -41,6 +41,7 @@ import { IncomingMessage, ServerResponse } from "node:http";
  * Exported for direct unit testing of the URL choice.
  */
 declare function resolveServerEntryImportUrl(entryPath: string): string;
+declare function rememberCurrentServerEntryImportMtime(entryPath: string): void;
 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>;
@@ -54,7 +55,8 @@ type ProdServerOptions = {
    * Omitted for normal `vinext start` so the existing production-server output
    * remains stable.
    */
-  purpose?: "prerender";
+  purpose?: "prerender"; /** Suppress the startup log for internal child-process servers. */
+  silent?: boolean;
 };
 /** Content types that benefit from compression. */
 declare const COMPRESSIBLE_TYPES: Set<string>;
@@ -145,4 +147,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, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

package/dist/server/prod-server.js

@@ -1,24 +1,24 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { filterInternalHeaders } from "./request-pipeline.js";
 import { isUnknownRecord } from "../utils/record.js";
-import { buildNextDataNotFoundResponse, isNextDataPathname, parseNextDataPathname } from "./pages-data-route.js";
+import { buildNextDataNotFoundResponse, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname } from "./pages-data-route.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
 import { resolveRequestHost, resolveRequestProtocol, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, isSafeImageContentType, parseImageParams } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
-import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash } from "./static-file-cache.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
 import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
-import { setPagesClientAssets } from "./pages-client-assets.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
@@ -56,6 +56,18 @@ import { createServer } from "node:http";
 * through a cache-busted URL instead.
 */
 const bareServerEntryMtimes = /* @__PURE__ */ new Map();
+function resolveCanonicalServerEntry(entryPath) {
+	let canonicalEntryPath;
+	try {
+		canonicalEntryPath = fs.realpathSync.native(entryPath);
+	} catch {
+		canonicalEntryPath = entryPath;
+	}
+	return {
+		href: pathToFileURL(canonicalEntryPath).href,
+		mtime: fs.statSync(canonicalEntryPath).mtimeMs
+	};
+}
 /**
 * Import a built server entry module (App Router RSC entry or Pages Router
 * server entry) by absolute file path.
@@ -93,14 +105,7 @@ const bareServerEntryMtimes = /* @__PURE__ */ new Map();
 * Exported for direct unit testing of the URL choice.
 */
 function resolveServerEntryImportUrl(entryPath) {
-	let canonicalEntryPath;
-	try {
-		canonicalEntryPath = fs.realpathSync.native(entryPath);
-	} catch {
-		canonicalEntryPath = entryPath;
-	}
-	const href = pathToFileURL(canonicalEntryPath).href;
-	const mtime = fs.statSync(canonicalEntryPath).mtimeMs;
+	const { href, mtime } = resolveCanonicalServerEntry(entryPath);
 	const bareMtime = bareServerEntryMtimes.get(href);
 	if (bareMtime === void 0 || bareMtime === mtime) {
 		bareServerEntryMtimes.set(href, mtime);
@@ -108,6 +113,10 @@ function resolveServerEntryImportUrl(entryPath) {
 	}
 	return `${href}?t=${mtime}`;
 }
+function rememberCurrentServerEntryImportMtime(entryPath) {
+	const { href, mtime } = resolveCanonicalServerEntry(entryPath);
+	bareServerEntryMtimes.set(href, mtime);
+}
 async function importServerEntryModule(entryPath) {
 	return import(resolveServerEntryImportUrl(entryPath));
 }
@@ -557,9 +566,11 @@ function nodeToWebRequest(req, urlOverride, prerenderSecret) {
 	const url = new URL(urlOverride ?? req.url ?? "/", origin);
 	const rawHeaders = nodeHeadersToWebHeaders(req.headers);
 	const prerenderRouteParamsPayload = readTrustedPrerenderRouteParamsFromHeaders(rawHeaders, prerenderSecret);
+	const isTrustedSpeculativePrerender = process.env.VINEXT_PRERENDER === "1" && prerenderSecret !== void 0 && rawHeaders.get("x-vinext-prerender-secret") === prerenderSecret && rawHeaders.get("x-vinext-prerender-speculative") === "1";
 	const headers = filterInternalHeaders(rawHeaders);
 	const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);
 	if (prerenderRouteParamsHeader !== null) headers.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+	if (isTrustedSpeculativePrerender) headers.set(VINEXT_PRERENDER_SPECULATIVE_HEADER, "1");
 	const method = req.method ?? "GET";
 	const hasBody = method !== "GET" && method !== "HEAD";
 	const init = {
@@ -622,7 +633,7 @@ async function sendWebResponse(webResponse, req, res, compress) {
 */
 async function startProdServer(options = {}) {
 	installSocketErrorBackstop();
-	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), noCompression = false, purpose } = options;
+	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), noCompression = false, purpose, silent = false } = options;
 	const compress = !noCompression;
 	const resolvedOutDir = path.resolve(outDir);
 	const clientDir = path.join(resolvedOutDir, "client");
@@ -640,7 +651,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		rscEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 	return startPagesRouterServer({
 		port,
@@ -648,7 +660,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		serverEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 }
 function createNodeExecutionContext() {
@@ -776,7 +789,7 @@ function installPagesClientAssets(options) {
 * 4. Stream the Web Response back (with optional compression)
 */
 async function startAppRouterServer(options) {
-	const { port, host, clientDir, rscEntryPath, compress, purpose } = options;
+	const { port, host, clientDir, rscEntryPath, compress, purpose, silent } = options;
 	const prerenderSecret = readPrerenderSecret(path.dirname(rscEntryPath));
 	const rscModule = await importServerEntryModule(rscEntryPath);
 	const rscHandler = resolveAppRouterHandler(rscModule.default);
@@ -899,7 +912,8 @@ async function startAppRouterServer(options) {
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
 			const addr = server.address();
-			logProdServerStarted(host, typeof addr === "object" && addr ? addr.port : port, purpose);
+			const actualPort = typeof addr === "object" && addr ? addr.port : port;
+			if (!silent) logProdServerStarted(host, actualPort, purpose);
 			resolve();
 		});
 	});
@@ -930,7 +944,7 @@ function readPagesServerEntryPageRoutes(value) {
 * - vinextConfig — embedded next.config.js settings
 */
 async function startPagesRouterServer(options) {
-	const { port, host, clientDir, serverEntryPath, compress, purpose } = options;
+	const { port, host, clientDir, serverEntryPath, compress, purpose, silent } = options;
 	const serverEntry = await importServerEntryModule(serverEntryPath);
 	const { renderPage, handleApiRoute: handleApi, runMiddleware, vinextConfig, buildId: pagesBuildId } = serverEntry;
 	const matchPageRoute = typeof serverEntry.matchPageRoute === "function" ? serverEntry.matchPageRoute : void 0;
@@ -1062,8 +1076,9 @@ async function startPagesRouterServer(options) {
 				}
 				isDataReq = true;
 				const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-				url = dataMatch.pagePathname + qs;
-				pathname = dataMatch.pagePathname;
+				const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, hasMiddleware && trailingSlash);
+				url = pagePathname + qs;
+				pathname = pagePathname;
 			}
 			const protocol = resolveRequestProtocol(req);
 			const hostHeader = resolveRequestHost(req, `${host}:${port}`);
@@ -1144,7 +1159,8 @@ async function startPagesRouterServer(options) {
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
 			const addr = server.address();
-			logProdServerStarted(host, typeof addr === "object" && addr ? addr.port : port, purpose);
+			const actualPort = typeof addr === "object" && addr ? addr.port : port;
+			if (!silent) logProdServerStarted(host, actualPort, purpose);
 			resolve();
 		});
 	});
@@ -1155,4 +1171,4 @@ async function startPagesRouterServer(options) {
 	};
 }
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

package/dist/server/request-pipeline.js

@@ -338,7 +338,7 @@ function isOriginAllowed(origin, allowed) {
 */
 function processMiddlewareHeaders(headers) {
 	const keysToDelete = [];
-	for (const key of headers.keys()) if (key.startsWith("x-middleware-")) keysToDelete.push(key);
+	for (const key of headers.keys()) if (key.startsWith("x-middleware-") && key !== "x-middleware-cache") keysToDelete.push(key);
 	for (const key of keysToDelete) headers.delete(key);
 }
 const STRIPPED_INTERNAL_HEADERS = new Set([...INTERNAL_HEADERS, ...VINEXT_INTERNAL_HEADERS]);

package/dist/shims/cache-handler.js

@@ -42,6 +42,10 @@ function readStringArrayField(ctx, field) {
 	if (!Array.isArray(value)) return [];
 	return value.filter((item) => typeof item === "string");
 }
+function readPositiveNumberField(ctx, field) {
+	const value = ctx?.[field];
+	return typeof value === "number" && value > 0 ? value : void 0;
+}
 var MemoryCacheHandler = class {
 	store = /* @__PURE__ */ new Map();
 	tagRevalidatedAt = /* @__PURE__ */ new Map();
@@ -89,7 +93,10 @@ var MemoryCacheHandler = class {
 			return null;
 		}
 		this.touchEntry(key, entry);
-		if (entry.revalidateAt !== null && Date.now() > entry.revalidateAt) return {
+		const now = Date.now();
+		const requestedRevalidate = readPositiveNumberField(ctx, "revalidate");
+		const requestedRevalidateAt = requestedRevalidate === void 0 ? null : entry.lastModified + requestedRevalidate * 1e3;
+		if (entry.revalidateAt !== null && now > entry.revalidateAt || requestedRevalidateAt !== null && now > requestedRevalidateAt) return {
 			lastModified: entry.lastModified,
 			value: entry.value,
 			cacheState: "stale",

package/dist/shims/cache.js

@@ -8,6 +8,7 @@ import { makeHangingPromise } from "./internal/make-hanging-promise.js";
 import { getHeadersAccessPhase, isDraftModeEnabled, markDynamicUsage } from "./headers.js";
 import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, recordUnstableCacheObservation, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
 import { encodeCacheTag, encodeCacheTags } from "../utils/encode-cache-tag.js";
+import { addCollectedRequestTags } from "./fetch-cache.js";
 import { workUnitAsyncStorage } from "./internal/work-unit-async-storage.js";
 //#region src/shims/cache.ts
 /**
@@ -124,6 +125,7 @@ function updateTag(tag) {
 * It's provided for API compatibility so apps importing it don't break.
 */
 function unstable_noStore() {
+	if (isInsideUnstableCacheScope()) return;
 	markDynamicUsage();
 }
 /**
@@ -373,6 +375,7 @@ function unstable_cache(fn, keyParts, options) {
 	const revalidateSeconds = options?.revalidate;
 	const cachedFn = async (...args) => {
 		const cacheKey = `unstable_cache:${baseKey}:${JSON.stringify(args)}`;
+		addCollectedRequestTags(tags);
 		recordUnstableCacheObservation({
 			kind: "unstable_cache",
 			keyHash: fnv1a64(cacheKey),

package/dist/shims/fetch-cache.d.ts

@@ -42,6 +42,7 @@ type FetchCacheState = {
   currentFetchCacheMode: FetchCacheMode | null;
   currentForceDynamicFetchDefault: boolean;
   dynamicFetchUrls: Set<string>;
+  refreshStaleFetchesInForeground: boolean;
   isFetchDedupeActive: boolean;
   currentFetchDedupeEntries: Map<string, FetchDedupeEntry[]>;
 };
@@ -86,6 +87,7 @@ declare function setCurrentFetchSoftTags(tags: string[]): void;
 declare function getCurrentFetchSoftTags(): string[];
 declare function setCurrentFetchCacheMode(mode: FetchCacheMode | null): void;
 declare function setCurrentForceDynamicFetchDefault(enabled: boolean): void;
+declare function setRefreshStaleFetchesInForeground(enabled: boolean): void;
 /**
  * Install the patched fetch and reset per-request tag state.
  * Returns a cleanup function that clears tags.
@@ -133,4 +135,4 @@ declare function ensureFetchPatch(): void;
  */
 declare function getOriginalFetch(): typeof globalThis.fetch;
 //#endregion
-export { FetchCacheMode, FetchCacheState, _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getCurrentFetchSoftTags, getOriginalFetch, peekCacheableFetchObservations, peekDynamicFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, withFetchCache };
+export { FetchCacheMode, FetchCacheState, _resetPendingRefetches, addCollectedRequestTags, consumeDynamicFetchObservations, ensureFetchPatch, getCollectedFetchTags, getCurrentFetchSoftTags, getOriginalFetch, peekCacheableFetchObservations, peekDynamicFetchObservations, runWithFetchCache, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground, withFetchCache };