vinext 1.0.0-beta.2 → 1.0.0-beta.3

package/README.md

@@ -345,24 +345,16 @@ Requires a custom domain (zone analytics are unavailable on `*.workers.dev`) and
 
 #### Custom Vite configuration
 
-If you need to customize the Vite config, create a `vite.config.ts`. vinext will merge its config with yours. This is required for Cloudflare Workers deployment with the App Router (RSC needs explicit plugin configuration):
+If you need to customize the Vite config, create a `vite.config.ts`. vinext will merge its config with yours. For Cloudflare Workers deployment with the App Router, configure `@cloudflare/vite-plugin` so the RSC environment runs in workerd:
 
 ```ts
 import { defineConfig } from "vite";
 import vinext from "vinext";
-import rsc from "@vitejs/plugin-rsc";
 import { cloudflare } from "@cloudflare/vite-plugin";
 
 export default defineConfig({
   plugins: [
     vinext(),
-    rsc({
-      entries: {
-        rsc: "virtual:vinext-rsc-entry",
-        ssr: "virtual:vinext-app-ssr-entry",
-        client: "virtual:vinext-app-browser-entry",
-      },
-    }),
     cloudflare({
       viteEnvironment: { name: "rsc", childEnvironments: ["ssr"] },
     }),
@@ -370,6 +362,11 @@ export default defineConfig({
 });
 ```
 
