vinext 1.0.0-beta.9 → 1.0.1

package/dist/server/dev-server.js

@@ -1,16 +1,18 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { createValidFileMatcher, findFileWithExts } from "../routing/file-matcher.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { sanitizeDestination } from "../config/config-matchers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
-import { sanitizeDestination } from "../config/config-matchers.js";
 import { extractLocaleFromUrl as extractLocaleFromUrl$1, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
-import { isOnDemandRevalidateRequest } from "./isr-cache.js";
+import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
+import "./isr-cache.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import "../shims/router-state.js";
@@ -25,9 +27,9 @@ import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
+import { traceFindPageComponents, tracePagesData, tracePagesDocument, tracePagesDocumentStream } from "./pages-execution-tracing.js";
 import { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds } from "./pages-page-data.js";
 import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
 import { collectPagesDevInitialStylesheetHeadHTML } from "./pages-dev-stylesheets.js";
@@ -158,27 +160,43 @@ function stripDevPagesNotFoundFramingHeaders(res) {
 * deferring them reduces TTFB and lets the browser start parsing the
 * shell sooner).
 */
-async function streamPageToResponse(res, element, options) {
-	const { url, server, fontHeadHTML, assetHeadHTML = "", scripts, DocumentComponent, statusCode, extraHeaders, getHeadHTML, getTailHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, crossOrigin, bufferBodyBeforeHeaders = false, preserveExistingContentType = false } = options;
-	const documentRenderPage = await runDocumentRenderPage({
-		DocumentComponent,
-		enhancePageElement,
-		renderToReadableStream,
-		renderStylesToString: renderToStringAsync,
-		scriptNonce,
-		context: documentContext
-	});
-	if (res.headersSent || res.writableEnded) return;
-	let bodyStream;
-	if (documentRenderPage.status === "rendered") {
-		const synthesised = documentRenderPage.bodyHtml;
-		bodyStream = new ReadableStream({ start(controller) {
-			controller.enqueue(new TextEncoder().encode(synthesised));
-			controller.close();
-		} });
-	} else bodyStream = await renderToReadableStream(element);
-	if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(DocumentComponent, setDocumentInitialHead);
-	else setDocumentInitialHead?.(documentRenderPage.head);
+async function streamPageToResponseImpl(routePattern, res, element, options) {
+	const { url, server, fontHeadHTML, assetHeadHTML = "", scripts, DocumentComponent, statusCode, extraHeaders, getHeadHTML, getTailHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, crossOrigin, bufferBodyBeforeHeaders = false, preserveExistingContentType = false, onDocumentBody } = options;
+	const renderDocument = async () => {
+		const documentRenderPage = await runDocumentRenderPage({
+			DocumentComponent,
+			enhancePageElement,
+			renderToReadableStream,
+			renderStylesToString: renderToStringAsync,
+			scriptNonce,
+			context: documentContext
+		});
+		if (res.headersSent || res.writableEnded) return {
+			documentRenderPage,
+			responseSent: true
+		};
+		let bodyStream;
+		if (documentRenderPage.status === "rendered") {
+			const synthesised = documentRenderPage.bodyHtml;
+			bodyStream = new ReadableStream({ start(controller) {
+				controller.enqueue(new TextEncoder().encode(synthesised));
+				controller.close();
+			} });
+		} else bodyStream = await renderToReadableStream(element);
+		if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(DocumentComponent, setDocumentInitialHead);
+		else setDocumentInitialHead?.(documentRenderPage.head);
+		return {
+			bodyStream,
+			documentRenderPage,
+			responseSent: false,
+			waitForBody: documentRenderPage.status === "skipped"
+		};
+	};
+	const documentResult = await tracePagesDocumentStream(routePattern, renderDocument);
+	if (documentResult.responseSent) return;
+	const { bodyStream, documentRenderPage } = documentResult;
+	if (!bodyStream) throw new Error("Pages document render did not produce a body stream");
+	onDocumentBody?.(bodyStream);
 	const headHTML = getHeadHTML();
 	const ssrHeadMarkerId = randomUUID();
 	const ssrHeadStartMarker = `<!--VINEXT_SSR_HEAD_START:${ssrHeadMarkerId}-->`;
@@ -198,7 +216,8 @@ async function streamPageToResponse(res, element, options) {
 	}));
 	if (DocumentComponent) {
 		const docProps = documentRenderPage.status === "skipped" ? await loadUserDocumentInitialProps(DocumentComponent) : documentRenderPage.docProps;
-		const renderedDocument = extractDocumentAssetProps(await renderToStringAsync(docProps ? React.createElement(DocumentComponent, docProps) : React.createElement(DocumentComponent)));
+		const docElement = docProps ? React.createElement(DocumentComponent, docProps) : React.createElement(DocumentComponent);
+		const renderedDocument = extractDocumentAssetProps(await renderToStringAsync(docElement));
 		documentAssetProps = renderedDocument.props;
 		let docHtml = protectAssetTags(renderedDocument.html);
 		const generatedScripts = applyGeneratedAssetProps(scripts, renderedDocument.props, "next-script");
@@ -264,6 +283,20 @@ async function streamPageToResponse(res, element, options) {
 	}
 	res.end(suffix);
 }
+async function streamPageToResponse(...args) {
+	let bodyStream;
+	try {
+		await streamPageToResponseImpl(args[0], args[1], args[2], {
+			...args[3],
+			onDocumentBody(stream) {
+				bodyStream = stream;
+			}
+		});
+	} catch (error) {
+		if (bodyStream && !bodyStream.locked) await bodyStream.cancel(error).catch(() => {});
+		throw error;
+	}
+}
 /**
 * Extract locale prefix from a URL path.
 * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }
@@ -282,9 +315,20 @@ function extractLocaleFromUrl(url, i18nConfig) {
 * 4. Render the component to HTML
 * 5. Wrap in _document shell and send response
 */
-function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false, expireTime = PAGES_CACHE_ONE_YEAR_SECONDS, crossOrigin, buildId = process.env.__VINEXT_BUILD_ID ?? "development") {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false, expireTime = PAGES_CACHE_ONE_YEAR_SECONDS, crossOrigin, buildId = process.env.__VINEXT_BUILD_ID ?? "development", clientMiddlewareMatcher, classifyPageRoute) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const pagePatterns = routes.map((r) => patternToNextFormat(r.pattern));
+	const pageLoaders = routes.map((route) => ({
+		pattern: patternToNextFormat(route.pattern),
+		moduleSource: createPagesDevModuleUrl(server.config.root, route.filePath, "/"),
+		dataKind: classifyPageRoute?.(route) ?? "none"
+	}));
+	const errorFile = findFileWithExts(pagesDir, "_error", matcher);
+	pageLoaders.push({
+		pattern: "/_error",
+		moduleSource: errorFile ? createPagesDevModuleUrl(server.config.root, errorFile, "/") : "next/error",
+		dataKind: "none"
+	});
 	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
 	_alsRegistration.catch(() => {});
 	return async (req, res, url, statusCode, isDataReq = false, originalUrl = url) => {
@@ -324,6 +368,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			basePath,
 			buildId,
 			clientTraceMetadata,
+			pageLoaders,
+			hasMiddleware,
+			clientMiddlewareMatcher,
 			locale: locale ?? currentDefaultLocale,
 			locales: i18nConfig?.locales,
 			defaultLocale: currentDefaultLocale,
@@ -359,6 +406,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		const userFacingParams = route.isDynamic ? params : null;
 		let query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
 		const requestContext = createRequestContext();
+		let isStaticPropsRender = false;
 		const closeRequest = () => void closeAfterResponse(requestContext);
 		res.on("finish", closeRequest);
 		res.on("close", closeRequest);
@@ -378,8 +426,20 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						hostname: req.headers.host?.split(":", 1)[0]
 					});
 				}
