vinext 1.0.0-beta.7 → 1.0.0-beta.9

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

@@ -85,6 +85,8 @@ type AppRouterConfig = {
   publicFiles?: string[];
   /** Server-only token used to validate the draft-mode bypass cookie. */
   draftModeSecret?: string;
+  /** Server-only token used to authorize build-time prerender endpoints. */
+  prerenderSecret?: string;
 };
 /**
  * Generate the virtual RSC entry module.

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

@@ -90,6 +90,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const hasPagesDir = config?.hasPagesDir ?? false;
 	const publicFiles = config?.publicFiles ?? [];
 	const draftModeSecret = config?.draftModeSecret ?? randomUUID();
+	const prerenderSecret = config?.prerenderSecret ?? randomUUID();
 	const imageAllowedWidths = [...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES];
 	const imageConfig = {
 		qualities: config?.imageConfig?.qualities,
@@ -115,6 +116,8 @@ ${hasAppRouteHandlers ? `// Capture the canonical Request surface before any use
 // The global-backed snapshot remains available to the lazy dispatch chunk.
 import ${JSON.stringify(appRouteRequestBuiltInsPath)};` : ""}
 import ${JSON.stringify(serverGlobalsPath)};
+import __cacheabilityManifest from "virtual:vinext-cacheability-manifest";
+export { __cacheabilityManifest };
 import {
   renderToReadableStream as _renderToReadableStream,
   ${hasServerActions ? `decodeAction,
@@ -352,6 +355,9 @@ ${metaRouteEntries.join(",\n")}
 // Re-exported so the Cloudflare worker entry can strip basePath before
 // recognising /_next/static/* paths (parity with __assetPrefix below).
 export const __basePath = ${JSON.stringify(bp)};
+// Per-build capability used by Worker entries to authorize remote path
+// discovery. It is never included in responses or exposed to user modules.
+export const __prerenderSecret = ${JSON.stringify(prerenderSecret)};
 
 // Hoisted alongside __basePath so __fallbackRenderer / buildPageElements can
 // thread the configured trailingSlash flag through canonical URL rendering.
@@ -557,6 +563,7 @@ const __appRscHandler = createAppRscHandler({
   isDev: process.env.NODE_ENV !== "production",
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
+    bypassInterceptionContextCache,
     clientReuseManifest,
     cleanPathname,
     displayPathname,
@@ -619,6 +626,7 @@ const __appRscHandler = createAppRscHandler({
     const _asyncRouteParams = makeThenableParams(params);
     return __dispatchAppPage({
       basePath: __basePath,
+      bypassInterceptionContextCache,
       ensureRouteLoaded: __ensureRouteLoaded,
       clientTraceMetadata: __clientTraceMetadata,
       reactMaxHeadersLength: __reactMaxHeadersLength,
@@ -709,7 +717,11 @@ const __appRscHandler = createAppRscHandler({
         });
       },
       async probePage(probeSearchParams = searchParams) {
-        const __probeIntercept = findIntercept(interceptionPathname, interceptionContext);
+        const __probeIntercept = findIntercept(
+          interceptionPathname,
+          interceptionContext,
+          interceptionId,
+        );
         // The intercepting-route page module is lazy (page: null + __pageLoader).
         // Resolve it before probing so buildAppPageProbes inspects the real page
         // component for dynamic bailout — matching the render path, which also
@@ -730,7 +742,11 @@ const __appRscHandler = createAppRscHandler({
         }));
       },
       renderErrorBoundaryPage(renderErr, errorOrigin) {
-        const __activeIntercept = findIntercept(interceptionPathname, interceptionContext);
+        const __activeIntercept = findIntercept(
+          interceptionPathname,
+          interceptionContext,
+          interceptionId,
+        );
         return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, {
           isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
           sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
@@ -739,7 +755,11 @@ const __appRscHandler = createAppRscHandler({
         }, errorOrigin);
       },
       renderHttpAccessFallbackPage(statusCode, opts, currentMiddlewareContext) {
-        const __activeIntercept = findIntercept(interceptionPathname, interceptionContext);
+        const __activeIntercept = findIntercept(
+          interceptionPathname,
+          interceptionContext,
+          interceptionId,
+        );
         return __fallbackRenderer.renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, currentMiddlewareContext, {
           isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
           routePathname: cleanPathname,
@@ -1133,7 +1153,11 @@ const __appRscHandler = createAppRscHandler({
         params[name] = intercept.sourceMatchedParams[name];
       }
     }
-    return { route, params };
+    return {
+      interceptionSourceIsConcrete: intercept.sourceRouteIsConcrete,
+      route,
+      params,
+    };
   },
   ${middlewarePath ? `runMiddleware({ cleanPathname, context, externalRewriteRequest, hadBasePath, isDataRequest, middlewareRequest, request, validateExternalRewriteRequest }) {
     return __applyAppMiddleware({

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

@@ -296,6 +296,7 @@ function buildGenerateStaticParamsEntries(routes, imports, namesByPattern) {
 		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)} }`);
 		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 rootParamNames = namesByPattern.get(pattern) ?? [];

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

@@ -5,6 +5,6 @@ import { ResolvedNextConfig } from "../config/next-config.js";
  * 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[]): Promise<string>;
+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 };

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

@@ -35,7 +35,7 @@ async function getPagesDataKind(filePath) {
 * 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 = []) {
+async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles = [], 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)};`);
@@ -173,6 +173,9 @@ const i18nConfig = ${i18nConfigJson};
 // match _next/data requests against the embedded buildId without needing
 // to load next.config.js at runtime.
 export const buildId = ${buildIdJson};
+// Per-build capability used by Worker entries to authorize remote path
+// discovery. It is never included in responses or exposed to user modules.
+export const prerenderSecret = ${JSON.stringify(prerenderSecret ?? null)};
 export function normalizeDataRequest(request) {
   return __normalizePagesDataRequest(
     request,

package/dist/index.d.ts

@@ -61,6 +61,9 @@ type VinextOptions = {
    * Enabled by default. Set to `false` to disable (e.g. if you configure
    * @vitejs/plugin-react manually in your vite.config.ts), or pass an options
    * object to customize the Babel transform.
+   *
+   * Pass `{ compiler: true }` to enable the React Compiler. That requires
+   * @vitejs/plugin-react 6.1+ and the optional `oxc-transform-react` package.
    * @default true
    */
   react?: Options | boolean;

