vinext 0.0.49 → 0.0.51

package/dist/server/prod-server.js

@@ -1,12 +1,14 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { applyMiddlewareRequestHeaders, isExternalUrl, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { applyConfigHeadersToHeaderRecord, filterInternalHeaders, isOpenRedirectShaped } from "./request-pipeline.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
-import { manifestFileWithBase } from "../utils/manifest-paths.js";
 import { CONTENT_TYPES, StaticFileCache, etagFromFilenameHash } from "./static-file-cache.js";
+import { manifestFileWithBase } from "../utils/manifest-paths.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isSafeImageContentType, parseImageParams } from "./image-optimization.js";
 import { computeLazyChunks } from "../utils/lazy-chunks.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
@@ -323,7 +325,7 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 	if (!resolved) return false;
 	const ext = path.extname(resolved.path);
 	const ct = CONTENT_TYPES[ext] ?? "application/octet-stream";
-	const isHashed = pathname.startsWith("/assets/");
+	const isHashed = pathname.startsWith("/assets/") || pathname.includes("/_next/static/");
 	const cacheControl = isHashed ? "public, max-age=31536000, immutable" : "public, max-age=3600";
 	const etag = isHashed && etagFromFilenameHash(resolved.path, ext) || `W/"${resolved.size}-${Math.floor(resolved.mtimeMs / 1e3)}"`;
 	const baseType = ct.split(";")[0].trim();
@@ -583,6 +585,49 @@ function resolveAppRouterHandler(entry) {
 	process.exit(1);
 }
 /**
+* Resolve a request pathname to a static-asset lookup path inside `clientDir`.
+*
+* Returns `null` when the request is not for a built asset, in which case
+* the caller should let the request fall through to the RSC handler.
+*
+* Three URL shapes are recognised:
+*
+*  - `/assets/...` — the historical Vite default, used when `assetPrefix` is
+*    unset. Returns the pathname verbatim.
+*  - `<assetPathPrefix>/_next/static/...` — when `assetPrefix` is a path
+*    prefix (e.g. `/custom-asset-prefix`). The on-disk layout is
+*    `dist/client/<prefix>/_next/static/...`, so the pathname maps 1:1.
+*  - `/_next/static/...` — when `assetPrefix` is an absolute URL with no
+*    path component (e.g. `https://cdn.example.com`). Files land on disk
+*    at `dist/client/_next/static/...`. This branch is mostly a fallback
+*    for setups that don't actually route asset requests to the CDN.
+*
+* When `assetPrefix` is an absolute URL with a non-empty pathname
+* (e.g. `https://cdn.example.com/sub`), files are written to
+* `dist/client/_next/static/...` but emitted URLs prepend the full URL
+* (`https://cdn.example.com/sub/_next/static/...`). Requests for those
+* URLs do not normally arrive at this server — they go to the CDN. We
+* still accept `<pathname>/_next/static/...` so a same-origin reverse
+* proxy can route through.
+*/
+function resolveAppRouterAssetPath(pathname, assetPathPrefix, assetPrefix) {
+	if (pathname.startsWith("/assets/")) return pathname;
+	if (!assetPrefix) return null;
+	const nextStaticDir = `/${ASSET_PREFIX_URL_DIR}/`;
+	if (assetPathPrefix) {
+		if (pathname === assetPathPrefix || pathname.startsWith(assetPathPrefix + "/")) {
+			const rest = pathname.slice(assetPathPrefix.length) || "/";
+			if (rest.startsWith(nextStaticDir)) {
+				if (!isAbsoluteAssetPrefix(assetPrefix)) return pathname;
+				return rest;
+			}
+		}
+		return null;
+	}
+	if (pathname.startsWith(nextStaticDir)) return pathname;
+	return null;
+}
+/**
 * Start the App Router production server.
 *
 * The App Router entry (dist/server/index.js) can export either:
@@ -608,16 +653,19 @@ async function startAppRouterServer(options) {
 	} catch {}
 	const prerenderSecret = readPrerenderSecret(path.dirname(rscEntryPath));
 	const rscMtime = fs.statSync(rscEntryPath).mtimeMs;
-	const rscHandler = resolveAppRouterHandler((await import(`${pathToFileURL(rscEntryPath).href}?t=${rscMtime}`)).default);
+	const rscModule = await import(`${pathToFileURL(rscEntryPath).href}?t=${rscMtime}`);
+	const rscHandler = resolveAppRouterHandler(rscModule.default);
+	const appRouterAssetPrefix = typeof rscModule.__assetPrefix === "string" ? rscModule.__assetPrefix : "";
+	const appAssetPathPrefix = assetPrefixPathname(appRouterAssetPrefix);
 	const seededRoutes = await seedMemoryCacheFromPrerender(path.dirname(rscEntryPath));
 	if (seededRoutes > 0) console.log(`[vinext] Seeded ${seededRoutes} pre-rendered route${seededRoutes !== 1 ? "s" : ""} into memory cache`);
 	const staticCache = await StaticFileCache.create(clientDir);
-	const server = createServer(async (req, res) => {
+	const handleRequest = async (req, res) => {
 		const rawUrl = req.url ?? "/";
 		const rawPathname = rawUrl.split("?")[0];
 		if (isOpenRedirectShaped(rawPathname)) {
 			res.writeHead(404);
-			res.end("404 Not Found");
+			res.end("This page could not be found");
 			return;
 		}
 		const normalizedRawPathname = rawPathname.replaceAll("\\", "/");
@@ -630,14 +678,17 @@ async function startAppRouterServer(options) {
 			return;
 		}
 		if (pathname === "/__vinext/prerender/static-params" || pathname === "/__vinext/prerender/pages-static-paths") {
-			const secret = req.headers["x-vinext-prerender-secret"];
+			const secret = req.headers[VINEXT_PRERENDER_SECRET_HEADER];
 			if (!prerenderSecret || secret !== prerenderSecret) {
 				res.writeHead(403);
 				res.end("Forbidden");
 				return;
 			}
 		}
-		if (pathname.startsWith("/assets/") && await tryServeStatic(req, res, clientDir, pathname, compress, staticCache)) return;
+		{
+			const assetLookupPath = resolveAppRouterAssetPath(pathname, appAssetPathPrefix, appRouterAssetPrefix);
+			if (assetLookupPath && await tryServeStatic(req, res, clientDir, assetLookupPath, compress, staticCache)) return;
+		}
 		if (pathname === "/_vinext/image") {
 			const params = parseImageParams(new URL(rawUrl, "http://localhost"), [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES]);
 			if (!params) {
@@ -663,7 +714,7 @@ async function startAppRouterServer(options) {
 		try {
 			const qs = rawUrl.includes("?") ? rawUrl.slice(rawUrl.indexOf("?")) : "";
 			const response = await rscHandler(nodeToWebRequest(req, pathname + qs));
-			const staticFileSignal = response.headers.get("x-vinext-static-file");
+			const staticFileSignal = response.headers.get(VINEXT_STATIC_FILE_HEADER);
 			if (staticFileSignal) {
 				let staticFilePath = "/";
 				try {
@@ -672,7 +723,7 @@ async function startAppRouterServer(options) {
 					staticFilePath = staticFileSignal;
 				}
 				const staticResponseHeaders = omitHeadersCaseInsensitive(mergeResponseHeaders({}, response), [
-					"x-vinext-static-file",
+					VINEXT_STATIC_FILE_HEADER,
 					"content-encoding",
 					"content-length",
 					"content-type"
@@ -691,6 +742,9 @@ async function startAppRouterServer(options) {
 				res.end("Internal Server Error");
 			}
 		}
+	};
+	const server = createServer((req, res) => {
+		handleRequest(req, res);
 	});
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
@@ -705,6 +759,17 @@ async function startAppRouterServer(options) {
 		port: typeof addr === "object" && addr ? addr.port : port
 	};
 }
+function isPagesServerEntryPageRoute(value) {
+	if (!value || typeof value !== "object" || !("pattern" in value)) return false;
+	if (typeof value.pattern !== "string") return false;
+	if (!("module" in value) || value.module === void 0) return true;
+	const pageModule = value.module;
+	if (!pageModule || typeof pageModule !== "object") return false;
+	return !("getStaticPaths" in pageModule) || typeof pageModule.getStaticPaths === "function";
+}
+function readPagesServerEntryPageRoutes(value) {
+	return Array.isArray(value) && value.every(isPagesServerEntryPageRoute) ? value : void 0;
+}
 /**
 * Start the Pages Router production server.
 *
@@ -719,8 +784,12 @@ async function startPagesRouterServer(options) {
 	const serverMtime = fs.statSync(serverEntryPath).mtimeMs;
 	const serverEntry = await import(`${pathToFileURL(serverEntryPath).href}?t=${serverMtime}`);
 	const { renderPage, handleApiRoute: handleApi, runMiddleware, vinextConfig } = serverEntry;
+	const matchPageRoute = typeof serverEntry.matchPageRoute === "function" ? serverEntry.matchPageRoute : void 0;
+	const pageRoutes = readPagesServerEntryPageRoutes(serverEntry.pageRoutes);
 	const prerenderSecret = readPrerenderSecret(path.dirname(serverEntryPath));
 	const basePath = vinextConfig?.basePath ?? "";
+	const assetPrefix = vinextConfig?.assetPrefix ?? "";
+	const pagesAssetPathPrefix = assetPrefixPathname(assetPrefix);
 	const assetBase = basePath ? `${basePath}/` : "/";
 	const trailingSlash = vinextConfig?.trailingSlash ?? false;
 	const configRedirects = vinextConfig?.redirects ?? [];
@@ -733,6 +802,7 @@ async function startPagesRouterServer(options) {
 	const allowedImageWidths = [...vinextConfig?.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...vinextConfig?.images?.imageSizes ?? DEFAULT_IMAGE_SIZES];
 	const pagesImageConfig = vinextConfig?.images ? {
 		dangerouslyAllowSVG: vinextConfig.images.dangerouslyAllowSVG,
+		dangerouslyAllowLocalIP: vinextConfig.images.dangerouslyAllowLocalIP,
 		contentDispositionType: vinextConfig.images.contentDispositionType,
 		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
 	} : void 0;
@@ -745,12 +815,12 @@ async function startPagesRouterServer(options) {
 		if (lazyChunks.length > 0) globalThis.__VINEXT_LAZY_CHUNKS__ = lazyChunks;
 	} catch {}
 	const staticCache = await StaticFileCache.create(clientDir);
-	const server = createServer(async (req, res) => {
+	const handleRequest = async (req, res) => {
 		const rawUrl = req.url ?? "/";
 		const rawPagesPathnameBeforeNormalize = rawUrl.split("?")[0];
 		if (isOpenRedirectShaped(rawPagesPathnameBeforeNormalize)) {
 			res.writeHead(404);
-			res.end("404 Not Found");
+			res.end("This page could not be found");
 			return;
 		}
 		const rawPagesPathname = rawPagesPathnameBeforeNormalize.replaceAll("\\", "/");
@@ -765,7 +835,7 @@ async function startPagesRouterServer(options) {
 		}
 		let url = pathname + rawQs;
 		if (pathname === "/__vinext/prerender/pages-static-paths") {
-			const secret = req.headers["x-vinext-prerender-secret"];
+			const secret = req.headers[VINEXT_PRERENDER_SECRET_HEADER];
 			if (!prerenderSecret || secret !== prerenderSecret) {
 				res.writeHead(403);
 				res.end("Forbidden");
@@ -776,7 +846,7 @@ async function startPagesRouterServer(options) {
 			const localesRaw = parsedUrl.searchParams.get("locales");
 			const locales = localesRaw ? JSON.parse(localesRaw) : [];
 			const defaultLocale = parsedUrl.searchParams.get("defaultLocale") ?? "";
-			const fn = (serverEntry.pageRoutes?.find((r) => r.pattern === pattern))?.module?.getStaticPaths;
+			const fn = (pageRoutes?.find((r) => r.pattern === pattern))?.module?.getStaticPaths;
 			if (typeof fn !== "function") {
 				res.writeHead(200, { "Content-Type": "application/json" });
 				res.end("null");
@@ -796,7 +866,8 @@ async function startPagesRouterServer(options) {
 			return;
 		}
 		const staticLookupPath = stripBasePath(pathname, basePath);
-		if (staticLookupPath.startsWith("/assets/") && await tryServeStatic(req, res, clientDir, staticLookupPath, compress, staticCache)) return;
+		const pagesAssetLookup = resolveAppRouterAssetPath(pathname, pagesAssetPathPrefix, assetPrefix);
+		if (pagesAssetLookup && await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
 		if (pathname === "/_vinext/image" || staticLookupPath === "/_vinext/image") {
 			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths);
 			if (!params) {
@@ -868,7 +939,7 @@ async function startPagesRouterServer(options) {
 			}
 			let resolvedUrl = url;
 			const middlewareHeaders = {};
-			let middlewareRewriteStatus;
+			let middlewareStatus;
 			if (typeof runMiddleware === "function") {
 				const result = await runMiddleware(webRequest, void 0);
 				if (result.waitUntilPromises && result.waitUntilPromises.length > 0) Promise.allSettled(result.waitUntilPromises);
@@ -907,9 +978,9 @@ async function startPagesRouterServer(options) {
 					else middlewareHeaders[key] = [value];
 				} else middlewareHeaders[key] = value;
 				if (result.rewriteUrl) resolvedUrl = result.rewriteUrl;
-				middlewareRewriteStatus = result.rewriteStatus;
+				middlewareStatus = result.status ?? result.rewriteStatus;
 			}
-			const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, webRequest);
+			const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, webRequest, { preserveCredentialHeaders: isExternalUrl(resolvedUrl) });
 			webRequest = postMwReq;
 			let resolvedPathname = resolvedUrl.split("?")[0];
 			if (configHeaders.length) applyConfigHeadersToHeaderRecord(middlewareHeaders, {
@@ -937,7 +1008,7 @@ async function startPagesRouterServer(options) {
 				let response;
 				if (typeof handleApi === "function") response = await handleApi(webRequest, resolvedUrl);
 				else response = new Response("404 - API route not found", { status: 404 });
-				const mergedResponse = mergeWebResponse(middlewareHeaders, response, middlewareRewriteStatus);
+				const mergedResponse = mergeWebResponse(middlewareHeaders, response, middlewareStatus);
 				if (!mergedResponse.body) {
 					await sendWebResponse(mergedResponse, req, res, compress);
 					return;
@@ -949,7 +1020,8 @@ async function startPagesRouterServer(options) {
 				sendCompressed(req, res, responseBody, ct, mergedResponse.status, responseHeaders, compress, finalStatusText);
 				return;
 			}
-			if (configRewrites.afterFiles?.length) {
+			const pageMatch = matchPageRoute ? matchPageRoute(resolvedPathname, webRequest) : null;
+			if ((!pageMatch || pageMatch.route.isDynamic) && configRewrites.afterFiles?.length) {
 				const rewritten = matchRewrite(resolvedPathname, configRewrites.afterFiles, postMwReqCtx);
 				if (rewritten) {
 					if (isExternalUrl(rewritten)) {
@@ -977,11 +1049,11 @@ async function startPagesRouterServer(options) {
 			}
 			if (!response) {
 				res.writeHead(404);
-				res.end("404 - Not found");
+				res.end("This page could not be found");
 				return;
 			}
 			const shouldStreamPagesResponse = isVinextStreamedHtmlResponse(response);
-			const mergedResponse = mergeWebResponse(middlewareHeaders, response, middlewareRewriteStatus);
+			const mergedResponse = mergeWebResponse(middlewareHeaders, response, middlewareStatus);
 			if (shouldStreamPagesResponse || !mergedResponse.body) {
 				await sendWebResponse(mergedResponse, req, res, compress);
 				return;
@@ -998,6 +1070,9 @@ async function startPagesRouterServer(options) {
 				res.end("Internal Server Error");
 			}
 		}
+	};
+	const server = createServer((req, res) => {
+		handleRequest(req, res);
 	});
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
@@ -1013,6 +1088,6 @@ async function startPagesRouterServer(options) {
 	};
 }
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, resolveHost, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, resolveAppRouterAssetPath, resolveHost, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
 
 //# sourceMappingURL=prod-server.js.map