-				const pageModule = await importModule(runner, route.filePath);
-				const isStaticPropsRender = typeof pageModule.getStaticProps === "function" && typeof pageModule.getServerSideProps !== "function";
+				const { pageModule, AppComponent, appFilePath, DocumentComponent } = await traceFindPageComponents(route.pattern, async () => {
+					const pageModule = await importModule(runner, route.filePath);
+					const appFilePath = findFileWithExts(pagesDir, "_app", matcher);
+					const appModule = appFilePath ? await importModule(runner, appFilePath) : null;
+					const docFilePath = findFileWithExts(pagesDir, "_document", matcher);
+					const docModule = docFilePath ? await runner.import(docFilePath) : null;
+					return {
+						pageModule,
+						AppComponent: appModule?.default ?? null,
+						appFilePath,
+						DocumentComponent: docModule?.default ?? null
+					};
+				});
+				isStaticPropsRender = typeof pageModule.getStaticProps === "function" && typeof pageModule.getServerSideProps !== "function";
 				if (isStaticPropsRender) {
 					query = mergeRouteParamsIntoQuery({}, params);
 					requestAsPath = localeStrippedUrl.split("?")[0];
@@ -389,9 +449,6 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					shouldClear: false
 				};
 				const requestPreviewData = requestPreview.data;
