vinext 0.1.8 → 0.2.1

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

@@ -1,8 +1,10 @@
 import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
+import { patternToNextFormat } from "../routing/route-validation.js";
 import { applyMiddlewareRequestHeaders, isExternalUrl, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 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) {
@@ -141,6 +143,22 @@ async function runPagesRequest(request, deps) {
 	});
 	let resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 	const matchResolvedPathname = (p) => i18nConfig ? normalizeDefaultLocalePathname(p, i18nConfig, { hostname: requestHostname }) : p;
+	const matchedPathnameForRoute = (routePattern) => {
+		const matchedPathname = routePattern ? patternToNextFormat(routePattern) : resolvedPathname;
+		if (!i18nConfig) return matchedPathname;
+		const resolvedLocale = resolvedPathname.split("/", 3)[1];
+		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,
@@ -170,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;
@@ -204,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);
@@ -215,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;
@@ -231,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 {
@@ -240,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();
@@ -248,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();
@@ -264,16 +289,33 @@ 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;
+			renderPageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
 			response = await deps.renderPage(request, resolvedUrl, void 0, stagedHeaders);
 			matchedFallbackRewrite = true;
 			if (response.status !== 404) break;
 		}
 		if (response.status === 404 && shouldDeferErrorPageOnMiss && !matchedFallbackRewrite) response = await deps.renderPage(request, resolvedUrl, void 0, stagedHeaders);
-		const merged = mergeHeaders(response, middlewareHeaders, middlewareStatus);
+		const matchedPathHeaders = { ...middlewareHeaders };
+		if ((isDataReq || isDataRequest) && deps.hasMiddleware && !renderPageMatch && response.status === 404 && (middlewareStatus === void 0 || middlewareStatus === 200 || middlewareStatus === 404)) {
+			const headers = new Headers(response.headers);
+			headers.set("content-type", "application/json");
+			headers.set("x-nextjs-matched-path", matchResolvedPathname(pathname));
+			return {
+				type: "response",
+				response: mergeHeaders(new Response("{}", {
+					status: 200,
+					headers
+				}), matchedPathHeaders, void 0),
+				defaultContentType: "application/json"
+			};
+		}
+		if ((isDataReq || isDataRequest) && renderPageMatch && (middlewareStatus ?? response.status) === 200) matchedPathHeaders["x-nextjs-matched-path"] = matchedPathnameForRoute(renderPageMatch?.route.pattern);
+		const merged = mergeHeaders(response, matchedPathHeaders, middlewareStatus);
 		if (merged !== response) merged.__vinextStreamedHtmlResponse = response.__vinextStreamedHtmlResponse;
 		return {
 			type: "response",
@@ -281,7 +323,8 @@ async function runPagesRequest(request, deps) {
 			defaultContentType: "text/html"
 		};
 	}