+> **Do not register `@vitejs/plugin-rsc` yourself.** It is an optional peer dependency, so it must be
+> _installed_ in your project, but vinext auto-registers it whenever an `app/` directory is detected.
+> Adding an explicit `rsc()` call fails the build with `[vinext] Duplicate @vitejs/plugin-rsc detected`.
+> Pass `rsc: false` to `vinext()` only if you want to own that registration.
+
 See the [examples](#live-examples) for complete working configurations.
 
 ### Other platforms (via Nitro)

package/dist/build/client-build-config.js

@@ -89,7 +89,13 @@ function createClientManualChunks(shimsDir, preserveRouteBoundaries = false) {
 		if (id.includes("node_modules")) {
 			const pkg = getPackageName(id);
 			if (!pkg) return void 0;
-			if (pkg === "react" || pkg === "react-dom" || pkg === "scheduler") return "framework";
+			if (pkg === "react-dom") {
+				const slashedId = toSlash(id);
+				const sub = slashedId.slice(slashedId.lastIndexOf("react-dom/") + 10);
+				if (sub.startsWith("server.") || sub.startsWith("static.") || sub.startsWith("cjs/react-dom-server")) return "react-dom-server";
+				return "framework";
+			}
+			if (pkg === "react" || pkg === "scheduler") return "framework";
 			return;
 		}
 		const slashedId = toSlash(id);

package/dist/check.js

@@ -230,6 +230,10 @@ const CONFIG_SUPPORT = {
 		status: "supported",
 		detail: "server actions via 'use server' directive"
 	},
+	"experimental.allowedRevalidateHeaderKeys": {
+		status: "supported",
+		detail: "forwards explicitly allowed request headers during Pages Router revalidation"
+	},
 	"experimental.prefetchInlining": {
 		status: "partial",
 		detail: "config recognized; Link prefetch preserves pending/dedup semantics, but vinext does not implement per-segment cache storage"

package/dist/config/config-matchers.js

@@ -1,4 +1,4 @@
-import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+import { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { analyzeRegexSafety } from "../utils/regex-safety.js";
 import { normalizeHost, parseCookies, requestContextFromRequest } from "./request-context.js";
@@ -835,6 +835,9 @@ async function proxyExternalRequest(request, externalUrl) {
 	for (const key of keysToDelete) headers.delete(key);
 	headers.delete(VINEXT_PRERENDER_SECRET_HEADER);
 	headers.delete(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER);
+	headers.delete(PRERENDER_REVALIDATE_HEADER);
+	headers.delete(PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER);
+	headers.delete(VINEXT_REVALIDATE_HOST_HEADER);
 	headers.delete(VINEXT_MW_CTX_HEADER);
 	const method = request.method;
 	const hasBody = method !== "GET" && method !== "HEAD";

package/dist/config/next-config.d.ts

@@ -100,7 +100,11 @@ type NextConfig = {
    * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
    */
   assetPrefix?: string; /** Whether to add trailing slashes */
-  trailingSlash?: boolean; /** Internationalization routing config */
+  trailingSlash?: boolean; /** TypeScript build settings. */
+  typescript?: {
+    /** Project-relative path to the TypeScript configuration file. */tsconfigPath?: string;
+    [key: string]: unknown;
+  }; /** Internationalization routing config */
   i18n?: NextI18nConfig; /** URL redirect rules */
   redirects?: () => Promise<NextRedirect[]> | NextRedirect[]; /** URL rewrite rules */
   rewrites?: () => Promise<NextRewrite[] | {
@@ -217,7 +221,8 @@ type NextConfig = {
     prefetchInlining?: boolean | {
       maxBundleSize?: number;
       maxSize?: number;
-    };
+    }; /** Header names forwarded by Pages Router `res.revalidate()` internal requests. */
+    allowedRevalidateHeaderKeys?: string[];
     [key: string]: unknown;
   };
   /**
@@ -266,6 +271,9 @@ type ResolvedNextConfig = {
    */
   assetPrefix: string;
   trailingSlash: boolean;
+  typescript: {
+    tsconfigPath?: string;
+  };
   output: "" | "export" | "standalone";
   pageExtensions: string[];
   resolveExtensions: string[] | null;
@@ -295,7 +303,8 @@ type ResolvedNextConfig = {
   mdx: MdxOptions | null; /** Explicit module aliases preserved from wrapped next.config plugins. */
   aliases: Record<string, string>; /** Extra allowed origins for dev server access (from allowedDevOrigins). */
   allowedDevOrigins: string[]; /** Extra allowed origins for server action CSRF validation (from experimental.serverActions.allowedOrigins). */
-  serverActionsAllowedOrigins: string[]; /** Packages whose barrel imports should be optimized (from experimental.optimizePackageImports). */
+  serverActionsAllowedOrigins: string[]; /** Header names forwarded by Pages Router `res.revalidate()` internal requests. */
+  allowedRevalidateHeaderKeys: string[]; /** Packages whose barrel imports should be optimized (from experimental.optimizePackageImports). */
   optimizePackageImports: string[]; /** Packages explicitly requested for server/client transpilation. */
   transpilePackages: string[]; /** Packages treated as application code by Turbopack's foreign-code condition. */
   turbopackTranspilePackages: string[]; /** Inline app CSS into production HTML (from experimental.inlineCss). */

package/dist/config/next-config.js

@@ -658,6 +658,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			basePath: "",
 			assetPrefix: "",
 			trailingSlash: false,
+			typescript: {},
 			output: "",
 			pageExtensions: normalizePageExtensions(),
 			resolveExtensions: null,
@@ -679,6 +680,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			aliases: {},
 			allowedDevOrigins: [],
 			serverActionsAllowedOrigins: [],
+			allowedRevalidateHeaderKeys: [],
 			optimizePackageImports: [],
 			transpilePackages: [],
 			turbopackTranspilePackages: [...DEFAULT_TRANSPILED_PACKAGES],
@@ -833,6 +835,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		basePath: config.basePath ?? "",
 		assetPrefix: normalizeAssetPrefix(config.assetPrefix),
 		trailingSlash: config.trailingSlash ?? false,
+		typescript: typeof config.typescript?.tsconfigPath === "string" ? { tsconfigPath: config.typescript.tsconfigPath } : {},
 		output: output === "export" || output === "standalone" ? output : "",
 		pageExtensions,
 		resolveExtensions: resolveExtensions ?? webpackProbe.resolveExtensions,
@@ -851,6 +854,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		aliases,
 		allowedDevOrigins,
 		serverActionsAllowedOrigins,
+		allowedRevalidateHeaderKeys: Array.isArray(experimental?.allowedRevalidateHeaderKeys) ? experimental.allowedRevalidateHeaderKeys.filter((value) => typeof value === "string").map((value) => value.toLowerCase()) : [],
 		optimizePackageImports,
 		transpilePackages,
 		turbopackTranspilePackages,

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

@@ -15,15 +15,9 @@ declare function generateBrowserEntry(routes?: readonly AppRoute[], routeManifes
   beforeFiles: NextRewrite[];
   fallback: NextRewrite[];
 }): string;
-/**
- * Filter for routes that should appear in the `__VINEXT_LINK_PREFETCH_ROUTES__`
- * manifest. Exported so the Pages Router client entry can reuse it when
- * emitting the same manifest for hybrid builds — see issue #1526 and
- * `pages-client-entry.ts`.
- */
-declare function isLinkPrefetchRoute(route: AppRoute): boolean;
-declare function toDocumentOnlyAppRoute(route: AppRoute): VinextLinkPrefetchRoute;
 /** Project an `AppRoute` down to the public `VinextLinkPrefetchRoute` shape. */
-declare function toLinkPrefetchRoute(route: AppRoute): VinextLinkPrefetchRoute;
+declare function toLinkPrefetchRoute(route: AppRoute, hasSiblingInterceptLoading?: boolean): VinextLinkPrefetchRoute;
+/** Project App routes together so sibling-intercept loading is applied to its target route. */
+declare function toLinkPrefetchRoutes(routes: readonly AppRoute[]): VinextLinkPrefetchRoute[];
 //#endregion
-export { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute };
+export { generateBrowserEntry, toLinkPrefetchRoute, toLinkPrefetchRoutes };

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

@@ -1,4 +1,5 @@
 import { resolveClientRuntimeModule, resolveRuntimeEntryModule } from "./runtime-entry-module.js";
+import { patternsStructurallyEquivalent } from "../routing/app-route-graph.js";
 //#region src/entries/app-browser-entry.ts
 /**
 * Generate the virtual browser entry module.
@@ -14,7 +15,7 @@ function generateBrowserEntry(routes = [], routeManifest = null, pagesPrefetchRo
 }) {
 	const entryPath = resolveRuntimeEntryModule("app-browser-entry");
 	const navigationRuntimePath = resolveClientRuntimeModule("navigation-runtime");
-	const prefetchRoutes = routes.map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route));
+	const prefetchRoutes = toLinkPrefetchRoutes(routes);
 	return `import { registerNavigationRuntimeBootstrap } from ${JSON.stringify(navigationRuntimePath)};
 
 window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(prefetchRoutes)};
@@ -50,15 +51,30 @@ function toDocumentOnlyAppRoute(route) {
 function requiresDynamicNavigationRequest(route) {
 	return route.isDynamic && route.parallelSlots.length > 0;
 }
+function splitPatternParts(pattern) {
+	return pattern.split("/").filter(Boolean);
+}
+function interceptTargetsRoute(interceptTargetPattern, route) {
+	return patternsStructurallyEquivalent(splitPatternParts(interceptTargetPattern), route.patternParts);
+}
+function hasLoadingBoundary(route, hasSiblingInterceptLoading) {
+	return route.loadingPath !== null || (route.loadingPaths?.length ?? 0) > 0 || route.parallelSlots.some((slot) => slot.loadingPath !== null || (slot.loadingPaths?.length ?? 0) > 0 || slot.interceptingRoutes.some((intercept) => interceptTargetsRoute(intercept.targetPattern, route) && (intercept.loadingPaths?.length ?? 0) > 0)) || hasSiblingInterceptLoading;
+}
 /** Project an `AppRoute` down to the public `VinextLinkPrefetchRoute` shape. */
-function toLinkPrefetchRoute(route) {
+function toLinkPrefetchRoute(route, hasSiblingInterceptLoading = route.siblingIntercepts.some((intercept) => interceptTargetsRoute(intercept.targetPattern, route) && (intercept.loadingPaths?.length ?? 0) > 0)) {
 	return {
-		canPrefetchLoadingShell: route.loadingPath !== null,
+		canPrefetchLoadingShell: hasLoadingBoundary(route, hasSiblingInterceptLoading),
 		patternParts: [...route.patternParts],
 		isDynamic: route.isDynamic,
 		...requiresDynamicNavigationRequest(route) ? { requiresDynamicNavigationRequest: true } : {}
 	};
 }
+/** Project App routes together so sibling-intercept loading is applied to its target route. */
+function toLinkPrefetchRoutes(routes) {
+	const siblingInterceptLoadingTargets = [];
+	for (const route of routes) for (const intercept of route.siblingIntercepts) if ((intercept.loadingPaths?.length ?? 0) > 0) siblingInterceptLoadingTargets.push(splitPatternParts(intercept.targetPattern));
+	return routes.map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route, siblingInterceptLoadingTargets.some((targetParts) => patternsStructurallyEquivalent(targetParts, route.patternParts))) : toDocumentOnlyAppRoute(route));
+}
 function buildRouteManifestExpression(routeManifest) {
 	if (routeManifest === null) return "null";
 	const graph = routeManifest.segmentGraph;
@@ -84,4 +100,4 @@ function buildMapExpression(map) {
 	return `new Map(${JSON.stringify(Array.from(map.entries()))})`;
 }
 //#endregion
-export { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute };
+export { generateBrowserEntry, toLinkPrefetchRoute, toLinkPrefetchRoutes };

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

@@ -195,6 +195,7 @@ import {
   isrGet as __isrGet,
   isrSet as __isrSet,
   isrSetPrerenderedAppPage as __isrSetPrerenderedAppPage,
+  isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest,
   triggerBackgroundRegeneration as __triggerBackgroundRegeneration,
 } from ${JSON.stringify(isrCachePath)};
 // Import server-only state module to register ALS-backed accessors.
@@ -436,6 +437,8 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
 }
 
 const __i18nConfig = ${JSON.stringify(i18nConfig)};
+export { __i18nConfig };
+export const authorizeOnDemandRevalidate = __isOnDemandRevalidateRequest;
 const __configRedirects = ${JSON.stringify(redirects)};
 const __configRewrites = ${JSON.stringify(rewrites)};
 const __configHeaders = ${JSON.stringify(headers)};

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

@@ -53,6 +53,7 @@ function registerRouteModules(routes, imports) {
 		for (const layout of route.layouts) imports.getLazyLoaderVar(layout);
 		for (const tmpl of route.templates) imports.getLazyLoaderVar(tmpl);
 		if (route.loadingPath) imports.getLazyLoaderVar(route.loadingPath);
+		for (const loadingPath of route.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 		if (route.errorPath) imports.getLazyLoaderVar(route.errorPath);
 		if (route.layoutErrorPaths) {
 			for (const ep of route.layoutErrorPaths) if (ep) imports.getLazyLoaderVar(ep);
@@ -76,18 +77,21 @@ function registerRouteModules(routes, imports) {
 			if (slot.layoutPath) imports.getLazyLoaderVar(slot.layoutPath);
 			for (const layoutPath of slot.configLayoutPaths ?? []) imports.getLazyLoaderVar(layoutPath);
 			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
+			for (const loadingPath of slot.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
 			if (slot.notFoundPath) imports.getLazyLoaderVar(slot.notFoundPath);
 			for (const ir of slot.interceptingRoutes) {
 				imports.getLazyLoaderVar(ir.pagePath);
 				if (ir.notFoundPath) imports.getLazyLoaderVar(ir.notFoundPath);
 				for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
+				for (const loadingPath of ir.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 			}
 		}
 		for (const ir of route.siblingIntercepts ?? []) {
 			imports.getLazyLoaderVar(ir.pagePath);
 			if (ir.notFoundPath) imports.getLazyLoaderVar(ir.notFoundPath);
 			for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
+			for (const loadingPath of ir.loadingPaths ?? []) imports.getLazyLoaderVar(loadingPath);
 		}
 	}
 }
@@ -102,10 +106,12 @@ function buildRouteEntries(routes, imports) {
 		const staticSiblings = route.isDynamic ? computeAppRouteStaticSiblings(routes, route) : [];
 		const layoutLoaders = lazyLoaderArray(route.layouts, imports);
 		const templateLoaders = lazyLoaderArray(route.templates, imports);
+		const loadingPaths = route.loadingPaths ?? [];
 		const notFoundPaths = route.notFoundPaths ?? [];
 		const forbiddenPaths = route.forbiddenPaths ?? [];
 		const unauthorizedPaths = route.unauthorizedPaths ?? [];
 		const notFoundLoaders = lazyLoaderArray(notFoundPaths, imports);
+		const loadingLoaders = lazyLoaderArray(loadingPaths, imports);
 		const forbiddenLoaders = lazyLoaderArray(forbiddenPaths, imports);
 		const unauthorizedLoaders = lazyLoaderArray(unauthorizedPaths, imports);
 		const siblingInterceptEntries = (route.siblingIntercepts ?? []).map((ir) => `    {
@@ -118,6 +124,9 @@ function buildRouteEntries(routes, imports) {
       __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
       interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
       interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
+      interceptLoadings: ${moduleArray(ir.loadingPaths?.length ?? 0)},
+      __loadInterceptLoadings: ${lazyLoaderArray(ir.loadingPaths ?? [], imports)},
+      interceptLoadingTreePositions: ${JSON.stringify(ir.loadingTreePositions ?? [])},
       interceptNotFoundBranchSegments: ${JSON.stringify(ir.notFoundBranchSegments ?? ir.branchSegments ?? [])},
       page: null,
       __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
@@ -136,6 +145,9 @@ function buildRouteEntries(routes, imports) {
           __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
           interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
           interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
+          interceptLoadings: ${moduleArray(ir.loadingPaths?.length ?? 0)},
+          __loadInterceptLoadings: ${lazyLoaderArray(ir.loadingPaths ?? [], imports)},
+          interceptLoadingTreePositions: ${JSON.stringify(ir.loadingTreePositions ?? [])},
           interceptNotFoundBranchSegments: ${JSON.stringify(ir.notFoundBranchSegments ?? ir.branchSegments ?? [])},
           page: null,
           __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
@@ -147,6 +159,7 @@ function buildRouteEntries(routes, imports) {
 			return `      ${JSON.stringify(slot.key)}: {
         id: ${JSON.stringify(slot.id ?? null)},
         name: ${JSON.stringify(slot.name)},
+        ownerTreePosition: ${slot.ownerTreePosition ?? "null"},
         page: null,
         __loadPage: ${slot.pagePath ? imports.getLazyLoaderVar(slot.pagePath) : "null"},
         default: null,
@@ -158,6 +171,9 @@ function buildRouteEntries(routes, imports) {
         configLayoutTreePositions: ${JSON.stringify(slot.configLayoutTreePositions ?? [])},
         loading: null,
         __loadLoading: ${slot.loadingPath ? imports.getLazyLoaderVar(slot.loadingPath) : "null"},
+        loadings: ${moduleArray(slot.loadingPaths?.length ?? 0)},
+        __loadLoadings: ${lazyLoaderArray(slot.loadingPaths ?? [], imports)},
+        loadingTreePositions: ${JSON.stringify(slot.loadingTreePositions ?? [])},
         error: null,
         __loadError: ${slot.errorPath ? imports.getLazyLoaderVar(slot.errorPath) : "null"},
         notFound: null,
@@ -200,6 +216,9 @@ ${interceptEntries.join(",\n")}
     layoutTreePositions: ${JSON.stringify(route.layoutTreePositions)},
     templates: ${moduleArray(route.templates.length)},
     __loadTemplates: ${templateLoaders},
+    loadings: ${moduleArray(loadingPaths.length)},
+    __loadLoadings: ${loadingLoaders},
+    loadingTreePositions: ${JSON.stringify(route.loadingTreePositions ?? null)},
     errors: ${moduleArray(layoutErrorPaths.length)},
     __loadErrors: ${layoutErrorLoaders},
     errorPaths: ${moduleArray(errorPaths.length)},

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

@@ -177,7 +177,6 @@ async function hydrate() {
     element = React.createElement(AppComponent, {
       ...props,
       Component: PageComponent,
-      pageProps: rawPageProps,
       router: Router,
     });
   } catch {

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

@@ -24,6 +24,7 @@ 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 _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
 async function getPagesDataKind(filePath) {
 	const source = await readFile(filePath, "utf8");
 	if (hasExportedName(source, "getStaticProps")) return "static";
@@ -71,6 +72,7 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		},
 		headers: nextConfig?.headers ?? [],
 		expireTime: nextConfig?.expireTime,
+		allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys ?? [],
 		cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 		htmlLimitedBots: nextConfig?.htmlLimitedBots,
 		i18n: nextConfig?.i18n ?? null,
@@ -151,11 +153,17 @@ import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_p
 import { normalizePagesDataRequest as __normalizePagesDataRequest, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
+import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_isrCachePath)};
 ${instrumentationImportCode}
 ${middlewareImportCode}
 
 ${instrumentationInitCode}
 
+// The outer Node production pipeline runs outside this generated bundle, so
+// it cannot safely validate against its own development fallback secret. Give
+// it a verifier closed over this entry's build-time-baked secret instead.
+export const authorizeOnDemandRevalidate = __isOnDemandRevalidateRequest;
+
 // i18n config (embedded at build time)
 const i18nConfig = ${i18nConfigJson};
 
@@ -344,7 +352,6 @@ const _renderPage = __createPagesPageHandler({
       ? React.createElement(AppComponent, {
           ...props,
           Component: PageComponent,
-          pageProps: rawPageProps,
           router: Router,
         })
       : React.createElement(PageComponent, pageProps);
@@ -362,7 +369,6 @@ const _renderPage = __createPagesPageHandler({
       ? React.createElement(FinalApp, {
           ...props,
           Component: FinalComp,
-          pageProps: rawPageProps,
           router: Router,
         })
       : React.createElement(FinalComp, pageProps);
@@ -379,7 +385,7 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 
-export async function handleApiRoute(request, url, ctx) {
+export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin) {
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({
@@ -387,6 +393,7 @@ export async function handleApiRoute(request, url, ctx) {
     match,
     nextConfig: vinextConfig,
     request,
+    trustedRevalidateOrigin,
     url,
     reportRequestError(error, routePattern) {
       console.error("[vinext] API error:", error);