vinext 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/server/metadata-route-response.js

@@ -1,14 +1,18 @@
 import { markFullyBufferedBody } from "./fully-buffered-response.js";
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { decodeMatchedParams } from "../routing/utils.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_METADATA_ROUTE_CACHE_HEADER } from "./headers.js";
 import { notFoundResponse } from "./http-error-responses.js";
+import { beginRouteCacheability, markRouteCacheabilityExplicitResponsePolicy } from "../shims/cacheability-classification.js";
+import { hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy } from "./cache-control.js";
 import { isrCacheControl } from "./isr-cache.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
 import { _consumeRequestScopedCacheLife, cacheLifeProfiles } from "../shims/cache-request-state.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { isValidMetadataImageId, manifestToJson, matchMetadataRoutePattern, robotsToText, sitemapToXml } from "./metadata-routes.js";
 import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./prerender-cache-life-header.js";
+import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
 import { isMetadataResponseCacheable } from "./metadata-route-cache-policy.js";
@@ -50,6 +54,7 @@ function metadataRouteCacheHeader(route) {
 	return CACHE_HEADERS.revalidate;
 }
 function withMetadataRouteCacheHeader(response, route) {
+	if (hasCdnResponsePolicy(response.headers) && !hasExplicitNonCacheableResponsePolicy(response.headers)) markRouteCacheabilityExplicitResponsePolicy();
 	const headers = new Headers(response.headers);
 	if (!headers.has("Cache-Control")) headers.set("Cache-Control", metadataRouteCacheHeader(route));
 	return new Response(response.body, {
@@ -58,13 +63,18 @@ function withMetadataRouteCacheHeader(response, route) {
 		statusText: response.statusText
 	});
 }
+function beginMetadataRouteCacheability(route) {
+	beginRouteCacheability("app-route", route.patternParts ? `/${route.patternParts.join("/")}` : route.servedUrl);
+}
 function getMetadataRouteFunctions(route) {
 	const cached = routeFunctionCache.get(route);
 	if (cached) return cached;
 	const generateImageMetadata = route.isDynamic && isImageMetadataRoute(route) ? readFunction(route.module, "generateImageMetadata") : null;
 	const functions = {
 		defaultExport: route.isDynamic ? readFunction(route.module, "default") : null,
+		dynamicParams: route.isDynamic && typeof route.module?.dynamicParams === "boolean" ? route.module.dynamicParams : void 0,
 		generateImageMetadata,
+		generateStaticParams: route.isDynamic ? readFunction(route.module, "generateStaticParams") : null,
 		generateSitemaps: route.type === "sitemap" && route.isDynamic ? readFunction(route.module, "generateSitemaps") : null,
 		hasGeneratedImageMetadata: route.isDynamic && isImageMetadataRoute(route) && Boolean(generateImageMetadata)
 	};
@@ -256,6 +266,39 @@ function matchMetadataRoute(route, cleanPathname, functions, getUrlParts) {
 		imageId: null
 	} : null;
 }
+function metadataRouteParamNames(patternParts) {
+	return patternParts.flatMap((part) => {
+		if (!part.startsWith(":")) return [];
+		return [part.slice(1, part.endsWith("+") || part.endsWith("*") ? -1 : void 0)];
+	});
+}
+function metadataRouteOptionalCatchAllParamNames(patternParts) {
+	return patternParts.flatMap((part) => part.startsWith(":") && part.endsWith("*") ? [part.slice(1, -1)] : []);
+}
+function metadataRouteRawParams(route, match, routePathname) {
+	const urlParts = routePathname.split("/").filter(Boolean);
+	if (match.imageId !== null) urlParts.pop();
+	const params = Object.create(null);
+	let urlIndex = 0;
+	for (const part of route.patternParts ?? []) {
+		if (!part.startsWith(":")) {
+			urlIndex++;
+			continue;
+		}
+		const isCatchAll = part.endsWith("+") || part.endsWith("*");
+		const name = part.slice(1, isCatchAll ? -1 : void 0);
+		if (!isCatchAll) {
+			const value = urlParts[urlIndex++];
+			if (value !== void 0) params[name] = value;
+			continue;
+		}
+		const matchedValue = match.params?.[name];
+		const valueCount = Array.isArray(matchedValue) ? matchedValue.length : matchedValue ? 1 : 0;
+		if (valueCount > 0) params[name] = urlParts.slice(urlIndex, urlIndex + valueCount);
+		urlIndex += valueCount;
+	}
+	return params;
+}
 function findGeneratedSitemapId(entries, rawId) {
 	if (!Array.isArray(entries)) return null;
 	for (const entry of entries) {
@@ -386,6 +429,7 @@ async function handleMetadataRouteRequest(options) {
 		if (route.type === "sitemap" && route.isDynamic) {
 			if (functions.generateSitemaps) {
 				if (isGeneratedSitemapPath(route, options.cleanPathname)) {
+					beginMetadataRouteCacheability(route);
 					const render = async () => {
 						setCurrentFetchSoftTags(buildMetadataRouteTags(route, options.cleanPathname, []));
 						const response = await handleGeneratedSitemap(route, options.cleanPathname, functions);
@@ -404,6 +448,27 @@ async function handleMetadataRouteRequest(options) {
 		}
 		const match = matchMetadataRoute(route, options.cleanPathname, functions, getUrlParts);
 		if (!match) continue;
+		beginMetadataRouteCacheability(route);
+		const rawParams = route.patternParts ? metadataRouteRawParams(route, match, options.routePathname ?? options.cleanPathname) : Object.create(null);
+		if (route.patternParts) {
+			const runtimeParams = { ...rawParams };
+			decodeMatchedParams(runtimeParams);
+			match.params = runtimeParams;
+		}
+		if (route.isDynamic && isImageMetadataRoute(route) && functions.dynamicParams === false) {
+			const validationParams = { ...rawParams };
+			canonicalizeAppPageParams(validationParams);
+			const { validateAppPageDynamicParams } = await import("./app-page-request.js");
+			const dynamicParamsResponse = await validateAppPageDynamicParams({
+				enforceStaticParamsOnly: true,
+				generateStaticParams: functions.generateStaticParams,
+				isDynamicRoute: Boolean(route.patternParts),
+				optionalCatchAllParamNames: metadataRouteOptionalCatchAllParamNames(route.patternParts ?? []),
+				params: validationParams,
+				requiredParamNames: metadataRouteParamNames(route.patternParts ?? [])
+			});
+			if (dynamicParamsResponse) return dynamicParamsResponse;
+		}
 		const render = async () => {
 			setCurrentFetchSoftTags(buildMetadataRouteTags(route, options.cleanPathname, []));
 			return captureRenderedMetadataRoute(route.isDynamic ? await callDynamicMetadataRoute(route, match, options.makeThenableParams, functions) : serveStaticMetadataRoute(route));

package/dist/server/middleware-runtime.js

@@ -1,12 +1,12 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import "../utils/protocol-headers.js";
+import { shouldKeepMiddlewareHeader } from "../utils/middleware-request-headers.js";
+import { normalizeHost } from "../config/request-context.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "../shims/request-context.js";
 import "./server-globals.js";
-import { normalizeHost } from "../config/request-context.js";
-import "../utils/protocol-headers.js";
 import { MIDDLEWARE_REWRITE_HEADER } from "./headers.js";
-import { shouldKeepMiddlewareHeader } from "../utils/middleware-request-headers.js";
 import { NextFetchEvent, NextRequest } from "../shims/server.js";
 import { normalizePath } from "./normalize-path.js";
 import { matchesMiddleware, matchesMiddlewarePathname } from "./middleware-matcher.js";

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

@@ -59,6 +59,7 @@ type CollectAssetTagsOptions = {
   assetPrefix?: string;
   deploymentId?: string;
   crossOrigin?: string;
+  initialStylesheetHrefs?: Set<string>;
 };
 /**
  * Build the HTML `<link>` and `<script>` tag string for the SSR response.

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

@@ -34,6 +34,30 @@ function getManifestFilesForModule(manifest, moduleId) {
 	for (const key in manifest) if (moduleId.endsWith("/" + key) || moduleId === key) return manifest[key];
 	return null;
 }
+function collectGraphOrderedCss(graph, moduleIds) {
+	const ordered = [];
+	const emitted = /* @__PURE__ */ new Set();
+	const visited = /* @__PURE__ */ new Set();
+	function findKey(moduleId) {
+		if (!moduleId) return void 0;
+		if (graph[moduleId]) return moduleId;
+		for (const key in graph) if (moduleId === key || moduleId.endsWith("/" + key)) return key;
+	}
+	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) visit(findKey(moduleId));
+	return ordered;
+}
 /**
 * 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
@@ -87,6 +111,14 @@ function collectAssetTags(options) {
 		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;
@@ -114,8 +146,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>");

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

@@ -1,10 +1,17 @@
 //#region src/server/pages-client-assets.d.ts
+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;
 };
 export declare function setPagesClientAssets(assets: PagesClientAssets | undefined): void;
 export declare function getPagesClientAssets(): PagesClientAssets;

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-dev-hydration.d.ts

@@ -4,6 +4,12 @@ export type PagesDevHydrationOptions = {
   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;

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-document-initial-props.d.ts

@@ -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;
 };

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

@@ -75,7 +75,7 @@ async function runDocumentRenderPage(input) {
 	const enhancePageElement = input.enhancePageElement;
 	const renderPage = async (opts = {}) => {
 		const enhancedElement = enhancePageElement(typeof opts === "function" ? { enhanceComponent: opts } : opts);
-		const wrapped = withScriptNonce(enhancedElement, input.scriptNonce);
+		const wrapped = withScriptNonce(enhancedElement, input.scriptNonce, input.initialStylesheetHrefs);
 		const stream = await input.renderToReadableStream(wrapped);
 		return {
 			html: await readStreamAsText(stream),

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

@@ -1,14 +1,14 @@
+import { isUnknownRecord } from "../utils/record.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { buildPagesCacheValue, isrCacheControl } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { matchesIfNoneMatch } from "./http-conditional.js";
 import { buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";

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

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
 import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { extractLocaleFromUrl, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { reportRequestError } from "./instrumentation.js";
@@ -492,6 +492,7 @@ function createPagesPageHandler(opts) {
 				const pageModuleIds = [];
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
 				if (route.filePath) pageModuleIds.push(route.filePath);
+				const initialStylesheetHrefs = /* @__PURE__ */ new Set();
 				let pageResponse = await renderTracedPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
@@ -501,7 +502,8 @@ function createPagesPageHandler(opts) {
 						basePath: vinextConfig.basePath,
 						assetPrefix: vinextConfig.assetPrefix,
 						deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
-						crossOrigin: vinextConfig.crossOrigin
+						crossOrigin: vinextConfig.crossOrigin,
+						initialStylesheetHrefs
 					}),
 					buildId,
 					clearSsrContext() {
@@ -549,6 +551,7 @@ function createPagesPageHandler(opts) {
 					routeUrl: renderRouteUrl,
 					safeJsonStringify,
 					scriptNonce,
+					initialStylesheetHrefs,
 					crossOrigin: vinextConfig.crossOrigin,
 					disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
 					statusCode: renderStatusCode,

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

@@ -112,6 +112,7 @@ type RenderPagesPageResponseOptions = {
   routeUrl: string;
   safeJsonStringify: (value: unknown) => string;
   scriptNonce?: string;
+  initialStylesheetHrefs?: ReadonlySet<string>;
   crossOrigin?: string;
   disableOptimizedLoading: boolean;
   statusCode?: number;

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

@@ -1,3 +1,4 @@
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
@@ -15,7 +16,6 @@ import { setCacheStateHeaders } from "./cache-headers.js";
 import { readStreamAsText } from "../utils/text-stream.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 { matchesIfNoneMatch } from "./http-conditional.js";
 import React from "react";
 //#region src/server/pages-page-response.ts
@@ -189,6 +189,7 @@ async function renderPagesPageResponse(options) {
 			renderToReadableStream: options.renderToReadableStream,
 			renderStylesToString: async (element) => readStreamAsText(await options.renderToReadableStream(element)),
 			scriptNonce: options.scriptNonce,
+			initialStylesheetHrefs: options.initialStylesheetHrefs,
 			context: {
 				err: options.err,
 				req: options.documentReqRes?.req,
@@ -208,7 +209,7 @@ async function renderPagesPageResponse(options) {
 			controller.close();
 		} });
 		else {
-			const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce);
+			const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce, options.initialStylesheetHrefs);
 			bodyStream = await options.renderToReadableStream(pageElement);
 		}
 		if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(options.DocumentComponent, options.setDocumentInitialHead);

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

@@ -1,9 +1,9 @@
-import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
-import { patternToNextFormat } from "../routing/route-validation.js";
-import { requestContextFromRequest } from "../config/request-context.js";
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
 import { isExternalUrl } from "../utils/external-url.js";
 import { applyMiddlewareRequestHeaders, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, sanitizeDestination } from "../config/config-matchers.js";
+import { addBasePathToPathname, hasBasePath } from "../utils/base-path.js";
+import { patternToNextFormat } from "../routing/route-validation.js";
 import { methodNotAllowedResponse, sanitizeMethodNotAllowedHeaders } from "./http-error-responses.js";
 import { cloneRequestWithUrl, normalizeTrailingSlash } from "./request-pipeline.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./pages-i18n.js";

package/dist/server/pages-request-stage-entry.js

@@ -1,8 +1,9 @@
+import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { requestContextFromRequest } from "../config/request-context.js";
+import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { runWithExecutionContext } from "../shims/request-context.js";
-import { requestContextFromRequest } from "../config/request-context.js";
-import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { notFoundStaticAssetResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
@@ -11,7 +12,6 @@ import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { CACHEABILITY_REQUEST_STATE } from "../shims/cacheability-classification.js";
 import { applyCdnResponseIdentityHeaders, captureCdnResponsePolicyOverrides, reconcileCdnResponseHeadersAfterOuterPolicy, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
-import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, handleConfiguredImageOptimization, isImageOptimizationPath } from "./image-optimization.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
 import { resolveResponseStageCachePolicy } from "./config-headers.js";

package/dist/server/pages-revalidate.js

@@ -1,5 +1,5 @@
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { normalizeDomainHostname } from "../utils/domain-locale.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";

package/dist/server/prerender-route-params.js

@@ -1,6 +1,6 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import "./headers.js";
-import { isUnknownRecord } from "../utils/record.js";
 //#region src/server/prerender-route-params.ts
 function isPrerenderRouteParams(value) {
 	if (!isUnknownRecord(value)) return false;

package/dist/server/prod-server.js

@@ -1,23 +1,23 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { isUnknownRecord } from "../utils/record.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
+import { StaticFileCache, contentTypeForPath, etagFromFilenameHash } from "./static-file-cache.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { VINEXT_PRERENDER_RENDER_ERROR_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { readStaticFileSignal } from "./static-file-signal.js";
 import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { parseHttpDate } from "./http-date.js";
 import { evaluateStaticPreconditions } from "./http-conditional.js";
 import { buildNextDataNotFoundResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./pages-data-route.js";
-import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
 import { resolveRequestHost, resolveRequestProtocol, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, isSafeImageContentType, parseImageParams } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
-import { StaticFileCache, contentTypeForPath, etagFromFilenameHash } from "./static-file-cache.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./revalidation-host.js";
 import { traceFrameworkRequest } from "./request-tracing.js";
@@ -32,8 +32,8 @@ import { ifRangeAllowsRange, parseByteRange } from "./http-range.js";
 import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
 import fs from "node:fs";
-import fsp from "node:fs/promises";
 import { pathToFileURL } from "node:url";
+import fsp from "node:fs/promises";
 import { Readable, pipeline } from "node:stream";
 import zlib from "node:zlib";
 import { createServer } from "node:http";
@@ -41,7 +41,7 @@ import { createServer } from "node:http";
 /**
 * Production server for vinext.
 *
-* Serves the built output from `vinext build`. Handles:
+* Serves the built output from `vite build`. Handles:
 * - Static asset serving from client build output
 * - Pages Router: SSR rendering + API route handling
 * - App Router: RSC/SSR rendering, route handlers, server actions
@@ -315,7 +315,7 @@ const OMIT_METHOD_NOT_ALLOWED_HEADERS = /* @__PURE__ */ new Set([
 	"content-type",
 	"transfer-encoding"
 ]);
-function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
+function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix, crossOrigin) {
 	const metadata = computeClientRuntimeMetadata({
 		clientDir,
 		assetBase,
@@ -324,7 +324,8 @@ function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
 	setPagesClientAssets({
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
 		lazyChunks: metadata.lazyChunks,
-		dynamicPreloads: metadata.dynamicPreloads
+		dynamicPreloads: metadata.dynamicPreloads,
+		crossOrigin
 	});
 }
 function isNoBodyResponseStatus(status) {
@@ -841,7 +842,7 @@ async function startProdServer(options = {}) {
 	const isAppRouter = fs.existsSync(rscEntryPath);
 	if (!isAppRouter && !fs.existsSync(serverEntryPath)) {
 		console.error(`[vinext] No build output found in ${outDir}`);
-		console.error("Run `vinext build` first.");
+		console.error("Run `vite build` first.");
 		process.exit(1);
 	}
 	if (isAppRouter) return startAppRouterServer({
@@ -980,8 +981,10 @@ function installPagesClientAssets(options) {
 		clientEntry: metadata.clientEntryFile,
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
 		ssrManifest: Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0,
+		cssGraph: metadata.cssGraph,
 		lazyChunks: metadata.lazyChunks,
-		dynamicPreloads: metadata.dynamicPreloads
+		dynamicPreloads: metadata.dynamicPreloads,
+		crossOrigin: options.crossOrigin
 	});
 	return ssrManifest;
 }
@@ -1011,6 +1014,7 @@ async function startAppRouterServer(options) {
 	const workerEntry = rscModule.default && typeof rscModule.default === "object" ? rscModule.default : void 0;
 	const ensureInstrumentation = typeof workerEntry?.__ensureInstrumentation === "function" ? () => workerEntry.__ensureInstrumentation() : typeof rscModule.__ensureInstrumentation === "function" ? () => rscModule.__ensureInstrumentation() : () => void 0;
 	const appRouterAssetPrefix = typeof rscModule.__assetPrefix === "string" ? rscModule.__assetPrefix : "";
+	const appRouterCrossOrigin = rscModule.__crossOrigin === "anonymous" || rscModule.__crossOrigin === "use-credentials" ? rscModule.__crossOrigin : "";
 	const appRouterBasePath = typeof rscModule.__basePath === "string" ? rscModule.__basePath : "";
 	const appRouterInlineCss = rscModule.__inlineCss === true;
 	const appRouterHasPagesDir = rscModule.__hasPagesDir === true;
@@ -1031,9 +1035,10 @@ async function startAppRouterServer(options) {
 		clientDir,
 		assetPrefix: appRouterAssetPrefix,
 		assetBase: appAssetBase,
-		clientEntryLookup: "pages-client-entry"
+		clientEntryLookup: "pages-client-entry",
+		crossOrigin: appRouterCrossOrigin
 	});
-	else installClientBuildManifestGlobals(clientDir, appAssetBase, appRouterAssetPrefix);
+	else installClientBuildManifestGlobals(clientDir, appAssetBase, appRouterAssetPrefix, appRouterCrossOrigin);
 	const seedPrerenderedRoutes = resolveAppRouterPrerenderSeeder(rscModule);
 	const seededRoutes = await runWithServerEntryRequire(rscEntryRequire, () => seedPrerenderedRoutes(serverDir));
 	if (seededRoutes > 0) console.log(`[vinext] Seeded ${seededRoutes} pre-rendered route${seededRoutes !== 1 ? "s" : ""} into memory cache`);
@@ -1230,7 +1235,8 @@ async function startPagesRouterServer(options) {
 		clientDir,
 		assetPrefix,
 		assetBase,
-		clientEntryLookup: "any-client-entry"
+		clientEntryLookup: "any-client-entry",
+		crossOrigin: vinextConfig?.crossOrigin ?? ""
 	});
 	const staticCache = await StaticFileCache.create(clientDir);
 	const handleRequest = async (req, res) => {

package/dist/server/request-pipeline.js

@@ -1,7 +1,7 @@
-import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import "../utils/protocol-headers.js";
-import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 import { getUnconsumedMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
+import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 import { forbiddenResponse, methodNotAllowedResponse, notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { createStaticFileSignal } from "./static-file-signal.js";

package/dist/server/rsc-stream-hints.d.ts

@@ -1,4 +1,16 @@
 //#region src/server/rsc-stream-hints.d.ts
+/**
+ * Rewrite stylesheet preload hints in a React Flight stream.
+ *
+ * The rewrite is byte-length preserving, so this transform keeps React's
+ * text chunk boundaries instead of re-emitting one chunk per Flight row. Every
+ * downstream consumer (the tee, the SSR Flight client, the inline RSC embed,
+ * RSC response wrappers) pays a per-chunk cost, and splitting per row
+ * multiplied the chunk count roughly 8x on content-heavy pages. Chunks with
+ * no stylesheet hint are forwarded as-is without copying; only rows whose
+ * tag is `HL` are decoded and inspected. Length-prefixed bodies remain separate
+ * so binary bytes do not force adjacent text through the embed's base64 path.
+ */
 export declare function normalizeReactFlightPreloadHints(stream: ReadableStream<Uint8Array>): ReadableStream<Uint8Array>;
 export type RscRawRenderer = (model: unknown, options?: unknown) => ReadableStream<Uint8Array>;
 export type RscRawPrerenderer = (model: unknown, options?: unknown) => Promise<{