-	if (!(resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch) && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
+	let devPageMatch = isOutsideBasePathUnclaimed() ? null : resolvedPathnameChanged ? deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null : pageMatch;
+	if (!devPageMatch && configRewrites.fallback?.length) for (const rewrite of configRewrites.fallback) {
 		const fallbackRewrite = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
 		if (!fallbackRewrite) continue;
 		if (isExternalUrl(fallbackRewrite)) return {
@@ -290,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.d.ts

@@ -0,0 +1,30 @@
+//#region src/server/pages-router-entry.d.ts
+/**
+ * Router-specific Cloudflare Worker entry point for vinext Pages Router.
+ *
+ * New projects should usually use the router-selected entry in wrangler.jsonc:
+ *   "main": "vinext/server/fetch-handler"
+ *
+ * This Pages Router entry remains available for existing configs and for custom
+ * workers that need to opt into the Pages Router handler explicitly:
+ *   "main": "vinext/server/pages-router-entry"
+ *
+ * Or import and delegate to it from a custom worker:
+ *   import handler from "vinext/server/pages-router-entry";
+ *   return handler.fetch(request, env, ctx);
+ */
+type AssetFetcher = {
+  fetch(request: Request): Promise<Response> | Response;
+};
+type PagesWorkerEnv = {
+  ASSETS?: AssetFetcher;
+} & Record<string, unknown>;
+type PagesWorkerExecutionContext = {
+  waitUntil?(promise: Promise<unknown>): void;
+  passThroughOnException?(): void;
+};
+declare const _default: {
+  fetch(request: Request, env?: PagesWorkerEnv, ctx?: PagesWorkerExecutionContext): Promise<Response>;
+};
+//#endregion
+export { _default as default };

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

@@ -0,0 +1,108 @@
+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 { 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";
+import { registerConfiguredImageOptimizer } from "virtual:vinext-image-adapters";
+import * as pagesEntry from "virtual:vinext-server-entry";
+//#region src/server/pages-router-entry.ts
+/**
+* Router-specific Cloudflare Worker entry point for vinext Pages Router.
+*
+* New projects should usually use the router-selected entry in wrangler.jsonc:
+*   "main": "vinext/server/fetch-handler"
+*
+* This Pages Router entry remains available for existing configs and for custom
+* workers that need to opt into the Pages Router handler explicitly:
+*   "main": "vinext/server/pages-router-entry"
+*
+* Or import and delegate to it from a custom worker:
+*   import handler from "vinext/server/pages-router-entry";
+*   return handler.fetch(request, env, ctx);
+*/
+const { handleApiRoute, hasMiddleware, matchPageRoute, normalizeDataRequest, renderPage, runMiddleware, vinextConfig } = pagesEntry;
+const basePath = vinextConfig?.basePath ?? "";
+const assetPathPrefix = assetPrefixPathname(vinextConfig?.assetPrefix ?? "");
+const trailingSlash = vinextConfig?.trailingSlash ?? false;
+const i18nConfig = vinextConfig?.i18n ?? null;
+const configRedirects = vinextConfig?.redirects ?? [];
+const configRewrites = vinextConfig?.rewrites ?? {
+	beforeFiles: [],
+	afterFiles: [],
+	fallback: []
+};
+const configHeaders = vinextConfig?.headers ?? [];
+const imageConfig = vinextConfig?.images ? {
+	qualities: vinextConfig.images.qualities,
+	dangerouslyAllowSVG: vinextConfig.images.dangerouslyAllowSVG,
+	dangerouslyAllowLocalIP: vinextConfig.images.dangerouslyAllowLocalIP,
+	contentDispositionType: vinextConfig.images.contentDispositionType,
+	contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
+} : void 0;
+var pages_router_entry_default = { async fetch(request, env, ctx) {
+	return handleRequest(request, env, ctx);
+} };
+async function handleRequest(request, env, ctx) {
+	registerConfiguredCacheAdapters(env);
+	registerConfiguredImageOptimizer(env);
+	try {
+		let pathname = new URL(request.url).pathname;
+		if (isOpenRedirectShaped(pathname)) return new Response("This page could not be found", { status: 404 });
+		const missingBuildAsset = isNextStaticPath(pathname, basePath, assetPathPrefix);
+		request = cloneRequestWithHeaders(request, filterInternalHeaders(request.headers));
+		const hadBasePath = !basePath || hasBasePath(pathname, basePath);
+		{
+			const stripped = stripBasePath(pathname, basePath);
+			if (stripped !== pathname) {
+				const strippedUrl = new URL(request.url);
+				strippedUrl.pathname = stripped;
+				request = cloneRequestWithUrl(request, strippedUrl.toString());
+				pathname = stripped;
+			}
+		}
+		const dataNorm = normalizeDataRequest(request);
+		if (dataNorm.notFoundResponse) return dataNorm.notFoundResponse;
+		const isDataReq = dataNorm.isDataReq;
+		if (isDataReq) {
+			request = dataNorm.request;
+			pathname = dataNorm.normalizedPathname;
+		}
+		if (isImageOptimizationPath(pathname) && env?.ASSETS) {
+			const allowedWidths = [...vinextConfig?.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...vinextConfig?.images?.imageSizes ?? DEFAULT_IMAGE_SIZES];
+			return handleConfiguredImageOptimization(request, (assetPath) => Promise.resolve(env.ASSETS.fetch(new Request(new URL(assetPath, request.url)))), allowedWidths, imageConfig);
+		}
+		const deps = {
+			basePath,
+			trailingSlash,
+			i18nConfig,
+			configRedirects,
+			configRewrites,
+			configHeaders,
+			hadBasePath,
+			isDataReq,
+			isDataRequest: isDataReq,
+			hasMiddleware,
+			ctx,
+			matchPageRoute: typeof matchPageRoute === "function" ? matchPageRoute : null,
+			runMiddleware: typeof runMiddleware === "function" ? wrapMiddlewareWithBasePath(runMiddleware, basePath, hadBasePath) : null,
+			renderPage: typeof renderPage === "function" ? (req, resolvedUrl, options, stagedHeaders) => renderPage(req, resolvedUrl, null, ctx, stagedHeaders, options) : null,
+			handleApi: typeof handleApiRoute === "function" ? (req, apiUrl) => handleApiRoute(req, apiUrl, ctx) : null,
+			serveFilesystemRoute: async (requestPathname, _stagedHeaders, phase) => {
+				if (!env?.ASSETS) return false;
+				return fetchWorkerFilesystemRoute(request, requestPathname, phase, (assetRequest) => Promise.resolve(env.ASSETS.fetch(assetRequest)));
+			}
+		};
+		const result = await runPagesRequest(request, deps);
+		if (result.type === "response") return finalizeMissingStaticAssetResponse(result.response, missingBuildAsset);
+		return missingBuildAsset ? notFoundStaticAssetResponse() : new Response("This page could not be found", { status: 404 });
+	} catch (error) {
+		console.error("[vinext] Worker error:", error);
+		return new Response("Internal Server Error", { status: 500 });
+	}
+}
+//#endregion
+export { pages_router_entry_default as default };

package/dist/server/prerender-manifest.d.ts

@@ -7,11 +7,13 @@ type PrerenderManifestRoute = {
   path?: string;
   router?: string;
   fallback?: boolean;
+  headers?: Record<string, string>;
 };
 type PrerenderManifest = {
   buildId?: string;
   trailingSlash?: boolean;
   routes?: PrerenderManifestRoute[];
+  pregeneratedConcretePaths?: Array<[string, string[]]>;
 };
 declare function readPrerenderManifest(manifestPath: string): PrerenderManifest | null;
 declare function getRenderedAppRoutes(routes: PrerenderManifestRoute[]): PrerenderManifestRoute[];
@@ -30,4 +32,4 @@ declare function isFallbackShellArtifactPath(pathname: string, route?: Prerender
  */
 declare function buildPregeneratedConcretePathTable(manifest: PrerenderManifest): Array<[string, string[]]>;
 //#endregion
-export { buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };
+export { PrerenderManifest, buildPregeneratedConcretePathTable, getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest };

package/dist/server/prerender-route-params.js

@@ -1,4 +1,4 @@
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "./headers.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
 //#region src/server/prerender-route-params.ts
 function isPrerenderRouteParams(value) {

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

@@ -41,6 +41,7 @@ import { IncomingMessage, ServerResponse } from "node:http";
  * Exported for direct unit testing of the URL choice.
  */
 declare function resolveServerEntryImportUrl(entryPath: string): string;
+declare function rememberCurrentServerEntryImportMtime(entryPath: string): void;
 declare function importServerEntryModule(entryPath: string): Promise<any>;
 /** Convert a Node.js IncomingMessage into a ReadableStream for Web Request body. */
 declare function readNodeStream(req: IncomingMessage): ReadableStream<Uint8Array>;
@@ -54,7 +55,8 @@ type ProdServerOptions = {
    * Omitted for normal `vinext start` so the existing production-server output
    * remains stable.
    */
-  purpose?: "prerender";
+  purpose?: "prerender"; /** Suppress the startup log for internal child-process servers. */
+  silent?: boolean;
 };
 /** Content types that benefit from compression. */
 declare const COMPRESSIBLE_TYPES: Set<string>;
@@ -74,7 +76,7 @@ declare function mergeResponseHeaders(middlewareHeaders: Record<string, string |
  * arguments in (headers, response) order. The request path now calls
  * `runPagesRequest`, which uses `mergeHeaders` directly; this wrapper is retained
  * only for its existing tests and any external callers, so there is a single
- * implementation to keep in sync. (deploy.ts still emits its own generated copy.)
+ * implementation to keep in sync. The init-owned Cloudflare Worker template delegates here.
  */
 declare function mergeWebResponse(middlewareHeaders: Record<string, string | string[]>, response: Response, statusOverride?: number): Response;
 /**
@@ -145,4 +147,4 @@ declare function resolveAppRouterPrerenderSeeder(entryModule: unknown): AppRoute
  */
 declare function resolveAppRouterAssetPath(pathname: string, assetPathPrefix: string, assetPrefix: string): string | null;
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

package/dist/server/prod-server.js

@@ -1,22 +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, VINEXT_STATIC_FILE_HEADER } from "./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, 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 { buildNextDataNotFoundResponse, isNextDataPathname, parseNextDataPathname } from "./pages-data-route.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
-import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
+import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
@@ -24,9 +26,9 @@ import fs from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import { pathToFileURL } from "node:url";
+import { Readable, pipeline } from "node:stream";
 import zlib from "node:zlib";
 import { createServer } from "node:http";
-import { Readable, pipeline } from "node:stream";
 //#region src/server/prod-server.ts
 /**
 * Production server for vinext.
@@ -54,6 +56,18 @@ import { Readable, pipeline } from "node:stream";
 * 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.
@@ -91,14 +105,7 @@ const bareServerEntryMtimes = /* @__PURE__ */ new Map();
 * Exported for direct unit testing of the URL choice.
 */
 function resolveServerEntryImportUrl(entryPath) {
-	let canonicalEntryPath;
-	try {
-		canonicalEntryPath = fs.realpathSync.native(entryPath);
-	} catch {
-		canonicalEntryPath = entryPath;
-	}
-	const href = pathToFileURL(canonicalEntryPath).href;
-	const mtime = fs.statSync(canonicalEntryPath).mtimeMs;
+	const { href, mtime } = resolveCanonicalServerEntry(entryPath);
 	const bareMtime = bareServerEntryMtimes.get(href);
 	if (bareMtime === void 0 || bareMtime === mtime) {
 		bareServerEntryMtimes.set(href, mtime);
@@ -106,6 +113,10 @@ function resolveServerEntryImportUrl(entryPath) {
 	}
 	return `${href}?t=${mtime}`;
 }
+function rememberCurrentServerEntryImportMtime(entryPath) {
+	const { href, mtime } = resolveCanonicalServerEntry(entryPath);
+	bareServerEntryMtimes.set(href, mtime);
+}
 async function importServerEntryModule(entryPath) {
 	return import(resolveServerEntryImportUrl(entryPath));
 }
@@ -275,8 +286,11 @@ function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
 		assetBase,
 		assetPrefix
 	});
-	globalThis.__VINEXT_LAZY_CHUNKS__ = metadata.lazyChunks;
-	globalThis.__VINEXT_DYNAMIC_PRELOADS__ = metadata.dynamicPreloads;
+	setPagesClientAssets({
+		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		lazyChunks: metadata.lazyChunks,
+		dynamicPreloads: metadata.dynamicPreloads
+	});
 }
 function isNoBodyResponseStatus(status) {
 	return NO_BODY_RESPONSE_STATUSES.has(status);
@@ -305,7 +319,7 @@ function logProdServerStarted(host, port, purpose) {
 * arguments in (headers, response) order. The request path now calls
 * `runPagesRequest`, which uses `mergeHeaders` directly; this wrapper is retained
 * only for its existing tests and any external callers, so there is a single
-* implementation to keep in sync. (deploy.ts still emits its own generated copy.)
+* implementation to keep in sync. The init-owned Cloudflare Worker template delegates here.
 */
 function mergeWebResponse(middlewareHeaders, response, statusOverride) {
 	return mergeHeaders(response, middlewareHeaders, statusOverride);
@@ -552,9 +566,11 @@ function nodeToWebRequest(req, urlOverride, prerenderSecret) {
 	const url = new URL(urlOverride ?? req.url ?? "/", origin);
 	const rawHeaders = nodeHeadersToWebHeaders(req.headers);
 	const prerenderRouteParamsPayload = readTrustedPrerenderRouteParamsFromHeaders(rawHeaders, prerenderSecret);
+	const isTrustedSpeculativePrerender = process.env.VINEXT_PRERENDER === "1" && prerenderSecret !== void 0 && rawHeaders.get("x-vinext-prerender-secret") === prerenderSecret && rawHeaders.get("x-vinext-prerender-speculative") === "1";
 	const headers = filterInternalHeaders(rawHeaders);
 	const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);
 	if (prerenderRouteParamsHeader !== null) headers.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+	if (isTrustedSpeculativePrerender) headers.set(VINEXT_PRERENDER_SPECULATIVE_HEADER, "1");
 	const method = req.method ?? "GET";
 	const hasBody = method !== "GET" && method !== "HEAD";
 	const init = {
@@ -617,7 +633,7 @@ async function sendWebResponse(webResponse, req, res, compress) {
 */
 async function startProdServer(options = {}) {
 	installSocketErrorBackstop();
-	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), noCompression = false, purpose } = options;
+	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), noCompression = false, purpose, silent = false } = options;
 	const compress = !noCompression;
 	const resolvedOutDir = path.resolve(outDir);
 	const clientDir = path.join(resolvedOutDir, "client");
@@ -635,7 +651,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		rscEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 	return startPagesRouterServer({
 		port,
@@ -643,7 +660,8 @@ async function startProdServer(options = {}) {
 		clientDir,
 		serverEntryPath,
 		compress,
-		purpose
+		purpose,
+		silent
 	});
 }
 function createNodeExecutionContext() {
@@ -736,18 +754,21 @@ function readSsrManifest(clientDir) {
 	}
 	return parsed;
 }
-function installPagesClientAssetGlobals(options) {
+function installPagesClientAssets(options) {
 	const ssrManifest = readSsrManifest(options.clientDir);
-	globalThis.__VINEXT_SSR_MANIFEST__ = Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0;
 	const metadata = computeClientRuntimeMetadata({
 		clientDir: options.clientDir,
 		assetBase: options.assetBase,
 		assetPrefix: options.assetPrefix,
 		includeClientEntry: options.clientEntryLookup === "pages-client-entry" ? "pages-client-entry" : true
 	});
-	globalThis.__VINEXT_CLIENT_ENTRY__ = metadata.clientEntryFile;
-	globalThis.__VINEXT_LAZY_CHUNKS__ = metadata.lazyChunks;
-	globalThis.__VINEXT_DYNAMIC_PRELOADS__ = metadata.dynamicPreloads;
+	setPagesClientAssets({
+		clientEntry: metadata.clientEntryFile,
+		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
+		ssrManifest: Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0,
+		lazyChunks: metadata.lazyChunks,
+		dynamicPreloads: metadata.dynamicPreloads
+	});
 	return ssrManifest;
 }
 /**
@@ -768,12 +789,7 @@ function installPagesClientAssetGlobals(options) {
 * 4. Stream the Web Response back (with optional compression)
 */
 async function startAppRouterServer(options) {
-	const { port, host, clientDir, rscEntryPath, compress, purpose } = options;
-	let imageConfig;
-	const imageConfigPath = path.join(path.dirname(rscEntryPath), "image-config.json");
-	if (fs.existsSync(imageConfigPath)) try {
-		imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
-	} catch {}
+	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);
@@ -781,10 +797,18 @@ async function startAppRouterServer(options) {
 	const appRouterBasePath = typeof rscModule.__basePath === "string" ? rscModule.__basePath : "";
 	const appRouterInlineCss = rscModule.__inlineCss === true;
 	const appRouterHasPagesDir = rscModule.__hasPagesDir === true;
+	const appImageAllowedWidths = Array.isArray(rscModule.__imageAllowedWidths) ? rscModule.__imageAllowedWidths : [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES];
+	let imageConfig = typeof rscModule.__imageConfig === "object" && rscModule.__imageConfig !== null ? rscModule.__imageConfig : void 0;
+	if (imageConfig === void 0) {
+		const imageConfigPath = path.join(path.dirname(rscEntryPath), "image-config.json");
+		if (fs.existsSync(imageConfigPath)) try {
+			imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
+		} catch {}
+	}
 	globalThis.__VINEXT_INLINE_CSS__ = appRouterInlineCss ? collectInlineCssManifest(clientDir, appRouterAssetPrefix) : void 0;
 	const appAssetPathPrefix = assetPrefixPathname(appRouterAssetPrefix);
 	const appAssetBase = appRouterBasePath ? `${appRouterBasePath}/` : "/";
-	if (appRouterHasPagesDir) installPagesClientAssetGlobals({
+	if (appRouterHasPagesDir) installPagesClientAssets({
 		clientDir,
 		assetPrefix: appRouterAssetPrefix,
 		assetBase: appAssetBase,
@@ -828,7 +852,7 @@ async function startAppRouterServer(options) {
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
-			const params = parseImageParams(new URL(rawUrl, "http://localhost"), [...imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], imageConfig?.qualities);
+			const params = parseImageParams(new URL(rawUrl, "http://localhost"), appImageAllowedWidths, imageConfig?.qualities);
 			if (!params) {
 				res.writeHead(400);
 				res.end("Bad Request");
@@ -888,7 +912,8 @@ async function startAppRouterServer(options) {
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
 			const addr = server.address();
-			logProdServerStarted(host, typeof addr === "object" && addr ? addr.port : port, purpose);
+			const actualPort = typeof addr === "object" && addr ? addr.port : port;
+			if (!silent) logProdServerStarted(host, actualPort, purpose);
 			resolve();
 		});
 	});
@@ -919,10 +944,11 @@ 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;
+	const hasMiddleware = serverEntry.hasMiddleware === true;
 	const pageRoutes = readPagesServerEntryPageRoutes(serverEntry.pageRoutes);
 	const prerenderSecret = readPrerenderSecret(path.dirname(serverEntryPath));
 	const basePath = vinextConfig?.basePath ?? "";
@@ -946,7 +972,7 @@ async function startPagesRouterServer(options) {
 		contentDispositionType: vinextConfig.images.contentDispositionType,
 		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
 	} : void 0;
-	const ssrManifest = installPagesClientAssetGlobals({
+	const ssrManifest = installPagesClientAssets({
 		clientDir,
 		assetPrefix,
 		assetBase,
@@ -1050,8 +1076,9 @@ async function startPagesRouterServer(options) {
 				}
 				isDataReq = true;
 				const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-				url = dataMatch.pagePathname + qs;
-				pathname = dataMatch.pagePathname;
+				const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, hasMiddleware && trailingSlash);
+				url = pagePathname + qs;
+				pathname = pagePathname;
 			}
 			const protocol = resolveRequestProtocol(req);
 			const hostHeader = resolveRequestHost(req, `${host}:${port}`);
@@ -1075,6 +1102,7 @@ async function startPagesRouterServer(options) {
 				hadBasePath,
 				isDataReq,
 				isDataRequest,
+				hasMiddleware,
 				ctx: void 0,
 				rawSearch: rawQs,
 				matchPageRoute: matchPageRoute ?? null,
@@ -1131,7 +1159,8 @@ async function startPagesRouterServer(options) {
 	await new Promise((resolve) => {
 		server.listen(port, host, () => {
 			const addr = server.address();
-			logProdServerStarted(host, typeof addr === "object" && addr ? addr.port : port, purpose);
+			const actualPort = typeof addr === "object" && addr ? addr.port : port;
+			if (!silent) logProdServerStarted(host, actualPort, purpose);
 			resolve();
 		});
 	});
@@ -1142,4 +1171,4 @@ async function startPagesRouterServer(options) {
 	};
 }
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

package/dist/server/request-pipeline.js

@@ -1,4 +1,5 @@
 import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import "../utils/protocol-headers.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { matchHeaders } from "../config/config-matchers.js";
 import { forbiddenResponse, notFoundResponse } from "./http-error-responses.js";
@@ -337,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]);