package/dist/index.js

@@ -28,6 +28,7 @@ import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
+import { CACHEABILITY_MANIFEST_MODULE } from "./server/cacheability-manifest.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
@@ -37,7 +38,7 @@ import { validateDevRequest } from "./server/dev-origin-check.js";
 import { createActionOwnerManifestPlugin } from "./plugins/action-owner-manifest.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
-import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
+import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule, hasVerbatimResponseVary } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
@@ -55,6 +56,7 @@ import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
+import { hasReactCompilerPlugin, isReactCompilerPlugin, isReactCompilerRequested, reactCompilerUnsupportedMessage } from "./utils/react-compiler-support.js";
 import { VIRTUAL_MODULE_ID_RE } from "./utils/virtual-module.js";
 import { assertNoPublicDirAssetConflict, assertNoPublicNextRequestConflict } from "./build/public-dir-conflict.js";
 import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
@@ -68,6 +70,7 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
+import { isServerEnvironment } from "./plugins/environment.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
@@ -627,6 +630,8 @@ const VIRTUAL_PAGES_CLIENT_ASSETS = "virtual:vinext-pages-client-assets";
 const RESOLVED_PAGES_CLIENT_ASSETS = "\0virtual:vinext-pages-client-assets";
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
 const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
+const VIRTUAL_CACHEABILITY_MANIFEST = "virtual:vinext-cacheability-manifest";
+const RESOLVED_CACHEABILITY_MANIFEST = "\0virtual:vinext-cacheability-manifest";
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0virtual:vinext-app-ssr-entry";
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
@@ -768,6 +773,7 @@ function createServerEnvironmentFileNameResolver(config, outputRoot) {
 function vinext(options = {}) {
 	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
+	const cacheAdapterBuildOutputs = [options.cache?.data?.output, options.cache?.cdn?.output].filter((output) => output !== void 0);
 	let root;
 	let pagesDir;
 	let canonicalPagesDir;
@@ -801,13 +807,26 @@ function vinext(options = {}) {
 	let pagesClientAssetsModule = null;
 	let devPublicFileRoutes = null;
 	let publicDirConflictOptions = null;
+	let copyPublicDirIntoStaticExportBasePath = false;
+	let rscBuildIdentity;
 	let rscCompatibilityId;
 	let draftModeSecret = getPagesPreviewModeId();
+	const prerenderSecret = process.env.__VINEXT_SHARED_PRERENDER_SECRET ?? randomBytes(32).toString("hex");
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	let rscClassificationManifest = null;
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
+	const serverEntryKindsByEnvironment = /* @__PURE__ */ new Map();
+	function recordServerEntryLoad(environmentName, id) {
+		if (!environmentName) return;
+		let entries = serverEntryKindsByEnvironment.get(environmentName);
+		if (!entries) {
+			entries = /* @__PURE__ */ new Set();
+			serverEntryKindsByEnvironment.set(environmentName, entries);
+		}
+		entries.add(id);
+	}
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
@@ -835,7 +854,7 @@ function vinext(options = {}) {
 	*/
 	async function generateServerEntry$1(configuredPublicDir) {
 		const publicFiles = isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, configuredPublicDir === "" ? false : configuredPublicDir);
-		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles);
+		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles, prerenderSecret);
 	}
 	/**
 	* Generate the virtual client hydration entry module.
@@ -915,9 +934,12 @@ function vinext(options = {}) {
 	const configuredReactOptions = options.react && options.react !== true ? options.react : void 0;
 	const reactOptions = configuredReactOptions;
 	let reactPluginPromise = null;
+	let reactCompilerPluginPromise = null;
 	if (options.react !== false) {
 		if (!resolvedReactPath) throw new Error("vinext: @vitejs/plugin-react is not installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-react");
-		reactPluginPromise = import(pathToFileURL(resolvedReactPath).href).then((mod) => {
+		const allReactPlugins = import(pathToFileURL(resolvedReactPath).href).catch((cause) => {
+			throw new Error("vinext: Failed to load @vitejs/plugin-react.", { cause });
+		}).then((mod) => {
 			const react = mod.default;
 			const limitToCommand = (plugin, command) => {
 				const originalApply = plugin.apply;
@@ -931,15 +953,17 @@ function vinext(options = {}) {
 					}
 				};
 			};
-			const buildPlugins = react(reactOptions).map((plugin) => limitToCommand(plugin, "build"));
+			const resolvedBuildPlugins = react(reactOptions);
+			if (isReactCompilerRequested(configuredReactOptions) && !hasReactCompilerPlugin(resolvedBuildPlugins)) throw new Error(reactCompilerUnsupportedMessage(detectPackageManager(process.cwd())));
+			const buildPlugins = resolvedBuildPlugins.map((plugin) => limitToCommand(plugin, "build"));
 			const servePlugins = react(configuredReactOptions !== void 0 && Object.prototype.hasOwnProperty.call(configuredReactOptions, "include") ? reactOptions : {
 				...reactOptions,
 				include: /\.(?:[tj]sx?|mdx)$/i
 			}).map((plugin) => limitToCommand(plugin, "serve"));
 			return [...buildPlugins, ...servePlugins];
-		}).catch((cause) => {
-			throw new Error("vinext: Failed to load @vitejs/plugin-react.", { cause });
 		});
+		reactPluginPromise = allReactPlugins.then((plugins) => plugins.filter((plugin) => !isReactCompilerPlugin(plugin)));
+		reactCompilerPluginPromise = allReactPlugins.then((plugins) => plugins.filter(isReactCompilerPlugin));
 	}
 	const imageImportDimCache = /* @__PURE__ */ new Map();
 	const staticImageAssets = /* @__PURE__ */ new Map();
@@ -1075,6 +1099,7 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		reactCompilerPluginPromise,
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
@@ -1172,6 +1197,10 @@ function vinext(options = {}) {
 					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
 				}
+				if (env?.command === "build" && rscBuildIdentity === void 0) {
+					const sharedRscBuildIdentity = process.env.__VINEXT_SHARED_RSC_BUILD_IDENTITY;
+					rscBuildIdentity = sharedRscBuildIdentity && sharedRscBuildIdentity.length > 0 ? sharedRscBuildIdentity : randomBytes(16).toString("hex");
+				}
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				globalNotFoundCssIsolationPath = env?.command === "build" && nextConfig.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
@@ -1208,6 +1237,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_TEST_MODE"] = JSON.stringify(process.env.__NEXT_TEST_MODE ?? false);
 				defines["process.env.__NEXT_SCROLL_RESTORATION"] = JSON.stringify(nextConfig.scrollRestoration ? "true" : "false");
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
+				defines["process.env.__NEXT_CONFIG_OUTPUT"] = JSON.stringify(nextConfig.output ?? "");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
 				{
@@ -1230,7 +1260,9 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
 				defines["process.env.__VINEXT_IMAGE_UNOPTIMIZED"] = JSON.stringify(String(nextConfig.images?.unoptimized === true));
 				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
+				defines["process.env.__VINEXT_CANONICAL_RSC_REQUESTS"] = JSON.stringify(env?.command === "build" && hasVerbatimResponseVary(options.cache) ? "1" : "");
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
+				defines["process.env.__VINEXT_RSC_BUILD_IDENTITY"] = JSON.stringify(rscBuildIdentity ?? "");
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
 				defines["process.env.NEXT_RUNTIME"] = "\"\"";
@@ -1581,6 +1613,11 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configEnvironment(name, config) {
+				if (name === "client" && nextConfig.output === "export" && nextConfig.basePath) {
+					config.build ??= {};
+					copyPublicDirIntoStaticExportBasePath = config.build.copyPublicDir !== false;
+					config.build.copyPublicDir = false;
+				}
 				if (name !== "client" && config.consumer !== "client") {
 					config.optimizeDeps ??= {};
 					config.optimizeDeps.rolldownOptions ??= {};
@@ -1664,6 +1701,26 @@ function vinext(options = {}) {
 					assertNoPublicDirAssetConflict(publicDirConflictOptions);
 				}
 			},
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(outputOptions) {
+					if (this.environment?.name !== "client" || nextConfig.output !== "export" || !nextConfig.basePath || !copyPublicDirIntoStaticExportBasePath) return;
+					const envConfig = this.environment.config;
+					const publicDir = envConfig.publicDir;
+					if (!publicDir || !fs.existsSync(publicDir)) return;
+					if (publicDirConflictOptions) assertNoPublicDirAssetConflict(publicDirConflictOptions);
+					const buildRoot = envConfig.root ?? process.cwd();
+					const clientOutDir = outputOptions.dir ? path.resolve(buildRoot, outputOptions.dir) : path.resolve(buildRoot, envConfig.build.outDir);
+					const basePathDir = path.join(clientOutDir, nextConfig.basePath.slice(1));
+					fs.mkdirSync(basePathDir, { recursive: true });
+					fs.cpSync(publicDir, basePathDir, {
+						recursive: true,
+						dereference: true,
+						force: true
+					});
+				}
+			},
 			resolveId: {
 				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
@@ -1684,6 +1741,13 @@ function vinext(options = {}) {
 					if (cleanId.endsWith("/virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
 					if (cleanId.endsWith("/virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
+					if (cleanId === VIRTUAL_CACHEABILITY_MANIFEST) {
+						if ((hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment)) && this.environment.config?.command === "build") return {
+							id: `./${CACHEABILITY_MANIFEST_MODULE}`,
+							external: true
+						};
+						return RESOLVED_CACHEABILITY_MANIFEST;
+					}
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId === VIRTUAL_APP_CAPABILITIES) return RESOLVED_APP_CAPABILITIES;
@@ -1709,7 +1773,10 @@ function vinext(options = {}) {
 				filter: { id: /virtual:vinext-/ },
 				async handler(id) {
 					if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
-					if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1(this.environment.config.publicDir === "" ? false : this.environment.config.publicDir);
+					if (id === RESOLVED_SERVER_ENTRY) {
+						recordServerEntryLoad(this.environment?.name, id);
+						return await generateServerEntry$1(this.environment.config.publicDir === "" ? false : this.environment.config.publicDir);
+					}
 					if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
 					if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
 						const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
@@ -1725,7 +1792,9 @@ function vinext(options = {}) {
 						if (Object.keys(ssrManifest).length > 0) metadata.ssrManifest = ssrManifest;
 						return `export default ${JSON.stringify(metadata)};`;
 					}
+					if (id === RESOLVED_CACHEABILITY_MANIFEST) return "export default null;";
 					if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
+						recordServerEntryLoad(this.environment?.name, id);
 						const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 						const metaRoutes = scanMetadataFiles(appDir);
 						const hasServerActions = await resolveHasServerActions(this.environment.config);
@@ -1767,13 +1836,17 @@ function vinext(options = {}) {
 							hasPagesDir,
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
 							globalNotFoundPath,
-							draftModeSecret
+							draftModeSecret,
+							prerenderSecret
 						}, instrumentationPath);
 					}
 					if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 					if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
 					if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
-					if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
+					if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) {
+						recordServerEntryLoad(this.environment?.name, id);
+						return generateSsrEntry(hasPagesDir);
+					}
 					if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 						const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
 						const pagesPrefetchRoutes = hasPagesDir ? [...(await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
@@ -1786,7 +1859,7 @@ function vinext(options = {}) {
 							isDynamic: route.isDynamic,
 							patternParts: [...route.patternParts]
 						}))] : [];
-						return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites);
+						return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales);
 					}
 					if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
 						const hasServerActions = await resolveHasServerActions(this.environment.config);
@@ -1907,6 +1980,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				return null;
 			}
 		},
