vinext 1.4.2 → 1.4.3

package/dist/server/prod-server.js

@@ -7,7 +7,7 @@ import { notFoundResponse } from "./http-error-responses.js";
 import { getRepeatedSlashRedirect, isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./open-redirect.js";
 import { readStaticFileSignal } from "./static-file-signal.js";
 import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
-import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix, isAssetPrefixBuildAsset } from "../utils/asset-prefix.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { StaticFileCache, contentTypeForPath, etagFromFilenameHash, staticFileCacheControl } from "./static-file-cache.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { resolveRequestHost, resolveRequestProtocol, resolveTrustedForwardedHost, trustProxy, trustedHosts } from "./proxy-trust.js";
@@ -19,13 +19,13 @@ import { parseHttpDate } from "./http-date.js";
 import { evaluateStaticPreconditions } from "./http-conditional.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
 import { signalFromNodeResponse } from "./node-response-signal.js";
-import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_RESPONSE_CACHE_STATE, INVALID_IMAGE_SOURCE_MESSAGE, MUTABLE_IMAGE_SOURCE_CACHE_CONTROL, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, parseImageParams, readImageOptimizationSignal } from "./image-optimization.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_RESPONSE_CACHE_STATE, IMAGE_TYPE_NOT_ALLOWED_MESSAGE, INVALID_IMAGE_SOURCE_MESSAGE, isImageOptimizationPath, isImageSourceBodyStatus, isSafeImageContentType, parseImageParams, readImageOptimizationSignal, sourceImageCacheControl } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./revalidation-host.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { mergeHeaders } from "./worker-utils.js";
-import { runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
+import { isServableFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
 import { readPrerenderSecret, readServerCompress } from "../build/server-manifest.js";
 import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
@@ -339,6 +339,7 @@ function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix, cr
 	});
 	setPagesClientAssets({
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		appBootstrapPreloadModules: metadata.appBootstrapPreloadModules,
 		appRouteManifestModule: metadata.appRouteManifestModule,
 		lazyChunks: metadata.lazyChunks,
 		dynamicPreloads: metadata.dynamicPreloads,
@@ -444,7 +445,7 @@ function sendCompressed(req, res, body, contentType, statusCode, extraHeaders =
 	if (encoding !== "identity") {
 		writeHead(mergeVaryHeader({
 			...headersWithoutBodyHeaders,
-			"Content-Type": contentType,
+			...contentType !== void 0 && { "Content-Type": contentType },
 			"Content-Encoding": encoding
 		}, "Accept-Encoding"));
 		const compressor = createCompressor(encoding);
@@ -453,7 +454,7 @@ function sendCompressed(req, res, body, contentType, statusCode, extraHeaders =
 	} else {
 		const identityHeaders = {
 			...headersWithoutBodyHeaders,
-			"Content-Type": contentType,
+			...contentType !== void 0 && { "Content-Type": contentType },
 			"Content-Length": String(buf.length)
 		};
 		writeHead(varyByEncoding ? mergeVaryHeader(identityHeaders, "Accept-Encoding") : identityHeaders);
@@ -477,20 +478,18 @@ function staticCacheLookupPath(pathname) {
 }
 /**
 * Give a Node image passthrough Next.js's image Cache-Control instead of the
-* public-file default: a hashed build asset keeps its immutable default, and
-* any other source is revalidated after the default `images.minimumCacheTTL`.
+* public-file default: a build asset keeps its immutable default, and a public
+* file, whatever its path, is revalidated after `images.minimumCacheTTL`, or
+* after the max-age a direct request for it gets (from middleware or
+* `headers()`, else the public-file default) when that is longer.
 */
-function withImageSourceCacheControl(headers, sourcePath) {
-	if (sourcePath.includes(`/_next/static/`)) return headers;
+function withImageSourceCacheControl(headers, publicFileCacheControl, config) {
+	if (publicFileCacheControl === void 0) return headers;
 	return {
 		...headers,
-		"Cache-Control": MUTABLE_IMAGE_SOURCE_CACHE_CONTROL
+		"Cache-Control": sourceImageCacheControl(false, publicFileCacheControl ?? staticFileCacheControl(false), config)
 	};
 }
-/** Pathnames the Pages Router serves from routes rather than the client directory. */
-function isPagesFilesystemExcludedPath(pathname, phase) {
-	return pathname === "/" || pathname === "/api" || pathname.startsWith("/api/") || phase === "direct" && pathname.startsWith(`/_next/static/`);
-}
 /**
 * Try to serve a static file from the client build directory.
 *
@@ -783,32 +782,14 @@ function pipeStaticFileRange(filePath, range, res) {
 		}
 	});
 }
-/**
-* Resolve the actual file to serve, trying extension-less HTML fallbacks.
-* Returns the resolved path + size + mtime, or null if not found.
-*/
+/** Returns the file's path + size + mtime, or null if it is not a regular file. */
 async function resolveStaticFile(staticFile) {
 	const stat = await statIfFile(staticFile);
-	if (stat) return {
+	return stat ? {
 		path: staticFile,
 		size: stat.size,
 		mtimeMs: stat.mtimeMs
-	};
-	const htmlFallback = staticFile + ".html";
-	const htmlStat = await statIfFile(htmlFallback);
-	if (htmlStat) return {
-		path: htmlFallback,
-		size: htmlStat.size,
-		mtimeMs: htmlStat.mtimeMs
-	};
-	const indexFallback = path.join(staticFile, "index.html");
-	const indexStat = await statIfFile(indexFallback);
-	if (indexStat) return {
-		path: indexFallback,
-		size: indexStat.size,
-		mtimeMs: indexStat.mtimeMs
-	};
-	return null;
+	} : null;
 }
 async function statIfFile(filePath) {
 	try {
@@ -1129,6 +1110,7 @@ function installPagesClientAssets(options) {
 	setPagesClientAssets({
 		clientEntry: metadata.clientEntryFile,
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		appBootstrapPreloadModules: metadata.appBootstrapPreloadModules,
 		appRouteManifestModule: metadata.appRouteManifestModule,
 		ssrManifest: Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0,
 		sharedChunks: metadata.sharedChunks,
@@ -1214,7 +1196,7 @@ async function startAppRouterServer(options) {
 			return;
 		}
 		const sendUnsafeContentType = () => {
-			sendBadRequest("The requested resource is not an allowed image type");
+			sendBadRequest(IMAGE_TYPE_NOT_ALLOWED_MESSAGE);
 		};
 		const isSafeSourcePath = (sourcePath) => isSafeImageContentType(contentTypeForPath(sourcePath), imageConfig?.dangerouslyAllowSVG);
 		const imageSecurityHeaders = {
@@ -1222,7 +1204,7 @@ async function startAppRouterServer(options) {
 			"X-Content-Type-Options": "nosniff",
 			"Content-Disposition": imageConfig?.contentDispositionType === "attachment" ? "attachment" : "inline"
 		};
-		const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, sourcePath), void 0, IMAGE_REPRESENTATION_HEADERS);
+		const serveSource = (sourcePath, publicFileCacheControl) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, publicFileCacheControl, imageConfig), void 0, IMAGE_REPRESENTATION_HEADERS);
 		const sourceUrl = new URL(params.imageUrl, request.url);
 		let sourcePathname = null;
 		try {
@@ -1248,7 +1230,7 @@ async function startAppRouterServer(options) {
 					sendUnsafeContentType();
 					return;
 				}
-				if (await serveSource(sourcePath)) return;
+				if (await serveSource(sourcePath, sourceResponse.headers.get("Cache-Control"))) return;
 			}
 		}
 		sendBadRequest(INVALID_IMAGE_SOURCE_MESSAGE);
@@ -1440,6 +1422,8 @@ async function createPagesRouterRequestHandler(options) {
 	const ensureInstrumentation = typeof serverEntry.__ensureInstrumentation === "function" ? () => serverEntry.__ensureInstrumentation() : () => void 0;
 	const hasMiddleware = serverEntry.hasMiddleware === true;
 	const pageRoutes = readPagesServerEntryPageRoutes(serverEntry.pageRoutes);
+	const publicFiles = serverEntry.publicFiles instanceof Set ? serverEntry.publicFiles : /* @__PURE__ */ new Set();
+	const clientBuildFiles = serverEntry.clientBuildFiles instanceof Set ? serverEntry.clientBuildFiles : /* @__PURE__ */ new Set();
 	const prerenderSecret = readPrerenderSecret(path.dirname(serverEntryPath));
 	const compress = compressOption && readServerCompress(serverDir);
 	const basePath = vinextConfig?.basePath ?? "";
@@ -1464,7 +1448,9 @@ async function createPagesRouterRequestHandler(options) {
 		qualities: vinextConfig.images.qualities,
 		localPatterns: vinextConfig.images.localPatterns,
 		contentDispositionType: vinextConfig.images.contentDispositionType,
-		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
+		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy,
+		minimumCacheTTL: vinextConfig.images.minimumCacheTTL,
+		maximumResponseBody: vinextConfig.images.maximumResponseBody
 	} : void 0;
 	const ssrManifest = installPagesClientAssets({
 		clientDir,
@@ -1554,6 +1540,10 @@ async function createPagesRouterRequestHandler(options) {
 		if (pagesAssetLookup) {
 			if (await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
 		}
+		if (req.method === "GET" || req.method === "HEAD") {
+			const clientBuildFile = resolveClientBuildFile(rawPagesPathname, basePath, clientBuildFiles);
+			if (clientBuildFile && await tryServeStatic(req, res, clientDir, clientBuildFile, compress, staticCache)) return;
+		}
 		try {
 			const hadBasePath = !basePath || hasBasePath(requestPathname, basePath);
 			const restoreLocaleRootTrailingSlash = shouldRestoreLocaleRootTrailingSlash(requestPathname, {
@@ -1624,6 +1614,7 @@ async function createPagesRouterRequestHandler(options) {
 			const middlewareRequest = isDataReq && skipProxyUrlNormalize ? new Request(new URL(originalRenderUrl, webRequest.url), webRequest) : void 0;
 			const middlewareCtx = createNodeExecutionContext(void 0, { middlewareOrigin: resolveNodeMiddlewareOrigin(req, webRequest.url, host, port) });
 			const runNodeMiddleware = typeof runMiddleware === "function" ? (request, _ctx, opts) => runMiddleware(request, middlewareCtx, opts) : null;
+			/** The public file a source resolves to, with the Cache-Control staged for it. */
 			const resolvePublicImageSource = async (sourceUrl) => {
 				const rawSourcePathname = sourceUrl.pathname;
 				if (getRepeatedSlashRedirect(rawSourcePathname) || isOpenRedirectShaped(rawSourcePathname)) return null;
@@ -1631,7 +1622,7 @@ async function createPagesRouterRequestHandler(options) {
 				const sourceHadBasePath = !basePath || hasBasePath(sourceRequestPathname, basePath);
 				const strippedSourcePathname = stripBasePath(sourceRequestPathname, basePath);
 				if (isNextDataPathname(strippedSourcePathname)) return null;
-				let sourcePath = null;
+				let source = null;
 				const result = await runPagesRequest(new Request(new URL(strippedSourcePathname + sourceUrl.search, sourceUrl), { signal: webRequest.signal }), {
 					...deps,
 					hadBasePath: sourceHadBasePath,
@@ -1649,17 +1640,20 @@ async function createPagesRouterRequestHandler(options) {
 					runMiddleware: runNodeMiddleware ? wrapMiddlewareWithBasePath(runNodeMiddleware, basePath, sourceHadBasePath) : null,
 					renderPage: null,
 					handleApi: null,
-					serveFilesystemRoute: async (candidate, _stagedHeaders, phase, _resolvedUrl, _request, candidateHasBasePath) => {
-						if (!candidateHasBasePath && !isAssetPrefixBuildAsset(candidate, pagesAssetPathPrefix) || isImageOptimizationPath(candidate) || isPagesFilesystemExcludedPath(candidate, phase)) return false;
+					serveFilesystemRoute: async (candidate, stagedHeaders, phase, _resolvedUrl, sourceRequest, candidateHasBasePath) => {
+						if (isImageOptimizationPath(candidate) || !isServableFilesystemRoute(candidate, phase, sourceRequest.method, publicFiles, basePath, pagesAssetPathPrefix, candidateHasBasePath)) return false;
 						const lookupPath = staticCacheLookupPath(candidate);
 						if (lookupPath === null || lookupPath === "/" || !staticCache.lookup(lookupPath)) return false;
-						sourcePath = candidate;
+						source = {
+							path: candidate,
+							cacheControl: readHeaderCaseInsensitive(stagedHeaders, "cache-control") ?? null
+						};
 						return new Response(null);
 					}
 				});
 				if (result.type !== "response") return null;
 				cancelResponseBody(result.response);
-				return isImageSourceBodyStatus(result.response.status) ? sourcePath : null;
+				return isImageSourceBodyStatus(result.response.status) ? source : null;
 			};
 			const deps = {
 				assetPrefix,
@@ -1693,7 +1687,7 @@ async function createPagesRouterRequestHandler(options) {
 					return handleApi(request, apiUrl, createNodeExecutionContext(), resolveTrustedNodeRevalidateOrigin(req, host, port), "node", stagedHeaders);
 				} : null,
 				handleApiAppliesStagedHeaders: true,
-				serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl, _request, resolvedPathnameHasBasePath) => {
+				serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl, filesystemRequest, resolvedPathnameHasBasePath) => {
 					if (resolvedPathnameHasBasePath && isImageOptimizationPath(requestPathname)) {
 						for (const [name, value] of Object.entries(stagedHeaders)) res.setHeader(name, value);
 						const parsedUrl = new URL(resolvedUrl, "http://localhost");
@@ -1705,7 +1699,7 @@ async function createPagesRouterRequestHandler(options) {
 						}
 						const sendUnsafeContentType = () => {
 							res.writeHead(400);
-							res.end("The requested resource is not an allowed image type");
+							res.end(IMAGE_TYPE_NOT_ALLOWED_MESSAGE);
 						};
 						const isSafeSourcePath = (sourcePath) => isSafeImageContentType(contentTypeForPath(sourcePath), pagesImageConfig?.dangerouslyAllowSVG);
 						const imageSecurityHeaders = {
@@ -1713,7 +1707,7 @@ async function createPagesRouterRequestHandler(options) {
 							"X-Content-Type-Options": "nosniff",
 							"Content-Disposition": pagesImageConfig?.contentDispositionType === "attachment" ? "attachment" : "inline"
 						};
-						const serveSource = (sourcePath) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, sourcePath), void 0, IMAGE_REPRESENTATION_HEADERS);
+						const serveSource = (sourcePath, publicFileCacheControl) => tryServeStatic(req, res, clientDir, sourcePath, false, staticCache, withImageSourceCacheControl(imageSecurityHeaders, publicFileCacheControl, pagesImageConfig), void 0, IMAGE_REPRESENTATION_HEADERS);
 						const sourceUrl = new URL(params.imageUrl, webRequest.url);
 						let sourcePathname = null;
 						try {
@@ -1723,22 +1717,22 @@ async function createPagesRouterRequestHandler(options) {
 							sendUnsafeContentType();
 							return true;
 						}
-						const assetLookupPath = sourcePathname !== null ? resolveAppRouterAssetPath(sourcePathname, pagesAssetPathPrefix, assetPrefix) : null;
+						const assetLookupPath = sourcePathname !== null ? resolveAppRouterAssetPath(sourcePathname, pagesAssetPathPrefix, assetPrefix) ?? resolveClientBuildFile(sourceUrl.pathname, basePath, clientBuildFiles) : null;
 						if (assetLookupPath && await serveSource(assetLookupPath)) return true;
-						const sourcePath = sourcePathname !== null ? await resolvePublicImageSource(sourceUrl) : null;
+						const source = sourcePathname !== null ? await resolvePublicImageSource(sourceUrl) : null;
 						if (webRequest.signal.aborted) return true;
-						if (sourcePath !== null) {
-							if (!isSafeSourcePath(staticCacheLookupPath(sourcePath) ?? sourcePath)) {
+						if (source !== null) {
+							if (!isSafeSourcePath(staticCacheLookupPath(source.path) ?? source.path)) {
 								sendUnsafeContentType();
 								return true;
 							}
-							if (await serveSource(sourcePath)) return true;
+							if (await serveSource(source.path, source.cacheControl)) return true;
 						}
 						res.writeHead(400);
 						res.end(INVALID_IMAGE_SOURCE_MESSAGE);
 						return true;
 					}
-					if (!resolvedPathnameHasBasePath && !isAssetPrefixBuildAsset(requestPathname, pagesAssetPathPrefix) || isPagesFilesystemExcludedPath(requestPathname, phase)) return false;
+					if (!isServableFilesystemRoute(requestPathname, phase, filesystemRequest.method, publicFiles, basePath, pagesAssetPathPrefix, resolvedPathnameHasBasePath)) return false;
 					return tryServeStatic(req, res, clientDir, requestPathname, compress, staticCache, stagedHeaders);
 				}
 			};
@@ -1758,7 +1752,7 @@ async function createPagesRouterRequestHandler(options) {
 				}
 				const responseBody = await bufferResponseBodyUntilAborted(response, webRequest.signal);
 				if (!responseBody) return;
-				const ct = response.headers.get("content-type") ?? result.defaultContentType;
+				const ct = response.headers.get("content-type") ?? (responseBody.length > 0 ? result.defaultContentType : void 0);
 				const responseHeaders = {};
 				response.headers.forEach((v, k) => {
 					if (k === "set-cookie") return;

package/dist/server/srvx-middleware-origin.d.ts

@@ -0,0 +1,13 @@
+//#region src/server/srvx-middleware-origin.d.ts
+/**
+ * The server-owned origin middleware runs against when srvx serves the
+ * request on Node. srvx builds `request.url` from the client's Host and
+ * `X-Forwarded-Proto` headers, which must not decide whether a rewrite to
+ * another host is external, so like the Node production server (and Next.js,
+ * which uses its hostname and port) this uses the socket's TLS state and
+ * local port, or a trusted `X-Forwarded-Proto` and `X-Forwarded-Host`.
+ * Undefined on other hosts, and on Vercel, which routes by hostname like
+ * Workers; they keep the request URL's origin.
+ */
+export declare function resolveSrvxMiddlewareOrigin(request: Request): string | undefined;
+//#endregion

package/dist/server/srvx-middleware-origin.js

@@ -0,0 +1,19 @@
+import { resolveRequestProtocol, resolveTrustedForwardedHost } from "./proxy-trust.js";
+//#region src/server/srvx-middleware-origin.ts
+/**
+* The server-owned origin middleware runs against when srvx serves the
+* request on Node. srvx builds `request.url` from the client's Host and
+* `X-Forwarded-Proto` headers, which must not decide whether a rewrite to
+* another host is external, so like the Node production server (and Next.js,
+* which uses its hostname and port) this uses the socket's TLS state and
+* local port, or a trusted `X-Forwarded-Proto` and `X-Forwarded-Host`.
+* Undefined on other hosts, and on Vercel, which routes by hostname like
+* Workers; they keep the request URL's origin.
+*/
+function resolveSrvxMiddlewareOrigin(request) {
+	const socket = request.runtime?.node?.req?.socket;
+	if (!socket || process.env.VERCEL) return void 0;
+	return `${socket.encrypted === true || resolveRequestProtocol(request.headers) === "https" ? "https:" : "http:"}//${resolveTrustedForwardedHost(request.headers) ?? (socket.localPort === void 0 ? "localhost" : `localhost:${socket.localPort}`)}`;
+}
+//#endregion
+export { resolveSrvxMiddlewareOrigin };

package/dist/server/srvx-request-target.d.ts

@@ -0,0 +1,12 @@
+//#region src/server/srvx-request-target.d.ts
+/**
+ * Whether srvx, serving the request on Node, got a request target that is not
+ * origin-form (`GET https://other.example/x`). srvx then takes the origin of
+ * `request.url` from the target, as RFC 9112 §3.2.2 asks of an origin server.
+ * `vinext start` 404s every such target (see `getRepeatedSlashRedirect`) and
+ * Next.js never routes one, so the request-based entries Nitro calls refuse
+ * them too. The raw target is the one `nitroRequestTargetPlugin` saved before
+ * h3 could rewrite `req.url`.
+ */
+export declare function isSrvxAbsoluteFormTarget(request: Request): boolean;
+//#endregion

package/dist/server/srvx-request-target.js

@@ -0,0 +1,20 @@
+import { NITRO_REQUEST_TARGET_KEY } from "./nitro-request-target-plugin.js";
+//#region src/server/srvx-request-target.ts
+/**
+* Whether srvx, serving the request on Node, got a request target that is not
+* origin-form (`GET https://other.example/x`). srvx then takes the origin of
+* `request.url` from the target, as RFC 9112 §3.2.2 asks of an origin server.
+* `vinext start` 404s every such target (see `getRepeatedSlashRedirect`) and
+* Next.js never routes one, so the request-based entries Nitro calls refuse
+* them too. The raw target is the one `nitroRequestTargetPlugin` saved before
+* h3 could rewrite `req.url`.
+*/
+function isSrvxAbsoluteFormTarget(request) {
+	const req = request.runtime?.node?.req;
+	if (!req) return false;
+	const saved = Reflect.get(req, Symbol.for(NITRO_REQUEST_TARGET_KEY));
+	const target = typeof saved === "string" ? saved : req.url;
+	return !!target && !target.startsWith("/");
+}
+//#endregion
+export { isSrvxAbsoluteFormTarget };

package/dist/server/static-file-cache.js

@@ -29,9 +29,11 @@ const CONTENT_TYPES = {
 	".css": "text/css; charset=utf-8",
 	".html": "text/html; charset=utf-8",
 	".ico": "image/x-icon",
+	".icns": "image/x-icns",
 	".jpeg": "image/jpeg",
 	".jpg": "image/jpeg",
 	".json": "application/json; charset=utf-8",
+	".jxl": "image/jxl",
 	".map": "application/json; charset=utf-8",
 	".mp3": "audio/mpeg",
 	".mp4": "video/mp4",
@@ -148,30 +150,16 @@ var StaticFileCache = class StaticFileCache {
 			}
 			const pathname = "/" + relativePath;
 			entries.set(pathname, entry);
-			if (ext === ".html") {
-				if (relativePath.endsWith("/index.html")) {
-					const dirPath = "/" + relativePath.slice(0, -11);
-					if (dirPath !== "/") entries.set(dirPath, entry);
-				} else {
-					const withoutExt = "/" + relativePath.slice(0, -ext.length);
-					entries.set(withoutExt, entry);
-				}
-			}
 		}
 		const toBuffer = [];
-		const seenEntries = /* @__PURE__ */ new Set();
-		for (const entry of entries.values()) {
-			if (seenEntries.has(entry)) continue;
-			seenEntries.add(entry);
-			for (const variant of [
-				entry.original,
-				entry.br,
-				entry.gz,
-				entry.zst
-			]) {
-				if (!variant || variant.size > BUFFER_THRESHOLD) continue;
-				toBuffer.push(variant);
-			}
+		for (const entry of entries.values()) for (const variant of [
+			entry.original,
+			entry.br,
+			entry.gz,
+			entry.zst
+		]) {
+			if (!variant || variant.size > BUFFER_THRESHOLD) continue;
+			toBuffer.push(variant);
 		}
 		for (let i = 0; i < toBuffer.length; i += 64) await Promise.all(toBuffer.slice(i, i + 64).map(async (v) => {
 			v.buffer = await fsp.readFile(v.path);

package/dist/server/worker-image-optimization.d.ts

@@ -19,10 +19,17 @@ export type WorkerImageSourceOptions = {
  * served only when the application pipeline selects a public file for it.
  */
 export declare function fetchWorkerImageSource(imageUrl: string, request: Request, options: WorkerImageSourceOptions): Promise<Response>;
+/**
+ * Give a public-file source the Cache-Control middleware or `headers()` staged
+ * for it, which a direct request receives in place of the asset default and
+ * Next.js' internal source fetch reads.
+ */
+export declare function withStagedCacheControl(asset: Response, cacheControl: string | null): Response;
 /**
  * Return the public file a framework static-file signal selects, provided the
  * pipeline answered with a body-bearing 2xx outcome. The file is fetched with middleware's
- * request header overrides, as resolveStaticAssetSignal fetches it.
+ * request header overrides, as resolveStaticAssetSignal fetches it, and keeps
+ * the Cache-Control the pipeline staged.
  */
 export declare function fetchSignalledPublicFile(response: Response, sourceRequest: Request, assets: VinextAssetFetcher): Promise<Response> | null;
 /**

package/dist/server/worker-image-optimization.js

@@ -2,7 +2,7 @@ import { VINEXT_PRERENDER_SPECIAL_ERROR_HEADER } from "./headers.js";
 import { readStaticFileSignal, readStaticFileSignalRequestHeaders } from "./static-file-signal.js";
 import { attachRequestCfMetadata, cloneRequestWithUrl } from "./request-pipeline.js";
 import { isNextStaticPath } from "../utils/asset-prefix.js";
-import { handleConfiguredImageOptimization, invalidImageSourceResponse, isImageSourceBodyStatus } from "./image-optimization.js";
+import { handleConfiguredImageOptimization, invalidImageSourceResponse, isImageSourceBodyStatus, markImageBuildAsset } from "./image-optimization.js";
 import { createStaticAssetRequest, mergeHeaders } from "./worker-utils.js";
 import { resolveClientBuildFile } from "./client-build-files.js";
 //#region src/server/worker-image-optimization.ts
@@ -53,28 +53,47 @@ async function fetchWorkerImageSource(imageUrl, request, options) {
 	} catch {
 		return invalidImageSourceResponse();
 	}
-	const buildAssetPath = resolveNextStaticFile(decodedPathname, options) ?? resolveClientBuildFile(sourceUrl.pathname, options.basePath, options.clientBuildFiles);
-	if (buildAssetPath !== null) return options.assets.fetch(new Request(new URL(buildAssetPath, request.url)));
+	const nextStaticFile = resolveNextStaticFile(decodedPathname, options);
+	if (nextStaticFile !== null) return markImageBuildAsset(await options.assets.fetch(new Request(new URL(nextStaticFile, request.url))));
+	const clientBuildFile = resolveClientBuildFile(sourceUrl.pathname, options.basePath, options.clientBuildFiles);
+	if (clientBuildFile !== null) return options.assets.fetch(new Request(new URL(clientBuildFile, request.url)));
 	const sourceResponse = await options.fetchPublicFile(attachRequestCfMetadata(new Request(sourceUrl, { signal: request.signal }), request));
 	if (sourceResponse && isImageSourceBodyStatus(sourceResponse.status)) return sourceResponse;
 	if (sourceResponse) cancelResponseBody(sourceResponse);
 	return invalidImageSourceResponse();
 }
 /**
+* Give a public-file source the Cache-Control middleware or `headers()` staged
+* for it, which a direct request receives in place of the asset default and
+* Next.js' internal source fetch reads.
+*/
+function withStagedCacheControl(asset, cacheControl) {
+	if (cacheControl === null) return asset;
+	const headers = new Headers(asset.headers);
+	headers.set("Cache-Control", cacheControl);
+	return new Response(asset.body, {
+		status: asset.status,
+		statusText: asset.statusText,
+		headers
+	});
+}
+/**
 * Return the public file a framework static-file signal selects, provided the
 * pipeline answered with a body-bearing 2xx outcome. The file is fetched with middleware's
-* request header overrides, as resolveStaticAssetSignal fetches it.
+* request header overrides, as resolveStaticAssetSignal fetches it, and keeps
+* the Cache-Control the pipeline staged.
 */
 function fetchSignalledPublicFile(response, sourceRequest, assets) {
 	const signal = isImageSourceBodyStatus(response.status) ? readStaticFileSignal(response) : null;
 	const requestHeaders = readStaticFileSignalRequestHeaders(response);
+	const stagedCacheControl = response.headers.get("Cache-Control");
 	cancelResponseBody(response);
 	if (signal === null) return null;
 	let assetPath = signal;
 	try {
 		assetPath = decodeURIComponent(signal);
 	} catch {}
-	return Promise.resolve(assets.fetch(createStaticAssetRequest(assetPath, sourceRequest, requestHeaders)));
+	return Promise.resolve(assets.fetch(createStaticAssetRequest(assetPath, sourceRequest, requestHeaders))).then((asset) => withStagedCacheControl(asset, stagedCacheControl));
 }
 /**
 * Serve the App Router image endpoint once the request handler admitted it
@@ -111,4 +130,4 @@ async function serveWorkerImageOptimization(request, signal, allowedWidths, imag
 	});
 }
 //#endregion
-export { fetchSignalledPublicFile, fetchWorkerImageSource, serveWorkerImageOptimization };
+export { fetchSignalledPublicFile, fetchWorkerImageSource, serveWorkerImageOptimization, withStagedCacheControl };

package/dist/server/worker-revalidation-context.js

@@ -12,6 +12,7 @@ function deriveExecutionContext(base, dispatchPagesRevalidate, isInternalPagesRe
 		...base?.cache === void 0 ? {} : { cache: base.cache },
 		...base?.assets === void 0 ? {} : { assets: base.assets },
 		...base?.trustedRevalidateOrigin === void 0 ? {} : { trustedRevalidateOrigin: base.trustedRevalidateOrigin },
+		...base?.middlewareOrigin === void 0 ? {} : { middlewareOrigin: base.middlewareOrigin },
 		dispatchPagesRevalidate,
 		isInternalPagesRevalidation
 	};

package/dist/shims/error-boundary.d.ts

@@ -6,6 +6,8 @@ export type ErrorBoundaryProps = {
     reset: () => void;
   }>;
   children: React.ReactNode;
+  /** Whether this boundary renders global-error, at the root of the page. */
+  isGlobalErrorBoundary?: boolean;
   resetKey?: string | null;
 };
 export type SerializedBoundaryError = {
@@ -38,6 +40,7 @@ type RedirectBoundaryProps = {
 type ErrorBoundaryInnerProps = {
   isImplicitRootErrorBoundary?: boolean;
   pathname: string | null;
+  wrapsGlobalErrorBoundary?: boolean;
 } & ErrorBoundaryProps;
 export type ErrorBoundaryState = {
   error: CapturedError | null;
@@ -66,13 +69,14 @@ export declare class ErrorBoundaryInner extends React.Component<ErrorBoundaryInn
   reset: () => void;
   render(): string | number | bigint | boolean | React.JSX.Element | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | React.ReactPortal | null | undefined> | null | undefined;
 }
-export declare function ErrorBoundary({ fallback, children, resetKey }: ErrorBoundaryProps): React.JSX.Element;
-export declare function GlobalErrorBoundary({ fallback, children }: {
+export declare function ErrorBoundary({ fallback, children, isGlobalErrorBoundary, resetKey }: ErrorBoundaryProps): React.JSX.Element;
+export declare function GlobalErrorBoundary({ fallback, children, wrapsGlobalErrorBoundary }: {
   fallback: React.ComponentType<{
     error: unknown;
     reset: () => void;
   }>;
   children: React.ReactNode;
+  wrapsGlobalErrorBoundary?: boolean;
 }): React.JSX.Element;
 type NotFoundBoundaryProps = {
   fallback: React.ReactNode;

package/dist/shims/error-boundary.js

@@ -174,21 +174,23 @@ var ErrorBoundaryInner = class extends React.Component {
 		return this.props.children;
 	}
 };
-function ErrorBoundary({ fallback, children, resetKey }) {
+function ErrorBoundary({ fallback, children, isGlobalErrorBoundary, resetKey }) {
 	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
 		pathname,
 		resetKey,
 		fallback,
+		isGlobalErrorBoundary,
 		children
 	});
 }
-function GlobalErrorBoundary({ fallback, children }) {
+function GlobalErrorBoundary({ fallback, children, wrapsGlobalErrorBoundary }) {
 	const pathname = useErrorBoundaryPathname();
 	return /* @__PURE__ */ jsx(ErrorBoundaryInner, {
 		pathname,
 		fallback,
 		isImplicitRootErrorBoundary: fallback === DefaultGlobalError,
+		wrapsGlobalErrorBoundary,
 		children
 	});
 }

package/dist/shims/request-context.d.ts

@@ -46,7 +46,9 @@ export type ExecutionContextLike = {
   requestSignal?: AbortSignal;
   /**
    * Server-owned origin middleware runs against. Set by the Node production
-   * server, whose request URL comes from the client's Host header. Without it
+   * server and by entries that srvx serves on Node (Nitro's Node presets,
+   * @vitejs/plugin-rsc's dev and preview handlers), whose request URL comes
+   * from the client's Host header. Without it
    * middleware uses the request URL's origin, which Workers can trust because
    * the platform routes by hostname.
    */

package/dist/shims/url-utils.js

@@ -115,12 +115,17 @@ function normalizePathTrailingSlash(path, trailingSlash) {
 	if (!path.startsWith("/") || path.startsWith("//") || process.env.__VINEXT_MANUAL_TRAILING_SLASH === "true") return path;
 	const { pathname, query, hash } = parsePath(path);
 	if (trailingSlash) {
-		if (/\.[^/]+\/?$/.test(pathname)) return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
+		if (hasFileLikeLastSegment(pathname)) return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
 		if (pathname.endsWith("/")) return `${pathname}${query}${hash}`;
 		return `${pathname}/${query}${hash}`;
 	}
 	return `${removeRouteTrailingSlash(pathname)}${query}${hash}`;
 }
+function hasFileLikeLastSegment(pathname) {
+	const end = pathname.endsWith("/") ? pathname.length - 1 : pathname.length;
+	const dot = pathname.indexOf(".", pathname.lastIndexOf("/", end - 1) + 1);
+	return dot !== -1 && dot < end - 1;
+}
 /**
 * Prepend basePath to a local path for browser URLs / fetches.
 */

package/dist/utils/client-entry-manifest.d.ts

@@ -11,6 +11,11 @@ export declare const VINEXT_CLIENT_REFERENCE_SOURCES = ".vite/vinext-client-refe
 export type ClientEntryManifest = {
   pagesClientEntry?: string;
   appBrowserEntry?: string;
+  /**
+   * The chunk holding the App Router browser runtime, whose evaluation starts
+   * hydration. A user chunk group can move it out of `appBrowserEntry`.
+   */
+  appBrowserRuntime?: string;
   /** The App Router RouteManifest chunk, which the browser entry imports as it boots. */
   appRouteManifest?: string;
   /** What each App Router client reference loads in the browser. */

package/dist/utils/client-entry-manifest.js

@@ -20,6 +20,7 @@ function readClientEntryManifest(clientDir) {
 		const manifest = {};
 		if (typeof value.pagesClientEntry === "string") manifest.pagesClientEntry = value.pagesClientEntry;
 		if (typeof value.appBrowserEntry === "string") manifest.appBrowserEntry = value.appBrowserEntry;
+		if (typeof value.appBrowserRuntime === "string") manifest.appBrowserRuntime = value.appBrowserRuntime;
 		if (typeof value.appRouteManifest === "string") manifest.appRouteManifest = value.appRouteManifest;
 		if (isUnknownRecord(value.appClientReferenceChunks)) manifest.appClientReferenceChunks = value.appClientReferenceChunks;
 		return manifest.pagesClientEntry || manifest.appBrowserEntry ? manifest : void 0;

package/dist/utils/client-runtime-metadata.d.ts

@@ -3,6 +3,7 @@ import { ClientReferenceChunks } from "./client-reference-chunks.js";
 type ClientRuntimeMetadata = {
   clientEntryFile?: string;
   appBootstrapPreinitModules?: string[];
+  appBootstrapPreloadModules?: string[];
   appRouteManifestModule?: string;
   appClientReferenceChunks?: ClientReferenceChunks;
   cssGraph?: Record<string, {
@@ -17,6 +18,10 @@ type ClientRuntimeMetadata = {
  * Read the client build manifest and compute runtime metadata used by
  * Cloudflare worker entry injection and Node production server startup.
  *
+ * - `appBootstrapPreinitModules` — chunks the App Router browser entry imports,
+ *   preinitialized during SSR.
+ * - `appBootstrapPreloadModules` — those of them that would start hydration if
+ *   evaluated ahead of the shell, preloaded during SSR instead.
  * - `appRouteManifestModule` — the App Router RouteManifest chunk, which the
  *   browser entry imports as it boots, preloaded during SSR.
  * - `appClientReferenceChunks` — what each App Router client reference loads