-				let AppComponent = null;
-				const appFilePath = findFileWithExts(pagesDir, "_app", matcher);
-				if (appFilePath) AppComponent = (await importModule(runner, appFilePath)).default ?? null;
 				const pagesNextData = {
 					...buildPagesReadinessNextData({
 						pageModule,
@@ -447,12 +504,17 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
 					const pathsResult = await pageModule.getStaticPaths({
 						locales: i18nConfig?.locales ?? [],
-						defaultLocale: currentDefaultLocale ?? ""
+						defaultLocale: i18nConfig?.defaultLocale ?? ""
 					});
 					const fallback = pathsResult?.fallback ?? false;
 					const paths = pathsResult?.paths ?? [];
-					const routeParams = getPagesRouteParams(patternToNextFormat(route.pattern));
-					const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, params, routeParams, url));
+					const routePattern = patternToNextFormat(route.pattern);
+					const routeParams = getPagesRouteParams(routePattern);
+					const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, params, routeParams, localeStrippedUrl, {
+						locale,
+						locales: i18nConfig?.locales,
+						defaultLocale: i18nConfig?.defaultLocale
+					}));
 					if (fallback === false && !isValidPath && requestPreviewData === false) {
 						if (isDataReq) {
 							const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -540,7 +602,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						defaultLocale: currentDefaultLocale,
 						...previewContext
 					};
-					const result = await pageModule.getServerSideProps(context);
+					const result = await tracePagesData("getServerSideProps", route.pattern, () => pageModule.getServerSideProps(context));
 					if (res.writableEnded) return;
 					if (result && "props" in result) {
 						pageProps = mergePagesDataProps(renderProps.pageProps, await Promise.resolve(result.props));
@@ -609,7 +671,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						...previewContext
 					};
 					if (await loadAppInitialProps()) return;
-					const result = await pageModule.getStaticProps(context);
+					const result = await tracePagesData("getStaticProps", route.pattern, () => pageModule.getStaticProps(context));
 					const routePattern = patternToNextFormat(route.pattern);
 					assertPages404DoesNotReturnNotFound(routePattern, result);
 					if (result) staticPropsRevalidateSeconds = resolvePagesRevalidateSeconds(result, routePattern);
@@ -687,6 +749,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					}
 					if ((statusCode ?? 200) === 200) dataHeaders["x-nextjs-matched-path"] = `${locale ? `/${locale}` : ""}${patternToNextFormat(route.pattern)}`;
 					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
+					dataHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
 					applyDevPagesPreviewHeaders(dataHeaders, requestPreview);
 					const dataRoutePattern = patternToNextFormat(route.pattern);
 					if (dataRoutePattern !== "/_error" && dataRoutePattern !== "/500") {
@@ -754,17 +817,19 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						pageModuleUrl,
 						appModuleUrl,
 						hasMiddleware,
-						routeUrl: requestAsPath
+						routeUrl: requestAsPath,
+						clientMiddlewareMatcher
 					}
 				};
 				const hydrationScript = createPagesDevHydrationScript({
 					appModuleSource,
 					pageModuleSource,
+					pageLoaders,
 					reactStrictMode: reactStrictMode === true,
 					replaceFallbackRoute: true,
 					scriptNonce
 				});
