vinext 0.1.3 → 0.1.4

package/dist/server/pages-document-initial-props.js

@@ -19,19 +19,19 @@ import React from "react";
 * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
 * (search for `loadDocumentInitialProps` and `documentElement`).
 *
-* vinext only forwards `docProps`. The full `DocumentContext`
-* (`renderPage`, `defaultGetInitialProps`, `pathname`, `query`, `req`, `res`,
-* `err`, `asPath`) is not yet plumbed through. The common upstream pattern
+* `runDocumentRenderPage()` supplies `renderPage`, `defaultGetInitialProps`,
+* and the request pathname/query/asPath fields needed by the common upstream
+* pattern:
 *
 *   static async getInitialProps(ctx) {
 *     const initialProps = await Document.getInitialProps(ctx)
 *     return { ...initialProps, docValue }
 *   }
 *
-* works because the base `Document.getInitialProps` shim in
-* `shims/document.tsx` returns `{ html: "" }` and ignores `ctx`. User
-* overrides that *only* read `ctx` will see `undefined` fields — that is a
-* separate gap tracked alongside the shim TODO.
+* The standalone `loadUserDocumentInitialProps()` compatibility path supplies
+* an empty default render result because it is only used after the body has
+* already been produced. Request-only fields such as req/res remain outside
+* that compatibility helper.
 *
 * Returns `null` when the user did not override the base shim (the static
 * `getInitialProps` reference still points at the shim's stub) so callers
@@ -47,7 +47,7 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 	const getInitialProps = DocumentComponent.getInitialProps;
 	if (typeof getInitialProps !== "function") return null;
 	if (getInitialProps === BASE_GET_INITIAL_PROPS) return null;
-	const result = await getInitialProps({});
+	const result = await getInitialProps({ defaultGetInitialProps: async () => ({ html: "" }) });
 	return result && typeof result === "object" ? result : null;
 }
 /**
@@ -60,11 +60,10 @@ async function loadUserDocumentInitialProps(DocumentComponent) {
 * prod (`pages-page-response.ts`) and dev (`dev-server.ts`) SSR pipelines so
 * the `getInitialProps` + `renderPage` contract lives in one place.
 *
-* `getInitialProps` is invoked at most once here. When this returns `consumed`
-* or `rendered`, callers MUST treat that as the single invocation and must not
-* call `loadUserDocumentInitialProps` (which would invoke it again — and, for a
-* throwing override, surface the error as a 500 rather than the clean fallback
-* this contract guarantees).
+* `getInitialProps` is invoked at most once here. When this returns `rendered`,
+* callers MUST treat that as the single invocation and must not call
+* `loadUserDocumentInitialProps` again. Errors intentionally propagate to the
+* Pages Router's normal error-page pipeline, matching Next.js.
 *
 * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
 */
@@ -74,58 +73,30 @@ async function runDocumentRenderPage(input) {
 	if (DocCtor.getInitialProps === BASE_GET_INITIAL_PROPS) return { status: "skipped" };
 	if (!input.enhancePageElement) return { status: "skipped" };
 	const enhancePageElement = input.enhancePageElement;
-	let renderPageCalled = false;
 	const renderPage = async (opts = {}) => {
-		renderPageCalled = true;
-		const wrapped = withScriptNonce(enhancePageElement(opts), input.scriptNonce);
+		const wrapped = withScriptNonce(enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts), input.scriptNonce);
 		return {
 			html: await readStreamAsText(await input.renderToReadableStream(wrapped)),
 			head: []
 		};
 	};
