vinext 1.0.0-beta.9 → 1.0.0

package/dist/entries/app-rsc-manifest.d.ts

@@ -3,6 +3,7 @@ import { MetadataFileRoute } from "../server/metadata-routes.js";
 //#region src/entries/app-rsc-manifest.d.ts
 type AppRscManifestCode = {
   imports: string[];
+  importInitializers: string[];
   routeEntries: string[];
   metaRouteEntries: string[];
   generateStaticParamsEntries: string[];
@@ -35,6 +36,7 @@ type AppRscManifestCode = {
   globalNotFoundImportSpecifier: string | null;
 };
 type BuildAppRscManifestCodeOptions = {
+  deferEagerImports?: boolean;
   routes: AppRoute[];
   metadataRoutes?: MetadataFileRoute[];
   globalErrorPath?: string | null;
@@ -47,6 +49,5 @@ type BuildAppRscManifestCodeOptions = {
    */
   globalNotFoundPath?: string | null;
 };
-declare function buildAppRscManifestCode(options: BuildAppRscManifestCodeOptions): AppRscManifestCode;
-//#endregion
-export { buildAppRscManifestCode };
+export declare function buildAppRscManifestCode(options: BuildAppRscManifestCodeOptions): AppRscManifestCode;
+//#endregion

package/dist/entries/app-rsc-manifest.js

@@ -1,6 +1,6 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { computeAppRouteStaticSiblings, convertSegmentsToRouteParts } from "../routing/app-route-graph.js";
-import "../routing/app-router.js";
+import { appRouteHasMainTreeLoadingBoundary, appRouteLayoutStaticParamsGroups } from "../routing/app-router.js";
 import { createMetadataRouteEntriesSource } from "../server/metadata-route-build-data.js";
 //#region src/entries/app-rsc-manifest.ts
 function findRootBoundaryRoute(routes) {
@@ -17,8 +17,9 @@ function rootRouteBoundaryPath(route, boundaryPaths, fallbackPath) {
 	if (route.pattern === "/") return fallbackPath ?? null;
 	return boundaryPaths?.[0] ?? fallbackPath ?? null;
 }
-function createImportAllocator() {
+function createImportAllocator(deferEagerImports) {
 	const imports = [];
+	const importInitializers = [];
 	const importMap = /* @__PURE__ */ new Map();
 	const lazyMap = /* @__PURE__ */ new Map();
 	let importIdx = 0;
@@ -26,12 +27,16 @@ function createImportAllocator() {
 	return {
 		importMap,
 		imports,
+		importInitializers,
 		getImportVar(filePath) {
 			const existing = importMap.get(filePath);
 			if (existing) return existing;
 			const varName = `mod_${importIdx++}`;
 			const absPath = toSlash(filePath);
-			imports.push(`import * as ${varName} from ${JSON.stringify(absPath)};`);
+			if (deferEagerImports) {
+				imports.push(`let ${varName};`);
+				importInitializers.push(`${varName} = await import(${JSON.stringify(absPath)});`);
+			} else imports.push(`import * as ${varName} from ${JSON.stringify(absPath)};`);
 			importMap.set(filePath, varName);
 			return varName;
 		},
@@ -198,6 +203,7 @@ ${interceptEntries.join(",\n")}
 		return `  {
     __buildTimeClassifications: __VINEXT_CLASS(${routeIdx}), // evaluated once at module load
     __buildTimeReasons: __classDebug ? __VINEXT_CLASS_REASONS(${routeIdx}) : null,
+    canUseCanonicalLoadingShell: ${appRouteHasMainTreeLoadingBoundary(route)},
     ids: ${JSON.stringify(route.ids ?? null)},
     pattern: ${JSON.stringify(route.pattern)},
     patternParts: ${JSON.stringify(route.patternParts)},
@@ -292,22 +298,33 @@ function buildRootParamNamesByPattern(routes) {
 }
 function buildGenerateStaticParamsEntries(routes, imports, namesByPattern) {
 	const sourcesByPattern = /* @__PURE__ */ new Map();
+	const layoutGroupsByKey = /* @__PURE__ */ new Map();
+	const layoutSource = (layoutPath) => `{ load: ${imports.getLazyLoaderVar(layoutPath)} }`;
 	for (const route of routes) {
 		if (!route.isDynamic) continue;
-		for (const [index, layoutPath] of route.layouts.entries()) appendStaticParamSource(sourcesByPattern, createRoutePatternPrefix(route.routeSegments, route.layoutTreePositions[index] ?? 0)?.pattern ?? null, `{ load: ${imports.getLazyLoaderVar(layoutPath)} }`);
+		const layoutGroups = appRouteLayoutStaticParamsGroups(route);
+		for (const group of layoutGroups) {
+			if (group.pattern === route.pattern) appendStaticParamSource(sourcesByPattern, route.pattern, layoutSource(group.layoutPath));
+			if (layoutGroupsByKey.has(group.key)) continue;
+			layoutGroupsByKey.set(group.key, {
+				pattern: group.pattern,
+				sources: [layoutSource(group.layoutPath)]
+			});
+		}
 		if (route.pagePath) appendStaticParamSource(sourcesByPattern, route.pattern, `{ load: ${imports.getLazyLoaderVar(route.pagePath)} }`);
 		if (!route.pagePath && route.routePath) appendStaticParamSource(sourcesByPattern, route.pattern, `{ load: ${imports.getLazyLoaderVar(route.routePath)} }`);
 	}
-	return Array.from(sourcesByPattern.entries()).map(([pattern, sources]) => {
+	const entry = (key, pattern, sources) => {
 		const rootParamNames = namesByPattern.get(pattern) ?? [];
-		return `  ${JSON.stringify(pattern)}: __createAppPrerenderStaticParamsResolver([${sources.join(", ")}], ${JSON.stringify(rootParamNames)}),`;
-	});
+		return `  ${JSON.stringify(key)}: __createAppPrerenderStaticParamsResolver([${sources.join(", ")}], ${JSON.stringify(rootParamNames)}),`;
+	};
+	return [...Array.from(sourcesByPattern, ([pattern, sources]) => entry(pattern, pattern, sources)), ...Array.from(layoutGroupsByKey, ([key, group]) => entry(key, group.pattern, group.sources))];
 }
 function buildRootParamNameEntries(namesByPattern) {
 	return Array.from(namesByPattern.entries()).map(([pattern, names]) => `  ${JSON.stringify(pattern)}: ${JSON.stringify(names)},`);
 }
 function buildAppRscManifestCode(options) {
-	const imports = createImportAllocator();
+	const imports = createImportAllocator(options.deferEagerImports === true);
 	const metadataRoutes = options.metadataRoutes ?? [];
 	registerRouteModules(options.routes, imports);
 	const routeEntries = buildRouteEntries(options.routes, imports);
@@ -326,6 +343,7 @@ function buildAppRscManifestCode(options) {
 	const namesByPattern = buildRootParamNamesByPattern(options.routes);
 	return {
 		imports: imports.imports,
+		importInitializers: imports.importInitializers,
 		routeEntries,
 		metaRouteEntries: createMetadataRouteEntriesSource(metadataRoutes, imports.importMap),
 		generateStaticParamsEntries: buildGenerateStaticParamsEntries(options.routes, imports, namesByPattern),

package/dist/entries/app-ssr-entry.d.ts

@@ -10,6 +10,5 @@
  * `virtual:vinext-server-entry` so the RSC bundle can access Pages Router
  * route metadata and fallback dispatchers via `import("./ssr/index.js")`.
  */
-declare function generateSsrEntry(hasPagesDir?: boolean): string;
-//#endregion
-export { generateSsrEntry };
+export declare function generateSsrEntry(hasPagesDir?: boolean): string;
+//#endregion

package/dist/entries/app-ssr-entry.js

@@ -17,7 +17,14 @@ function generateSsrEntry(hasPagesDir = false) {
 export * from ${JSON.stringify(entryPath)};
 export { default } from ${JSON.stringify(entryPath)};
 ${hasPagesDir ? `
-export { handleApiRoute, matchApiRoute, matchPageRoute, pageRoutes, renderPage } from "virtual:vinext-server-entry";
+export {
+  __ensureInstrumentation,
+  handleApiRoute,
+  matchApiRoute,
+  matchPageRoute,
+  pageRoutes,
+  renderPage,
+} from "virtual:vinext-server-entry";
 ` : ""}`;
 }
 //#endregion

package/dist/entries/pages-client-entry.d.ts

@@ -3,11 +3,11 @@ import { ResolvedNextConfig } from "../config/next-config.js";
 import { StaticMiddlewareMatcher } from "../build/report.js";
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
 //#region src/entries/pages-client-entry.d.ts
-declare function generateClientEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, options?: {
+export declare function compileClientMiddlewareMatchers(matcher: StaticMiddlewareMatcher | undefined): unknown[] | undefined;
+export declare function generateClientEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, options?: {
   appPrefetchRoutes?: readonly VinextLinkPrefetchRoute[];
   instrumentationClientPath?: string | null;
   middlewareMatcher?: StaticMiddlewareMatcher | undefined;
   reactPreamble?: boolean;
 }): Promise<string>;
-//#endregion
-export { generateClientEntry };
+//#endregion

package/dist/entries/pages-client-entry.js

@@ -3,6 +3,7 @@ import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 import { resolveClientRuntimeModule } from "./runtime-entry-module.js";
+import { compileMiddlewareMatcherPattern } from "../server/middleware-matcher-pattern.js";
 import { hasExportedName } from "../build/report.js";
 import { toClientRewrites } from "../client/client-rewrites.js";
 import { readFile } from "node:fs/promises";
@@ -18,6 +19,19 @@ import { readFile } from "node:fs/promises";
 *
 * Extracted from index.ts.
 */
+function compileClientMiddlewareMatchers(matcher) {
+	if (matcher === void 0) return void 0;
+	return (typeof matcher === "string" ? [matcher] : matcher).map((entry) => {
+		const source = typeof entry === "string" ? entry : entry.source;
+		const compiled = compileMiddlewareMatcherPattern(source);
+		if (!compiled.regexp) return entry;
+		return {
+			...typeof entry === "string" ? { source } : entry,
+			regexp: compiled.regexp.source,
+			flags: compiled.regexp.flags
+		};
+	});
+}
 /**
 * Project a Pages `Route` down to the public `VinextPagesLinkPrefetchRoute`
 * shape used for client-side hybrid ownership decisions. Mirrors
@@ -54,6 +68,7 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	const pagesSspPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetServerSidePropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const instrumentationClientPath = options.instrumentationClientPath ?? null;
 	const clientRewrites = toClientRewrites(nextConfig.rewrites);
+	const clientMiddlewareMatchers = compileClientMiddlewareMatchers(options.middlewareMatcher);
 	const reactInstanceBootstrapPath = resolveClientRuntimeModule("react-instance-bootstrap");
 	const loaderEntries = pageRoutes.map((r) => {
 		const absPath = r.filePath;
@@ -103,7 +118,7 @@ window.__VINEXT_PAGE_PATTERNS__ = Object.keys(pageLoaders);
 window.__VINEXT_REACT_STRICT_MODE__ = ${JSON.stringify(reactStrictModeEnabled)};
 window.__VINEXT_PAGES_SSG_PATTERNS__ = ${JSON.stringify(pagesSsgPatterns)};
 window.__VINEXT_PAGES_SSP_PATTERNS__ = ${JSON.stringify(pagesSspPatterns)};
-window.__VINEXT_MIDDLEWARE_MATCHER__ = ${JSON.stringify(options.middlewareMatcher)};
+window.__VINEXT_MIDDLEWARE_MATCHER__ = ${JSON.stringify(clientMiddlewareMatchers)};
 window.__VINEXT_APP_LOADER__ = appLoader;
 // Expose the App Router prefetch manifest so Pages Router \`<Link>\`s and
 // \`Router.prefetch\` can detect when a prefetch target is actually an App
@@ -237,4 +252,4 @@ hydrate();
 `;
 }
 //#endregion
-export { generateClientEntry };
+export { compileClientMiddlewareMatchers, generateClientEntry };

package/dist/entries/pages-server-entry.d.ts

@@ -1,10 +1,20 @@
 import { createValidFileMatcher } from "../routing/file-matcher.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
 //#region src/entries/pages-server-entry.d.ts
+type GeneratePagesServerEntryOptions = {
+  includeMiddlewareRuntime?: boolean;
+  nodeOpenTelemetryLoader?: boolean;
+  prerenderSecret?: string;
+};
+/**
+ * Generate the request-only Pages Worker entry used by a multi-stage output.
+ * It intentionally contains no page/API module imports or render runtime.
+ */
+export declare function generatePagesRequestEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[], prerenderSecret?: string): Promise<string>;
 /**
  * Generate the virtual SSR server entry module.
  * This is the entry point for `vite build --ssr`.
  */
-declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[], prerenderSecret?: string): Promise<string>;
-//#endregion
-export { generateServerEntry };
+export declare function generatePagesResponseEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, prerenderSecret?: string): Promise<string>;
+export declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null, publicFiles?: string[], options?: GeneratePagesServerEntryOptions): Promise<string>;
+//#endregion

package/dist/entries/pages-server-entry.js

@@ -24,7 +24,10 @@ const _pagesApiRoutePath = resolveEntryPath("../server/pages-api-route.js", impo
 const _serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const _queryUtilsPath = resolveEntryPath("../utils/query.js", import.meta.url);
 const _pagesPageHandlerPath = resolveEntryPath("../server/pages-page-handler.js", import.meta.url);
+const _pagesRouteDataKindPath = resolveEntryPath("../server/pages-route-data-kind.js", import.meta.url);
 const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
+const _revalidationRequestPath = resolveEntryPath("../server/revalidation-request.js", import.meta.url);
+const _instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
 async function getPagesDataKind(filePath) {
 	const source = await readFile(filePath, "utf8");
 	if (hasExportedName(source, "getStaticProps")) return "static";
@@ -32,27 +35,187 @@ async function getPagesDataKind(filePath) {
 	return "none";
 }
 /**
+* Generate the request-only Pages Worker entry used by a multi-stage output.
+* It intentionally contains no page/API module imports or render runtime.
+*/
+async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles = [], prerenderSecret) {
+	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+	const hasRequestAwareDocument = findFileWithExts(pagesDir, "_document", fileMatcher) !== null;
+	const pageRouteEntries = await Promise.all(pageRoutes.map(async (route) => {
+		const dataKind = await getPagesDataKind(route.filePath);
+		return `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)}, dataKind: ${JSON.stringify(dataKind)} }`;
+	}));
+	const apiRouteEntries = apiRoutes.map((route) => `  { pattern: ${JSON.stringify(route.pattern)}, patternParts: ${JSON.stringify(route.patternParts)}, isDynamic: ${route.isDynamic}, params: ${JSON.stringify(route.params)} }`);
+	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
+		locales: nextConfig.i18n.locales,
+		defaultLocale: nextConfig.i18n.defaultLocale,
+		localeDetection: nextConfig.i18n.localeDetection,
+		domains: nextConfig.i18n.domains
+	}) : "null";
+	const vinextConfigJson = JSON.stringify({
+		basePath: nextConfig?.basePath ?? "",
+		assetPrefix: nextConfig?.assetPrefix ?? "",
+		trailingSlash: nextConfig?.trailingSlash ?? false,
+		skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize ?? false,
+		redirects: nextConfig?.redirects ?? [],
+		rewrites: nextConfig?.rewrites ?? {
+			beforeFiles: [],
+			afterFiles: [],
+			fallback: []
+		},
+		headers: nextConfig?.headers ?? [],
+		expireTime: nextConfig?.expireTime,
+		allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys ?? [],
+		cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
+		htmlLimitedBots: nextConfig?.htmlLimitedBots,
+		i18n: nextConfig?.i18n ?? null,
+		disableOptimizedLoading: nextConfig?.disableOptimizedLoading === true,
+		crossOrigin: nextConfig?.crossOrigin,
+		clientTraceMetadata: nextConfig?.clientTraceMetadata,
+		images: {
+			deviceSizes: nextConfig?.images?.deviceSizes,
+			imageSizes: nextConfig?.images?.imageSizes,
+			qualities: nextConfig?.images?.qualities,
+			dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
+			dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
+			contentDispositionType: nextConfig?.images?.contentDispositionType,
+			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+		}
+	});
+	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+	const instrumentationInitCode = instrumentationPath ? `let __applicationInitialization;
+async function __initializeApplication() {
+  await __ensureInstrumentationRegistered(_instrumentation, ${JSON.stringify(instrumentationPath)});
+  ${middlewarePath ? `middlewareModule = await import(${JSON.stringify(middlewarePath)});` : ""}
+}
+export function __ensureInstrumentation() {
+  return __applicationInitialization ??= __initializeApplication();
+}` : "export function __ensureInstrumentation() {}";
+	const middlewareImportCode = middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(middlewarePath)};` : "";
+	const middlewareExportCode = middlewarePath ? `export async function runMiddleware(request, ctx, options) {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  return __runGeneratedMiddleware({
+    basePath: vinextConfig.basePath,
+    ctx,
+    filePath: ${JSON.stringify(middlewarePath)},
+    i18nConfig,
+    isDataRequest: options?.isDataRequest === true,
+    isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
+    module: middlewareModule,
+    request,
+    trailingSlash: vinextConfig.trailingSlash,
+  });
+}` : `export async function runMiddleware() {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  return { continue: true };
+}`;
+	return `
+import ${JSON.stringify(_serverGlobalsPath)};
+import { runGeneratedMiddleware as __runGeneratedMiddleware } from ${JSON.stringify(_middlewareRuntimePath)};
+import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSON.stringify(_routeTriePath)};
+import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
+import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath } from ${JSON.stringify(_pagesDataRoutePath)};
+import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_revalidationRequestPath)};
+${instrumentationImportCode}
+
+${instrumentationInitCode}
+${middlewareImportCode}
+
+export const authorizeOnDemandRevalidate = __isOnDemandRevalidateRequest;
+export const buildId = ${JSON.stringify(nextConfig?.buildId ?? null)};
+export const prerenderSecret = ${JSON.stringify(prerenderSecret ?? null)};
+const i18nConfig = ${i18nConfigJson};
+export const hasMiddleware = ${JSON.stringify(Boolean(middlewarePath))};
+export const hasRequestAwareDocument = ${JSON.stringify(hasRequestAwareDocument)};
+export const vinextConfig = ${vinextConfigJson};
+export const publicFiles = new Set(${JSON.stringify(publicFiles)});
+
+export function normalizeDataRequest(request) {
+  return __normalizePagesDataRequest(
+    request,
+    buildId,
+    vinextConfig.basePath,
+    __shouldAddTrailingSlashToPagesDataPath(
+      hasMiddleware,
+      vinextConfig.trailingSlash,
+      vinextConfig.skipProxyUrlNormalize,
+    ),
+  );
+}
+
+const pageRoutes = [
+${pageRouteEntries.join(",\n")}
+];
+const pageRouteTrie = _buildRouteTrie(pageRoutes);
+const apiRoutes = [
+${apiRouteEntries.join(",\n")}
+];
+const apiRouteTrie = _buildRouteTrie(apiRoutes);
+
+function matchRoute(url, trie) {
+  const pathname = url.split("?")[0];
+  const normalizedUrl = pathname === "/" ? "/" : pathname.replace(/\\/$/, "");
+  return _trieMatch(trie, normalizedUrl.split("/").filter(Boolean));
+}
+
+function resolveI18nRouteUrl(url, request) {
+  return i18nConfig && request
+    ? resolvePagesI18nRequest(
+        url,
+        i18nConfig,
+        request.headers,
+        new URL(request.url).hostname,
+        vinextConfig.basePath,
+        vinextConfig.trailingSlash,
+      ).url
+    : url;
+}
+
+export function matchPageRoute(url, request) {
+  return matchRoute(resolveI18nRouteUrl(url, request), pageRouteTrie);
+}
+
+export function matchApiRoute(url, request) {
+  return matchRoute(resolveI18nRouteUrl(url, request), apiRouteTrie);
+}
+
+${middlewareExportCode}
+`;
+}
+/**
 * Generate the virtual SSR server entry module.
 * This is the entry point for `vite build --ssr`.
 */
-async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles = [], prerenderSecret) {
+function generatePagesResponseEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, prerenderSecret) {
+	return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, [], {
+		includeMiddlewareRuntime: false,
+		prerenderSecret
+	});
+}
+async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles = [], options = {}) {
+	const includeMiddlewareRuntime = options.includeMiddlewareRuntime !== false;
+	const prerenderSecret = options.prerenderSecret;
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-	const pageImports = pageRoutes.map((r, i) => `import * as page_${i} from ${JSON.stringify(r.filePath)};`);
-	const apiImports = apiRoutes.map((r, i) => `import * as api_${i} from ${JSON.stringify(r.filePath)};`);
+	const pageImports = pageRoutes.map((r, i) => instrumentationPath ? `let page_${i};` : `import * as page_${i} from ${JSON.stringify(r.filePath)};`);
+	const pageImportInitializers = pageRoutes.map((r, i) => `page_${i} = await import(${JSON.stringify(r.filePath)});`);
+	const apiImports = apiRoutes.map((r, i) => instrumentationPath ? `let api_${i};` : `import * as api_${i} from ${JSON.stringify(r.filePath)};`);
+	const apiImportInitializers = apiRoutes.map((r, i) => `api_${i} = await import(${JSON.stringify(r.filePath)});`);
 	const pageRouteEntries = await Promise.all(pageRoutes.map(async (r, i) => {
 		const dataKind = await getPagesDataKind(r.filePath);
-		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: page_${i}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)} }`;
+		return `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `page_${i}`}, filePath: ${JSON.stringify(r.filePath)}, dataKind: ${JSON.stringify(dataKind)} }`;
 	}));
