vinext 1.0.0-beta.9 → 1.0.1

package/dist/server/pages-asset-tags.d.ts

@@ -9,18 +9,19 @@
  * unit-testable and lives in a normal typed module rather than a codegen
  * template string.
  */
+export declare function getSharedChunkFiles(manifest: Record<string, string[]>): string[];
 /**
  * Resolve the effective SSR manifest: prefer the caller-supplied object and
  * fall back to the registered client build metadata.
  */
-declare function resolveSsrManifest(manifest: Record<string, string[]> | null | undefined): Record<string, string[]> | null;
+export declare function resolveSsrManifest(manifest: Record<string, string[]> | null | undefined): Record<string, string[]> | null;
 /**
  * Look up the asset-file list for a module ID in the SSR manifest.
  *
  * The manifest keys may use relative paths while callers supply absolute
  * paths, so a suffix-match fallback is used when an exact-key lookup fails.
  */
-declare function getManifestFilesForModule(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined): string[] | null;
+export declare function getManifestFilesForModule(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined): string[] | null;
 /**
  * Find the first `.js` file in the manifest for `moduleId` and return the URL it
  * is actually SERVED from. Used to resolve the client-navigation / hydration URL
@@ -29,7 +30,7 @@ declare function getManifestFilesForModule(manifest: Record<string, string[]> |
  * asset URLs. SSR-manifest values are base-anchored; re-anchor under any
  * configured `assetPrefix` (default `""` keeps the legacy `"/" + file`).
  */
-declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string, _deploymentId?: string): string | undefined;
+export declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string, _deploymentId?: string): string | undefined;
 type CollectAssetTagsOptions = {
   /**
    * SSR manifest mapping module file paths to their associated asset list.
@@ -59,6 +60,7 @@ type CollectAssetTagsOptions = {
   assetPrefix?: string;
   deploymentId?: string;
   crossOrigin?: string;
+  initialStylesheetHrefs?: Set<string>;
 };
 /**
  * Build the HTML `<link>` and `<script>` tag string for the SSR response.
@@ -73,6 +75,5 @@ type CollectAssetTagsOptions = {
  *
  * Extracted from `entries/pages-server-entry.ts`.
  */
-declare function collectAssetTags(options: CollectAssetTagsOptions): string;
-//#endregion
-export { collectAssetTags, getManifestFilesForModule, resolveClientModuleUrl, resolveSsrManifest };
+export declare function collectAssetTags(options: CollectAssetTagsOptions): string;
+//#endregion

package/dist/server/pages-asset-tags.js

@@ -13,12 +13,73 @@ import { getPagesClientAssets } from "./pages-client-assets.js";
 * unit-testable and lives in a normal typed module rather than a codegen
 * template string.
 */
+const nonEmptyManifests = /* @__PURE__ */ new WeakMap();
+const moduleKeyOrder = /* @__PURE__ */ new WeakMap();
+const sharedChunkFiles = /* @__PURE__ */ new WeakMap();
+const lazyChunkSets = /* @__PURE__ */ new WeakMap();
+function findModuleKey(manifest, moduleId) {
+	if (manifest[moduleId]) return moduleId;
+	let uniqueKey = null;
+	let candidate = moduleId;
+	while (true) {
+		if (Object.prototype.propertyIsEnumerable.call(manifest, candidate)) {
+			if (uniqueKey !== null) {
+				uniqueKey = null;
+				break;
+			}
+			uniqueKey = candidate;
+		}
+		const slash = candidate.indexOf("/");
+		if (slash === -1) break;
+		candidate = candidate.slice(slash + 1);
+	}
+	if (uniqueKey !== null) return uniqueKey;
+	let keyOrder = moduleKeyOrder.get(manifest);
+	if (!keyOrder) {
+		keyOrder = /* @__PURE__ */ new Map();
+		for (const key in manifest) keyOrder.set(key, keyOrder.size);
+		moduleKeyOrder.set(manifest, keyOrder);
+	}
+	let matchedKey = null;
+	let matchedOrder = Infinity;
+	let suffix = moduleId;
+	while (true) {
+		const order = keyOrder.get(suffix);
+		if (order !== void 0 && order < matchedOrder) {
+			matchedKey = suffix;
+			matchedOrder = order;
+		}
+		const slash = suffix.indexOf("/");
+		if (slash === -1) break;
+		suffix = suffix.slice(slash + 1);
+	}
+	return matchedKey;
+}
+function getSharedChunkFiles(manifest) {
+	const cached = sharedChunkFiles.get(manifest);
+	if (cached) return cached;
+	const files = /* @__PURE__ */ new Set();
+	for (const key in manifest) for (const file of manifest[key] ?? []) {
+		const basename = file.slice(file.lastIndexOf("/") + 1);
+		if (basename.startsWith("framework-") || basename.startsWith("vinext-") || basename.includes("vinext-client-entry") || basename.includes("vinext-app-browser-entry")) files.add(file);
+	}
+	const result = [...files];
+	sharedChunkFiles.set(manifest, result);
+	return result;
+}
 /**
 * Resolve the effective SSR manifest: prefer the caller-supplied object and
 * fall back to the registered client build metadata.
 */
 function resolveSsrManifest(manifest) {
-	if (manifest && Object.keys(manifest).length > 0) return manifest;
+	if (manifest) {
+		let nonEmpty = nonEmptyManifests.get(manifest);
+		if (nonEmpty === void 0) {
+			nonEmpty = Object.keys(manifest).length > 0;
+			nonEmptyManifests.set(manifest, nonEmpty);
+		}
+		if (nonEmpty) return manifest;
+	}
 	return getPagesClientAssets().ssrManifest ?? null;
 }
 /**
@@ -29,10 +90,27 @@ function resolveSsrManifest(manifest) {
 */
 function getManifestFilesForModule(manifest, moduleId) {
 	if (!manifest || !moduleId) return null;
-	const files = manifest[moduleId];
-	if (files) return files;
-	for (const key in manifest) if (moduleId.endsWith("/" + key) || moduleId === key) return manifest[key];
-	return null;
+	const key = findModuleKey(manifest, moduleId);
+	return key === null ? null : manifest[key];
+}
+function collectGraphOrderedCss(graph, moduleIds) {
+	const ordered = [];
+	const emitted = /* @__PURE__ */ new Set();
+	const visited = /* @__PURE__ */ new Set();
+	function visit(key) {
+		if (!key || visited.has(key)) return;
+		visited.add(key);
+		const chunk = graph[key];
+		if (!chunk) return;
+		for (const importedKey of chunk.imports ?? []) visit(importedKey);
+		for (const file of chunk.css ?? []) {
+			if (emitted.has(file)) continue;
+			emitted.add(file);
+			ordered.push(file);
+		}
+	}
+	for (const moduleId of moduleIds) if (moduleId) visit(findModuleKey(graph, moduleId));
+	return ordered;
 }
 /**
 * Find the first `.js` file in the manifest for `moduleId` and return the URL it
@@ -80,13 +158,25 @@ function collectAssetTags(options) {
 	};
 	const runtimeAssets = getPagesClientAssets();
 	const lazyChunks = runtimeAssets.lazyChunks ?? null;
-	const lazySet = lazyChunks && lazyChunks.length > 0 ? new Set(lazyChunks) : null;
+	let lazySet = lazyChunks ? lazyChunkSets.get(lazyChunks) : void 0;
+	if (lazyChunks && !lazySet) {
+		lazySet = new Set(lazyChunks);
+		lazyChunkSets.set(lazyChunks, lazySet);
+	}
 	const clientEntry = runtimeAssets.clientEntry;
 	if (clientEntry) {
 		seen.add(clientEntry);
 		tags.push("<link rel=\"modulepreload\"" + nonceAttr + " href=\"" + href(clientEntry) + "\"" + preloadCrossOriginAttr + " />");
 		tags.push("<script type=\"module\"" + deferAttr + nonceAttr + " src=\"" + href(clientEntry) + "\"" + scriptCrossOriginAttr + "><\/script>");
 	}
+	if (runtimeAssets.cssGraph) for (let file of collectGraphOrderedCss(runtimeAssets.cssGraph, options.moduleIds)) {
+		if (file.charAt(0) === "/") file = file.slice(1);
+		if (seen.has(file)) continue;
+		seen.add(file);
+		const stylesheetHref = href(file);
+		options.initialStylesheetHrefs?.add(stylesheetHref);
+		tags.push("<link rel=\"stylesheet\"" + nonceAttr + " href=\"" + stylesheetHref + "\" />");
+	}
 	if (m) {
 		const allFiles = [];
 		const moduleIds = options.moduleIds;
@@ -96,15 +186,8 @@ function collectAssetTags(options) {
 				const files = getManifestFilesForModule(m, id);
 				if (files) for (let fi = 0; fi < files.length; fi++) allFiles.push(files[fi]);
 			}
-			for (const key in m) {
-				const vals = m[key];
-				if (!vals) continue;
-				for (let vi = 0; vi < vals.length; vi++) {
-					const file = vals[vi];
-					const basename = file.split("/").pop() || "";
-					if (basename.startsWith("framework-") || basename.startsWith("vinext-") || basename.includes("vinext-client-entry") || basename.includes("vinext-app-browser-entry")) allFiles.push(file);
-				}
-			}
+			const sharedFiles = m === runtimeAssets.ssrManifest && runtimeAssets.sharedChunks ? runtimeAssets.sharedChunks : getSharedChunkFiles(m);
+			for (const file of sharedFiles) allFiles.push(file);
 		} else for (const akey in m) {
 			const avals = m[akey];
 			if (avals) for (let ai = 0; ai < avals.length; ai++) allFiles.push(avals[ai]);
@@ -114,8 +197,11 @@ function collectAssetTags(options) {
 			if (tf.charAt(0) === "/") tf = tf.slice(1);
 			if (seen.has(tf)) continue;
 			seen.add(tf);
-			if (tf.endsWith(".css")) tags.push("<link rel=\"stylesheet\"" + nonceAttr + " href=\"" + href(tf) + "\" />");
-			else if (tf.endsWith(".js")) {
+			if (tf.endsWith(".css")) {
+				const stylesheetHref = href(tf);
+				options.initialStylesheetHrefs?.add(stylesheetHref);
+				tags.push("<link rel=\"stylesheet\"" + nonceAttr + " href=\"" + stylesheetHref + "\" />");
+			} else if (tf.endsWith(".js")) {
 				if (lazySet && lazySet.has(tf)) continue;
 				tags.push("<link rel=\"modulepreload\"" + nonceAttr + " href=\"" + href(tf) + "\"" + preloadCrossOriginAttr + " />");
 				tags.push("<script type=\"module\"" + deferAttr + nonceAttr + " src=\"" + href(tf) + "\"" + scriptCrossOriginAttr + "><\/script>");
@@ -125,4 +211,4 @@ function collectAssetTags(options) {
 	return tags.join("\n  ");
 }
 //#endregion
-export { collectAssetTags, getManifestFilesForModule, resolveClientModuleUrl, resolveSsrManifest };
+export { collectAssetTags, getManifestFilesForModule, getSharedChunkFiles, resolveClientModuleUrl, resolveSsrManifest };

package/dist/server/pages-body-parser-config.d.ts

@@ -23,7 +23,7 @@
 /**
  * Default Pages Router API body size limit, matching Next.js.
  */
-declare const DEFAULT_PAGES_API_BODY_SIZE_LIMIT: number;
+export declare const DEFAULT_PAGES_API_BODY_SIZE_LIMIT: number;
 /**
  * Resolved bodyParser configuration. When `enabled` is `false`, the body
  * MUST be passed through to the handler as a raw stream (or left unparsed
@@ -43,17 +43,16 @@ type ResolvedBodyParserConfig = {
  * Matches the format accepted by Next.js (the `bytes` package); we
  * implement it inline to avoid pulling a dependency for a tiny parser.
  */
-declare function parseSizeLimit(value: string | number | undefined): number | undefined;
+export declare function parseSizeLimit(value: string | number | undefined): number | undefined;
 /**
  * Read the resolved `bodyParser` config from a route module's `config`
  * export. Defaults to enabled with the 1 MB Next.js default.
  */
-declare function resolveBodyParserConfig(moduleConfig: {
+export declare function resolveBodyParserConfig(moduleConfig: {
   api?: {
     bodyParser?: boolean | {
       sizeLimit?: string | number;
     };
   };
 } | undefined, defaultSizeLimit?: number): ResolvedBodyParserConfig;
-//#endregion
-export { DEFAULT_PAGES_API_BODY_SIZE_LIMIT, parseSizeLimit, resolveBodyParserConfig };
+//#endregion

package/dist/server/pages-body-parser-config.js

@@ -23,13 +23,13 @@
 /**
 * Default Pages Router API body size limit, matching Next.js.
 */
-const DEFAULT_PAGES_API_BODY_SIZE_LIMIT = 1 * 1024 * 1024;
+const DEFAULT_PAGES_API_BODY_SIZE_LIMIT = 1048576;
 const SIZE_UNITS = {
 	b: 1,
 	kb: 1024,
-	mb: 1024 * 1024,
-	gb: 1024 * 1024 * 1024,
-	tb: 1024 * 1024 * 1024 * 1024
+	mb: 1048576,
+	gb: 1073741824,
+	tb: 1099511627776
 };
 /**
 * Parse a Next.js-style `sizeLimit` string (e.g. `"4mb"`, `"100kb"`, `"1gb"`)

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

@@ -1,12 +1,20 @@
 //#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[]>;
+  /** Build-time shared file list, valid only for this ssrManifest object. */
+  sharedChunks?: 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