-	let docInitialProps;
-	try {
-		docInitialProps = await DocCtor.getInitialProps({
-			renderPage,
-			defaultGetInitialProps: async (ctx) => {
-				const result = await (ctx.renderPage ?? renderPage)({ enhanceApp: (App) => (props) => React.createElement(App, props) });
-				return {
-					html: result.html,
-					head: result.head ?? [],
-					styles: void 0
-				};
-			},
-			...input.context
-		});
-	} catch (err) {
-		console.error("[vinext] _document.getInitialProps() threw:", err);
-		return {
-			status: "consumed",
-			docProps: {},
-			head: []
-		};
-	}
+	const docInitialProps = await DocCtor.getInitialProps({
+		renderPage,
+		defaultGetInitialProps: async (ctx) => {
+			const result = await ctx.renderPage({ enhanceApp: (App) => (props) => React.createElement(App, props) });
+			return {
+				html: result.html,
+				head: result.head ?? [],
+				styles: void 0
+			};
+		},
+		...input.context
+	});
 	const { html: _html, head: rawHead, styles: _styles, ...docProps } = docInitialProps ?? {};
 	const head = Array.isArray(rawHead) ? rawHead : [];
-	if (!renderPageCalled) return {
-		status: "consumed",
-		docProps,
-		head
-	};
-	if (!docInitialProps || typeof docInitialProps.html !== "string") {
-		console.error(`[vinext] "${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" did not return an object with a string "html" prop`);
-		return {
-			status: "consumed",
-			docProps,
-			head
-		};
-	}
+	if (!docInitialProps || typeof docInitialProps.html !== "string") throw new Error(`"${DocCtor.displayName ?? DocCtor.name ?? "Document"}.getInitialProps()" should resolve to an object with a "html" prop set with a valid html string`);
 	let stylesHTML = "";
