vinext 0.1.5 → 0.1.6

package/dist/server/app-ssr-entry.js

@@ -16,12 +16,12 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
+import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
 import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
-import { runWithRootParamsScope } from "../shims/root-params.js";
-import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
 import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";

package/dist/server/headers.d.ts

@@ -23,6 +23,10 @@ declare const VINEXT_TIMING_HEADER = "x-vinext-timing";
 declare const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
 /** URL-encoded JSON route params for build-time prerender renders. */
 declare const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Internal endpoint used to evaluate App Router generateStaticParams exports. */
+declare const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
+/** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
+declare const VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH = "/__vinext/prerender/pages-static-paths";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 declare const VINEXT_REVALIDATE_HEADER = "x-vinext-revalidate";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
@@ -107,4 +111,4 @@ declare const INTERNAL_HEADERS: string[];
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 declare const VINEXT_INTERNAL_HEADERS: string[];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/headers.js

@@ -23,6 +23,10 @@ const VINEXT_TIMING_HEADER = "x-vinext-timing";
 const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
 /** URL-encoded JSON route params for build-time prerender renders. */
 const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
+/** Internal endpoint used to evaluate App Router generateStaticParams exports. */
+const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
+/** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
+const VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH = "/__vinext/prerender/pages-static-paths";
 /** TPR (Tailored Per-Request) revalidation interval in seconds. */
 const VINEXT_REVALIDATE_HEADER = "x-vinext-revalidate";
 /** Marker on cached ISR entries indicating RSC payload (value "1"). */