-	const apiRouteEntries = apiRoutes.map((r, i) => `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: api_${i} }`);
+	const apiRouteEntries = apiRoutes.map((r, i) => `  { pattern: ${JSON.stringify(r.pattern)}, patternParts: ${JSON.stringify(r.patternParts)}, isDynamic: ${r.isDynamic}, params: ${JSON.stringify(r.params)}, module: ${instrumentationPath ? "null" : `api_${i}`} }`);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const docFilePath = findFileWithExts(pagesDir, "_document", fileMatcher);
 	const errorFilePath = findFileWithExts(pagesDir, "_error", fileMatcher);
 	const appAssetPathJson = appFilePath !== null ? JSON.stringify(appFilePath) : "null";
-	const appImportCode = appFilePath !== null ? `import { default as AppComponent } from ${JSON.stringify(appFilePath)};` : `const AppComponent = null;`;
-	const docImportCode = docFilePath !== null ? `import { default as DocumentComponent } from ${JSON.stringify(docFilePath)};` : `const DocumentComponent = null;`;
+	const appImportCode = appFilePath !== null ? instrumentationPath ? "let AppComponent;" : `import { default as AppComponent } from ${JSON.stringify(appFilePath)};` : `const AppComponent = null;`;
+	const docImportCode = docFilePath !== null ? instrumentationPath ? "let DocumentComponent;" : `import { default as DocumentComponent } from ${JSON.stringify(docFilePath)};` : `const DocumentComponent = null;`;
 	const errorAssetPathJson = errorFilePath !== null ? JSON.stringify(errorFilePath) : "null";
-	const errorImportCode = errorFilePath !== null ? `import * as ErrorPageModule from ${JSON.stringify(errorFilePath)};` : `import * as ErrorPageModule from "next/error";`;
+	const errorImportCode = errorFilePath !== null ? instrumentationPath ? "let ErrorPageModule;" : `import * as ErrorPageModule from ${JSON.stringify(errorFilePath)};` : instrumentationPath ? "let ErrorPageModule;" : `import * as ErrorPageModule from "next/error";`;
 	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
 		locales: nextConfig.i18n.locales,
 		defaultLocale: nextConfig.i18n.defaultLocale,
@@ -90,21 +253,39 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 			contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
 		}
 	});
-	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};` : "";
-	const instrumentationInitCode = instrumentationPath ? `// Run instrumentation register() once at module evaluation time — before any
-// requests are handled. Matches Next.js semantics: register() is called once
-// on startup in the process that handles requests.
-if (typeof _instrumentation.register === "function") {
-  await _instrumentation.register();
+	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+	const specialModuleInitializers = instrumentationPath ? [
+		appFilePath ? `({ default: AppComponent } = await import(${JSON.stringify(appFilePath)}));` : "",
+		docFilePath ? `({ default: DocumentComponent } = await import(${JSON.stringify(docFilePath)}));` : "",
+		`ErrorPageModule = await import(${JSON.stringify(errorFilePath ?? "next/error")});`
+	].filter(Boolean) : [];
+	const instrumentationInitCode = instrumentationPath ? `let __applicationInitialization;
+async function __initializeApplication() {
+  await __ensureInstrumentationRegistered(_instrumentation, ${JSON.stringify(instrumentationPath)});
+  ${includeMiddlewareRuntime && middlewarePath ? `middlewareModule = await import(${JSON.stringify(middlewarePath)});` : ""}
+  ${pageImportInitializers.join("\n  ")}
+  ${apiImportInitializers.join("\n  ")}
+  ${specialModuleInitializers.join("\n  ")}
+  ${pageRoutes.map((_, index) => `pageRoutes[${index}].module = page_${index};`).join("\n  ")}
+  ${apiRoutes.map((_, index) => `apiRoutes[${index}].module = api_${index};`).join("\n  ")}
+  _errorPageRoute.module = ErrorPageModule;
+  _renderPage = __createRenderPage();
 }
-// Store the onRequestError handler on globalThis so it is visible to all
-// code within the Worker (same global scope).
-if (typeof _instrumentation.onRequestError === "function") {
-  globalThis.__VINEXT_onRequestErrorHandler__ = _instrumentation.onRequestError;
+export function __ensureInstrumentation() {
+  return __applicationInitialization ??= __initializeApplication();
+}` : "export function __ensureInstrumentation() {}";
+	const openTelemetryLoaderCode = options.nodeOpenTelemetryLoader ? `import { register as __registerOpenTelemetryLoader } from "node:module";
+const __openTelemetryLoaderKey = Symbol.for("vinext.openTelemetryLoader");
+if (process.env.VINEXT_PRERENDER !== "1" && !globalThis[__openTelemetryLoaderKey]) {
+  globalThis[__openTelemetryLoaderKey] = true;
+  __registerOpenTelemetryLoader("@opentelemetry/instrumentation/hook.mjs", import.meta.url);
 }` : "";
-	const middlewareImportCode = middlewarePath ? `import * as middlewareModule from ${JSON.stringify(middlewarePath)};` : "";
-	const middlewareExportCode = middlewarePath ? `
+	const middlewareImportCode = includeMiddlewareRuntime && middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(middlewarePath)};` : "";
+	const middlewareRuntimeImportCode = includeMiddlewareRuntime ? `import { runGeneratedMiddleware as __runGeneratedMiddleware } from ${JSON.stringify(_middlewareRuntimePath)};` : "";
+	const middlewareExportCode = includeMiddlewareRuntime ? middlewarePath ? `
 export async function runMiddleware(request, ctx, options) {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
@@ -119,9 +300,10 @@ export async function runMiddleware(request, ctx, options) {
 }
 ` : `
 export async function runMiddleware(request) {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
   return { continue: true };
 }
-`;
+` : "";
 	return `
 import ${JSON.stringify(_serverGlobalsPath)};
 import React from "react";
@@ -147,7 +329,7 @@ import { getSSRFontLinks as _getSSRFontLinks, getSSRFontStyles as _getSSRFontSty
 import { getSSRFontStyles as _getSSRFontStylesLocal, getSSRFontPreloads as _getSSRFontPreloadsLocal } from "next/font/local";
 import { sanitizeDestination as sanitizeDestinationLocal } from ${JSON.stringify(resolveEntryPath("../config/config-matchers.js", import.meta.url))};
 import { runWithExecutionContext as _runWithExecutionContext } from ${JSON.stringify(_requestContextShimPath)};
-import { runGeneratedMiddleware as __runGeneratedMiddleware } from ${JSON.stringify(_middlewareRuntimePath)};
+${middlewareRuntimeImportCode}
 import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSON.stringify(_routeTriePath)};
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
 import { resolvePagesI18nRequest } from ${JSON.stringify(_pagesI18nPath)};
@@ -155,11 +337,13 @@ import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_p
 import { normalizePagesDataRequest as __normalizePagesDataRequest, shouldAddTrailingSlashToPagesDataPath as __shouldAddTrailingSlashToPagesDataPath, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
+import { getRuntimePagesDataKind as __getRuntimePagesDataKind } from ${JSON.stringify(_pagesRouteDataKindPath)};
 import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_isrCachePath)};
