vinext 1.0.0-beta.8 → 1.0.0

package/dist/server/pages-client-assets.d.ts

@@ -1,12 +1,18 @@
 //#region src/server/pages-client-assets.d.ts
-type PagesClientAssets = {
+export type AssetCrossOrigin = "" | "anonymous" | "use-credentials";
+export type PagesClientAssets = {
   clientEntry?: string;
   appBootstrapPreinitModules?: string[];
   ssrManifest?: Record<string, string[]>;
+  cssGraph?: Record<string, {
+    imports?: string[];
+    css?: string[];
+  }>;
   lazyChunks?: string[];
   dynamicPreloads?: Record<string, string[]>;
+  /** next.config crossOrigin, defaulting to anonymous for Vite's CORS-fetched assets. */
+  crossOrigin?: AssetCrossOrigin;
 };
-declare function setPagesClientAssets(assets: PagesClientAssets | undefined): void;
-declare function getPagesClientAssets(): PagesClientAssets;
-//#endregion
-export { PagesClientAssets, getPagesClientAssets, setPagesClientAssets };
+export declare function setPagesClientAssets(assets: PagesClientAssets | undefined): void;
+export declare function getPagesClientAssets(): PagesClientAssets;
+//#endregion

package/dist/server/pages-data-route.d.ts

@@ -33,17 +33,17 @@ type NextDataMatch = {
  * of buildId. Used by the request pipeline to short-circuit before middleware
  * even when the buildId is wrong (so we can still return a 404 JSON response).
  */
-declare function isNextDataPathname(pathname: string): boolean;
+export declare function isNextDataPathname(pathname: string): boolean;
 /**
  * WHATWG URL parsing removes TAB, LF, and CR characters. Reject paths where
  * that normalization would manufacture the internal Pages data namespace.
  */
-declare function urlParserCreatesPagesDataPath(pathname: string): boolean;
+export declare function urlParserCreatesPagesDataPath(pathname: string): boolean;
 /**
  * Keep URL-parser-ignored characters encoded until route matching decodes the
  * captured parameter. Passing them literally to `new URL()` would remove them.
  */
-declare function encodeUrlParserIgnoredCharacters(pathname: string): string;
+export declare function encodeUrlParserIgnoredCharacters(pathname: string): string;
 /**
  * Parse `/_next/data/<buildId>/<...page>.json` and return the normalized page
  * pathname. Returns `null` if the pathname does not match the pattern or if
@@ -60,22 +60,22 @@ declare function encodeUrlParserIgnoredCharacters(pathname: string): string;
  * `/_next/data/<wrong-id>/about.json`        → null
  * `/_next/data/<buildId>/about`              → null  (missing .json suffix)
  */
-declare function parseNextDataPathname(pathname: string, buildId: string): NextDataMatch | null;
-declare function normalizeNextDataPagePathname(pagePathname: string, trailingSlash?: boolean): string;
+export declare function parseNextDataPathname(pathname: string, buildId: string): NextDataMatch | null;
+export declare function normalizeNextDataPagePathname(pagePathname: string, trailingSlash?: boolean): string;
 /**
  * Next.js only applies `trailingSlash` while normalizing a data URL for
  * middleware when proxy URL normalization is enabled. With
  * `skipProxyUrlNormalize`, the data route must retain the page's canonical
  * pathname without adding a slash.
  */
-declare function shouldAddTrailingSlashToPagesDataPath(hasMiddleware: boolean, trailingSlash: boolean, skipProxyUrlNormalize: boolean): boolean;
+export declare function shouldAddTrailingSlashToPagesDataPath(hasMiddleware: boolean, trailingSlash: boolean, skipProxyUrlNormalize: boolean): boolean;
 /**
  * Build a `_next/data` JSON response from the full Pages props object returned
  * through `_app.getInitialProps`. Next.js serializes the same outer props
  * object that would be passed to `<App />`, so custom app-level props remain
  * siblings of `pageProps` in the data envelope.
  */
-declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
+export declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
 /**
  * Build the 404 response Next.js returns for an unknown `_next/data` page.
  * Next.js renders this as a normal 404 page, but the body shape that clients
@@ -87,8 +87,8 @@ declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>,
  * empty JSON object so clients that blindly call `res.json()` do not throw
  * before checking the status code.
  */
-declare function buildNextDataNotFoundResponse(): Response;
-declare function buildMiddlewarePrefetchSkipResponse(matchedPathname: string): Response;
+export declare function buildNextDataNotFoundResponse(): Response;
+export declare function buildMiddlewarePrefetchSkipResponse(matchedPathname: string): Response;
 type NormalizePagesDataRequestResult = {
   isDataReq: false;
   request: Request;
@@ -127,6 +127,5 @@ type NormalizePagesDataRequestResult = {
  * Extracted from `entries/pages-server-entry.ts` so both `renderPage` and
  * `runMiddleware` share a single implementation.
  */
-declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string, trailingSlash?: boolean): NormalizePagesDataRequestResult;
-//#endregion
-export { buildMiddlewarePrefetchSkipResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath };
+export declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string, trailingSlash?: boolean): NormalizePagesDataRequestResult;
+//#endregion

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

@@ -1,5 +1,5 @@
-import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { MIDDLEWARE_SKIP_HEADER } from "../utils/protocol-headers.js";
+import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 //#region src/server/pages-data-route.ts
 /**

package/dist/server/pages-default-404.d.ts

@@ -23,8 +23,7 @@
  * Content-type is `text/html; charset=utf-8`, matching Next.js's
  * `pages-handler` 404 response.
  */
-declare function buildDefaultPagesNotFoundResponse(): Response;
+export declare function buildDefaultPagesNotFoundResponse(): Response;
 /** Exported for tests / callers that need the raw HTML body. */
-declare const DEFAULT_PAGES_NOT_FOUND_HTML = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"/><meta name=\"viewport\" content=\"width=device-width\"/><title>404: This page could not be found.</title><meta name=\"next-head-count\" content=\"2\"/><style data-next-hide-fouc=\"true\">body{display:none}</style><noscript data-next-hide-fouc=\"true\"><style>body{display:block}</style></noscript></head><body><div id=\"__next\"><div style=\"font-family:system-ui,&quot;Segoe UI&quot;,Roboto,Helvetica,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center\"><div style=\"line-height:48px\"><style>body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}</style><h1 class=\"next-error-h1\" style=\"display:inline-block;margin:0 20px 0 0;padding-right:23px;font-size:24px;font-weight:500;vertical-align:top\">404</h1><div style=\"display:inline-block\"><h2 style=\"font-size:14px;font-weight:400;line-height:28px\">This page could not be found.</h2></div></div></div></div></body></html>";
-//#endregion
-export { DEFAULT_PAGES_NOT_FOUND_HTML, buildDefaultPagesNotFoundResponse };
+export declare const DEFAULT_PAGES_NOT_FOUND_HTML = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"/><meta name=\"viewport\" content=\"width=device-width\"/><title>404: This page could not be found.</title><meta name=\"next-head-count\" content=\"2\"/><style data-next-hide-fouc=\"true\">body{display:none}</style><noscript data-next-hide-fouc=\"true\"><style>body{display:block}</style></noscript></head><body><div id=\"__next\"><div style=\"font-family:system-ui,&quot;Segoe UI&quot;,Roboto,Helvetica,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center\"><div style=\"line-height:48px\"><style>body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}</style><h1 class=\"next-error-h1\" style=\"display:inline-block;margin:0 20px 0 0;padding-right:23px;font-size:24px;font-weight:500;vertical-align:top\">404</h1><div style=\"display:inline-block\"><h2 style=\"font-size:14px;font-weight:400;line-height:28px\">This page could not be found.</h2></div></div></div></div></body></html>";
+//#endregion

package/dist/server/pages-dev-hydration.d.ts

@@ -1,14 +1,19 @@
 //#region src/server/pages-dev-hydration.d.ts
-type PagesDevHydrationOptions = {
+export type PagesDevHydrationOptions = {
   appModuleSource: string | null;
   forceRouterReady?: boolean;
   normalizePageProps?: boolean;
   pageModuleSource: string;
+  /** Lazily importable page routes, matching the production client manifest. */
+  pageLoaders?: readonly {
+    pattern: string;
+    moduleSource: string;
+    dataKind?: "static" | "server" | "none";
+  }[];
   reactStrictMode: boolean;
   replaceFallbackRoute?: boolean;
   scriptNonce?: string;
   setPagePatternsFromNextData?: boolean;
 };
-declare function createPagesDevHydrationScript(options: PagesDevHydrationOptions): string;
-//#endregion
-export { PagesDevHydrationOptions, createPagesDevHydrationScript };
+export declare function createPagesDevHydrationScript(options: PagesDevHydrationOptions): string;
+//#endregion

package/dist/server/pages-dev-hydration.js

@@ -1,11 +1,17 @@
 import { resolveClientRuntimeModule } from "../entries/runtime-entry-module.js";
-import { createNonceAttribute } from "./html.js";
+import { createNonceAttribute, safeJsonStringify } from "./html.js";
 //#region src/server/pages-dev-hydration.ts
 function createPagesDevHydrationScript(options) {
 	const nonceAttr = createNonceAttribute(options.scriptNonce);
 	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const initializeRouter = options.forceRouterReady ? "_initializePagesRouterReadyFromNextData(nextData, true);" : "_initializePagesRouterReadyFromNextData(nextData);";
-	const pagePatterns = options.setPagePatternsFromNextData ? "window.__VINEXT_PAGE_PATTERNS__ = [nextData.page];" : "";
+	const pagePatterns = options.setPagePatternsFromNextData ? options.pageLoaders ? "window.__VINEXT_PAGE_PATTERNS__ = Object.keys(window.__VINEXT_PAGE_LOADERS__);" : "window.__VINEXT_PAGE_PATTERNS__ = [nextData.page];" : "";
+	const pageLoaders = `{ ${[...options.pageLoaders?.map(({ pattern, moduleSource }) => {
+		const importer = moduleSource === "next/error" ? "import(\"next/error\")" : `loadDevPage(import.meta.env.BASE_URL + ${safeJsonStringify(moduleSource.slice(1))})`;
+		return `${safeJsonStringify(pattern)}: () => ${importer}`;
+	}) ?? [], `[nextData.page]: () => import(${safeJsonStringify(options.pageModuleSource)})`].join(", ")} }`;
+	const ssgPatterns = options.pageLoaders?.filter((route) => route.dataKind === "static").map((route) => route.pattern);
+	const sspPatterns = options.pageLoaders?.filter((route) => route.dataKind === "server").map((route) => route.pattern);
 	const pageProps = options.normalizePageProps === false ? "const pageProps = rawPageProps ?? {};" : "const pageProps = rawPageProps && typeof rawPageProps === \"object\" ? rawPageProps : {};";
 	const hydrationQueryUpdate = options.replaceFallbackRoute ? `
   const initialMatchesMiddleware =
@@ -19,7 +25,7 @@ function createPagesDevHydrationScript(options) {
     await Router.replace(routeUrl || currentUrl, routeUrl ? currentUrl : undefined, { _h: 1, scroll: false, shallow: !nextData.isFallback && !initialMatchesMiddleware });
   }` : "";
 	const createElement = options.appModuleSource ? `
-  const appModule = await import(${JSON.stringify(options.appModuleSource)});
+  const appModule = await import(${safeJsonStringify(options.appModuleSource)});
   const AppComponent = appModule.default;
   window.__VINEXT_APP__ = AppComponent;
   const appRouter = ${options.forceRouterReady ? "{ ...Router, isReady: true }" : "Router"};
@@ -33,7 +39,7 @@ function createPagesDevHydrationScript(options) {
   `;
 	return `
 <script type="module"${nonceAttr}>
-import ${JSON.stringify(reactInstanceBootstrapPath)};
+import ${safeJsonStringify(reactInstanceBootstrapPath)};
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -47,13 +53,19 @@ if (nextDataElement?.textContent) {
   window.__VINEXT_DEFAULT_LOCALE__ = window.__NEXT_DATA__.defaultLocale;
 }
 const nextData = window.__NEXT_DATA__;
+window.__VINEXT_MIDDLEWARE_MATCHER__ = nextData.__vinext?.clientMiddlewareMatcher;
 ${initializeRouter}
 const props = nextData.props && typeof nextData.props === "object" ? nextData.props : {};
 const rawPageProps = props.pageProps;
 ${pageProps}
-window.__VINEXT_PAGE_LOADERS__ = { [nextData.page]: () => import(${JSON.stringify(options.pageModuleSource)}) };
+// Other pages must not become static dependencies of this page's HMR proxy.
+// Vite adds ?import to variable imports, so source URLs are bare and base-qualified here.
+const loadDevPage = (source) => import(/* @vite-ignore */ source);
+window.__VINEXT_PAGE_LOADERS__ = ${pageLoaders};
 ${pagePatterns}
-window.__VINEXT_APP_LOADER__ = ${options.appModuleSource ? `() => import(${JSON.stringify(options.appModuleSource)})` : "undefined"};
+${ssgPatterns ? `window.__VINEXT_PAGES_SSG_PATTERNS__ = ${safeJsonStringify(ssgPatterns)};` : ""}
+${sspPatterns ? `window.__VINEXT_PAGES_SSP_PATTERNS__ = ${safeJsonStringify(sspPatterns)};` : ""}
+window.__VINEXT_APP_LOADER__ = ${options.appModuleSource ? `() => import(${safeJsonStringify(options.appModuleSource)})` : "undefined"};
 window.__VINEXT_REACT_STRICT_MODE__ = ${JSON.stringify(options.reactStrictMode)};
 
 async function hydrate() {
@@ -69,7 +81,7 @@ async function hydrate() {
     };
   }
 
-  const pageModule = await import(${JSON.stringify(options.pageModuleSource)});
+  const pageModule = await import(${safeJsonStringify(options.pageModuleSource)});
   const PageComponent = pageModule.default;
   let element;
   ${createElement}

package/dist/server/pages-dev-module-url.d.ts

@@ -1,5 +1,4 @@
 //#region src/server/pages-dev-module-url.d.ts
-declare function createPagesDevAssetUrl(assetPath: string): string;
-declare function createPagesDevModuleUrl(viteRoot: string, moduleFilePath: string, viteBase: string): string;
-//#endregion
-export { createPagesDevAssetUrl, createPagesDevModuleUrl };
+export declare function createPagesDevAssetUrl(assetPath: string): string;
+export declare function createPagesDevModuleUrl(viteRoot: string, moduleFilePath: string, viteBase: string): string;
+//#endregion

package/dist/server/pages-dev-stylesheets.d.ts

@@ -1,10 +1,9 @@
 import { ModuleImporter } from "./instrumentation.js";
 import { EnvironmentModuleGraph, EnvironmentModuleNode, ViteDevServer } from "vite";
 //#region src/server/pages-dev-stylesheets.d.ts
-declare function isViteStylesheetGraphTraversalBoundary(moduleNode: Pick<EnvironmentModuleNode, "url">): boolean;
-declare function isViteInjectedStylesheetModule(moduleNode: Pick<EnvironmentModuleNode, "type" | "url">): boolean;
+export declare function isViteStylesheetGraphTraversalBoundary(moduleNode: Pick<EnvironmentModuleNode, "url">): boolean;
+export declare function isViteInjectedStylesheetModule(moduleNode: Pick<EnvironmentModuleNode, "type" | "url">): boolean;
 /** Resolve the exact id Vite's CSS transform passes to updateStyle(). */
-declare function resolvePagesDevStylesheetId(moduleGraph: Pick<EnvironmentModuleGraph, "resolveUrl">, url: string, resolvedId?: string | null): Promise<string | null>;
-declare function collectPagesDevInitialStylesheetHeadHTML(server: ViteDevServer, runner: ModuleImporter, moduleIds: (string | null | undefined)[], nonceAttr: string): Promise<string>;
-//#endregion
-export { collectPagesDevInitialStylesheetHeadHTML, isViteInjectedStylesheetModule, isViteStylesheetGraphTraversalBoundary, resolvePagesDevStylesheetId };
+export declare function resolvePagesDevStylesheetId(moduleGraph: Pick<EnvironmentModuleGraph, "resolveUrl">, url: string, resolvedId?: string | null): Promise<string | null>;
+export declare function collectPagesDevInitialStylesheetHeadHTML(server: ViteDevServer, runner: ModuleImporter, moduleIds: (string | null | undefined)[], nonceAttr: string): Promise<string>;
+//#endregion

package/dist/server/pages-document-asset-props.d.ts

@@ -1,5 +1,5 @@
 //#region src/server/pages-document-asset-props.d.ts
-type DocumentAssetProps = {
+export type DocumentAssetProps = {
   headNonce?: string;
   headCrossOrigin?: string;
   scriptNonce?: string;
@@ -10,7 +10,7 @@ type ApplyDocumentAssetPropsOptions = {
   protectedAssetMarker?: string;
   scriptOwner?: "head" | "next-script";
 };
-declare function extractDocumentAssetProps(html: string): {
+export declare function extractDocumentAssetProps(html: string): {
   html: string;
   props: DocumentAssetProps;
 };
@@ -19,8 +19,7 @@ declare function extractDocumentAssetProps(html: string): {
  * Vite runs its HTML transforms. Tags injected by Vite after this marker pass
  * remain unmarked, so Document/config props can still be applied to them.
  */
-declare function markDocumentAssetPropsProtectedTags(html: string, markerAttribute: string): string;
-declare function stripDocumentAssetPropsProtectionMarkers(html: string, markerAttribute: string): string;
-declare function applyDocumentAssetProps(html: string, props: DocumentAssetProps, options?: ApplyDocumentAssetPropsOptions): string;
-//#endregion
-export { DocumentAssetProps, applyDocumentAssetProps, extractDocumentAssetProps, markDocumentAssetPropsProtectedTags, stripDocumentAssetPropsProtectionMarkers };
+export declare function markDocumentAssetPropsProtectedTags(html: string, markerAttribute: string): string;
+export declare function stripDocumentAssetPropsProtectionMarkers(html: string, markerAttribute: string): string;
+export declare function applyDocumentAssetProps(html: string, props: DocumentAssetProps, options?: ApplyDocumentAssetPropsOptions): string;
+//#endregion

package/dist/server/pages-document-initial-props.d.ts

@@ -1,8 +1,8 @@
 import React, { ComponentType, ReactNode } from "react";
 //#region src/server/pages-document-initial-props.d.ts
-declare function loadUserDocumentInitialProps(DocumentComponent: ComponentType): Promise<Record<string, unknown> | null>;
+export declare function loadUserDocumentInitialProps(DocumentComponent: ComponentType): Promise<Record<string, unknown> | null>;
 /** Options accepted by a `ctx.renderPage()` call (Pages Router contract). */
-type RenderPageEnhancers = {
+export type RenderPageEnhancers = {
   enhanceApp?: (App: ComponentType<{
     children?: ReactNode;
   }>) => any;
@@ -23,6 +23,7 @@ type DocumentRenderPageInput = {
   renderStylesToString: (element: React.ReactElement) => Promise<string>;
   /** Per-request CSP nonce applied to the enhanced page tree, if any. */
   scriptNonce?: string | undefined;
+  initialStylesheetHrefs?: ReadonlySet<string> | undefined;
   /** Extra `DocumentContext` fields (pathname/query/asPath). */
   context?: Record<string, unknown> | undefined;
 };
@@ -76,6 +77,5 @@ type RunDocumentRenderPageResult = {
  *
  * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
  */
-declare function runDocumentRenderPage(input: DocumentRenderPageInput): Promise<RunDocumentRenderPageResult>;
-//#endregion
-export { RenderPageEnhancers, loadUserDocumentInitialProps, runDocumentRenderPage };
+export declare function runDocumentRenderPage(input: DocumentRenderPageInput): Promise<RunDocumentRenderPageResult>;
+//#endregion

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

@@ -74,9 +74,11 @@ async function runDocumentRenderPage(input) {
 	if (!input.enhancePageElement) return { status: "skipped" };
 	const enhancePageElement = input.enhancePageElement;
 	const renderPage = async (opts = {}) => {
-		const wrapped = withScriptNonce(enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts), input.scriptNonce);
+		const enhancedElement = enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts);
+		const wrapped = withScriptNonce(enhancedElement, input.scriptNonce, input.initialStylesheetHrefs);
+		const stream = await input.renderToReadableStream(wrapped);
 		return {
-			html: await readStreamAsText(await input.renderToReadableStream(wrapped)),
+			html: await readStreamAsText(stream),
 			head: []
 		};
 	};

package/dist/server/pages-execution-tracing.d.ts

@@ -0,0 +1,40 @@
+//#region src/server/pages-execution-tracing.d.ts
+type PagesDataMethod = "getServerSideProps" | "getStaticProps";
+export declare function createPagesDataSpanDescriptor(method: PagesDataMethod, routePattern: string): {
+  readonly attributes: {
+    readonly "next.route": string;
+  };
+  readonly name: `getServerSideProps ${string}` | `getStaticProps ${string}`;
+  readonly type: "Render.getServerSideProps" | "Render.getStaticProps";
+};
+export declare function tracePagesData<T>(method: PagesDataMethod, routePattern: string, callback: () => T): T;
+export declare function createPagesDocumentSpanDescriptor(routePattern: string): {
+  readonly attributes: {
+    readonly "next.route": string;
+  };
+  readonly name: `render route (pages) ${string}`;
+  readonly type: "Render.renderDocument";
+};
+export declare function tracePagesDocument<T>(routePattern: string, callback: () => T): T;
+type PagesDocumentStreamResult = {
+  bodyStream?: ReadableStream<Uint8Array>;
+  waitForBody?: boolean;
+};
+/** Return at shell readiness while keeping the span open through body rendering. */
+export declare function tracePagesDocumentStream<T extends PagesDocumentStreamResult>(routePattern: string, callback: () => Promise<T>): Promise<T>;
+export declare function createPagesApiHandlerSpanDescriptor(routePattern: string): {
+  readonly name: `executing api route (pages) ${string}`;
+  readonly type: "Node.runHandler";
+};
+export declare function tracePagesApiHandler<T>(routePattern: string, callback: () => T, options?: {
+  recordErrors?: boolean;
+}): T;
+export declare function createFindPageComponentsSpanDescriptor(routePattern: string): {
+  readonly attributes: {
+    readonly "next.route": string;
+  };
+  readonly name: "resolve page components";
+  readonly type: "NextNodeServer.findPageComponents";
+};
+export declare function traceFindPageComponents<T>(routePattern: string, callback: () => T): T;
+//#endregion

package/dist/server/pages-execution-tracing.js

@@ -0,0 +1,80 @@
+import { patternToNextFormat } from "../routing/route-validation.js";
+import { frameworkTracer } from "./tracer.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+//#region src/server/pages-execution-tracing.ts
+function createPagesDataSpanDescriptor(method, routePattern) {
+	const route = patternToNextFormat(routePattern);
+	return {
+		attributes: { "next.route": route },
+		name: `${method} ${route}`,
+		type: `Render.${method}`
+	};
+}
+function tracePagesData(method, routePattern, callback) {
+	return frameworkTracer.trace(createPagesDataSpanDescriptor(method, routePattern), callback);
+}
+function createPagesDocumentSpanDescriptor(routePattern) {
+	const route = patternToNextFormat(routePattern);
+	return {
+		attributes: { "next.route": route },
+		name: `render route (pages) ${route}`,
+		type: "Render.renderDocument"
+	};
+}
+function tracePagesDocument(routePattern, callback) {
+	return frameworkTracer.trace(createPagesDocumentSpanDescriptor(routePattern), callback);
+}
+/** Return at shell readiness while keeping the span open through body rendering. */
+function tracePagesDocumentStream(routePattern, callback) {
+	return new Promise((resolve, reject) => {
+		tracePagesDocument(routePattern, async () => {
+			try {
+				let result = await callback();
+				if (!result.waitForBody || !result.bodyStream) {
+					resolve(result);
+					return result;
+				}
+				let finish;
+				let fail;
+				const completion = new Promise((resolveCompletion, rejectCompletion) => {
+					finish = resolveCompletion;
+					fail = rejectCompletion;
+				});
+				result = {
+					...result,
+					bodyStream: deferUntilStreamConsumed(result.bodyStream, finish, fail)
+				};
+				resolve(result);
+				await completion;
+				return result;
+			} catch (error) {
+				reject(error);
+				throw error;
+			}
+		}).catch(() => {});
+	});
+}
+function createPagesApiHandlerSpanDescriptor(routePattern) {
+	return {
+		name: `executing api route (pages) ${patternToNextFormat(routePattern)}`,
+		type: "Node.runHandler"
+	};
+}
+function tracePagesApiHandler(routePattern, callback, options = {}) {
+	return frameworkTracer.trace({
+		...createPagesApiHandlerSpanDescriptor(routePattern),
+		recordErrors: options.recordErrors
+	}, callback);
+}
+function createFindPageComponentsSpanDescriptor(routePattern) {
+	return {
+		attributes: { "next.route": patternToNextFormat(routePattern) },
+		name: "resolve page components",
+		type: "NextNodeServer.findPageComponents"
+	};
+}
+function traceFindPageComponents(routePattern, callback) {
+	return frameworkTracer.trace(createFindPageComponentsSpanDescriptor(routePattern), callback);
+}
+//#endregion
+export { createFindPageComponentsSpanDescriptor, createPagesApiHandlerSpanDescriptor, createPagesDataSpanDescriptor, createPagesDocumentSpanDescriptor, traceFindPageComponents, tracePagesApiHandler, tracePagesData, tracePagesDocument, tracePagesDocumentStream };

package/dist/server/pages-get-initial-props.d.ts

@@ -11,7 +11,7 @@ type PagesGetInitialPropsContext = {
   locales?: string[];
   defaultLocale?: string;
 } & Record<string, unknown>;
-type PagesGetInitialPropsRouter = Omit<Pick<NextRouter, "route" | "pathname" | "query" | "asPath">, "query"> & {
+export type PagesGetInitialPropsRouter = Omit<Pick<NextRouter, "route" | "pathname" | "query" | "asPath">, "query"> & {
   query: Record<string, unknown>;
 };
 /**
@@ -20,10 +20,10 @@ type PagesGetInitialPropsRouter = Omit<Pick<NextRouter, "route" | "pathname" | "
  * instance; this fallback keeps direct helper callers and tests aligned with
  * the same required fields.
  */
-declare function createPagesGetInitialPropsRouter(pathname: string, query: Record<string, unknown>, asPath: string): PagesGetInitialPropsRouter;
-declare function hasPagesGetInitialProps(component: unknown): boolean;
-declare function isResponseSent(res: unknown): boolean;
-declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
+export declare function createPagesGetInitialPropsRouter(pathname: string, query: Record<string, unknown>, asPath: string): PagesGetInitialPropsRouter;
+export declare function hasPagesGetInitialProps(component: unknown): boolean;
+export declare function isResponseSent(res: unknown): boolean;
+export declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
 /**
  * Decision returned by {@link loadDevAppInitialProps}.
  *
@@ -34,7 +34,7 @@ declare function loadPagesGetInitialProps(component: unknown, context: PagesGetI
  * - `render`: the caller should render with the returned `pageProps` /
  *   `renderProps`.
  */
-type DevAppInitialPropsResult = {
+export type DevAppInitialPropsResult = {
   kind: "skip";
 } | {
   kind: "response-sent";
@@ -45,7 +45,7 @@ type DevAppInitialPropsResult = {
     pageProps?: unknown;
   };
 };
-type DevAppInitialPropsContext = {
+export type DevAppInitialPropsContext = {
   appComponent: unknown;
   /**
    * Builds the `AppTree` element passed to `getInitialProps`. Injected so this
@@ -75,6 +75,5 @@ type DevAppInitialPropsContext = {
  * ISR cache HIT/STALE that serves cached HTML verbatim — so userland `App`
  * data code does not run on the cache hot path.
  */
-declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
-//#endregion
-export { DevAppInitialPropsContext, DevAppInitialPropsResult, PagesGetInitialPropsRouter, createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };
+export declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
+//#endregion

package/dist/server/pages-i18n.d.ts

@@ -55,7 +55,7 @@ type PagesI18nRequestInfo = {
  * Ported from Next.js: packages/next/src/server/lib/router-utils/resolve-routes.ts
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/router-utils/resolve-routes.ts
  */
-declare function normalizeDefaultLocalePathname(pathname: string, i18n: NextI18nConfig | null | undefined, options?: {
+export declare function normalizeDefaultLocalePathname(pathname: string, i18n: NextI18nConfig | null | undefined, options?: {
   hostname?: string | null;
 }): string;
 /**
@@ -63,7 +63,7 @@ declare function normalizeDefaultLocalePathname(pathname: string, i18n: NextI18n
  * e.g. /fr/about -> { locale: "fr", url: "/about", hadPrefix: true }
  *      /about    -> { locale: defaultLocale, url: "/about", hadPrefix: false }
  */
-declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig, defaultLocale?: string): {
+export declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig, defaultLocale?: string): {
   locale: string;
   url: string;
   hadPrefix: boolean;
@@ -83,18 +83,18 @@ declare function extractLocaleFromUrl(url: string, i18nConfig: NextI18nConfig, d
  *
  * Reference: packages/next/src/shared/lib/i18n/normalize-locale-path.ts.
  */
-declare function stripI18nLocaleForApiRoute(url: string, i18nConfig: NextI18nConfig | null | undefined): string;
+export declare function stripI18nLocaleForApiRoute(url: string, i18nConfig: NextI18nConfig | null | undefined): string;
 /**
  * Detect the preferred locale from the Accept-Language header.
  * Returns the best matching locale or null.
  */
-declare function detectLocaleFromAcceptLanguage(acceptLang: string | null | undefined, i18nConfig: NextI18nConfig): string | null;
+export declare function detectLocaleFromAcceptLanguage(acceptLang: string | null | undefined, i18nConfig: NextI18nConfig): string | null;
 /**
  * Parse the NEXT_LOCALE cookie.
  * Returns the cookie value if it matches a configured locale, otherwise null.
  */
-declare function parseCookieLocaleFromHeader(cookieHeader: string | null | undefined, i18nConfig: NextI18nConfig): string | null;
-declare function getLocaleRedirect({ headers, nextConfig, pathLocale, urlParsed }: LocaleRedirectOptions): string | undefined;
-declare function resolvePagesI18nRequest(url: string, i18nConfig: NextI18nConfig, headers?: HeaderBag, hostname?: string | null, basePath?: string, trailingSlash?: boolean): PagesI18nRequestInfo;
+export declare function parseCookieLocaleFromHeader(cookieHeader: string | null | undefined, i18nConfig: NextI18nConfig): string | null;
+export declare function getLocaleRedirect({ headers, nextConfig, pathLocale, urlParsed }: LocaleRedirectOptions): string | undefined;
+export declare function resolvePagesI18nRequest(url: string, i18nConfig: NextI18nConfig, headers?: HeaderBag, hostname?: string | null, basePath?: string, trailingSlash?: boolean): PagesI18nRequestInfo;
 //#endregion
-export { detectDomainLocale, detectLocaleFromAcceptLanguage, extractLocaleFromUrl, getLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, stripI18nLocaleForApiRoute };
+export { detectDomainLocale };

package/dist/server/pages-i18n.js

@@ -56,8 +56,9 @@ function normalizeDefaultLocalePathname(pathname, i18n, options = {}) {
 function extractLocaleFromUrl(url, i18nConfig, defaultLocale = i18nConfig.defaultLocale) {
 	const parts = url.split("?")[0].split("/").filter(Boolean);
 	const query = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-	if (parts.length > 0 && i18nConfig.locales.includes(parts[0])) return {
-		locale: parts[0],
+	const locale = i18nConfig.locales.find((candidate) => candidate.toLowerCase() === parts[0]?.toLowerCase());
+	if (locale) return {
+		locale,
 		url: ("/" + parts.slice(1).join("/") || "/") + query,
 		hadPrefix: true
 	};

package/dist/server/pages-media-type.d.ts

@@ -5,11 +5,10 @@
  * Used by both api-handler.ts (Pages Router dev/prod with Node.js req/res) and
  * pages-node-compat.ts (Pages Router fetch-based facade for Cloudflare Workers).
  */
-declare class PagesBodyParseError extends Error {
+export declare class PagesBodyParseError extends Error {
   readonly statusCode: number;
   constructor(message: string, statusCode: number);
 }
-declare function getMediaType(contentType: string | null | undefined): string;
-declare function isJsonMediaType(mediaType: string): boolean;
-//#endregion
-export { PagesBodyParseError, getMediaType, isJsonMediaType };
+export declare function getMediaType(contentType: string | null | undefined): string;
+export declare function isJsonMediaType(mediaType: string): boolean;
+//#endregion

package/dist/server/pages-node-compat.d.ts

@@ -3,8 +3,8 @@ import { RevalidateOptions } from "./pages-revalidate.js";
 import { PagesPreviewData } from "./pages-preview.js";
 import { Readable, Writable } from "node:stream";
 //#region src/server/pages-node-compat.d.ts
-type PagesRequestQuery = Record<string, string | string[]>;
-type PagesReqResRequest = Readable & {
+export type PagesRequestQuery = Record<string, string | string[]>;
+export type PagesReqResRequest = Readable & {
   method: string;
   url: string;
   headers: Record<string, string>;
@@ -18,7 +18,7 @@ type PagesReqResRequest = Readable & {
 type PagesReqResHeaders = {
   [key: string]: string | number | boolean | string[];
 };
-type PagesReqResResponse = Writable & {
+export type PagesReqResResponse = Writable & {
   statusCode: number;
   readonly headersSent: boolean;
   writeHead: (code: number, headers?: PagesReqResHeaders) => PagesReqResResponse;
@@ -50,6 +50,7 @@ type PagesRequestCookiesCarrier = {
 type CreatePagesReqResOptions = {
   allowedRevalidateHeaderKeys?: readonly string[];
   body: unknown;
+  initialResponseHeaders?: Headers;
   query: PagesRequestQuery;
   request: Request;
   trustedRevalidateOrigin?: string;
@@ -70,9 +71,9 @@ type CreatePagesReqResResult = {
  *
  * @see https://nextjs.org/docs/pages/building-your-application/routing/api-routes#custom-config
  */
-declare function parsePagesApiBody(request: Request, maxBytes?: number): Promise<unknown>;
-declare function attachPagesRequestCookies(req: PagesRequestCookiesCarrier): void;
-declare function attachPagesPreviewApi(req: PagesReqResRequest, res: PagesReqResResponse): void;
+export declare function parsePagesApiBody(request: Request, maxBytes?: number): Promise<unknown>;
+export declare function attachPagesRequestCookies(req: PagesRequestCookiesCarrier): void;
+export declare function attachPagesPreviewApi(req: PagesReqResRequest, res: PagesReqResResponse): void;
 /**
  * Marks a Pages API Response whose body was still being written when the
  * handler settled (streaming/piping), so Node adapters forward it as a stream.
@@ -81,8 +82,8 @@ declare function attachPagesPreviewApi(req: PagesReqResRequest, res: PagesReqRes
  * `res.end(data)`) are not marked and keep the buffered path, which preserves
  * Content-Length.
  */
-declare function markVinextStreamedApiResponse(response: Response): void;
-declare function isVinextStreamedApiResponse(response: Response): boolean;
-declare function createPagesReqRes(options: CreatePagesReqResOptions): CreatePagesReqResResult;
+export declare function markVinextStreamedApiResponse(response: Response): void;
+export declare function isVinextStreamedApiResponse(response: Response): boolean;
+export declare function createPagesReqRes(options: CreatePagesReqResOptions): CreatePagesReqResResult;
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, PagesReqResRequest, PagesReqResResponse, PagesRequestQuery, attachPagesPreviewApi, attachPagesRequestCookies, createPagesReqRes, isVinextStreamedApiResponse, markVinextStreamedApiResponse, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError };