vinext 0.0.54 → 0.1.0

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

@@ -27,7 +27,6 @@ const appFallbackRendererPath = resolveEntryPath("../server/app-fallback-rendere
 const appElementsPath = resolveEntryPath("../server/app-elements.js", import.meta.url);
 const appPageRouteWiringPath = resolveEntryPath("../server/app-page-route-wiring.js", import.meta.url);
 const appPageProbePath = resolveEntryPath("../server/app-page-probe.js", import.meta.url);
-const appPageParamsPath = resolveEntryPath("../server/app-page-params.js", import.meta.url);
 const appPageDispatchPath = resolveEntryPath("../server/app-page-dispatch.js", import.meta.url);
 const appPageRequestPath = resolveEntryPath("../server/app-page-request.js", import.meta.url);
 const appSegmentConfigPath = resolveEntryPath("../server/app-segment-config.js", import.meta.url);
@@ -39,10 +38,12 @@ const appPageElementBuilderPath = resolveEntryPath("../server/app-page-element-b
 const instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
 const appRscErrorHandlerPath = resolveEntryPath("../server/app-rsc-error-handler.js", import.meta.url);
 const appRequestContextPath = resolveEntryPath("../server/app-request-context.js", import.meta.url);
+const appRouteModuleLoaderPath = resolveEntryPath("../server/app-route-module-loader.js", import.meta.url);
 const appPrerenderStaticParamsPath = resolveEntryPath("../server/app-prerender-static-params.js", import.meta.url);
 const seedCachePath = resolveEntryPath("../server/seed-cache.js", import.meta.url);
 const appHookWarningSuppressionPath = resolveEntryPath("../server/app-hook-warning-suppression.js", import.meta.url);
 const serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
+const appPagesBridgePath = resolveEntryPath("../server/app-pages-bridge.js", import.meta.url);
 /**
 * Generate the virtual RSC entry module.
 *
@@ -66,6 +67,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const clientTraceMetadata = config?.clientTraceMetadata;
 	const assetPrefix = config?.assetPrefix ?? "";
 	const expireTime = config?.expireTime ?? DEFAULT_EXPIRE_TIME;
+	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
 	const inlineCss = config?.inlineCss === true;
 	const i18nConfig = config?.i18n ?? null;
 	const hasPagesDir = config?.hasPagesDir ?? false;
@@ -98,12 +100,14 @@ import { createRscRenderer } from ${JSON.stringify(rscStreamHintsPath)};
 const renderToReadableStream = createRscRenderer(_renderToReadableStream);
 import { createElement } from "react";
 import { getNavigationContext as _getNavigationContext } from "next/navigation";
+import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "next/cache";
 import { headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, consumeInvalidDynamicUsageError, setHeadersAccessPhase } from "next/headers";
 import { mergeMetadata, resolveModuleMetadata, mergeViewport, resolveModuleViewport } from "vinext/metadata";
 ${middlewarePath ? `import * as middlewareModule from ${JSON.stringify(normalizePathSeparators(middlewarePath))};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(normalizePathSeparators(instrumentationPath))};
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};` : ""}
 import { createAppRscHandler as __createAppRscHandler } from ${JSON.stringify(appRscHandlerPath)};
+import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import { decodePathParams as __decodePathParams } from ${JSON.stringify(normalizePathModulePath)};
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
 import {
@@ -133,13 +137,11 @@ import {
   AppElementsWire as __AppElementsWire,
 } from ${JSON.stringify(appElementsPath)};
 import {
+  probeAppPageLayoutWithTracking as __probeAppPageLayoutWithTracking,
   resolveAppPageChildSegments as __resolveAppPageChildSegments,
 } from ${JSON.stringify(appPageRouteWiringPath)};
 import { buildPageElements as __buildPageElements } from ${JSON.stringify(appPageElementBuilderPath)};
-import {
-  resolveAppPageSegmentParams as __resolveAppPageSegmentParams,
-} from ${JSON.stringify(appPageParamsPath)};
-import { probeAppPage as __probeAppPage } from ${JSON.stringify(appPageProbePath)};
+import { buildAppPageProbes as __buildAppPageProbes } from ${JSON.stringify(appPageProbePath)};
 import {
   dispatchAppPage as __dispatchAppPage,
 } from ${JSON.stringify(appPageDispatchPath)};
@@ -171,7 +173,8 @@ import { getSSRFontLinks as _getSSRFontLinks, getSSRFontStyles as _getSSRFontSty
 import { getSSRFontStyles as _getSSRFontStylesLocal, getSSRFontPreloads as _getSSRFontPreloadsLocal } from "next/font/local";
 function _getSSRFontStyles() { return [..._getSSRFontStylesGoogle(), ..._getSSRFontStylesLocal()]; }
 function _getSSRFontPreloads() { return [..._getSSRFontPreloadsGoogle(), ..._getSSRFontPreloadsLocal()]; }
-${hasPagesDir ? `// Pages Router routes are loaded lazily from the SSR environment for internal prerender requests.` : ""}
+${hasPagesDir ? `// Pages Router routes are loaded lazily from the SSR environment for internal prerender requests.
+import { renderPagesFallback as __renderPagesFallback } from ${JSON.stringify(appPagesBridgePath)};` : ""}
 
 // Suppress expected "Invalid hook call" dev warning when layout/page
 // components are probed outside React's render cycle. The import patches
@@ -179,7 +182,10 @@ ${hasPagesDir ? `// Pages Router routes are loaded lazily from the SSR environme
 // so per-route dispatch can opt into suppression via .run(true, ...).
 import { suppressHookWarningAls } from ${JSON.stringify(appHookWarningSuppressionPath)};
 import { clearAppRequestContext as __clearRequestContext, setAppNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestContextPath)};
+
+__configureMemoryCacheHandler({ cacheMaxMemorySize: ${JSON.stringify(cacheMaxMemorySize)} });
 import { createAppPrerenderStaticParamsResolver as __createAppPrerenderStaticParamsResolver } from ${JSON.stringify(appPrerenderStaticParamsPath)};
+import { ensureAppRouteModulesLoaded as __ensureRouteLoaded } from ${JSON.stringify(appRouteModuleLoaderPath)};
 import { seedMemoryCacheFromPrerender as __seedMemoryCacheFromPrerender } from ${JSON.stringify(seedCachePath)};
 
 const __draftModeSecret = ${JSON.stringify(draftModeSecret)};
@@ -218,6 +224,13 @@ function __resolveRouteFetchCacheMode(route) {
   });
 }
 
+function __resolveRouteRuntime(route) {
+  return __resolveAppPageSegmentConfig({
+    layouts: route.layouts,
+    page: route.page,
+  }).runtime ?? null;
+}
+
 ${imports.join("\n")}
 
 ${instrumentationPath ? `// Lazy instrumentation initialisation is handled by ensureInstrumentationRegistered
@@ -225,7 +238,7 @@ ${instrumentationPath ? `// Lazy instrumentation initialisation is handled by en
 // the user module in; all bookkeeping (initialized flag, shared promise, prerender
 // skip) lives in the typed helper so it can be unit-tested independently.` : ""}
 
-// Build-time layout classification dispatch. Replaced in generateBundle
+// Build-time layout classification dispatch. Replaced in renderChunk
 // with a switch statement that returns a pre-computed per-layout
 // Map<layoutIndex, "static" | "dynamic"> for each route. Until the
 // plugin patches this stub, every route falls back to the Layer 3
@@ -237,7 +250,7 @@ function __VINEXT_CLASS(routeIdx) {
 // Build-time layout classification reasons dispatch. Sibling of
 // __VINEXT_CLASS, returning a per-route Map<layoutIndex, ClassificationReason>
 // that feeds the debug channel when VINEXT_DEBUG_CLASSIFICATION is active.
-// Replaced in generateBundle with a real dispatch table; the stub returns
+// Replaced in renderChunk with a real dispatch table; the stub returns
 // null so the hot path never allocates reason maps when debug is off.
 function __VINEXT_CLASS_REASONS(routeIdx) {
   return null;
@@ -324,7 +337,9 @@ function findIntercept(pathname, sourcePathname = null) {
   return __routeMatcher.findIntercept(pathname, sourcePathname);
 }
 
-async function buildPageElements(route, params, routePath, pageRequest) {
+async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess) {
+  // Hydrate lazy page/route-handler modules before any synchronous read.
+  await __ensureRouteLoaded(route);
   return __buildPageElements({
     route,
     params,
@@ -335,6 +350,7 @@ async function buildPageElements(route, params, routePath, pageRequest) {
     rootForbiddenModule: ${rootForbiddenVar ? rootForbiddenVar : "null"},
     rootUnauthorizedModule: ${rootUnauthorizedVar ? rootUnauthorizedVar : "null"},
     metadataRoutes,
+    layoutParamAccess,
     basePath: __basePath,
     htmlLimitedBots: __htmlLimitedBots,
   });
@@ -393,14 +409,17 @@ ${rootParamNameEntries.join("\n")}
 
 export default __createAppRscHandler({
   basePath: __basePath,
+  ensureRouteLoaded: __ensureRouteLoaded,
   clearRequestContext() {
     __clearRequestContext();
   },
+  registerCacheAdapters: __registerConfiguredCacheAdapters,
   configHeaders: __configHeaders,
   configRedirects: __configRedirects,
   configRewrites: __configRewrites,
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
+    clientReuseManifest,
     cleanPathname,
     formState,
     actionError,
@@ -424,6 +443,7 @@ export default __createAppRscHandler({
     const __segmentConfig = __resolveAppPageSegmentConfig({
       layouts: route.layouts,
       page: route.page,
+      parallelPages: Object.values(route.slots ?? {}).map((slot) => slot.page),
     });
     const __generateStaticParams = __resolveAppPageGenerateStaticParamsSources({
       layouts: route.layouts,
@@ -434,8 +454,9 @@ export default __createAppRscHandler({
     const _asyncRouteParams = makeThenableParams(params);
     return __dispatchAppPage({
       basePath: __basePath,
+      ensureRouteLoaded: __ensureRouteLoaded,
       clientTraceMetadata: __clientTraceMetadata,
-      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams) {
+      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess) {
         return buildPageElements(targetRoute, targetParams, cleanPathname, {
           opts: targetOpts,
           searchParams: targetSearchParams,
@@ -443,8 +464,9 @@ export default __createAppRscHandler({
           request,
           mountedSlotsHeader,
           renderMode,
-        });
+        }, layoutParamAccess);
       },
+      clientReuseManifest,
       cleanPathname,
       clearRequestContext() {
         __clearRequestContext();
@@ -455,6 +477,7 @@ export default __createAppRscHandler({
       debugClassification: __classDebug,
       draftModeSecret: __draftModeSecret,
       dynamicConfig: __segmentConfig.dynamicConfig,
+      dynamicStaleTimeSeconds: __segmentConfig.dynamicStaleTimeSeconds,
       dynamicParamsConfig: __segmentConfig.dynamicParamsConfig,
       fetchCache: __segmentConfig.fetchCache ?? null,
       isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
@@ -473,6 +496,7 @@ export default __createAppRscHandler({
       hasPageDefaultExport: !!PageComponent,
       hasPageModule: !!route.page,
       handlerStart,
+      htmlLimitedBots: __htmlLimitedBots,
       interceptionContext,
       expireSeconds: __expireTime,
       formState,
@@ -494,24 +518,26 @@ export default __createAppRscHandler({
       params,
       staticParamsValidationParams,
       rootParams,
-      probeLayoutAt(li) {
-        const LayoutComp = route.layouts[li]?.default;
-        if (!LayoutComp) return null;
-        return LayoutComp({
-          params: makeThenableParams(__resolveAppPageSegmentParams(
-            route.routeSegments,
-            route.layoutTreePositions?.[li] ?? 0,
-            params,
-          )),
-          children: null,
+      probeLayoutAt(li, layoutParamAccess) {
+        return __probeAppPageLayoutWithTracking({
+          layoutIndex: li,
+          layoutParamAccess,
+          makeThenableParams,
+          matchedParams: params,
+          route,
         });
       },
       probePage() {
-        return __probeAppPage({
+        return Promise.all(__buildAppPageProbes({
+          route,
           pageComponent: PageComponent,
           asyncRouteParams: _asyncRouteParams,
           searchParams,
-        });
+          intercept: findIntercept(cleanPathname, interceptionContext),
+          isRscRequest,
+          matchedParams: params,
+          makeThenableParams,
+        }));
       },
       renderErrorBoundaryPage(renderErr) {
         return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime) });
@@ -605,7 +631,7 @@ export default __createAppRscHandler({
       setHeadersAccessPhase,
     });
   },
-  handleServerActionRequest({
+  async handleServerActionRequest({
     actionId,
     cleanPathname,
     contentType,
@@ -617,11 +643,13 @@ export default __createAppRscHandler({
     searchParams,
   }) {
     const __actionMatch = matchRoute(cleanPathname);
+    if (__actionMatch) await __ensureRouteLoaded(__actionMatch.route);
     const __actionIsEdgeRuntime = __actionMatch
       ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: __actionMatch.route.layouts, page: __actionMatch.route.page }).runtime)
       : false;
     return __handleServerActionRscRequest({
       actionId,
+      ensureRouteLoaded: __ensureRouteLoaded,
       allowedOrigins: __allowedOrigins,
       basePath: __basePath,
       isEdgeRuntime: __actionIsEdgeRuntime,
@@ -692,6 +720,7 @@ export default __createAppRscHandler({
       readFormDataWithLimit: __readFormDataWithLimit,
       renderToReadableStream,
       reportRequestError: _reportRequestError,
+      resolveRouteRuntime: __resolveRouteRuntime,
       request,
       sanitizeErrorForClient(error) {
         return __sanitizeErrorForClient(error);
@@ -725,43 +754,17 @@ export default __createAppRscHandler({
     return __fallbackRenderer.renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdge });
   },
   ${hasPagesDir ? `async renderPagesFallback({ isRscRequest, middlewareContext, request, url }) {
-    if (isRscRequest) return null;
-
-    const __pagesEntry = await import.meta.viteRsc.loadModule("ssr", "index");
-
-    const __pagesRequestHeaders = middlewareContext.requestHeaders
-      ? __buildRequestHeadersFromMiddlewareResponse(request.headers, middlewareContext.requestHeaders)
-      : null;
-    let __pagesRequest = request;
-    if (__pagesRequestHeaders) {
-      const __pagesRequestInit = {
-        method: request.method,
-        headers: __pagesRequestHeaders,
-      };
-      if (request.method !== "GET" && request.method !== "HEAD") {
-        __pagesRequestInit.body = request.body;
-        __pagesRequestInit.duplex = "half";
+    return __renderPagesFallback(
+      { isRscRequest, middlewareContext, request, url },
+      {
+        loadPagesEntry() {
+          return import.meta.viteRsc.loadModule("ssr", "index");
+        },
+        buildRequestHeaders: __buildRequestHeadersFromMiddlewareResponse,
+        decodePathParams: __decodePathParams,
+        applyRouteHandlerMiddlewareContext: __applyRouteHandlerMiddlewareContext,
       }
-      __pagesRequest = new Request(request.url, __pagesRequestInit);
-    }
-
-    const __pagesUrl = __decodePathParams(url.pathname) + (url.search || "");
-    const __pagesPathname = url.pathname;
-    if (__pagesPathname.startsWith("/api/") || __pagesPathname === "/api") {
-      if (typeof __pagesEntry.handleApiRoute !== "function") return null;
-      const __pagesApiResponse = await __pagesEntry.handleApiRoute(__pagesRequest, __pagesUrl);
-      return __applyRouteHandlerMiddlewareContext(__pagesApiResponse, middlewareContext);
-    }
-
-    if (typeof __pagesEntry.renderPage !== "function") return null;
-    const __pagesRes = await __pagesEntry.renderPage(
-      __pagesRequest,
-      __pagesUrl,
-      {},
-      undefined,
-      middlewareContext.requestHeaders,
     );
-    return __pagesRes.status !== 404 ? __pagesRes : null;
   },` : ""}
   rootParamNamesByPattern: rootParamNamesMap,
   setNavigationContext,
@@ -777,5 +780,3 @@ if (import.meta.hot) {
 }
 //#endregion
 export { generateRscEntry };
-
-//# sourceMappingURL=app-rsc-entry.js.map

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

@@ -50,5 +50,4 @@ type BuildAppRscManifestCodeOptions = {
 };
 declare function buildAppRscManifestCode(options: BuildAppRscManifestCodeOptions): AppRscManifestCode;
 //#endregion
-export { buildAppRscManifestCode };
-//# sourceMappingURL=app-rsc-manifest.d.ts.map
+export { buildAppRscManifestCode };

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

@@ -3,10 +3,26 @@ import { computeAppRouteStaticSiblings, convertSegmentsToRouteParts } from "../r
 import "../routing/app-router.js";
 import { createMetadataRouteEntriesSource } from "../server/metadata-route-build-data.js";
 //#region src/entries/app-rsc-manifest.ts
+function findRootBoundaryRoute(routes) {
+	return routes.find((route) => route.pattern === "/") ?? routes.find((route) => route.layouts.length > 0 && route.layoutTreePositions.length > 0);
+}
+function rootRouteLayoutPaths(route) {
+	if (!route) return [];
+	if (route.pattern === "/") return route.layouts;
+	const rootPosition = route.layoutTreePositions[0];
+	return route.layouts.filter((_, index) => route.layoutTreePositions[index] === rootPosition);
+}
+function rootRouteBoundaryPath(route, boundaryPaths, fallbackPath) {
+	if (!route) return null;
+	if (route.pattern === "/") return fallbackPath ?? null;
+	return boundaryPaths?.[0] ?? fallbackPath ?? null;
+}
 function createImportAllocator() {
 	const imports = [];
 	const importMap = /* @__PURE__ */ new Map();
+	const lazyMap = /* @__PURE__ */ new Map();
 	let importIdx = 0;
+	let lazyIdx = 0;
 	return {
 		importMap,
 		imports,
@@ -18,13 +34,22 @@ function createImportAllocator() {
 			imports.push(`import * as ${varName} from ${JSON.stringify(absPath)};`);
 			importMap.set(filePath, varName);
 			return varName;
+		},
+		getLazyLoaderVar(filePath) {
+			const existing = lazyMap.get(filePath);
+			if (existing) return existing;
+			const varName = `load_${lazyIdx++}`;
+			const absPath = normalizePathSeparators(filePath);
+			imports.push(`const ${varName} = () => import(${JSON.stringify(absPath)});`);
+			lazyMap.set(filePath, varName);
+			return varName;
 		}
 	};
 }
 function registerRouteModules(routes, imports) {
 	for (const route of routes) {
-		if (route.pagePath) imports.getImportVar(route.pagePath);
-		if (route.routePath) imports.getImportVar(route.routePath);
+		if (route.pagePath) imports.getLazyLoaderVar(route.pagePath);
+		if (route.routePath) imports.getLazyLoaderVar(route.routePath);
 		for (const layout of route.layouts) imports.getImportVar(layout);
 		for (const tmpl of route.templates) imports.getImportVar(tmpl);
 		if (route.loadingPath) imports.getImportVar(route.loadingPath);
@@ -94,6 +119,8 @@ ${interceptEntries.join(",\n")}
 		});
 		const layoutErrorVars = (route.layoutErrorPaths || []).map((ep) => ep ? imports.getImportVar(ep) : "null");
 		const errorVars = (route.errorPaths ?? []).map((ep) => imports.getImportVar(ep));
+		const loadPageField = route.pagePath ? imports.getLazyLoaderVar(route.pagePath) : "null";
+		const loadRouteHandlerField = route.routePath ? imports.getLazyLoaderVar(route.routePath) : "null";
 		return `  {
     __buildTimeClassifications: __VINEXT_CLASS(${routeIdx}), // evaluated once at module load
     __buildTimeReasons: __classDebug ? __VINEXT_CLASS_REASONS(${routeIdx}) : null,
@@ -104,8 +131,10 @@ ${interceptEntries.join(",\n")}
     params: ${JSON.stringify(route.params)},
     staticSiblings: ${JSON.stringify(staticSiblings)},
     rootParamNames: ${JSON.stringify(route.rootParamNames ?? [])},
-    page: ${route.pagePath ? imports.getImportVar(route.pagePath) : "null"},
-    routeHandler: ${route.routePath ? imports.getImportVar(route.routePath) : "null"},
+    page: null,
+    __loadPage: ${loadPageField},
+    routeHandler: null,
+    __loadRouteHandler: ${loadRouteHandlerField},
     layouts: [${layoutVars.join(", ")}],
     routeSegments: ${JSON.stringify(route.routeSegments)},
     templateTreePositions: ${JSON.stringify(route.templateTreePositions)},
@@ -169,7 +198,7 @@ function buildGenerateStaticParamsEntries(routes, imports, namesByPattern) {
 	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, `${imports.getImportVar(layoutPath)}?.generateStaticParams`);
-		if (route.pagePath) appendStaticParamSource(sourcesByPattern, route.pattern, `${imports.getImportVar(route.pagePath)}?.generateStaticParams`);
+		if (route.pagePath) appendStaticParamSource(sourcesByPattern, route.pattern, `{ load: ${imports.getLazyLoaderVar(route.pagePath)} }`);
 	}
 	return Array.from(sourcesByPattern.entries()).map(([pattern, sources]) => {
 		const rootParamNames = namesByPattern.get(pattern) ?? [];
@@ -184,11 +213,14 @@ function buildAppRscManifestCode(options) {
 	const metadataRoutes = options.metadataRoutes ?? [];
 	registerRouteModules(options.routes, imports);
 	const routeEntries = buildRouteEntries(options.routes, imports);
-	const rootRoute = options.routes.find((r) => r.pattern === "/");
-	const rootNotFoundVar = rootRoute?.notFoundPath ? imports.getImportVar(rootRoute.notFoundPath) : null;
-	const rootForbiddenVar = rootRoute?.forbiddenPath ? imports.getImportVar(rootRoute.forbiddenPath) : null;
-	const rootUnauthorizedVar = rootRoute?.unauthorizedPath ? imports.getImportVar(rootRoute.unauthorizedPath) : null;
-	const rootLayoutVars = rootRoute ? rootRoute.layouts.map((l) => imports.getImportVar(l)) : [];
+	const rootRoute = findRootBoundaryRoute(options.routes);
+	const rootNotFoundPath = rootRouteBoundaryPath(rootRoute, rootRoute?.notFoundPaths, rootRoute?.notFoundPath);
+	const rootForbiddenPath = rootRouteBoundaryPath(rootRoute, rootRoute?.forbiddenPaths, rootRoute?.forbiddenPath);
+	const rootUnauthorizedPath = rootRouteBoundaryPath(rootRoute, rootRoute?.unauthorizedPaths, rootRoute?.unauthorizedPath);
+	const rootNotFoundVar = rootNotFoundPath ? imports.getImportVar(rootNotFoundPath) : null;
+	const rootForbiddenVar = rootForbiddenPath ? imports.getImportVar(rootForbiddenPath) : null;
+	const rootUnauthorizedVar = rootUnauthorizedPath ? imports.getImportVar(rootUnauthorizedPath) : null;
+	const rootLayoutVars = rootRouteLayoutPaths(rootRoute).map((layoutPath) => imports.getImportVar(layoutPath));
 	const globalErrorVar = options.globalErrorPath ? imports.getImportVar(options.globalErrorPath) : null;
 	const globalNotFoundImportSpecifier = options.globalNotFoundPath ? JSON.stringify(normalizePathSeparators(options.globalNotFoundPath)) : null;
 	const dynamicMetadataRoutes = metadataRoutes.filter((r) => r.isDynamic);
@@ -210,5 +242,3 @@ function buildAppRscManifestCode(options) {
 }
 //#endregion
 export { buildAppRscManifestCode };
-
-//# sourceMappingURL=app-rsc-manifest.js.map

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

@@ -12,5 +12,4 @@
  */
 declare function generateSsrEntry(hasPagesDir?: boolean): string;
 //#endregion
-export { generateSsrEntry };
-//# sourceMappingURL=app-ssr-entry.d.ts.map
+export { generateSsrEntry };

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

@@ -22,5 +22,3 @@ export { handleApiRoute, pageRoutes, renderPage } from "virtual:vinext-server-en
 }
 //#endregion
 export { generateSsrEntry };
-
-//# sourceMappingURL=app-ssr-entry.js.map

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

@@ -1,11 +1,11 @@
-import { createValidFileMatcher } from "../routing/file-matcher.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
+import { createValidFileMatcher } from "../routing/file-matcher.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?: {
   appPrefetchRoutes?: readonly VinextLinkPrefetchRoute[];
+  instrumentationClientPath?: string | null;
 }): Promise<string>;
 //#endregion
-export { generateClientEntry };
-//# sourceMappingURL=pages-client-entry.d.ts.map
+export { generateClientEntry };

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

@@ -1,7 +1,7 @@
+import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { pagesRouter } from "../routing/pages-router.js";
 import { normalizePathSeparators } from "../utils/path.js";
-import { findFileWithExts } from "./pages-entry-helpers.js";
 //#region src/entries/pages-client-entry.ts
 /**
 * Pages Router client hydration entry generator.
@@ -19,13 +19,14 @@ async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options =
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const hasApp = appFilePath !== null;
 	const appPrefetchRoutes = options.appPrefetchRoutes ?? [];
+	const instrumentationClientPath = options.instrumentationClientPath ?? null;
 	const loaderEntries = pageRoutes.map((r) => {
 		const absPath = normalizePathSeparators(r.filePath);
 		const nextFormatPattern = patternToNextFormat(r.pattern);
 		return `  ${JSON.stringify(nextFormatPattern)}: () => import(${JSON.stringify(absPath)})`;
 	});
 	const appFileBase = appFilePath ? normalizePathSeparators(appFilePath) : void 0;
-	return `
+	return `${instrumentationClientPath ? `import ${JSON.stringify(normalizePathSeparators(instrumentationClientPath))};\n` : ""}
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
@@ -91,6 +92,18 @@ async function hydrate() {
     return;
   }
 
+  let hydrateRootOptions;
+  if (import.meta.env.DEV) {
+    const overlay = await import("vinext/dev-error-overlay");
+    overlay.installDevErrorOverlay();
+    overlay.installViteHmrErrorHandler(import.meta.hot);
+    overlay.reportInitialDevServerErrors();
+    hydrateRootOptions = {
+      onCaughtError: overlay.devOnCaughtError,
+      onUncaughtError: overlay.devOnUncaughtError,
+    };
+  }
+
   const { pageProps } = nextData.props;
   const loader = pageLoaders[nextData.page];
   if (!loader) {
@@ -128,7 +141,7 @@ async function hydrate() {
     return;
   }
 
-  const root = hydrateRoot(container, element);
+  const root = hydrateRoot(container, element, hydrateRootOptions);
   window.__VINEXT_ROOT__ = root;
   installPagesRouterRuntime();
   const hydratedAt = performance.now();
@@ -143,5 +156,3 @@ hydrate();
 }
 //#endregion
 export { generateClientEntry };
-
-//# sourceMappingURL=pages-client-entry.js.map

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

@@ -1,11 +1,2 @@
-import { createValidFileMatcher } from "../routing/file-matcher.js";
-
-//#region src/entries/pages-entry-helpers.d.ts
-/**
- * Find a file with any of the valid extensions in the given directory.
- * Returns the first matching absolute path, or null if not found.
- */
-declare function findFileWithExts(dir: string, name: string, matcher: ReturnType<typeof createValidFileMatcher>): string | null;
-//#endregion
-export { findFileWithExts };
-//# sourceMappingURL=pages-entry-helpers.d.ts.map
+import { findFileWithExts } from "../routing/file-matcher.js";
+export { findFileWithExts };

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

@@ -1,21 +1,2 @@
-import fs from "node:fs";
-import path from "node:path";
-//#region src/entries/pages-entry-helpers.ts
-/**
-* Shared helpers used by the Pages Router entry generators.
-*/
-/**
-* Find a file with any of the valid extensions in the given directory.
-* Returns the first matching absolute path, or null if not found.
-*/
-function findFileWithExts(dir, name, matcher) {
-	for (const ext of matcher.dottedExtensions) {
-		const filePath = path.join(dir, name + ext);
-		if (fs.existsSync(filePath)) return filePath;
-	}
-	return null;
-}
-//#endregion
+import { findFileWithExts } from "../routing/file-matcher.js";
 export { findFileWithExts };
-
-//# sourceMappingURL=pages-entry-helpers.js.map

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

@@ -1,5 +1,5 @@
-import { createValidFileMatcher } from "../routing/file-matcher.js";
 import { ResolvedNextConfig } from "../config/next-config.js";
+import { createValidFileMatcher } from "../routing/file-matcher.js";
 
 //#region src/entries/pages-server-entry.d.ts
 /**
@@ -8,5 +8,4 @@ import { ResolvedNextConfig } from "../config/next-config.js";
  */
 declare function generateServerEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, middlewarePath: string | null, instrumentationPath: string | null): Promise<string>;
 //#endregion
-export { generateServerEntry };
-//# sourceMappingURL=pages-server-entry.d.ts.map
+export { generateServerEntry };