vinext 0.2.0 → 1.0.0-beta.0

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();
@@ -302,10 +320,11 @@ async function runPagesRequest(request, deps) {
 		return {
 			type: "response",
 			response: merged,
-			defaultContentType: "text/html"
+			defaultContentType: "text/html; charset=utf-8"
 		};
 	}
-	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/prerender-manifest.d.ts

@@ -15,6 +15,10 @@ type PrerenderManifest = {
   routes?: PrerenderManifestRoute[];
   pregeneratedConcretePaths?: Array<[string, string[]]>;
 };
+type PrerenderedPathSelectionOptions = {
+  includeFallbackShells?: boolean;
+  includeErrorDocuments?: boolean;
+};
 declare function readPrerenderManifest(manifestPath: string): PrerenderManifest | null;
 declare function getRenderedAppRoutes(routes: PrerenderManifestRoute[]): PrerenderManifestRoute[];
 /**
@@ -31,5 +35,15 @@ declare function isFallbackShellArtifactPath(pathname: string, route?: Prerender
  * rendered App routes or all routes are fallback-shell artifacts.
  */
 declare function buildPregeneratedConcretePathTable(manifest: PrerenderManifest): Array<[string, string[]]>;
+/**
+ * Select concrete URL paths that were rendered by the prerender engine.
+ *
+ * This intentionally includes both App Router and Pages Router entries because
+ * deploy-time cache warmup should exercise the same URLs the prerender phase
+ * proved are statically renderable. PPR fallback-shell placeholder artifacts
+ * and known error documents are excluded by default so warmup does not request
+ * synthetic bracket paths or treat a healthy 404 response as a failed warmup.
+ */
+declare function getPrerenderedConcretePaths(manifest: PrerenderManifest, options?: PrerenderedPathSelectionOptions): string[];
 //#endregion
-export { PrerenderManifest, buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };
+export { PrerenderManifest, PrerenderManifestRoute, PrerenderedPathSelectionOptions, buildPregeneratedConcretePathTable, getPrerenderedConcretePaths, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prerender-manifest.js

@@ -22,6 +22,9 @@ function groupRoutesByPattern(routes) {
 	}
 	return byPattern;
 }
+function isErrorDocumentRoute(pathname, route) {
+	return pathname === "/404" || pathname === "/500" || pathname === "/_error" || route.route === "/404" || route.route === "/500" || route.route === "/_error";
+}
 /**
 * Returns true when `pathname` contains bracket-delimited route params,
 * indicating it is a fallback-shell placeholder (e.g. `/en/blog/[slug]`)
@@ -50,5 +53,30 @@ function buildPregeneratedConcretePathTable(manifest) {
 	});
 	return Array.from(groupRoutesByPattern(concreteRoutes).entries());
 }
+/**
+* Select concrete URL paths that were rendered by the prerender engine.
+*
+* This intentionally includes both App Router and Pages Router entries because
+* deploy-time cache warmup should exercise the same URLs the prerender phase
+* proved are statically renderable. PPR fallback-shell placeholder artifacts
+* and known error documents are excluded by default so warmup does not request
+* synthetic bracket paths or treat a healthy 404 response as a failed warmup.
+*/
+function getPrerenderedConcretePaths(manifest, options) {
+	const routes = manifest.routes;
+	if (!routes?.length) return [];
+	const paths = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const route of routes) {
+		if (route.status !== "rendered") continue;
+		const pathname = route.path ?? route.route;
+		if (!options?.includeFallbackShells && isFallbackShellArtifactPath(pathname, route)) continue;
+		if (!options?.includeErrorDocuments && isErrorDocumentRoute(pathname, route)) continue;
+		if (seen.has(pathname)) continue;
+		seen.add(pathname);
+		paths.push(pathname);
+	}
+	return paths;
+}
 //#endregion