+${openTelemetryLoaderCode}
 ${instrumentationImportCode}
-${middlewareImportCode}
 
 ${instrumentationInitCode}
+${middlewareImportCode}
 
 // The outer Node production pipeline runs outside this generated bundle, so
 // it cannot safely validate against its own development fallback secret. Give
@@ -252,7 +436,7 @@ const _errorPageRoute = {
   patternParts: ["_error"],
   isDynamic: false,
   params: [],
-  module: ErrorPageModule,
+  module: ${instrumentationPath ? "null" : "ErrorPageModule"},
   filePath: ${errorAssetPathJson},
 };
 
@@ -285,6 +469,12 @@ export function matchPageRoute(url, request) {
   return matchRoute(routeUrl, pageRoutes);
 }
 
+export function getRuntimePageDataKind(url, request) {
+  const match = matchPageRoute(url, request);
+  if (!match) return "none";
+  return __getRuntimePagesDataKind(match.route.module, AppComponent);
+}
+
 export function matchApiRoute(url, request) {
   const routeUrl = i18nConfig && request
     ? resolvePagesI18nRequest(
@@ -305,7 +495,8 @@ export function matchApiRoute(url, request) {
 // stays importable in test environments (the root vite.config.ts only
 // aliases vinext/shims/*, not next/*).
 __setPagesClientAssets(__pagesClientAssets);
-const _renderPage = __createPagesPageHandler({
+function __createRenderPage() {
+  return __createPagesPageHandler({
   pageRoutes,
   errorPageRoute: _errorPageRoute,
   matchRoute: (url) => matchRoute(url, pageRoutes),
@@ -396,22 +587,27 @@ const _renderPage = __createPagesPageHandler({
   },
   AppComponent,
   DocumentComponent,
-});
+  });
+}
+${instrumentationPath ? "let _renderPage;" : "const _renderPage = __createRenderPage();"}
 
-export async function renderPage(request, url, manifest, ctx, middlewareHeaders, options) {
+export async function renderPage(request, url, manifest, ctx, middlewareHeaders, options, initialResponseHeaders) {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
   __registerConfiguredCacheAdapters();
-  if (ctx) return _runWithExecutionContext(ctx, () => _renderPage(request, url, manifest, middlewareHeaders, options));
-  return _renderPage(request, url, manifest, middlewareHeaders, options);
+  if (ctx) return _runWithExecutionContext(ctx, () => _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders));
+  return _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders);
 }
 
 
 
-export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker") {
+export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker", initialResponseHeaders) {
+  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({
     ctx,
     edgeRuntime,
+    initialResponseHeaders,
     match,
     nextConfig: vinextConfig,
     request,
@@ -419,10 +615,15 @@ export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin,
     url,
     reportRequestError(error, routePattern) {
       console.error("[vinext] API error:", error);
-      void _reportRequestError(
+      return _reportRequestError(
         error,
         { path: url, method: request.method, headers: Object.fromEntries(request.headers.entries()) },
-        { routerKind: "Pages Router", routePath: routePattern, routeType: "route" },
+        {
+          routerKind: "Pages Router",
+          routePath: routePattern,
+          routeType: "route",
+          revalidateReason: undefined,
+        },
       );
     },
   });
@@ -432,4 +633,4 @@ ${middlewareExportCode}
 `;
 }
 //#endregion
-export { generateServerEntry };
+export { generatePagesRequestEntry, generatePagesResponseEntry, generateServerEntry };

package/dist/entries/runtime-entry-module.d.ts

@@ -10,7 +10,7 @@
  * @param rel  - Relative path to the target module (e.g. `"../server/foo.js"`)
  * @param base - The caller's `import.meta.url`
  */
-declare function resolveEntryPath(rel: string, base: string): string;
+export declare function resolveEntryPath(rel: string, base: string): string;
 /**
  * Resolve a real runtime module for a virtual entry generator.
  *
@@ -19,7 +19,6 @@ declare function resolveEntryPath(rel: string, base: string): string;
  * common source/build extensions and fall back to the `.js` path that exists in
  * published packages.
  */
-declare function resolveRuntimeEntryModule(name: string): string;
-declare function resolveClientRuntimeModule(name: string): string;
-//#endregion
-export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };
+export declare function resolveRuntimeEntryModule(name: string): string;
+export declare function resolveClientRuntimeModule(name: string): string;
+//#endregion