-				const nextDataScript = `<script id="__NEXT_DATA__" type="application/json"${nonceAttr}>${safeJsonStringify({
+				const allScripts = `${`<script id="__NEXT_DATA__" type="application/json"${nonceAttr}>${safeJsonStringify({
 					props: renderProps,
 					page: patternToNextFormat(route.pattern),
 					query: isFallbackRender ? {} : params,
@@ -775,19 +840,18 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					defaultLocale: currentDefaultLocale,
 					domainLocales,
 					...serializedPagesNextData
-				})}<\/script>`;
-				const docFilePath = findFileWithExts(pagesDir, "_document", matcher);
-				let DocumentComponent = null;
-				if (docFilePath) DocumentComponent = (await runner.import(docFilePath)).default ?? null;
-				const allScripts = `${nextDataScript}\n  ${createInlineScriptTag(`window.__VINEXT_PAGE_PATTERNS__=${safeJsonStringify(pagePatterns)}`, scriptNonce)}\n  ${hydrationScript}`;
-				const extraHeaders = { ...gsspExtraHeaders };
+				})}<\/script>`}\n  ${createInlineScriptTag(`window.__VINEXT_PAGE_PATTERNS__=${safeJsonStringify(pagePatterns)}`, scriptNonce)}\n  ${hydrationScript}`;
+				const extraHeaders = {
+					...gsspExtraHeaders,
+					"Cache-Control": DEV_PAGES_CACHE_CONTROL
+				};
 				if (typeof pageModule.getStaticProps === "function") {
 					extraHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
 					extraHeaders[NEXTJS_CACHE_HEADER] = isFallbackRender ? "MISS" : isOnDemandRevalidate ? "REVALIDATED" : "HIT";
 				}
 				applyDevPagesPreviewHeaders(extraHeaders, requestPreview);
 				if (allFontPreloads.length > 0) extraHeaders["Link"] = allFontPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