-	if (docInitialProps.styles != null) try {
-		stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
-	} catch (err) {
-		console.error("[vinext] Failed to render _document.getInitialProps() styles:", err);
-	}
+	if (docInitialProps.styles != null) stylesHTML = await input.renderStylesToString(React.createElement(React.Fragment, null, docInitialProps.styles));
 	return {
 		status: "rendered",
 		bodyHtml: docInitialProps.html,

package/dist/server/pages-i18n.js

@@ -127,8 +127,8 @@ function parseCookieLocaleFromHeader(cookieHeader, i18nConfig) {
 	} catch {
 		return null;
 	}
-	if (i18nConfig.locales.includes(value)) return value;
-	return null;
+	const lowerValue = value.toLowerCase();
+	return i18nConfig.locales.find((locale) => locale.toLowerCase() === lowerValue) ?? null;
 }
 function formatLocalizedRootPath(locale, defaultLocale, basePath = "", trailingSlash = false, search = "") {
 	if (locale.toLowerCase() === defaultLocale.toLowerCase()) return void 0;

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

@@ -198,7 +198,9 @@ function applyBotETagAndCheck(cachedResponse, html, options) {
 function rewritePagesCachedHtml(cachedHtml, freshBody, nextDataScript) {
 	const bodyStart = cachedHtml.indexOf("<div id=\"__next\">");
 	const contentStart = bodyStart >= 0 ? bodyStart + 17 : -1;
-	const nextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const canonicalNextDataStart = cachedHtml.search(/<script\b(?=[^>]*\bid=["']__NEXT_DATA__["'])(?=[^>]*\btype=["']application\/json["'])[^>]*>/);
+	const legacyNextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const nextDataStart = canonicalNextDataStart >= 0 ? canonicalNextDataStart : legacyNextDataStart;
 	if (contentStart >= 0 && nextDataStart >= 0) {
 		const region = cachedHtml.slice(contentStart, nextDataStart);
 		const lastCloseDiv = region.lastIndexOf("</div>");

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

@@ -184,7 +184,7 @@ function createPagesPageHandler(opts) {
 				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
-					err,
+					err: err instanceof Error ? err : void 0,
 					applyRequestContexts: applySSRContext,
 					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
@@ -327,6 +327,7 @@ function createPagesPageHandler(opts) {
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
 					},
 					DocumentComponent,
+					err: err instanceof Error ? err : void 0,
 					flushPreloads: typeof flushPreloads === "function" ? flushPreloads : void 0,
 					fontLinkHeader,
 					fontPreloads: allFontPreloads,
@@ -344,6 +345,7 @@ function createPagesPageHandler(opts) {
 					pageProps,
 					props: renderProps,
 					params,
+					query,
 					renderDocumentToString(element) {
 						return renderToStringAsync(element);
 					},

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

@@ -66,6 +66,7 @@ type RenderPagesPageResponseOptions = {
    */
   enhancePageElement?: ((opts: RenderPageEnhancers) => ReactNode) | undefined;
   DocumentComponent: ComponentType | null;
+  err?: Error;
   flushPreloads?: (() => Promise<void> | void) | undefined;
   fontLinkHeader: string;
   fontPreloads: PagesFontPreload[];
@@ -95,6 +96,7 @@ type RenderPagesPageResponseOptions = {
   pageProps: Record<string, unknown>;
   props?: Record<string, unknown>;
   params: Record<string, unknown>;
+  query?: Record<string, unknown>;
   renderDocumentToString: (element: ReactNode) => Promise<string>;
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
   resetSSRHead?: (() => void) | undefined;

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

@@ -7,7 +7,7 @@ import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders }
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
-import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr } from "./html.js";
+import { createNonceAttribute, escapeHtmlAttr } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
@@ -89,8 +89,7 @@ function buildPagesNextDataScript(options) {
 		...options.nextData?.__vinext,
 		...options.vinext
 	};
-	const localeGlobals = options.i18n.locales ? `;window.__VINEXT_LOCALE__=${options.safeJsonStringify(options.i18n.locale)};window.__VINEXT_LOCALES__=${options.safeJsonStringify(options.i18n.locales)};window.__VINEXT_DEFAULT_LOCALE__=${options.safeJsonStringify(options.i18n.defaultLocale)}` : "";
-	return createInlineScriptTag(`window.__NEXT_DATA__ = ${options.safeJsonStringify(nextDataPayload)}${localeGlobals}`, options.scriptNonce);
+	return `<script id="__NEXT_DATA__" type="application/json"${createNonceAttribute(options.scriptNonce)}>${options.safeJsonStringify(nextDataPayload)}<\/script>`;
 }
 async function buildPagesShellHtml(bodyMarker, fontHeadHTML, nextDataScript, options) {
 	if (options.DocumentComponent) {
@@ -197,8 +196,9 @@ async function renderPagesPageResponse(options) {
 		renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
 		scriptNonce: options.scriptNonce,
 		context: {
+			err: options.err,
 			pathname: options.routePattern,
-			query: options.params,
+			query: options.query ?? options.params,
 			asPath: options.routeUrl
 		}
 	});

package/dist/server/pages-readiness.js

@@ -10,7 +10,7 @@ function buildPagesReadinessNextData(options) {
 	const hasAppGip = typeof options.appComponent?.getInitialProps === "function";
 	return {
 		gssp: hasPageGssp,
-		gsp: hasPageGsp,
+		gsp: hasPageGsp ? true : void 0,
 		gip: hasPageGip,
 		appGip: hasAppGip,
 		autoExport: !hasPageGssp && !hasPageGsp && !hasPageGip && !hasAppGip,

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

@@ -7,6 +7,8 @@ type PagesRenderOptions = {
   renderErrorPageOnMiss?: boolean;
   originalUrl?: string;
 };
+type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
   redirectUrl?: string;
@@ -53,15 +55,13 @@ type PagesPipelineDeps = {
    */
   proxyExternal?: ((currentRequest: Request, externalUrl: string) => Promise<Response>) | null;
   /**
-   * Optional public-directory static file server (Node prod only).
+   * Optional filesystem/static-asset probe supplied by each runtime adapter.
    * Called post-middleware (so middleware can intercept/redirect public files) with the
    * original basePath-stripped pathname and the staged middleware response headers.
-   * The callback writes the file to its own output (Node `res`) and resolves `true` when
-   * it served the request; the pipeline then returns `{ type: "handled" }`. Resolves `false`
-   * to fall through to rewrites/render. Worker/dev adapters omit this — their public files
-   * are served by the asset binding / Vite respectively.
+   * Node may write directly to `res` and return true; dev/Workers return a Response.
+   * Resolves false to continue through rewrites, API routes, and page rendering.
    */
-  serveStaticFile?: ((requestPathname: string, stagedHeaders: HeaderRecord) => Promise<boolean>) | null;
+  serveFilesystemRoute?: ((requestPathname: string, stagedHeaders: HeaderRecord, phase: FilesystemRoutePhase) => Promise<boolean | Response>) | null;
 };
 /**
  * Wrap an adapter's `runMiddleware` callback so middleware receives the original
@@ -111,4 +111,4 @@ type PagesPipelineResult = {
  */
 declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
 //#endregion
-export { MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, runPagesRequest, wrapMiddlewareWithBasePath };
+export { FilesystemRoutePhase, MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath };

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

@@ -5,6 +5,14 @@ import { mergeRewriteQuery } from "../utils/query.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";
 import { mergeHeaders } from "./worker-utils.js";
 //#region src/server/pages-request-pipeline.ts
+async function fetchWorkerFilesystemRoute(request, requestPathname, phase, fetchAsset) {
+	if (phase === "direct" || request.method !== "GET" && request.method !== "HEAD" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+	const assetUrl = new URL(request.url);
+	assetUrl.pathname = requestPathname;
+	assetUrl.search = "";
+	const response = await fetchAsset(new Request(assetUrl, request));
+	return response.status === 404 ? false : response;
+}
 /**
 * Wrap an adapter's `runMiddleware` callback so middleware receives the original
 * (pre-basePath-stripping) URL. Adapters strip the basePath before handing the
@@ -72,6 +80,15 @@ async function runPagesRequest(request, deps) {
 	let resolvedUrl = originalResolvedUrl;
 	const middlewareHeaders = {};
 	let middlewareStatus;
+	const serveFilesystemRoute = async (requestPathname, phase) => {
+		if (!deps.serveFilesystemRoute) return null;
+		const served = await deps.serveFilesystemRoute(requestPathname, middlewareHeaders, phase);
+		if (served instanceof Response) return {
+			type: "response",
+			response: mergeHeaders(served, middlewareHeaders, middlewareStatus)
+		};
+		return served ? { type: "handled" } : null;
+	};
 	if (typeof deps.runMiddleware === "function") {
 		const result = await deps.runMiddleware(request, deps.ctx ?? null, { isDataRequest });
 		if (result.waitUntilPromises && result.waitUntilPromises.length > 0) {
@@ -132,9 +149,8 @@ async function runPagesRequest(request, deps) {
 		type: "response",
 		response: mergeHeaders(await proxyExternal(request, resolvedUrl), middlewareHeaders, void 0)
 	};
-	if (deps.serveStaticFile) {
-		if (await deps.serveStaticFile(pathname, middlewareHeaders)) return { type: "handled" };
-	}
+	const directFilesystemResult = await serveFilesystemRoute(pathname, "direct");
+	if (directFilesystemResult) return directFilesystemResult;
 	let configRewriteFired = false;
 	for (const rewrite of configRewrites.beforeFiles ?? []) {
 		const rewritten = matchRewrite(matchResolvedPathname(resolvedPathname), [rewrite], rewriteRequestContext(), basePathState);
@@ -148,6 +164,10 @@ async function runPagesRequest(request, deps) {
 			configRewriteFired = true;
 		}
 	}
+	if (configRewriteFired) {
+		const beforeFilesResult = await serveFilesystemRoute(resolvedPathname, "beforeFiles");
+		if (beforeFilesResult) return beforeFilesResult;
+	}
 	if (basePath && !hadBasePath && !configRewriteFired) return {
 		type: "response",
 		response: new Response("This page could not be found", {
@@ -155,27 +175,33 @@ async function runPagesRequest(request, deps) {
 			headers: { "Content-Type": "text/html; charset=utf-8" }
 		})
 	};
-	const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, i18nConfig);
-	const apiLookupPathname = apiLookupUrl.split("?")[0];
-	if (apiLookupPathname.startsWith("/api/") || apiLookupPathname === "/api") if (typeof deps.handleApi === "function") {
-		let apiRequest = request;
-		if (basePath && hadBasePath) {
-			const apiRequestUrl = new URL(request.url);
-			apiRequestUrl.pathname = addBasePathToPathname(apiRequestUrl.pathname, basePath);
-			apiRequest = cloneRequestWithUrl(request, apiRequestUrl.toString());
+	const handleResolvedApiRoute = async () => {
+		const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, i18nConfig);
+		const apiLookupPathname = apiLookupUrl.split("?")[0];
+		if (!apiLookupPathname.startsWith("/api/") && apiLookupPathname !== "/api") return null;
+		if (typeof deps.handleApi === "function") {
+			let apiRequest = request;
+			if (basePath && hadBasePath) {
+				const apiRequestUrl = new URL(request.url);
+				apiRequestUrl.pathname = addBasePathToPathname(apiRequestUrl.pathname, basePath);
+				apiRequest = cloneRequestWithUrl(request, apiRequestUrl.toString());
+			}
+			return {
+				type: "response",
+				defaultContentType: "application/octet-stream",
+				response: mergeHeaders(await deps.handleApi(apiRequest, apiLookupUrl, deps.ctx ?? null), middlewareHeaders, middlewareStatus)
+			};
 		}
 		return {
-			type: "response",
-			defaultContentType: "application/octet-stream",
-			response: mergeHeaders(await deps.handleApi(apiRequest, apiLookupUrl, deps.ctx ?? null), middlewareHeaders, middlewareStatus)
+			type: "api",
+			apiUrl: apiLookupUrl,
+			stagedHeaders: middlewareHeaders,
+			requestHeaders: request.headers,
+			middlewareStatus
 		};
-	} else return {
-		type: "api",
-		apiUrl: apiLookupUrl,
-		stagedHeaders: middlewareHeaders,
-		requestHeaders: request.headers,
-		middlewareStatus
 	};
+	const apiResult = await handleResolvedApiRoute();
+	if (apiResult) return apiResult;
 	let pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
 	let resolvedPathnameChanged = false;
 	if (!pageMatch || pageMatch.route.isDynamic) for (const rewrite of configRewrites.afterFiles ?? []) {
@@ -188,6 +214,10 @@ async function runPagesRequest(request, deps) {
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
 			resolvedPathnameChanged = true;
+			const afterFilesFilesystemResult = await serveFilesystemRoute(resolvedPathname, "afterFiles");
+			if (afterFilesFilesystemResult) return afterFilesFilesystemResult;
+			const afterFilesApiResult = await handleResolvedApiRoute();
+			if (afterFilesApiResult) return afterFilesApiResult;
 			pageMatch = deps.matchPageRoute ? deps.matchPageRoute(resolvedPathname, request) : null;
 			if (pageMatch) break;
 		}
@@ -208,6 +238,10 @@ async function runPagesRequest(request, deps) {
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			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;
 			refreshDataRewriteHeader();
 			if (renderPageMatch) break;
@@ -228,6 +262,10 @@ async function runPagesRequest(request, deps) {
 			};
 			resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 			resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+			const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
+			if (fallbackFilesystemResult) return fallbackFilesystemResult;
+			const fallbackApiResult = await handleResolvedApiRoute();
+			if (fallbackApiResult) return fallbackApiResult;
 			response = await deps.renderPage(request, resolvedUrl, void 0, stagedHeaders);
 			matchedFallbackRewrite = true;
 			if (response.status !== 404) break;
@@ -250,6 +288,10 @@ async function runPagesRequest(request, deps) {
 		};
 		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 		resolvedPathname = pathnameForResolvedUrl(resolvedUrl);
+		const fallbackFilesystemResult = await serveFilesystemRoute(resolvedPathname, "fallback");
+		if (fallbackFilesystemResult) return fallbackFilesystemResult;
+		const fallbackApiResult = await handleResolvedApiRoute();
+		if (fallbackApiResult) return fallbackApiResult;
 		if (deps.matchPageRoute?.(resolvedPathname, request)) break;
 	}
 	refreshDataRewriteHeader();
@@ -264,4 +306,4 @@ async function runPagesRequest(request, deps) {
 	};
 }
 //#endregion
-export { runPagesRequest, wrapMiddlewareWithBasePath };
+export { fetchWorkerFilesystemRoute, runPagesRequest, wrapMiddlewareWithBasePath };

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

@@ -41,6 +41,8 @@ import { IncomingMessage, ServerResponse } from "node:http";
  */
 declare function resolveServerEntryImportUrl(entryPath: string): string;
 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>;
 type ProdServerOptions = {
   /** Port to listen on */port?: number; /** Host to bind to */
   host?: string; /** Path to the build output directory */
@@ -143,4 +145,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, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, ProdServerOptions, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

package/dist/server/prod-server.js

@@ -109,11 +109,42 @@ async function importServerEntryModule(entryPath) {
 }
 /** Convert a Node.js IncomingMessage into a ReadableStream for Web Request body. */
 function readNodeStream(req) {
-	return new ReadableStream({ start(controller) {
-		req.on("data", (chunk) => controller.enqueue(new Uint8Array(chunk)));
-		req.on("end", () => controller.close());
-		req.on("error", (err) => controller.error(err));
-	} });
+	let cancelled = false;
+	let cleanup = () => {};
+	return new ReadableStream({
+		start(controller) {
+			cleanup = () => {
+				req.off("data", onData);
+				req.off("end", onEnd);
+				req.off("error", onError);
+			};
+			const onData = (chunk) => {
+				if (cancelled) return;
+				controller.enqueue(new Uint8Array(chunk));
+				if ((controller.desiredSize ?? 0) <= 0) req.pause();
+			};
+			const onEnd = () => {
+				cleanup();
+				if (!cancelled) controller.close();
+			};
+			const onError = (error) => {
+				cleanup();
+				if (!cancelled) controller.error(error);
+			};
+			req.on("data", onData);
+			req.on("end", onEnd);
+			req.on("error", onError);
+			req.pause();
+		},
+		pull() {
+			if (!cancelled) req.resume();
+		},
+		cancel() {
+			cancelled = true;
+			cleanup();
+			req.resume();
+		}
+	});
 }
 /** Content types that benefit from compression. */
 const COMPRESSIBLE_TYPES = new Set([
@@ -514,7 +545,7 @@ function nodeToWebRequest(req, urlOverride, prerenderSecret) {
 		headers
 	};
 	if (hasBody) {
-		init.body = Readable.toWeb(req);
+		init.body = readNodeStream(req);
 		init.duplex = "half";
 	}
 	return new Request(url, init);
@@ -1008,7 +1039,7 @@ async function startPagesRouterServer(options) {
 			const protocol = resolveRequestProtocol(req);
 			const hostHeader = resolveRequestHost(req, `${host}:${port}`);
 			const rawReqHeaders = nodeHeadersToWebHeaders(req.headers);
-			const isDataRequest = rawReqHeaders.get("x-nextjs-data") === "1";
+			const isDataRequest = isDataReq;
 			const reqHeaders = filterInternalHeaders(rawReqHeaders);
 			const method = req.method ?? "GET";
 			const hasBody = method !== "GET" && method !== "HEAD";
@@ -1036,8 +1067,8 @@ async function startPagesRouterServer(options) {
 					originalUrl: originalRenderUrl
 				}) : null,
 				handleApi: typeof handleApi === "function" ? (request, apiUrl) => handleApi(request, apiUrl, createNodeExecutionContext()) : null,
-				serveStaticFile: async (requestPathname, stagedHeaders) => {
-					if (requestPathname === "/" || requestPathname.startsWith("/api/") || requestPathname.startsWith(`/_next/static/`)) return false;
+				serveFilesystemRoute: async (requestPathname, stagedHeaders, phase) => {
+					if (req.method !== "GET" && req.method !== "HEAD" || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/") || phase === "direct" && requestPathname.startsWith(`/_next/static/`)) return false;
 					return tryServeStatic(req, res, clientDir, requestPathname, compress, staticCache, stagedHeaders);
 				}
 			});
@@ -1088,4 +1119,4 @@ async function startPagesRouterServer(options) {
 	};
 }
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };

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

@@ -1,5 +1,5 @@
 import { normalizePathSeparators } from "../utils/path.js";
-import "../utils/asset-prefix.js";
+import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 //#region src/server/static-file-cache.ts
@@ -23,6 +23,7 @@ const CONTENT_TYPES = {
 	".css": "text/css",
 	".html": "text/html",
 	".json": "application/json",
+	".txt": "text/plain; charset=utf-8",
 	".png": "image/png",
 	".jpg": "image/jpeg",
 	".jpeg": "image/jpeg",
@@ -165,9 +166,20 @@ var StaticFileCache = class StaticFileCache {
 function etagFromFilenameHash(relativePath, ext) {
 	const basename = path.basename(relativePath, ext);
 	const lastDash = basename.lastIndexOf("-");
-	if (lastDash === -1 || lastDash === basename.length - 1) return null;
-	const suffix = basename.slice(lastDash + 1);
-	return suffix.length >= 6 && suffix.length <= 12 && /^[A-Za-z0-9_-]+$/.test(suffix) ? `W/"${suffix}"` : null;
+	if (lastDash !== -1 && lastDash !== basename.length - 1) {
+		const suffix = basename.slice(lastDash + 1);
+		if (suffix.length >= 6 && suffix.length <= 12 && /^[A-Za-z0-9_-]+$/.test(suffix)) return `W/"${suffix}"`;
+	}
+	const normalizedPath = normalizePathSeparators(relativePath);
+	const managedMediaSegment = `${ASSET_PREFIX_URL_DIR}/media/`;
+	if (normalizedPath.startsWith(managedMediaSegment) || normalizedPath.includes(`/${managedMediaSegment}`)) {
+		const lastDot = basename.lastIndexOf(".");
+		if (lastDot !== -1) {
+			const suffix = basename.slice(lastDot + 1);
+			if (/^[0-9a-f]{8}$/.test(suffix)) return `W/"${suffix}"`;
+		}
+	}
+	return null;
 }
 function buildVariant(info, baseHeaders, encoding) {
 	return {

package/dist/shims/before-interactive-context.d.ts

@@ -2,17 +2,28 @@ import React from "react";
 
 //#region src/shims/before-interactive-context.d.ts
 /**
- * Inline `<Script strategy="beforeInteractive">` content captured during SSR.
+ * A `<Script strategy="beforeInteractive">` captured during SSR.
  *
  * The Script shim hands these records to the SSR pipeline through
  * `BeforeInteractiveContext` instead of rendering the `<script>` tag inline.
  * The pipeline then emits the captured tag immediately after `<head>` opens,
  * so the script runs before any React-hoisted stylesheets or modulepreload
  * links. Matches the standard no-flash dark-mode pattern.
+ *
+ * Both inline (`children`/`dangerouslySetInnerHTML`) and external (`src`)
+ * beforeInteractive scripts flow through here, mirroring Next.js which registers
+ * inline and src beforeInteractive scripts equally in the App Router runtime
+ * (`(self.__next_s=...).push(...)`). An entry has `src` set for external
+ * scripts and `innerHTML` set for inline scripts (never both).
  */
 type BeforeInteractiveInlineScript = {
-  /** Optional id attribute. */id?: string; /** Pre-escaped inline content (already passed through `escapeInlineContent`). */
-  innerHTML: string; /** Nonce to emit on the `<script>` tag, when CSP is enabled. */
+  /** Optional id attribute. */id?: string; /** External script URL. Set for src beforeInteractive scripts. */
+  src?: string;
+  /**
+   * Pre-escaped inline content (already passed through `escapeInlineContent`).
+   * Set for inline beforeInteractive scripts; omitted for src scripts.
+   */
+  innerHTML?: string; /** Nonce to emit on the `<script>` tag, when CSP is enabled. */
   nonce?: string;
   /**
    * Additional HTML attributes to emit on the tag. Booleans render as the