@@ -129,4 +133,4 @@ const INTERNAL_HEADERS = [
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 const VINEXT_INTERNAL_HEADERS = [VINEXT_PRERENDER_ROUTE_PARAMS_HEADER];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/metadata-route-response.d.ts

@@ -2,15 +2,15 @@ import { MetadataFileRoute } from "./metadata-routes.js";
 
 //#region src/server/metadata-route-response.d.ts
 type AppPageParams = Record<string, string | string[]>;
-type MakeThenableParams = (params: AppPageParams) => unknown;
+type MetadataRouteMakeThenableParams = (params: AppPageParams) => unknown;
 type MetadataRuntimeRoute = MetadataFileRoute & {
   fileDataBase64?: string;
 };
 type MetadataRouteRequestOptions = {
   metadataRoutes: readonly MetadataRuntimeRoute[];
   cleanPathname: string;
-  makeThenableParams: MakeThenableParams;
+  makeThenableParams: MetadataRouteMakeThenableParams;
 };
 declare function handleMetadataRouteRequest(options: MetadataRouteRequestOptions): Promise<Response | null>;
 //#endregion
-export { handleMetadataRouteRequest };
+export { MetadataRouteMakeThenableParams, MetadataRuntimeRoute, handleMetadataRouteRequest };

package/dist/server/middleware-runtime.d.ts

@@ -56,6 +56,7 @@ type ExecuteMiddlewareOptions = {
 type RunGeneratedMiddlewareOptions = ExecuteMiddlewareOptions & {
   ctx?: ExecutionContextLike;
 };
+declare function createMiddlewareMissingExportError(filePath: string | undefined, isProxy: boolean): Error;
 declare function resolveMiddlewareModuleHandler(mod: MiddlewareModule, options: {
   filePath?: string;
   isProxy: boolean;
@@ -63,4 +64,4 @@ declare function resolveMiddlewareModuleHandler(mod: MiddlewareModule, options:
 declare function executeMiddleware(options: ExecuteMiddlewareOptions): Promise<MiddlewareResult>;
 declare function runGeneratedMiddleware(options: RunGeneratedMiddlewareOptions): Promise<MiddlewareResult>;
 //#endregion
-export { MiddlewareModule, MiddlewareResult, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };
+export { MiddlewareModule, MiddlewareResult, createMiddlewareMissingExportError, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };

package/dist/server/middleware-runtime.js

@@ -9,6 +9,7 @@ import { normalizePath } from "./normalize-path.js";
 import { matchesMiddleware } from "./middleware-matcher.js";
 import { badRequestResponse, internalServerErrorResponse } from "./http-error-responses.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
+import path from "node:path";
 //#region src/server/middleware-runtime.ts
 function isMiddlewareHandler(value) {
 	return typeof value === "function";
@@ -16,19 +17,29 @@ function isMiddlewareHandler(value) {
 function isMiddlewareConfigExport(value) {
 	return !!value && typeof value === "object";
 }
-function middlewareFileLabel(isProxy) {
-	return isProxy ? "Proxy" : "Middleware";
-}
 function middlewareExpectedExport(isProxy) {
 	return isProxy ? "proxy" : "middleware";
 }
+function middlewareDisplayPath(filePath) {
+	const fileName = path.basename(filePath);
+	return path.basename(path.dirname(filePath)) === "src" ? `./src/${fileName}` : `./${fileName}`;
+}
+function createMiddlewareMissingExportError(filePath, isProxy) {
+	const expectedExport = middlewareExpectedExport(isProxy);
+	const displayPath = filePath ? middlewareDisplayPath(filePath) : void 0;
+	const resolvedPath = displayPath ? ` "${displayPath}"` : "";
+	const migrationReason = isProxy ? "- You are migrating from `middleware` to `proxy`, but haven't updated the exported function.\n" : "";
+	return /* @__PURE__ */ new Error(`The file${resolvedPath} must export a function, either as a default export or as a named "${expectedExport}" export.\nThis function is what Next.js runs for every request handled by this ${isProxy ? "proxy (previously called middleware)" : "middleware"}.\n\nWhy this happens:\n` + migrationReason + `- The file exists but doesn't export a function.
+- The export is not a function (e.g., an object or constant).
+- There's a syntax error preventing the export from being recognized.
+
+To fix it:
+- Ensure this file has either a default or "${expectedExport}" function export.\n\nLearn more: https://nextjs.org/docs/messages/middleware-to-proxy`);
+}
 function resolveMiddlewareModuleHandler(mod, options) {
 	const handler = options.isProxy ? mod.proxy ?? mod.default : mod.middleware ?? mod.default;
 	if (isMiddlewareHandler(handler)) return handler;
-	const fileLabel = middlewareFileLabel(options.isProxy);
-	const expectedExport = middlewareExpectedExport(options.isProxy);
-	const fileSuffix = options.filePath ? ` "${options.filePath}"` : "";
-	throw new Error(`The ${fileLabel} file${fileSuffix} must export a function named \`${expectedExport}\` or a \`default\` function.`);
+	throw createMiddlewareMissingExportError(options.filePath, options.isProxy);
 }
 function middlewareMatcher(mod) {
 	const config = mod.config;
@@ -226,4 +237,4 @@ async function runGeneratedMiddleware(options) {
 	return options.ctx ? runWithExecutionContext(options.ctx, run) : run();
 }
 //#endregion
-export { executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };
+export { createMiddlewareMissingExportError, executeMiddleware, resolveMiddlewareModuleHandler, runGeneratedMiddleware };

package/dist/server/middleware.d.ts

@@ -28,7 +28,7 @@ declare function isProxyFile(filePath: string): boolean;
  */
 declare function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: string): (request: NextRequest, event: NextFetchEvent) => Response | undefined | void | Promise<Response | undefined | void>;
 /**
- * Find the proxy or middleware file in the project root.
+ * Find the proxy or middleware file at the selected app/pages convention level.
  * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
  * If middleware.ts is found, logs a deprecation warning.
  *
@@ -44,7 +44,7 @@ declare function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: strin
  * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
  *   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
  */
-declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher): string | null;
+declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher, conventionDir?: string): string | null;
 /**
  * Load and execute middleware for a given request.
  *

package/dist/server/middleware.js

@@ -13,7 +13,8 @@ import path from "node:path";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts
 */
 function isProxyFile(filePath) {
-	return path.basename(filePath).replace(/\.\w+$/, "") === "proxy";
+	const base = path.basename(filePath);
+	return base === "proxy" || base.startsWith("proxy.");
 }
 /**
 * Resolve the middleware/proxy handler function from a module's exports.
@@ -32,9 +33,8 @@ function resolveMiddlewareHandler(mod, filePath) {
 		isProxy: isProxyFile(filePath)
 	});
 }
-const MIDDLEWARE_LOCATIONS = ["", "src/"];
 /**
-* Find the proxy or middleware file in the project root.
+* Find the proxy or middleware file at the selected app/pages convention level.
 * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
 * If middleware.ts is found, logs a deprecation warning.
 *
@@ -50,18 +50,33 @@ const MIDDLEWARE_LOCATIONS = ["", "src/"];
 * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
 *   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
 */
-function findMiddlewareFile(root, fileMatcher) {
-	for (const dir of MIDDLEWARE_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {
-		const fullPath = path.join(root, dir, `proxy${ext}`);
-		if (fs.existsSync(fullPath)) return fullPath;
+function findMiddlewareFile(root, fileMatcher, conventionDir = root) {
+	let proxyPath = null;
+	for (const ext of fileMatcher.dottedExtensions) {
+		const fullPath = path.join(conventionDir, `proxy${ext}`);
+		if (fs.existsSync(fullPath)) {
+			proxyPath = fullPath;
+			break;
+		}
 	}
-	for (const dir of MIDDLEWARE_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {
-		const fullPath = path.join(root, dir, `middleware${ext}`);
+	let middlewarePath = null;
+	for (const ext of fileMatcher.dottedExtensions) {
+		const fullPath = path.join(conventionDir, `middleware${ext}`);
 		if (fs.existsSync(fullPath)) {
-			console.warn("The \"middleware\" file convention is deprecated. Please use \"proxy\" instead.\n\n  To migrate automatically, run:\n  npx @next/codemod@canary middleware-to-proxy .\n\n  Learn more: https://nextjs.org/docs/messages/middleware-to-proxy");
-			return fullPath;
+			middlewarePath = fullPath;
+			break;
 		}
 	}
+	if (proxyPath && middlewarePath) {
+		const relativeProxyPath = `./${path.relative(root, proxyPath)}`;
+		const relativeMiddlewarePath = `./${path.relative(root, middlewarePath)}`;
+		throw new Error(`Both middleware file "${relativeMiddlewarePath}" and proxy file "${relativeProxyPath}" are detected. Please use "${relativeProxyPath}" only. Learn more: https://nextjs.org/docs/messages/middleware-to-proxy`);
+	}
+	if (proxyPath) return proxyPath;
+	if (middlewarePath) {
+		console.warn("The \"middleware\" file convention is deprecated. Please use \"proxy\" instead.\n\n  To migrate automatically, run:\n  npx @next/codemod@canary middleware-to-proxy .\n\n  Learn more: https://nextjs.org/docs/messages/middleware-to-proxy");
+		return middlewarePath;
+	}
 	return null;
 }
 function isMiddlewareModule(value) {

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

@@ -106,7 +106,9 @@ type PagesPipelineResult = {
  * ASSUMPTION: request already has internal headers filtered and basePath stripped.
  * The adapter is responsible for that pre-processing before calling runPagesRequest.
  * The adapter also handles: open-redirect guard, _next/static 404, image optimization,
- * _next/data normalization, Node decode/normalize/400, public-file serving.
+ * _next/data normalization and classification: adapters must rewrite the data
+ * URL to its page pathname and set `isDataReq` (the source of truth here), Node
+ * decode/normalize/400, public-file serving.
  * runPagesRequest receives a "clean" request with basePath-stripped URL.
  */
 declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;

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

@@ -40,7 +40,9 @@ function wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath) {
 * ASSUMPTION: request already has internal headers filtered and basePath stripped.
 * The adapter is responsible for that pre-processing before calling runPagesRequest.
 * The adapter also handles: open-redirect guard, _next/static 404, image optimization,
-* _next/data normalization, Node decode/normalize/400, public-file serving.
+* _next/data normalization and classification: adapters must rewrite the data
+* URL to its page pathname and set `isDataReq` (the source of truth here), Node
+* decode/normalize/400, public-file serving.
 * runPagesRequest receives a "clean" request with basePath-stripped URL.
 */
 async function runPagesRequest(request, deps) {
@@ -54,7 +56,7 @@ async function runPagesRequest(request, deps) {
 		hadBasePath
 	};
 	{
-		const trailingSlashRedirect = normalizeTrailingSlash(pathname, basePath, trailingSlash, search);
+		const trailingSlashRedirect = isDataReq ? null : normalizeTrailingSlash(pathname, basePath, trailingSlash, search);
 		if (trailingSlashRedirect) return {
 			type: "response",
 			response: trailingSlashRedirect

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

@@ -1,3 +1,4 @@
+import { negotiateEncoding } from "./accept-encoding.js";
 import { StaticFileCache } from "./static-file-cache.js";
 import { resolveRequestHost, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { IncomingMessage, ServerResponse } from "node:http";
@@ -59,7 +60,6 @@ type ProdServerOptions = {
 declare const COMPRESSIBLE_TYPES: Set<string>;
 /** Minimum size threshold for compression (in bytes). Below this, compression overhead isn't worth it. */
 declare const COMPRESS_THRESHOLD = 1024;
-declare function negotiateEncoding(req: IncomingMessage): "zstd" | "br" | "gzip" | "deflate" | null;
 /**
  * Merge middleware headers and a Web Response's headers into a single
  * record suitable for Node.js `res.writeHead()`. Uses `getSetCookie()`

package/dist/server/prod-server.js

@@ -19,6 +19,7 @@ import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRoutePara
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
+import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
 import fs from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
@@ -167,25 +168,6 @@ const COMPRESSIBLE_TYPES = new Set([
 /** Minimum size threshold for compression (in bytes). Below this, compression overhead isn't worth it. */
 const COMPRESS_THRESHOLD = 1024;
 /**
-* Parse the Accept-Encoding header and return the best supported encoding.
-* Preference order: zstd > br > gzip > deflate > identity.
-*
-* zstd decompresses ~3-5x faster than brotli at similar compression ratios.
-* Supported in Chrome 123+, Firefox 126+. Safari can decompress but doesn't
-* send zstd in Accept-Encoding, so it transparently falls back to br/gzip.
-*/
-const HAS_ZSTD = typeof zlib.createZstdCompress === "function";
-function negotiateEncoding(req) {
-	const accept = req.headers["accept-encoding"];
-	if (!accept || typeof accept !== "string") return null;
-	const lower = accept.toLowerCase();
-	if (HAS_ZSTD && lower.includes("zstd")) return "zstd";
-	if (lower.includes("br")) return "br";
-	if (lower.includes("gzip")) return "gzip";
-	if (lower.includes("deflate")) return "deflate";
-	return null;
-}
-/**
 * Create a compression stream for the given encoding.
 */
 function createCompressor(encoding, mode = "default") {
@@ -265,6 +247,23 @@ function omitHeadersCaseInsensitive(headersRecord, targets) {
 	}
 	return filtered;
 }
+function mergeVaryHeader(headers, value) {
+	const merged = { ...headers };
+	const existingKey = Object.keys(merged).find((key) => key.toLowerCase() === "vary");
+	if (!existingKey) {
+		merged.Vary = value;
+		return merged;
+	}
+	const rawVary = merged[existingKey];
+	const existingVary = Array.isArray(rawVary) ? rawVary.join(", ") : rawVary;
+	if (existingVary.trim().length === 0) {
+		merged[existingKey] = value;
+		return merged;
+	}
+	const values = existingVary.split(",").map((entry) => entry.trim().toLowerCase());
+	if (!values.includes("*") && !values.includes(value.toLowerCase())) merged[existingKey] = `${existingVary}, ${value}`;
+	return merged;
+}
 function matchesIfNoneMatchHeader(ifNoneMatch, etag) {
 	if (!ifNoneMatch) return false;
 	if (ifNoneMatch === "*") return true;
@@ -318,33 +317,37 @@ function mergeWebResponse(middlewareHeaders, response, statusOverride) {
 function sendCompressed(req, res, body, contentType, statusCode, extraHeaders = {}, compress = true, statusText) {
 	const buf = typeof body === "string" ? Buffer.from(body) : body;
 	const baseType = contentType.split(";")[0].trim();
-	const encoding = compress ? negotiateEncoding(req) : null;
+	const varyByEncoding = compress && COMPRESSIBLE_TYPES.has(baseType);
+	const encoding = compress ? negotiateEncoding(req) : "identity";
 	const headersWithoutBodyHeaders = omitHeadersCaseInsensitive(extraHeaders, OMIT_BODY_HEADERS);
-	const writeHead = (headers) => {
-		if (statusText) res.writeHead(statusCode, statusText, headers);
-		else res.writeHead(statusCode, headers);
+	const writeHead = (headers, responseStatus = statusCode, responseStatusText = statusText) => {
+		if (responseStatusText) res.writeHead(responseStatus, responseStatusText, headers);
+		else res.writeHead(responseStatus, headers);
 	};
-	if (encoding && COMPRESSIBLE_TYPES.has(baseType) && buf.length >= 1024) {
-		const compressor = createCompressor(encoding);
-		const rawVary = extraHeaders["Vary"] ?? extraHeaders["vary"];
-		const existingVary = Array.isArray(rawVary) ? rawVary.join(", ") : rawVary;
-		let varyValue;
-		if (existingVary) varyValue = existingVary.toLowerCase().includes("accept-encoding") ? existingVary : existingVary + ", Accept-Encoding";
-		else varyValue = "Accept-Encoding";
-		writeHead({
+	if (encoding !== "identity" && varyByEncoding && buf.length >= 1024) {
+		writeHead(mergeVaryHeader({
 			...headersWithoutBodyHeaders,
 			"Content-Type": contentType,
-			"Content-Encoding": encoding,
-			Vary: varyValue
-		});
+			"Content-Encoding": encoding
+		}, "Accept-Encoding"));
+		if (req.method === "HEAD") {
+			res.end();
+			return;
+		}
+		const compressor = createCompressor(encoding);
 		compressor.end(buf);
 		pipeline(compressor, res, () => {});
 	} else {
-		writeHead({
+		const identityHeaders = {
 			...headersWithoutBodyHeaders,
 			"Content-Type": contentType,
 			"Content-Length": String(buf.length)
-		});
+		};
+		writeHead(varyByEncoding ? mergeVaryHeader(identityHeaders, "Accept-Encoding") : identityHeaders);
+		if (req.method === "HEAD") {
+			res.end();
+			return;
+		}
 		res.end(buf);
 	}
 }
@@ -378,24 +381,35 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 		}
 		const entry = cache.lookup(lookupPath);
 		if (!entry) return false;
+		const rawAe = compress ? req.headers["accept-encoding"] : void 0;
+		const parsed = typeof rawAe === "string" ? parseAcceptedEncodings(rawAe) : void 0;
+		const availableVariants = [
+			...entry.zst ? ["zstd"] : [],
+			...entry.br ? ["br"] : [],
+			...entry.gz ? ["gzip"] : []
+		];
+		const variesByEncoding = compress && availableVariants.length > 0;
+		const selected = parsed ? selectContentEncoding(parsed, availableVariants) : "identity";
+		const variant = selected === "zstd" ? entry.zst : selected === "br" ? entry.br : selected === "gzip" ? entry.gz : entry.original;
 		const ifNoneMatch = req.headers["if-none-match"];
 		if (responseStatus === 200 && typeof ifNoneMatch === "string" && matchesIfNoneMatchHeader(ifNoneMatch, entry.etag)) {
-			if (extraHeaders) res.writeHead(304, {
+			const notModifiedHeaders = variesByEncoding ? mergeVaryHeader({
 				...entry.notModifiedHeaders,
 				...extraHeaders
-			});
-			else res.writeHead(304, entry.notModifiedHeaders);
+			}, "Accept-Encoding") : {
+				...entry.notModifiedHeaders,
+				...extraHeaders
+			};
+			if (selected !== "identity") notModifiedHeaders["Content-Encoding"] = selected;
+			res.writeHead(304, notModifiedHeaders);
 			res.end();
 			return true;
 		}
-		const rawAe = compress ? req.headers["accept-encoding"] : void 0;
-		const ae = typeof rawAe === "string" ? rawAe.toLowerCase() : void 0;
-		const variant = ae ? ae.includes("zstd") && entry.zst || ae.includes("br") && entry.br || ae.includes("gzip") && entry.gz || entry.original : entry.original;
-		if (extraHeaders) res.writeHead(responseStatus, {
+		const responseHeaders = {
 			...variant.headers,
 			...extraHeaders
-		});
-		else res.writeHead(responseStatus, variant.headers);
+		};
+		res.writeHead(responseStatus, variesByEncoding ? mergeVaryHeader(responseHeaders, "Accept-Encoding") : responseHeaders);
 		if (omitBody || req.method === "HEAD") {
 			res.end();
 			return true;
@@ -428,18 +442,6 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 	const etag = isHashed && etagFromFilenameHash(resolved.path, ext) || `W/"${resolved.size}-${Math.floor(resolved.mtimeMs / 1e3)}"`;
 	const baseType = ct.split(";")[0].trim();
 	const isCompressible = compress && COMPRESSIBLE_TYPES.has(baseType);
-	const ifNoneMatch = req.headers["if-none-match"];
-	if (responseStatus === 200 && typeof ifNoneMatch === "string" && matchesIfNoneMatchHeader(ifNoneMatch, etag)) {
-		const notModifiedHeaders = {
-			ETag: etag,
-			"Cache-Control": cacheControl,
-			...isCompressible ? { Vary: "Accept-Encoding" } : void 0,
-			...extraHeaders
-		};
-		res.writeHead(304, notModifiedHeaders);
-		res.end();
-		return true;
-	}
 	const baseHeaders = {
 		"Content-Type": ct,
 		"Cache-Control": cacheControl,
@@ -448,12 +450,19 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 	};
 	if (isCompressible) {
 		const encoding = negotiateEncoding(req);
-		if (encoding) {
-			res.writeHead(responseStatus, {
+		const ifNoneMatch = req.headers["if-none-match"];
+		if (responseStatus === 200 && typeof ifNoneMatch === "string" && matchesIfNoneMatchHeader(ifNoneMatch, etag)) {
+			const notModifiedHeaders = mergeVaryHeader(baseHeaders, "Accept-Encoding");
+			if (encoding !== "identity") notModifiedHeaders["Content-Encoding"] = encoding;
+			res.writeHead(304, notModifiedHeaders);
+			res.end();
+			return true;
+		}
+		if (encoding !== "identity") {
+			res.writeHead(responseStatus, mergeVaryHeader({
 				...baseHeaders,
-				"Content-Encoding": encoding,
-				Vary: "Accept-Encoding"
-			});
+				"Content-Encoding": encoding
+			}, "Accept-Encoding"));
 			if (omitBody || req.method === "HEAD") {
 				res.end();
 				return true;
@@ -468,10 +477,17 @@ async function tryServeStatic(req, res, clientDir, pathname, compress, cache, ex
 			return true;
 		}
 	}
-	res.writeHead(responseStatus, {
+	const ifNoneMatch = req.headers["if-none-match"];
+	if (responseStatus === 200 && typeof ifNoneMatch === "string" && matchesIfNoneMatchHeader(ifNoneMatch, etag)) {
+		res.writeHead(304, isCompressible ? mergeVaryHeader(baseHeaders, "Accept-Encoding") : baseHeaders);
+		res.end();
+		return true;
+	}
+	const identityHeaders = {
 		...baseHeaders,
 		"Content-Length": String(resolved.size)
-	});
+	};
+	res.writeHead(responseStatus, isCompressible ? mergeVaryHeader(identityHeaders, "Accept-Encoding") : identityHeaders);
 	if (omitBody || req.method === "HEAD") {
 		res.end();
 		return true;
@@ -568,25 +584,22 @@ async function sendWebResponse(webResponse, req, res, compress) {
 		if (existing !== void 0) nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
 		else nodeHeaders[key] = value;
 	});
+	const alreadyEncoded = webResponse.headers.get("content-encoding") !== null;
 	if (!webResponse.body) {
 		writeHead(nodeHeaders);
 		res.end();
 		return;
 	}
-	const alreadyEncoded = webResponse.headers.has("content-encoding");
 	const baseType = (webResponse.headers.get("content-type") ?? "").split(";")[0].trim();
-	const encoding = compress && !alreadyEncoded ? negotiateEncoding(req) : null;
-	const shouldCompress = !!(encoding && COMPRESSIBLE_TYPES.has(baseType));
+	const varyByEncoding = compress && !alreadyEncoded && COMPRESSIBLE_TYPES.has(baseType);
+	const encoding = compress && !alreadyEncoded ? negotiateEncoding(req) : "identity";
+	const shouldCompress = encoding !== "identity" && COMPRESSIBLE_TYPES.has(baseType);
 	if (shouldCompress) {
 		delete nodeHeaders["content-length"];
 		delete nodeHeaders["Content-Length"];
 		nodeHeaders["Content-Encoding"] = encoding;
-		const existingVary = nodeHeaders["Vary"] ?? nodeHeaders["vary"];
-		if (existingVary) {
-			if (!String(existingVary).toLowerCase().includes("accept-encoding")) nodeHeaders["Vary"] = existingVary + ", Accept-Encoding";
-		} else nodeHeaders["Vary"] = "Accept-Encoding";
 	}
-	writeHead(nodeHeaders);
+	writeHead(varyByEncoding ? mergeVaryHeader(nodeHeaders, "Accept-Encoding") : nodeHeaders);
 	if (req.method === "HEAD") {
 		cancelResponseBody(webResponse);
 		res.end();

package/dist/shims/font-google-base.d.ts

@@ -19,6 +19,7 @@ type FontResult = {
 };
 type InternalGoogleFontRuntimeOptions = {
   selfHostedCSS?: string;
+  preloadUrls?: string[];
   adjustedFallbackCSS?: string;
   fontWeight?: number;
   fontStyle?: "normal" | "italic";

package/dist/shims/font-google-base.js

@@ -206,27 +206,12 @@ function getSSRFontPreloads() {
 	return [...ssrFontPreloads];
 }
 /**
-* Extract font file URLs from @font-face CSS rules.
-* Parses url('...') references from the CSS text.
-*/
-function extractFontUrlsFromCSS(css) {
-	const urls = [];
-	const urlRegex = /url\(['"]?([^'")]+)['"]?\)/g;
-	let match;
-	while ((match = urlRegex.exec(css)) !== null) {
-		const url = match[1];
-		if (url && url.startsWith("/")) urls.push(url);
-	}
-	return urls;
-}
-/**
-* Collect font file URLs from self-hosted CSS for preload link generation.
+* Collect build-selected font file URLs for preload link generation.
 * Only collects on the server (SSR). Deduplicates by href using a Set for O(1) lookups.
 */
-function collectFontPreloadsFromCSS(css) {
+function collectFontPreloads(urls) {
 	if (typeof document !== "undefined") return;
-	const urls = extractFontUrlsFromCSS(css);
-	for (const href of urls) if (!ssrFontPreloadHrefs.has(href)) {
+	for (const href of urls) if (href.startsWith("/") && !ssrFontPreloadHrefs.has(href)) {
 		ssrFontPreloadHrefs.add(href);
 		ssrFontPreloads.push({
 			href,
@@ -240,10 +225,10 @@ const injectedSelfHosted = /* @__PURE__ */ new Set();
 * Inject self-hosted @font-face CSS (from the build plugin).
 * This replaces the CDN <link> tag with inline CSS.
 */
-function injectSelfHostedCSS(css) {
+function injectSelfHostedCSS(css, preloadUrls = []) {
+	collectFontPreloads(preloadUrls);
 	if (injectedSelfHosted.has(css)) return;
 	injectedSelfHosted.add(css);
-	collectFontPreloadsFromCSS(css);
 	if (typeof document === "undefined") {
 		ssrFontStyles.push(css);
 		return;
@@ -277,7 +262,7 @@ function createFontLoader(family) {
 			internalStyle: internal?.fontStyle,
 			google: true
 		});
-		if (internal?.selfHostedCSS) injectSelfHostedCSS(internal.selfHostedCSS);
+		if (internal?.selfHostedCSS) injectSelfHostedCSS(internal.selfHostedCSS, internal.preloadUrls);
 		else {
 			const url = buildGoogleFontsUrl(family, options);
 			injectFontStylesheet(url);

package/dist/shims/internal/interpolate-as.d.ts

@@ -0,0 +1,25 @@
+import { UrlQuery } from "../../utils/query.js";
+
+//#region src/shims/internal/interpolate-as.d.ts
+/**
+ * Wire-compatible alias for Node's `querystring.ParsedUrlQuery`. Inlined here
+ * so this module has no dependency on the `querystring` types package.
+ */
+type ParsedUrlQuery = {
+  [key: string]: string | string[] | undefined;
+};
+type DynamicRouteHrefProjection = {
+  href: string;
+  params: string[];
+  query: ParsedUrlQuery;
+  routePathname: string;
+};
+/**
+ * Resolve a bracket-pattern route href against its displayed href. Query
+ * values can be supplied directly (object-form hrefs) or parsed from the route
+ * href (string-form hrefs). A `?` after `#` is part of the fragment, not a
+ * query delimiter.
+ */
+declare function interpolateDynamicRouteHref(routeHref: string, asHref: string, queryInput?: UrlQuery): DynamicRouteHrefProjection | null;
+//#endregion
+export { DynamicRouteHrefProjection, interpolateDynamicRouteHref };