+		{
+			name: "vinext:cacheability-manifest-asset",
+			apply: "build",
+			generateBundle() {
+				if (!(hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment))) return;
+				this.emitFile({
+					type: "asset",
+					fileName: CACHEABILITY_MANIFEST_MODULE,
+					source: "export default null;\n"
+				});
+			}
+		},
 		{
 			name: "vinext:css-url-assets-restore",
 			enforce: "post",
@@ -2914,6 +2999,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				if (name === "client") return null;
 				const serverDefines = { ...nextConfig.compilerDefineServer };
 				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
+				serverDefines["process.env.NEXT_PHASE"] = "globalThis.__VINEXT_NEXT_PHASE";
 				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
 				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
 				if (previewBuildCredentials) {
@@ -3095,6 +3181,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const outDir = path.join(root, "dist", "server");
 						fs.mkdirSync(outDir, { recursive: true });
 						fs.writeFileSync(path.join(outDir, "BUILD_ID"), nextConfig.buildId);
+						if (rscBuildIdentity) fs.writeFileSync(path.join(outDir, "RSC_BUILD_ID"), rscBuildIdentity);
 					}
 				}
 			};
@@ -3108,26 +3195,30 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				if (salt) return salt;
 			}
 		},
-		(() => {
-			const prerenderSecret = randomBytes(32).toString("hex");
-			return {
-				name: "vinext:server-manifest",
-				apply: "build",
-				enforce: "post",
-				writeBundle: {
-					sequential: true,
-					order: "post",
-					handler(options) {
-						const envName = this.environment?.name;
-						if (envName !== "rsc" && envName !== "ssr") return;
-						const outDir = options.dir;
-						if (!outDir) return;
-						const manifest = { prerenderSecret };
-						fs.writeFileSync(path.join(outDir, "vinext-server.json"), JSON.stringify(manifest));
+		{
+			name: "vinext:server-manifest",
+			apply: "build",
+			enforce: "post",
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(options) {
+					const environment = this.environment;
+					if (!environment || (hasAppDir ? environment.name !== "rsc" : !isServerEnvironment(environment))) return;
+					const outDir = options.dir;
+					if (!outDir) return;
+					const source = JSON.stringify({ prerenderSecret });
+					fs.writeFileSync(path.join(outDir, "vinext-server.json"), source);
+					if (!hasAppDir) {
+						const canonicalServerDir = path.join(root, "dist", "server");
+						if (path.resolve(outDir) !== canonicalServerDir) {
+							fs.mkdirSync(canonicalServerDir, { recursive: true });
+							fs.writeFileSync(path.join(canonicalServerDir, "vinext-server.json"), source);
+						}
 					}
 				}
-			};
-		})(),
+			}
+		},
 		{
 			name: "vinext:nitro-route-rules",
 			nitro: { setup: async (nitro) => {
@@ -3418,6 +3509,33 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		}
 	];
+	if (cacheAdapterBuildOutputs.length > 0) plugins.push({
+		name: "vinext:cache-adapter-build-output",
+		apply: "build",
+		enforce: "post",
+		writeBundle: {
+			sequential: true,
+			order: "post",
+			async handler(outputOptions) {
+				if (!outputOptions.dir) return;
+				const config = this.environment?.config;
+				if (!config) return;
+				const build = { plugins: config.plugins };
+				const buildRoot = config.root ?? process.cwd();
+				const outDir = path.resolve(buildRoot, outputOptions.dir);
+				const loadedEntries = serverEntryKindsByEnvironment.get(this.environment?.name ?? "");
+				const isPrimaryServerOutput = Boolean(loadedEntries?.has(RESOLVED_RSC_ENTRY) || loadedEntries?.has(RESOLVED_SERVER_ENTRY) && !loadedEntries.has(RESOLVED_APP_SSR_ENTRY));
+				for (const output of cacheAdapterBuildOutputs) {
+					if (output.matchesBuild && !output.matchesBuild(build)) continue;
+					await output.finalizeBuildOutput?.({
+						root: buildRoot,
+						outDir,
+						isPrimaryServerOutput
+					});
+				}
+			}
+		}
+	});
 	if (rscPluginPromise) plugins.push(rscPluginPromise);
 	if (earlyAppDirExists) plugins.push(createActionOwnerManifestPlugin({
 		canonicalizeModuleId: canonicalize,

package/dist/init-cloudflare.d.ts

@@ -28,17 +28,19 @@ declare function updateWranglerConfigForCloudflare(code: string, options: Cloudf
   root?: string;
 }): string;
 declare function getWranglerImagesBinding(code: string): string;
+declare function getWranglerVersionMetadataBinding(code: string): string;
 /** Generate vite.config.ts for App Router */
-declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean): string;
+declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string): string;
 /** Generate vite.config.ts for Pages Router */
-declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean): string;
+declare function generatePagesRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean, versionMetadataBinding?: string): string;
 declare function updateViteConfigForCloudflare(filePath: string, code: string, options: {
   isAppRouter: boolean;
   nativeModulesToStub: string[];
   cache?: CloudflareInitOptions;
   imagesBinding?: string;
+  versionMetadataBinding?: string;
   prerender?: boolean;
 }): string;
 declare function usesCommonJsViteConfig(filePath: string, code: string): boolean;
 //#endregion
-export { CloudflarePlatformSetupContext, CloudflarePlatformSetupResult, CloudflareProjectInfo, generateAppRouterViteConfig, generatePagesRouterViteConfig, generateWranglerConfig, getWranglerImagesBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };
+export { CloudflarePlatformSetupContext, CloudflarePlatformSetupResult, CloudflareProjectInfo, generateAppRouterViteConfig, generatePagesRouterViteConfig, generateWranglerConfig, getWranglerImagesBinding, getWranglerVersionMetadataBinding, setupCloudflarePlatform, updateViteConfigForCloudflare, updateWranglerConfigForCloudflare, usesCommonJsViteConfig, validateCloudflarePlatformSetup };