-export { buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };
+export { buildPregeneratedConcretePathTable, getPrerenderedConcretePaths, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

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

@@ -10,10 +10,9 @@ import { IncomingMessage, ServerResponse } from "node:http";
  *
  * The first import of a given path uses the plain file:// URL with NO query
  * string. This is load-bearing: code-split builds emit lazy chunks that
- * import the entry back by bare specifier (default Vite builds on both
- * supported majors — Rollup on Vite 7 and Rolldown on Vite 8 — hoist modules
- * shared between the entry's static graph and lazy route chunks into the
- * entry chunk, which the chunks then import as e.g. "../../index.js").
+ * import the entry back by bare specifier (default Vite/Rolldown builds hoist
+ * modules shared between the entry's static graph and lazy route chunks into
+ * the entry chunk, which the chunks then import as e.g. "../../index.js").
  * Node keys its ESM cache on the full URL including the query string, so if
  * the server imported the entry as `index.js?t=<mtime>`, a chunk's bare
  * back-import would evaluate the entire server bundle a second time and
@@ -41,20 +40,24 @@ 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>;
 type ProdServerOptions = {
   /** Port to listen on */port?: number; /** Host to bind to */
   host?: string; /** Path to the build output directory */
-  outDir?: string; /** Disable compression (default: false) */
+  outDir?: string; /** Explicit App Router RSC entry path. Defaults to `<outDir>/server/index.js`. */
+  rscEntryPath?: string; /** Explicit Pages Router server entry path. Defaults to `<outDir>/server/entry.js`. */
+  serverEntryPath?: string; /** Disable compression (default: false) */
   noCompression?: boolean;
   /**
    * Narrow startup context for callers that need a more precise log line.
    * 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 +148,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,16 +56,27 @@ 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.
 *
 * The first import of a given path uses the plain file:// URL with NO query
 * string. This is load-bearing: code-split builds emit lazy chunks that
-* import the entry back by bare specifier (default Vite builds on both
-* supported majors — Rollup on Vite 7 and Rolldown on Vite 8 — hoist modules
-* shared between the entry's static graph and lazy route chunks into the
-* entry chunk, which the chunks then import as e.g. "../../index.js").
+* import the entry back by bare specifier (default Vite/Rolldown builds hoist
+* modules shared between the entry's static graph and lazy route chunks into
+* the entry chunk, which the chunks then import as e.g. "../../index.js").
 * Node keys its ESM cache on the full URL including the query string, so if
 * the server imported the entry as `index.js?t=<mtime>`, a chunk's bare
 * back-import would evaluate the entire server bundle a second time and
@@ -93,14 +104,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 +112,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 +565,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,12 +632,12 @@ 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"), rscEntryPath: explicitRscEntryPath, serverEntryPath: explicitServerEntryPath, noCompression = false, purpose, silent = false } = options;
 	const compress = !noCompression;
 	const resolvedOutDir = path.resolve(outDir);
 	const clientDir = path.join(resolvedOutDir, "client");
-	const rscEntryPath = path.join(resolvedOutDir, "server", "index.js");
-	const serverEntryPath = path.join(resolvedOutDir, "server", "entry.js");
+	const rscEntryPath = explicitRscEntryPath ? path.resolve(explicitRscEntryPath) : path.join(resolvedOutDir, "server", "index.js");
+	const serverEntryPath = explicitServerEntryPath ? path.resolve(explicitServerEntryPath) : path.join(resolvedOutDir, "server", "entry.js");
 	const isAppRouter = fs.existsSync(rscEntryPath);
 	if (!isAppRouter && !fs.existsSync(serverEntryPath)) {
 		console.error(`[vinext] No build output found in ${outDir}`);
@@ -640,7 +650,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		rscEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 	return startPagesRouterServer({
 		port,
@@ -648,7 +659,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		serverEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 }
 function createNodeExecutionContext() {
@@ -776,7 +788,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 +911,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 +943,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 +1075,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 +1158,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 +1170,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/server/static-file-cache.js

@@ -21,7 +21,7 @@ const CONTENT_TYPES = {
 	".js": "application/javascript",
 	".mjs": "application/javascript",
 	".css": "text/css",
-	".html": "text/html",
+	".html": "text/html; charset=utf-8",
 	".json": "application/json",
 	".txt": "text/plain; charset=utf-8",
 	".png": "image/png",

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.d.ts

@@ -1,6 +1,6 @@
 import { ACTION_DID_REVALIDATE_DYNAMIC_ONLY, ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC, ActionRevalidationKind, CacheLifeConfig, CacheState, UnstableCacheObservation, UnstableCacheRevalidationMode, _consumeRequestScopedCacheLife, _initRequestScopedCacheState, _peekRequestScopedCacheLife, _peekUnstableCacheObservations, _registerCacheContextAccessor, _runWithCacheState, _setRequestScopedCacheLife, cacheLifeProfiles, getAndClearActionRevalidationKind, getRegisteredCacheContext, markActionRevalidation, recordUnstableCacheObservation, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
-import { CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
 import { ExecutionContextLike, getRequestExecutionContext, runWithExecutionContext } from "./request-context.js";
+import { CacheControlMetadata, CacheHandler, CacheHandlerContext, CacheHandlerValue, CachedAppPageValue, CachedFetchValue, CachedImageValue, CachedPagesValue, CachedRedirectValue, CachedRouteValue, IncrementalCacheValue, MemoryCacheHandler, NoOpCacheHandler, configureMemoryCacheHandler, getCacheHandler, getDataCacheHandler, setCacheHandler, setDataCacheHandler } from "./cache-handler.js";
 
 //#region src/shims/cache.d.ts
 /**

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/cdn-cache.d.ts

@@ -112,13 +112,8 @@ declare class DefaultCdnCacheAdapter implements CdnCacheAdapter {
  */
 declare function setCdnCacheAdapter(adapter: CdnCacheAdapter): void;
 /**
- * Get the active CDN cache adapter. See the precedence note above:
- * explicit (or an already-resolved auto-detected edge adapter) → origin-managed
- * {@link DefaultCdnCacheAdapter}.
- *
- * Auto-detection of the Cloudflare Workers Cache (`ctx.cache`) only runs when
- * `VINEXT_CDN_CACHE_AUTO_DETECT === "1"`; otherwise the default adapter is used
- * unless an adapter was set explicitly.
+ * Get the active CDN cache adapter. An explicitly configured adapter wins;
+ * otherwise the origin-managed {@link DefaultCdnCacheAdapter} is used.
  */
 declare function getCdnCacheAdapter(): CdnCacheAdapter;
 //#endregion

package/dist/shims/cdn-cache.js

@@ -1,6 +1,4 @@
-import { getRequestExecutionContext } from "./request-context.js";
 import { getDataCacheHandler } from "./cache-handler.js";
-import { CloudflareCdnCacheAdapter } from "../packages/cloudflare/src/cache/cdn-adapter.runtime.js";
 //#region src/shims/cdn-cache.ts
 /**
 * CDN cache adapter — owns the *page-level ISR serving strategy*.
@@ -78,22 +76,12 @@ function setCdnCacheAdapter(adapter) {
 	_gCdn[_CDN_KEY] = adapter;
 }
 /**
-* Get the active CDN cache adapter. See the precedence note above:
-* explicit (or an already-resolved auto-detected edge adapter) → origin-managed
-* {@link DefaultCdnCacheAdapter}.
-*
-* Auto-detection of the Cloudflare Workers Cache (`ctx.cache`) only runs when
-* `VINEXT_CDN_CACHE_AUTO_DETECT === "1"`; otherwise the default adapter is used
-* unless an adapter was set explicitly.
+* Get the active CDN cache adapter. An explicitly configured adapter wins;
+* otherwise the origin-managed {@link DefaultCdnCacheAdapter} is used.
 */
 function getCdnCacheAdapter() {
 	const active = _gCdn[_CDN_KEY];
 	if (active) return active;
-	if (process.env.VINEXT_CDN_CACHE_AUTO_DETECT === "1" && getRequestExecutionContext()?.cache) {
-		const edge = new CloudflareCdnCacheAdapter();
-		_gCdn[_CDN_KEY] = edge;
-		return edge;
-	}
 	return _defaultAdapter ??= new DefaultCdnCacheAdapter();
 }
 //#endregion

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 };