-				await streamPageToResponse(res, withScriptNonce(element, scriptNonce), {
+				await streamPageToResponse(route.pattern, res, withScriptNonce(element, scriptNonce), {
 					url,
 					server,
 					fontHeadHTML,
@@ -831,15 +895,16 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext(null);
 			} catch (e) {
 				console.error(e);
-				reportRequestError(e instanceof Error ? e : new Error(String(e)), {
+				await reportRequestError(e, {
 					path: url,
 					method: req.method ?? "GET",
-					headers: Object.fromEntries(Object.entries(req.headers).filter(([k]) => !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v ?? "")]))
+					headers: Object.fromEntries(Object.entries(req.headers).filter(([k]) => !k.startsWith(":")))
 				}, {
 					routerKind: "Pages Router",
 					routePath: route.pattern,
-					routeType: "render"
-				}).catch(() => {});
+					routeType: "render",
+					revalidateReason: isOnDemandRevalidateRequest(Array.isArray(req.headers["x-prerender-revalidate"]) ? req.headers["x-prerender-revalidate"]?.[0] : req.headers["x-prerender-revalidate"]) ? "on-demand" : isStaticPropsRender ? "stale" : void 0
+				});
 				try {
 					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher, e instanceof Error ? e : new Error(String(e)), reactStrictMode, errorPageContext);
 				} catch (fallbackErr) {
@@ -861,7 +926,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher, err, reactStrictMode = false, context = { basePath: "" }) {
 	attachPagesRequestCookies(req);
 	const matcher = fileMatcher ?? createValidFileMatcher();
-	const candidates = statusCode === 404 ? ["404", "_error"] : statusCode === 500 ? ["500", "_error"] : ["_error"];
+	const candidates = statusCode === 404 ? ["404", "_error"] : ["_error"];
 	for (const candidate of candidates) {
 		let errorRouterShim = null;
 		let candidateLoaded = false;
@@ -869,16 +934,25 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 		try {
 			errorAssetPath = findFileWithExts(pagesDir, candidate, matcher);
 			if (!errorAssetPath && candidate !== "_error") continue;
-			const errorModule = await importModule(runner, errorAssetPath ?? "next/error");
+			const errorPage = candidate === "_error" ? "/_error" : `/${candidate}`;
+			const { errorModule, AppComponent, appAssetPath, DocumentComponent } = await traceFindPageComponents(errorPage, async () => {
+				const errorModule = await importModule(runner, errorAssetPath ?? "next/error");
+				const appAssetPath = findFileWithExts(pagesDir, "_app", matcher);
+				const appModule = appAssetPath ? await importModule(runner, appAssetPath) : null;
+				const docFilePath = findFileWithExts(pagesDir, "_document", matcher);
+				const docModule = docFilePath ? await importModule(runner, docFilePath) : null;
+				return {
+					errorModule,
+					AppComponent: appModule?.default ?? null,
+					appAssetPath,
+					DocumentComponent: docModule?.default ?? null
+				};
+			});
 			candidateLoaded = true;
 			const ErrorComponent = errorModule.default;
 			if (!ErrorComponent) continue;
-			let AppComponent = null;
-			const appAssetPath = findFileWithExts(pagesDir, "_app", matcher);
-			if (appAssetPath) AppComponent = (await importModule(runner, appAssetPath)).default ?? null;
 			const createElement = React.createElement;
 			res.statusCode = statusCode;
-			const errorPage = candidate === "_error" ? "/_error" : `/${candidate}`;
 			const errorRouter = {
 				pathname: errorPage,
 				query: parseQueryString(url),
@@ -908,12 +982,12 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 			};
 			if (typeof errorModule.getStaticProps === "function") {
 				const isOnDemandRevalidate = isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]);
-				const staticResult = await errorModule.getStaticProps({
+				const staticResult = await tracePagesData("getStaticProps", errorPage, () => errorModule.getStaticProps({
 					locale: context.locale,
 					locales: context.locales,
 					defaultLocale: context.defaultLocale,
 					revalidateReason: isOnDemandRevalidate ? "on-demand" : "stale"
-				});
+				}));
 				assertPages404DoesNotReturnNotFound(errorPage, staticResult);
 				if (staticResult?.redirect) {
 					applyDevPagesCacheHeaders(res, isOnDemandRevalidate ? "REVALIDATED" : "HIT", NEVER_CACHE_CONTROL);
@@ -961,9 +1035,6 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 					pageProps: mergePagesDataProps(appRenderProps.pageProps, errorProps)
 				} : appRenderProps;
 			} else renderProps = { pageProps: errorProps };
-			let DocumentComponent = null;
-			const docFilePathErr = findFileWithExts(pagesDir, "_document", matcher);
-			if (docFilePathErr) DocumentComponent = (await importModule(runner, docFilePathErr)).default ?? null;
 			const createErrorElement = (FinalApp, FinalComponent) => {
 				let errorElement = FinalApp ? createElement(FinalApp, {
 					...renderProps,
@@ -990,22 +1061,28 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				query: parseQueryString(url),
 				buildId: context.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development",
 				isFallback: false,
+				locale: context.locale,
+				locales: context.locales,
+				defaultLocale: context.defaultLocale,
 				notFoundSrcPage: context.notFoundSrcPage,
 				__vinext: {
 					pageModuleUrl: errorModuleUrl ?? void 0,
-					appModuleUrl: appModuleUrl ?? void 0
+					appModuleUrl: appModuleUrl ?? void 0,
+					hasMiddleware: context.hasMiddleware,
+					clientMiddlewareMatcher: context.clientMiddlewareMatcher
 				}
 			})}<\/script>`}\n${createPagesDevHydrationScript({
 				appModuleSource,
 				forceRouterReady: true,
 				normalizePageProps: false,
 				pageModuleSource: errorModuleSource,
+				pageLoaders: context.pageLoaders,
 				reactStrictMode: reactStrictMode === true,
 				scriptNonce,
 				setPagePatternsFromNextData: true
 			})}`;
 			if (statusCode === 404) stripDevPagesNotFoundFramingHeaders(res);
-			if (DocumentComponent) await streamPageToResponse(res, element, {
+			if (DocumentComponent) await streamPageToResponse(errorPage, res, element, {
 				url,
 				server,
 				fontHeadHTML: "",
@@ -1035,7 +1112,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				preserveExistingContentType: statusCode === 404
 			});
 			else {
-				const bodyHtml = await renderToStringAsync(element);
+				const bodyHtml = await tracePagesDocument(errorPage, () => renderToStringAsync(element));
 				const traceMetaHTML = getClientTraceMetadataHTML(context.clientTraceMetadata);
 				const protectedAssetMarker = `data-vinext-document-asset-props-protected-${randomUUID()}`;
 				const protectAssetTags = (assetHtml) => markDocumentAssetPropsProtectedTags(assetHtml, protectedAssetMarker);

package/dist/server/dev-stack-sourcemap.d.ts

@@ -1,7 +1,7 @@
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { ViteDevServer } from "vite";
 //#region src/server/dev-stack-sourcemap.d.ts
-type SourceMapPayload = {
+export type SourceMapPayload = {
   version?: number;
   sources: string[];
   sourcesContent?: (string | null)[];
@@ -32,10 +32,10 @@ type MappedStackLine = {
   ignored: boolean;
   codeFrame?: StackCodeFramePayload;
 };
-declare function installDevStackSourcemapMiddleware(server: ViteDevServer): void;
-declare function mapStackLineWithMetadata(server: ViteDevServer, line: string, requestHost: string | undefined, sourceMapCache: Map<string, Promise<SourceMapPayload | null>>): Promise<MappedStackLine>;
-declare function originalPositionFor(sourceMap: SourceMapPayload, generatedLine: number, generatedColumn: number): SourceMapPosition | null;
-declare function decodeVlqSegment(segment: string): number[];
-declare function resolveSourceFile(source: string, sourceMap: SourceMapPayload, generatedUrl: URL): string;
+export declare function installDevStackSourcemapMiddleware(server: ViteDevServer): void;
+export declare function mapStackLineWithMetadata(server: ViteDevServer, line: string, requestHost: string | undefined, sourceMapCache: Map<string, Promise<SourceMapPayload | null>>): Promise<MappedStackLine>;
+export declare function originalPositionFor(sourceMap: SourceMapPayload, generatedLine: number, generatedColumn: number): SourceMapPosition | null;
+export declare function decodeVlqSegment(segment: string): number[];
+export declare function resolveSourceFile(source: string, sourceMap: SourceMapPayload, generatedUrl: URL): string;
 //#endregion
-export { SourceMapPayload, VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT, decodeVlqSegment, installDevStackSourcemapMiddleware, mapStackLineWithMetadata, originalPositionFor, resolveSourceFile };
+export { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT };

package/dist/server/dev-stack-sourcemap.js

@@ -3,7 +3,7 @@ import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcem
 import { readFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 //#region src/server/dev-stack-sourcemap.ts
-const MAX_ORIGINAL_STACK_TRACE_BODY_BYTES = 1024 * 1024;
+const MAX_ORIGINAL_STACK_TRACE_BODY_BYTES = 1048576;
 const V8_PAREN_STACK_LINE = /^(\s*at\s+.*?\()(.+):(\d+):(\d+)(\)\s*)$/;
 const V8_BARE_STACK_LINE = /^(\s*at\s+)(.+):(\d+):(\d+)(\s*)$/;
 const MOZ_STACK_LINE = /^([^@\n]*@)(.+):(\d+):(\d+)(\s*)$/;

package/dist/server/document-initial-head.d.ts

@@ -10,7 +10,6 @@ import React from "react";
  * Callers use this to decide whether the render pipeline owes `_document` the
  * full `getInitialProps` contract, since only an override can observe it.
  */
-declare function hasUserDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined): boolean;
-declare function callDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined, setDocumentInitialHead: ((head: React.ReactNode[]) => void) | undefined): Promise<void>;
-//#endregion
-export { callDocumentGetInitialProps, hasUserDocumentGetInitialProps };
+export declare function hasUserDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined): boolean;
+export declare function callDocumentGetInitialProps(DocumentComponent: React.ComponentType | null | undefined, setDocumentInitialHead: ((head: React.ReactNode[]) => void) | undefined): Promise<void>;
+//#endregion

package/dist/server/edge-api-runtime.d.ts

@@ -1,6 +1,6 @@
 //#region src/server/edge-api-runtime.d.ts
-declare function isEdgeApiRuntime(runtime: string | undefined): boolean;
-type EdgeApiExecutionRuntime = "node" | "worker";
+export declare function isEdgeApiRuntime(runtime: string | undefined): boolean;
+export type EdgeApiExecutionRuntime = "node" | "worker";
 /**
  * Remove wire-level body headers after Node's fetch implementation has decoded
  * an Edge API response. Next.js applies the same boundary in its edge sandbox.
@@ -8,6 +8,5 @@ type EdgeApiExecutionRuntime = "node" | "worker";
  * Workers keep the original response untouched: workerd preserves the encoded
  * body/header pair and can stream it directly to the client.
  */
-declare function finalizeEdgeApiResponse(response: Response, runtime: EdgeApiExecutionRuntime): Response;
-//#endregion
-export { EdgeApiExecutionRuntime, finalizeEdgeApiResponse, isEdgeApiRuntime };
+export declare function finalizeEdgeApiResponse(response: Response, runtime: EdgeApiExecutionRuntime): Response;
+//#endregion

package/dist/server/fetch-handler.d.ts

@@ -1,2 +1,3 @@
-import handler from "virtual:vinext-worker-entry";
-export { handler as default };
+import virtual_vinext_worker_entry_default from "virtual:vinext-worker-entry";
+export * from "virtual:vinext-worker-entry";
+export { virtual_vinext_worker_entry_default as default };

package/dist/server/fetch-handler.js

@@ -1,18 +1,3 @@
-import handler from "virtual:vinext-worker-entry";
-//#region src/server/fetch-handler.ts
-/**
-* Default Cloudflare fetch handler for vinext.
-*
-* Use this directly in wrangler.jsonc:
-*   "main": "vinext/server/fetch-handler"
-*
-* Or import and delegate to it from a custom worker:
-*   import handler from "vinext/server/fetch-handler";
-*   return handler.fetch(request, env, ctx);
-*
-* The vinext plugin resolves this to the App Router or Pages Router handler
-* for the current project at build time.
-*/
-var fetch_handler_default = handler;
-//#endregion
-export { fetch_handler_default as default };
+import virtual_vinext_worker_entry_default from "virtual:vinext-worker-entry";
+export * from "virtual:vinext-worker-entry";
+export { virtual_vinext_worker_entry_default as default };

package/dist/server/file-based-metadata.d.ts

@@ -23,6 +23,5 @@ type FileBasedMetadataOptions = {
    */
   basePath?: string;
 };
-declare function applyFileBasedMetadata(metadata: Metadata | null, routePath: string, params: AppPageParams, metadataRoutes: readonly MetadataFileRoute[] | null | undefined, options?: FileBasedMetadataOptions): Promise<Metadata | null>;
-//#endregion
-export { applyFileBasedMetadata };
+export declare function applyFileBasedMetadata(metadata: Metadata | null, routePath: string, params: AppPageParams, metadataRoutes: readonly MetadataFileRoute[] | null | undefined, options?: FileBasedMetadataOptions): Promise<Metadata | null>;
+//#endregion

package/dist/server/framework-tracer.d.ts

@@ -0,0 +1,46 @@
+//#region src/server/framework-tracer.d.ts
+type FrameworkSpanAttributeValue = string | number | boolean;
+type FrameworkSpanDescriptor = {
+  attributes?: Readonly<Record<string, FrameworkSpanAttributeValue | undefined>>;
+  kind?: "client" | "internal" | "server";
+  name?: string;
+  recordErrors?: boolean;
+  type: string;
+};
+export type ResolvedFrameworkSpanDescriptor = {
+  attributes: Readonly<Record<string, FrameworkSpanAttributeValue>>;
+  kind: "client" | "internal" | "server";
+  name: string;
+  type: string;
+};
+export type FrameworkTracingBackendSpan = {
+  recordException?(error: unknown): void;
+  setAttribute(key: string, value: FrameworkSpanAttributeValue): void;
+  setErrorStatus?(message?: string): void;
+  updateName?(name: string): void;
+};
+export type FrameworkTracingIntegration = {
+  captureActiveContext?(): <T>(callback: () => T) => T;
+  getActiveSpan?(): FrameworkTracingBackendSpan | undefined;
+  id: string;
+  enterSpan<T>(descriptor: ResolvedFrameworkSpanDescriptor, callback: (span: FrameworkTracingBackendSpan) => T): T;
+  runWithDetachedContext?<T>(callback: () => T): T;
+  withPropagatedContext?<T>(carrier: Headers, callback: () => T): T;
+};
+export type FrameworkSpan = {
+  recordException(error: unknown): void;
+  setAttribute(key: string, value: FrameworkSpanAttributeValue | undefined): void;
+  setAttributes(attributes: Readonly<Record<string, FrameworkSpanAttributeValue | undefined>>): void;
+  setErrorStatus(message?: string): void;
+  updateName(name: string): void;
+};
+export type FrameworkTracer = {
+  captureActiveContext(): <T>(callback: () => T) => T;
+  getActiveScopeSpan(): FrameworkSpan | undefined;
+  runWithDetachedContext<T>(callback: () => T): T;
+  trace<T>(descriptor: FrameworkSpanDescriptor, callback: (span: FrameworkSpan) => T): T;
+  withPropagatedContext<T>(carrier: Headers, callback: () => T): T;
+};
+export declare function recordFrameworkSpanError(span: FrameworkSpan, error: unknown): void;
+export declare function createFrameworkTracer(integrations: readonly FrameworkTracingIntegration[]): FrameworkTracer;
+//#endregion