vinext 0.1.7 → 0.2.0

package/dist/server/pages-page-handler.js

@@ -14,12 +14,18 @@ import { resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
+import { renderPagesPageResponse } from "./pages-page-response.js";
+import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
+import { resolvePagesPageData } from "./pages-page-data.js";
 import { createPagesReqRes } from "./pages-node-compat.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
-import { renderPagesPageResponse } from "./pages-page-response.js";
-import { resolvePagesPageData } from "./pages-page-data.js";
 //#region src/server/pages-page-handler.ts
+function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
+	if (typeof pageModule.getServerSideProps === "function") return true;
+	if (typeof pageModule.getStaticProps === "function") return false;
+	return hasPagesGetInitialProps(pageModule.default) || hasPagesGetInitialProps(appComponent);
+}
 function buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales) {
 	return {
 		locale,
@@ -182,6 +188,12 @@ function createPagesPageHandler(opts) {
 					if (allFontPreloads.length > 0) fontLinkHeader = allFontPreloads.map((p) => "<" + appendAssetDeploymentIdQuery(p.href) + ">; rel=preload; as=font; type=" + p.type + "; crossorigin").join(", ");
 				} catch {}
 				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
+				const createPageReqRes = () => createPagesReqRes({
+					body: void 0,
+					query,
+					request,
+					url: originalRequestPathAndSearch
+				});
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
@@ -189,14 +201,7 @@ function createPagesPageHandler(opts) {
 					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
 					htmlLimitedBots: vinextConfig.htmlLimitedBots,
-					createGsspReqRes() {
-						return createPagesReqRes({
-							body: void 0,
-							query,
-							request,
-							url: originalRequestPathAndSearch
-						});
-					},
+					createGsspReqRes: createPageReqRes,
 					createAppTree(appTreeProps) {
 						const el = createPageElement(PageComponent, AppComponent, appTreeProps);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
@@ -264,6 +269,7 @@ function createPagesPageHandler(opts) {
 					};
 				}
 				const gsspRes = pageDataResult.gsspRes;
+				const documentReqRes = serializedPagesNextData.autoExport === true ? null : pageDataResult.documentReqRes ?? createPageReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
 				if (isFallbackRender && typeof setSSRContext === "function") setSSRContext({
@@ -334,7 +340,8 @@ function createPagesPageHandler(opts) {
 					getFontLinks,
 					getFontStyles,
 					getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : void 0,
-					clientTraceMetadata: vinextConfig.clientTraceMetadata,
+					clientTraceMetadata: shouldEmitPagesClientTraceMetadata(pageModule, AppComponent) ? vinextConfig.clientTraceMetadata : void 0,
+					documentReqRes,
 					gsspRes,
 					isrCacheKey: pageIsrCacheKey,
 					expireSeconds: vinextConfig.expireTime,
@@ -400,4 +407,4 @@ function createPagesPageHandler(opts) {
 	return renderPage;
 }
 //#endregion
-export { createPagesPageHandler };
+export { createPagesPageHandler, shouldEmitPagesClientTraceMetadata };

package/dist/server/pages-page-response.d.ts

@@ -45,9 +45,15 @@ type PagesI18nRenderContext = {
   domainLocales?: unknown;
 };
 type PagesGsspResponse = {
+  headersSent?: boolean;
   statusCode: number;
   getHeaders(): Record<string, string | number | boolean | string[]>;
 };
+type PagesDocumentReqRes = {
+  req: unknown;
+  res: PagesGsspResponse;
+  responsePromise?: Promise<Response>;
+};
 type RenderPagesPageResponseOptions = {
   assetTags: string;
   buildId: string | null;
@@ -80,6 +86,7 @@ type RenderPagesPageResponseOptions = {
    */
   clientTraceMetadata?: readonly string[] | undefined;
   setDocumentInitialHead?: ((head: ReactNode[]) => void) | undefined;
+  documentReqRes?: PagesDocumentReqRes | null;
   gsspRes: PagesGsspResponse | null;
   isrCacheKey: (router: string, pathname: string) => string;
   expireSeconds?: number;

package/dist/server/pages-page-response.js

@@ -197,11 +197,14 @@ async function renderPagesPageResponse(options) {
 		scriptNonce: options.scriptNonce,
 		context: {
 			err: options.err,
+			req: options.documentReqRes?.req,
+			res: options.documentReqRes?.res,
 			pathname: options.routePattern,
 			query: options.query ?? options.params,
 			asPath: options.routeUrl
 		}
 	});
+	if (options.documentReqRes?.res.headersSent && options.documentReqRes.responsePromise) return options.documentReqRes.responsePromise;
 	let bodyStream;
 	if (documentRenderPage.status === "rendered") bodyStream = new ReadableStream({ start(controller) {
 		controller.enqueue(new TextEncoder().encode(documentRenderPage.bodyHtml));
@@ -230,7 +233,7 @@ async function renderPagesPageResponse(options) {
 	const shellPrefix = shellHtml.slice(0, markerIndex);
 	const shellSuffix = shellHtml.slice(markerIndex + 25);
 	const responseHeaders = new Headers({ "Content-Type": "text/html" });
-	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes, options.statusCode);
+	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes ?? options.documentReqRes?.res ?? null, options.statusCode);
 	let responseBodyStream = bodyStream;
 	if (!options.scriptNonce && options.isrRevalidateSeconds !== null && options.isrRevalidateSeconds > 0) {
 		const cacheBodyStreamPair = bodyStream.tee();

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

@@ -34,11 +34,13 @@ type PagesPipelineDeps = {
   hadBasePath: boolean;
   isDataReq: boolean;
   isDataRequest: boolean;
+  hasMiddleware: boolean;
   ctx?: unknown;
   rawSearch?: string;
   matchPageRoute?: ((pathname: string, request: Request) => {
     route: {
       isDynamic: boolean;
+      pattern?: string;
     };
   } | null) | null;
   runMiddleware?: ((request: Request, ctx: unknown, opts: {

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

@@ -1,4 +1,5 @@
 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";
@@ -141,6 +142,13 @@ 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);
+	};
 	if (configHeaders.length) applyConfigHeadersToHeaderRecord(middlewareHeaders, {
 		configHeaders,
 		pathname: matchPathname,
@@ -268,12 +276,28 @@ async function runPagesRequest(request, deps) {
 			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",

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 { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.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

@@ -74,7 +74,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;
 /**

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 } from "../utils/protocol-headers.js";
+import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { filterInternalHeaders } from "./request-pipeline.js";
 import { isUnknownRecord } from "../utils/record.js";
+import { buildNextDataNotFoundResponse, isNextDataPathname, parseNextDataPathname } from "./pages-data-route.js";
 import { 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 { setPagesClientAssets } from "./pages-client-assets.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
@@ -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.
@@ -275,8 +277,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 +310,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);
@@ -736,18 +741,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;
 }
 /**
@@ -769,11 +777,6 @@ function installPagesClientAssetGlobals(options) {
 */
 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 prerenderSecret = readPrerenderSecret(path.dirname(rscEntryPath));
 	const rscModule = await importServerEntryModule(rscEntryPath);
 	const rscHandler = resolveAppRouterHandler(rscModule.default);
@@ -781,10 +784,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,
@@ -819,17 +830,16 @@ async function startAppRouterServer(options) {
 				return;
 			}
 		}
+		let missingBuildAsset = false;
 		{
 			const assetLookupPath = resolveAppRouterAssetPath(pathname, appAssetPathPrefix, appRouterAssetPrefix);
 			if (assetLookupPath) {
 				if (await tryServeStatic(req, res, clientDir, assetLookupPath, compress, staticCache)) return;
-				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-				res.end("Not Found");
-				return;
+				missingBuildAsset = true;
 			}
 		}
 		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");
@@ -868,6 +878,12 @@ async function startAppRouterServer(options) {
 				await sendWebResponse(notFoundResponse({ headers: toWebHeaders(staticResponseHeaders) }), req, res, compress);
 				return;
 			}
+			if (missingBuildAsset && response.status === 404) {
+				cancelResponseBody(response);
+				res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+				res.end("Not Found");
+				return;
+			}
 			await sendWebResponse(response, req, res, compress);
 		} catch (e) {
 			console.error("[vinext] Server error:", e);
@@ -918,6 +934,7 @@ async function startPagesRouterServer(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 ?? "";
@@ -941,7 +958,7 @@ async function startPagesRouterServer(options) {
 		contentDispositionType: vinextConfig.images.contentDispositionType,
 		contentSecurityPolicy: vinextConfig.images.contentSecurityPolicy
 	} : void 0;
-	const ssrManifest = installPagesClientAssetGlobals({
+	const ssrManifest = installPagesClientAssets({
 		clientDir,
 		assetPrefix,
 		assetBase,
@@ -1000,11 +1017,9 @@ async function startPagesRouterServer(options) {
 		}
 		const staticLookupPath = stripBasePath(pathname, basePath);
 		const pagesAssetLookup = resolveAppRouterAssetPath(pathname, pagesAssetPathPrefix, assetPrefix);
+		const missingBuildAsset = pagesAssetLookup !== null;
 		if (pagesAssetLookup) {
 			if (await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
-			res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
-			res.end("Not Found");
-			return;
 		}
 		if (isImageOptimizationPath(pathname) || isImageOptimizationPath(staticLookupPath)) {
 			const params = parseImageParams(new URL(rawUrl, "http://localhost"), allowedImageWidths, pagesImageConfig?.qualities);
@@ -1072,6 +1087,7 @@ async function startPagesRouterServer(options) {
 				hadBasePath,
 				isDataReq,
 				isDataRequest,
+				hasMiddleware,
 				ctx: void 0,
 				rawSearch: rawQs,
 				matchPageRoute: matchPageRoute ?? null,
@@ -1089,6 +1105,12 @@ async function startPagesRouterServer(options) {
 			if (result.type === "handled") return;
 			if (result.type === "response") {
 				const { response } = result;
+				if (missingBuildAsset && response.status === 404) {
+					cancelResponseBody(response);
+					res.writeHead(404, { "Content-Type": "text/plain; charset=utf-8" });
+					res.end("Not Found");
+					return;
+				}
 				if (isVinextStreamedHtmlResponse(response) || !response.body || result.defaultContentType === void 0) {
 					await sendWebResponse(response, req, res, compress);
 					return;

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

package/dist/server/seed-cache.js

@@ -1,8 +1,8 @@
 import { isrCacheKey, isrSetPrerenderedAppPage } from "./isr-cache.js";
+import { getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest } from "./prerender-manifest.js";
 import { buildAppPageCacheTags } from "./app-page-cache.js";
 import { getOutputPath, getRscOutputPath } from "../utils/prerender-output-paths.js";
 import { addPregeneratedConcretePath, clearPregeneratedConcretePaths, normalizePregeneratedPathname } from "./pregenerated-concrete-paths.js";
-import { getRenderedAppRoutes, isFallbackShellArtifactPath, readPrerenderManifest } from "./prerender-manifest.js";
 import fs from "node:fs";
 import path from "node:path";
 //#region src/server/seed-cache.ts
@@ -67,7 +67,7 @@ async function seedMemoryCacheFromPrerender(serverDir, options) {
 		const revalidateSeconds = typeof route.revalidate === "number" ? route.revalidate : void 0;
 		const expireSeconds = typeof route.expire === "number" ? route.expire : void 0;
 		const tags = buildAppPageCacheTags(cachePathname, []);
-		if (await seedHtml(writeAppPageEntry, prerenderDir, htmlKey, artifactPathname, trailingSlash, revalidateSeconds, expireSeconds, tags)) {
+		if (await seedHtml(writeAppPageEntry, prerenderDir, htmlKey, artifactPathname, trailingSlash, route.headers, revalidateSeconds, expireSeconds, tags)) {
 			await seedRsc(writeAppPageEntry, prerenderDir, rscKey, artifactPathname, revalidateSeconds, expireSeconds, tags);
 			seeded++;
 		}
@@ -81,7 +81,7 @@ function createDefaultAppPageEntryWriter() {
 * Seed the HTML cache entry for a single route.
 * Returns true if the file existed and was seeded.
 */
-async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailingSlash, revalidateSeconds, expireSeconds, tags) {
+async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailingSlash, headers, revalidateSeconds, expireSeconds, tags) {
 	const relPath = getOutputPath(pathname, trailingSlash);
 	const fullPath = path.join(prerenderDir, relPath);
 	if (!fs.existsSync(fullPath)) return false;
@@ -89,7 +89,7 @@ async function seedHtml(writeAppPageEntry, prerenderDir, key, pathname, trailing
 		kind: "APP_PAGE",
 		html: fs.readFileSync(fullPath, "utf-8"),
 		rscData: void 0,
-		headers: void 0,
+		headers,
 		postponed: void 0,
 		status: void 0
 	}, {

package/dist/server/worker-utils.d.ts

@@ -1,7 +1,8 @@
 //#region src/server/worker-utils.d.ts
+declare function finalizeMissingStaticAssetResponse(response: Response, missingBuildAsset: boolean): Response;
 declare function mergeHeaders(response: Response, extraHeaders: Record<string, string | string[]>, statusOverride?: number): Response;
 declare function resolveStaticAssetSignal(signalResponse: Response, options: {
   fetchAsset(path: string): Promise<Response>;
 }): Promise<Response | null>;
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };

package/dist/server/worker-utils.js

@@ -1,4 +1,5 @@
 import { VINEXT_STATIC_FILE_HEADER } from "./headers.js";
+import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 //#region src/server/worker-utils.ts
 /**
 * Shared utilities for Cloudflare Worker entries.
@@ -29,6 +30,11 @@ function cancelResponseBody(response) {
 	if (!body || body.locked) return;
 	body.cancel().catch(() => {});
 }
+function finalizeMissingStaticAssetResponse(response, missingBuildAsset) {
+	if (!missingBuildAsset || response.status !== 404) return response;
+	cancelResponseBody(response);
+	return notFoundStaticAssetResponse();
+}
 function buildHeaderRecord(response, omitNames = []) {
 	const omitted = new Set(omitNames.map((name) => name.toLowerCase()));
 	const headers = {};
@@ -96,4 +102,4 @@ async function resolveStaticAssetSignal(signalResponse, options) {
 	return mergeHeaders(assetResponse, extraHeaders, assetResponse.ok && signalResponse.status !== 200 ? signalResponse.status : void 0);
 }
 //#endregion
-export { mergeHeaders, resolveStaticAssetSignal };
+export { finalizeMissingStaticAssetResponse, mergeHeaders, resolveStaticAssetSignal };

package/dist/shims/app-router-scroll-state.d.ts

@@ -2,6 +2,7 @@
 type AppRouterScrollIntent = Readonly<{
   commitId: number | null;
   hash: string | null;
+  headElements: ReadonlySet<Element> | null;
   id: number;
   targetHoistedInHead: boolean;
 }>;