vinext 1.0.0-beta.11 → 1.0.0-beta.12

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

@@ -43,6 +43,8 @@ type AppRouterConfig = {
    * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
    */
   assetPrefix?: string;
+  /** CORS mode for framework-managed assets from next.config. */
+  crossOrigin?: "anonymous" | "use-credentials";
   /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
   expireTime?: number;
   /**

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

@@ -190,6 +190,7 @@ const __trailingSlash = ${JSON.stringify(ts)};
 const __draftModeSecret = ${JSON.stringify(config?.draftModeSecret ?? "")};
 export const __prerenderSecret = ${JSON.stringify(config?.prerenderSecret ?? "")};
 export const __assetPrefix = ${JSON.stringify(config?.assetPrefix ?? "")};
+export const __crossOrigin = ${JSON.stringify(config?.crossOrigin ?? "")};
 export { __basePath };
 export const __imageAllowedWidths = ${JSON.stringify([...config?.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...config?.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES])};
 export const __imageConfig = ${JSON.stringify({
@@ -371,6 +372,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const htmlLimitedBots = config?.htmlLimitedBots;
 	const clientTraceMetadata = config?.clientTraceMetadata;
 	const assetPrefix = config?.assetPrefix ?? "";
+	const crossOrigin = config?.crossOrigin ?? "";
 	const expireTime = config?.expireTime ?? DEFAULT_EXPIRE_TIME;
 	const reactMaxHeadersLength = config?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
@@ -820,6 +822,7 @@ const __reactMaxHeadersLength = ${JSON.stringify(reactMaxHeadersLength)};
 // mirrors the embedded \`__basePath\` pattern (and Pages Router's
 // \`vinextConfig\` export). Empty string when unset.
 export const __assetPrefix = ${JSON.stringify(assetPrefix)};
+export const __crossOrigin = ${JSON.stringify(crossOrigin)};
 export const __imageAllowedWidths = ${JSON.stringify(imageAllowedWidths)};
 export const __imageConfig = ${JSON.stringify(imageConfig)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
@@ -898,6 +901,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   draftModeSecret: __draftModeSecret,
   dispatchMatchedPage({
     bypassInterceptionContextCache,
+    cachePathname,
     clientReuseManifest,
     cleanPathname,
     displayPathname,
@@ -1025,8 +1029,18 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       isRscRequest,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
-      isrHtmlKey: __isrHtmlKey,
-      isrRscKey: __isrRscKey,
+      isrHtmlKey(pathname) {
+        return __isrHtmlKey(pathname === cleanPathname ? cachePathname : pathname);
+      },
+      isrRscKey(pathname, mountedSlots, requestedRenderMode, requestedInterceptionContext, requestedInterceptionId) {
+        return __isrRscKey(
+          pathname === cleanPathname ? cachePathname : pathname,
+          mountedSlots,
+          requestedRenderMode,
+          requestedInterceptionContext,
+          requestedInterceptionId,
+        );
+      },
       isrSet: __isrSet,
       loadSsrHandler() {
         return import.meta.viteRsc.loadModule("ssr", "index");
@@ -1133,6 +1147,8 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     });
   },
   async dispatchMatchedRouteHandler({
+    bypassInterceptionContextCache,
+    cachePathname,
     cleanPathname,
     middlewareContext,
     params,
@@ -1144,6 +1160,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       await __loadAppRouteHandlerDispatch();
     return __dispatchAppRouteHandler({
       basePath: __basePath,
+      bypassSharedCache: bypassInterceptionContextCache,
       cleanPathname,
       clearRequestContext() {
         __clearRequestContext();
@@ -1153,7 +1170,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       trailingSlash: __trailingSlash,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
-      isrRouteKey: __isrRouteKey,
+      isrRouteKey(pathname) {
+        return __isrRouteKey(pathname === cleanPathname ? cachePathname : pathname);
+      },
       isrSet: __isrSet,
       middlewareContext,
       middlewareRequestHeaders: middlewareContext.requestHeaders,
@@ -1461,7 +1480,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       await __loadMetadataRouteResponse();
     return __isMetadataRouteRequestPath(metadataRoutes, cleanPathname);
   },` : ""}
-  ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname) {
+  ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname, routePathname) {
     const { handleMetadataRouteRequest: __handleMetadataRouteRequest } =
       await __loadMetadataRouteResponse();
     return __handleMetadataRouteRequest({
@@ -1471,6 +1490,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       isrRouteKey: __isrRouteKey,
       isrSet: __isrSet,
       makeThenableParams,
+      routePathname,
       scheduleBackgroundRegeneration: __triggerBackgroundRegeneration,
     });
   },` : ""}

package/dist/index.js

@@ -115,7 +115,7 @@ import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGI
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import { createIdResolver, createLogger, parseAst, transformWithOxc } from "vite";
+import { createIdResolver, createLogger, isRunnableDevEnvironment, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { createHash, randomBytes } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
@@ -316,7 +316,7 @@ function createDevPagesModuleDependencyReader(root, resolve) {
 			if (typeof specifier !== "string") continue;
 			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
 			if (!resolved?.id) continue;
-			if (isStylesheetSpecifier(specifier)) {
+			if (isStylesheetSpecifier(specifier) || isStylesheetSpecifier(resolved.id)) {
 				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
 				if (asset) dependencies.push({
 					type: "stylesheet",
@@ -1550,6 +1550,7 @@ function vinext(options = {}) {
 					}
 				};
 				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
+				if (env.command === "serve" && !hasAppDir && !hasCloudflarePlugin && !shouldInjectPlainPagesEnvironments) viteConfig.optimizeDeps.include = [.../* @__PURE__ */ new Set([...incomingInclude, "react-dom/client"])];
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
@@ -1631,6 +1632,7 @@ function vinext(options = {}) {
 				} else if (hasCloudflarePlugin) viteConfig.environments = { client: {
 					consumer: "client",
 					optimizeDeps: {
+						include: ["react-dom/client"],
 						...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
 						...depOptimizeNodeEnvOptions
 					},
@@ -1649,6 +1651,7 @@ function vinext(options = {}) {
 					client: {
 						consumer: "client",
 						optimizeDeps: {
+							include: ["react-dom/client"],
 							...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
 							...depOptimizeNodeEnvOptions
 						},
@@ -1913,7 +1916,10 @@ function vinext(options = {}) {
 					}
 					if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
 					if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
-						const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
+						const metadata = {
+							clientEntry: DEV_PAGES_CLIENT_ENTRY,
+							crossOrigin: nextConfig?.crossOrigin ?? ""
+						};
 						const ssrManifest = {};
 						const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 						const pagesRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
@@ -1952,6 +1958,7 @@ function vinext(options = {}) {
 							clientTraceMetadata: nextConfig?.clientTraceMetadata,
 							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
+							crossOrigin: nextConfig?.crossOrigin,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 							cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
@@ -2668,7 +2675,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						restore();
 						return false;
 					};
-					const pagesInstrumentationReady = instrumentationPath && (!hasAppDir || !hasCloudflarePlugin) ? runInstrumentation(getPagesRunner(), instrumentationPath) : Promise.resolve();
+					const pagesInstrumentationReady = (async () => {
+						if (!instrumentationPath || hasAppDir && hasCloudflarePlugin) return;
+						if (hasAppDir) {
+							const environment = server.environments["rsc"];
+							if (!isRunnableDevEnvironment(environment)) return;
+							return runInstrumentation(environment.runner, instrumentationPath);
+						} else return runInstrumentation(getPagesRunner(), instrumentationPath);
+					})();
 					pagesInstrumentationReady.catch(() => {});
 					if (hasAppDir) server.middlewares.use((req, res, next) => {
 						const url = req.url ?? "/";
@@ -3645,8 +3659,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
 							ssrManifest,
+							cssGraph: runtimeMetadata.cssGraph,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
-							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0
+							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
+							crossOrigin: nextConfig.crossOrigin ?? ""
 						});
 						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
 						if (hasAppDir && hasPagesDir && buildSession) setPagesClientAssetsBuildMetadata(buildSession, pagesClientAssetsModule);

package/dist/plugins/use-cache-callable.js

@@ -4,6 +4,7 @@ import { magicStringTransformResult } from "./transform-result.js";
 import { createRequire } from "node:module";
 import { parseAstAsync } from "vite";
 import { pathToFileURL } from "node:url";
+import { createHmac, randomBytes } from "node:crypto";
 //#region src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
 const SOURCE_MODULE_ID_RE = /\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
@@ -65,6 +66,17 @@ function hasFunctionDirective(meta, directive) {
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression" || node.body.type !== "BlockStatement") return false;
 	return node.body.body.some((statement) => statement.type === "ExpressionStatement" && "directive" in statement && statement.directive === directive);
 }
+function getFunctionDirectiveExportNames(transforms, ast, directive) {
+	const names = /* @__PURE__ */ new Set();
+	for (const group of transforms.scanModuleExports(ast)) {
+		const entries = group.type === "declaration" ? [group.export] : group.type === "variable-declaration" ? group.declarators.flatMap((declarator) => declarator.exports) : group.type === "specifiers" ? group.exports : group.type === "default" ? [{
+			exportName: "default",
+			meta: group.meta
+		}] : [];
+		for (const entry of entries) if (hasFunctionDirective(entry.meta, directive)) names.add(entry.exportName);
+	}
+	return names;
+}
 function getCacheWrapperOptions(options, id, name, isModuleDirective, meta) {
 	const argumentCount = getArgumentCount(meta);
 	return {
@@ -78,6 +90,7 @@ async function createUseCacheCallablePlugin(options) {
 	const transformsPath = resolvePluginRscModule(options.projectRoot, "@vitejs/plugin-rsc/transforms");
 	const rscModule = await import(pathToFileURL(rscModulePath).href);
 	const transforms = await import(pathToFileURL(transformsPath).href);
+	const referenceSecret = randomBytes(32);
 	let manager;
 	return {
 		name: PLUGIN_NAME,
@@ -109,6 +122,8 @@ async function createUseCacheCallablePlugin(options) {
 				const useServerBoundary = transforms.hasDirective(ast.body, "use server");
 				if (moduleDirective && useServerBoundary) throw new Error(`A module cannot contain both ${JSON.stringify(moduleDirective)} and "use server" directives.`);
 				const reference = manager.serverReferences.resolve(id, "rsc");
+				const relativeImportId = manager.toRelativeId(reference.importId);
+				const secureExportName = (name) => `$$vinext_cache_${createHmac("sha256", referenceSecret).update(relativeImportId).update("\0").update(name).digest("hex")}`;
 				if (!(this.environment.name === "rsc")) {
 					if (useServerBoundary) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
@@ -126,6 +141,7 @@ async function createUseCacheCallablePlugin(options) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
 						return;
 					}
+					const useServerExportNames = getFunctionDirectiveExportNames(transforms, ast, "use server");
 					const result = transforms.transformDirectiveProxyExport(ast, {
 						code,
 						directive: moduleDirective,
@@ -134,7 +150,7 @@ async function createUseCacheCallablePlugin(options) {
 							validateModuleExport(transforms, meta);
 							return true;
 						},
-						runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(`${reference.referenceKey}#${name}`)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
+						runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(`${reference.referenceKey}#${useServerExportNames.has(name) ? name : secureExportName(name)}`)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
 					});
 					if (!result?.output.hasChanged()) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
@@ -142,7 +158,7 @@ async function createUseCacheCallablePlugin(options) {
 					}
 					manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
 						...reference,
-						exportNames: result.exportNames
+						exportNames: result.exportNames.map((name) => useServerExportNames.has(name) ? name : secureExportName(name))
 					});
 					const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
 					result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
@@ -151,19 +167,23 @@ async function createUseCacheCallablePlugin(options) {
 						source: id
 					});
 				}
+				const secureExports = /* @__PURE__ */ new Set();
 				const wrap = (value, name, directiveMatch, meta, isModuleDirective) => {
 					const variant = directiveMatch[1] ?? "";
+					const secureName = secureExportName(name);
+					secureExports.add(secureName);
 					const wrapperOptions = {
 						...getCacheWrapperOptions(options, id, name, isModuleDirective, meta),
-						serverReferenceId: `${reference.referenceKey}#${name}`
+						serverReferenceId: `${reference.referenceKey}#${secureName}`
 					};
 					return `$$cacheRuntime.registerCachedFunction(${value}, ${JSON.stringify(`${id}:${name}`)}, ${JSON.stringify(variant)}, ${JSON.stringify(wrapperOptions)})`;
 				};
 				let needsReactServer = false;
 				const runtime = (value, name, directiveMatch, meta, isModuleDirective) => {
 					const cached = wrap(value, name, directiveMatch, meta, isModuleDirective);
+					const secureName = secureExportName(name);
 					needsReactServer = true;
-					return `$$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(name)})`;
+					return `(${secureName} = $$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(secureName)}))`;
 				};
 				const result = moduleDirective ? transforms.transformWrapExport(code, ast, {
 					filter: (name, meta) => {
@@ -176,6 +196,7 @@ async function createUseCacheCallablePlugin(options) {
 					directive: USE_CACHE_DIRECTIVE_CANDIDATE,
 					rejectNonAsyncFunction: true,
 					hoistRuntime: true,
+					noExport: true,
 					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(meta.directiveMatch[0]), meta, false),
 					encode: (value) => `$$cacheRuntime.encryptCacheCaptures(${value})`,
 					decode: (value) => value
@@ -186,10 +207,15 @@ async function createUseCacheCallablePlugin(options) {
 				}
 				manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
 					...reference,
-					exportNames: "names" in result ? result.names : result.exportNames
+					exportNames: [...secureExports]
 				});
 				const importPosition = ast.body.find((node) => !("directive" in node))?.start ?? code.length;
-				result.output.prependLeft(importPosition, [`import * as $$cacheRuntime from ${JSON.stringify(options.cacheRuntime)};`, needsReactServer && `import * as $$VinextReactServer from "@vitejs/plugin-rsc/react/rsc/server";`].filter(Boolean).join("\n") + "\n");
+				result.output.prependLeft(importPosition, [
+					`import * as $$cacheRuntime from ${JSON.stringify(options.cacheRuntime)};`,
+					needsReactServer && `import * as $$VinextReactServer from "@vitejs/plugin-rsc/react/rsc/server";`,
+					secureExports.size > 0 && `let ${[...secureExports].join(",")};`
+				].filter(Boolean).join("\n") + "\n");
+				if (secureExports.size > 0) result.output.append(`\nexport { ${[...secureExports].join(",")} };\n`);
 				return magicStringTransformResult(result.output, {
 					hires: "boundary",
 					source: id

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

@@ -848,6 +848,7 @@ function registerServerActionCallback() {
 			navigationPlanner,
 			performHardNavigation: (url, historyMode) => browserNavigationController.performHardNavigation(url, historyMode),
 			renderRedirectPayload(elements, target, actionInitiation, revalidation) {
+				if (browserNavigationController.isCurrentNavigation(actionInitiation.navigationId)) getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 				const hashIdx = target.href.indexOf("#");
 				const hash = hashIdx !== -1 ? target.href.slice(hashIdx) : "";
 				const actionScrollIntent = beginAppRouterScrollIntent(hash || null);

package/dist/server/app-page-cache-finalizer.d.ts

@@ -24,6 +24,7 @@ type FinalizeAppPageCacheabilityEvaluationOptions = {
   revalidateSeconds: number | null;
 };
 type FinalizeAppPageHtmlCacheResponseOptions = {
+  bypassInterceptionContextCache?: boolean;
   capturedDynamicUsageBeforeContextCleanup?: () => boolean;
   capturedRscDataPromise: Promise<ArrayBuffer> | null;
   cleanPathname: string;

package/dist/server/app-page-cache-finalizer.js

@@ -19,7 +19,7 @@ function applyPendingDynamicCdnHeaders(headers, tags, options = {}) {
 	});
 	finalizePendingCacheStateHeaders(headers, options);
 }
-function applyUncacheableRscVariantNoStoreHeaders(headers, options = {}) {
+function applyUncacheableVariantNoStoreHeaders(headers, options = {}) {
 	applyCdnResponseHeaders(headers, { cacheControl: NO_STORE_CACHE_CONTROL });
 	finalizePendingCacheStateHeaders(headers, {
 		...options,
@@ -114,6 +114,18 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 		}
 		return probeResponse;
 	}
+	if (options.bypassInterceptionContextCache === true) {
+		options.capturedRscDataPromise?.catch(() => {});
+		const headers = new Headers(response.headers);
+		applyUncacheableVariantNoStoreHeaders(headers, { omitCacheState: options.omitPendingDynamicCacheState === true });
+		const clientResponse = new Response(response.body, {
+			status: response.status,
+			statusText: response.statusText,
+			headers
+		});
+		markFrameworkLinkHeaders(clientResponse.headers, options.linkHeader);
+		return clientResponse;
+	}
 	if (!response.body) return response;
 	const [streamForClient, streamForCache] = response.body.tee();
 	const htmlKey = options.isrHtmlKey(options.cleanPathname);
@@ -184,7 +196,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	const isUncacheableVariant = Boolean(options.mountedSlotsHeader) || options.bypassInterceptionContextCache === true;
 	if (options.preserveClientResponseHeaders === true && !isUncacheableVariant) return response;
 	const clientHeaders = new Headers(response.headers);
-	if (isUncacheableVariant) applyUncacheableRscVariantNoStoreHeaders(clientHeaders, { omitCacheState: options.omitPendingDynamicCacheState === true });
+	if (isUncacheableVariant) applyUncacheableVariantNoStoreHeaders(clientHeaders, { omitCacheState: options.omitPendingDynamicCacheState === true });
 	else applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags(), { omitCacheState: options.omitPendingDynamicCacheState === true });
 	return new Response(response.body, {
 		status: response.status,

package/dist/server/app-page-render.js

@@ -705,6 +705,7 @@ async function renderAppPageLifecycleImpl(options, renderSpan) {
 		});
 		if (options.isPrerender === true) return isrResponse;
 		return finalizeAppPageHtmlCacheResponse(isrResponse, {
+			bypassInterceptionContextCache: options.bypassInterceptionContextCache,
 			capturedDynamicUsageBeforeContextCleanup() {
 				return dynamicUsedBeforeContextCleanup;
 			},

package/dist/server/app-page-request.d.ts

@@ -35,7 +35,9 @@ export type ValidateAppPageDynamicParamsOptions = {
   enforceStaticParamsOnly: boolean;
   generateStaticParams?: GenerateStaticParams | GenerateStaticParamsSource | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[] | null;
   isDynamicRoute: boolean;
+  optionalCatchAllParamNames?: readonly string[];
   params: AppPageParams;
+  requiredParamNames?: readonly string[];
 };
 type ResolveAppPageGenerateStaticParamsSourcesOptions = {
   layouts?: readonly (GenerateStaticParamsModule | null | undefined)[];

package/dist/server/app-page-request.js

@@ -110,18 +110,21 @@ function resolveAppPageGenerateStaticParamsSources(options) {
 	}
 	return sources;
 }
-function areStaticParamsAllowed(params, staticParams, allowMissingValues = false) {
-	const paramKeys = Object.keys(params);
+function areStaticParamsAllowed(params, staticParams, allowMissingValues = false, paramKeys = Object.keys(params), optionalCatchAllParamNames = []) {
 	const stringParamMatches = (value, staticValue) => value === encodeURIComponent(staticValue);
-	return staticParams.some((staticParamSet) => paramKeys.every((key) => {
-		const value = params[key];
-		const staticValue = staticParamSet[key];
-		if (!Object.hasOwn(staticParamSet, key)) return allowMissingValues;
-		if (Array.isArray(value)) return Array.isArray(staticValue) && value.length === staticValue.length && value.every((part, index) => typeof staticValue[index] === "string" ? stringParamMatches(part, staticValue[index]) : part === staticValue[index]);
-		if (typeof staticValue === "string") return stringParamMatches(value, staticValue);
-		if (typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
-		return JSON.stringify(value) === JSON.stringify(staticValue);
-	}));
+	return staticParams.some((staticParamSet) => {
+		if (!staticParamSet || typeof staticParamSet !== "object" || Array.isArray(staticParamSet)) return false;
+		return paramKeys.every((key) => {
+			const value = params[key];
+			const staticValue = staticParamSet[key];
+			if (!Object.hasOwn(staticParamSet, key)) return allowMissingValues;
+			if (value === void 0) return optionalCatchAllParamNames.includes(key) && (staticValue === void 0 || staticValue === null || staticValue === false || Array.isArray(staticValue) && staticValue.length === 0);
+			if (Array.isArray(value)) return Array.isArray(staticValue) && value.length === staticValue.length && value.every((part, index) => typeof staticValue[index] === "string" ? stringParamMatches(part, staticValue[index]) : part === staticValue[index]);
+			if (typeof staticValue === "string") return stringParamMatches(value, staticValue);
+			if (typeof staticValue === "number" || typeof staticValue === "boolean") return String(value) === String(staticValue);
+			return JSON.stringify(value) === JSON.stringify(staticValue);
+		});
+	});
 }
 function remapStaticParamsToRouteParams(staticParams, source) {
 	if (!source.paramAliases) return [...staticParams];
@@ -227,9 +230,10 @@ async function validateAppPageDynamicParams(options) {
 		const result = await generateIndependentStaticParams(sources, chainedStaticParams, options.params);
 		if (result.validated) {
 			validatedIndependentResults = true;
-			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) return notFoundResponse();
+			if (!areStaticParamsAllowed(options.params, result.staticParams, options.requiredParamNames === void 0, options.requiredParamNames, options.optionalCatchAllParamNames)) return notFoundResponse();
 		}
 	}
+	if (options.requiredParamNames && !validatedIndependentResults) return notFoundResponse();
 	if (chainedStaticParams && !validatedIndependentResults) {
 		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) return notFoundResponse();
 	}

package/dist/server/app-request-stage-dispatch.js

@@ -40,7 +40,7 @@ async function dispatchAppRequestStage(request, ctx, dispatchResponseStage, opti
 			draftModeCookie: null,
 			middlewareCookieOverlay: null,
 			prerenderDiscovery: options.prerenderDiscovery,
-			protocolVersion: 8,
+			protocolVersion: 10,
 			requestOrigin: new URL(request.url).origin,
 			scriptNonce: null,
 			staticFileSignalToken,

package/dist/server/app-route-handler-dispatch.d.ts

@@ -18,6 +18,7 @@ type RouteHandlerBackgroundRegenerationErrorContext = {
 type RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>, errorContext?: RouteHandlerBackgroundRegenerationErrorContext) => void;
 type DispatchAppRouteHandlerOptions = {
   basePath?: string;
+  bypassSharedCache?: boolean;
   cleanPathname: string;
   clearRequestContext: () => void;
   draftModeSecret: string;

package/dist/server/app-route-handler-dispatch.js

@@ -91,7 +91,7 @@ async function dispatchAppRouteHandlerImpl(options) {
 		headers: { Allow: allowHeaderForOptions }
 	}));
 	const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : void 0;
-	const shouldReadRouteCache = revalidateSeconds !== null && !getRouteCacheabilityDynamicReason() && shouldReadAppRouteHandlerCache({
+	const shouldReadRouteCache = options.bypassSharedCache !== true && revalidateSeconds !== null && !getRouteCacheabilityDynamicReason() && shouldReadAppRouteHandlerCache({
 		dynamicConfig: handler.dynamic,
 		handlerFn: resolvedHandlerFn,
 		isAutoHead,
@@ -160,6 +160,7 @@ async function dispatchAppRouteHandlerImpl(options) {
 	if (resolvedHandlerFn) {
 		const response = await executeAppRouteHandler({
 			basePath: options.basePath,
+			bypassSharedCache: options.bypassSharedCache,
 			buildPageCacheTags(pathname, extraTags) {
 				return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);
 			},

package/dist/server/app-route-handler-execution.d.ts

@@ -65,6 +65,7 @@ type RunAppRouteHandlerResult = {
 export declare function applyDraftModeCachePolicy(response: Response, isDraftMode: boolean): Response;
 type ExecuteAppRouteHandlerOptions = {
   buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];
+  bypassSharedCache?: boolean;
   clearRequestContext: () => void;
   cleanPathname: string;
   executionContext: ExecutionContextLike | null;

package/dist/server/app-route-handler-execution.js

@@ -214,7 +214,7 @@ async function executeAppRouteHandlerImpl(options) {
 			dynamicUsedInHandler = handlerResult.didAccessDynamicRequest() || dynamicUsedDuringCompletion || dynamicUsedInHandler;
 		}
 		const requestCacheabilityVeto = getRouteCacheabilityDynamicReason();
-		const responseMustStayPrivate = Boolean(options.handler.dynamic === "force-dynamic" || dynamicUsedInHandler || requestCacheabilityVeto || cleanupDeferredToBody);
+		const responseMustStayPrivate = Boolean(options.bypassSharedCache === true || options.handler.dynamic === "force-dynamic" || dynamicUsedInHandler || requestCacheabilityVeto || cleanupDeferredToBody);
 		if (dynamicUsedInHandler) markKnownDynamicAppRoute(options.routePattern);
 		const pendingCookies = options.getAndClearPendingCookies();
 		const handlerDraftCookie = options.getDraftModeCookieHeader() ?? handlerDraftCookieBeforeCompletion;
@@ -269,7 +269,7 @@ async function executeAppRouteHandlerImpl(options) {
 			isHead: options.isAutoHead
 		}), options.middlewareContext, middlewareMergeOptions), shouldApplyDraftPolicy);
 		const preserveHandlerPolicy = isRouteCacheabilityEvaluation() ? hasExplicitCacheablePolicy : handlerSetCachePolicy;
-		if (responseMustStayPrivate && !preserveHandlerPolicy) {
+		if (options.bypassSharedCache === true || responseMustStayPrivate && !preserveHandlerPolicy) {
 			const headers = new Headers(finalized.headers);
 			applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
 			finalized = new Response(finalized.body, {

package/dist/server/app-rsc-handler.d.ts

@@ -50,6 +50,7 @@ type AppRscRouteMatch<TRoute> = {
 };
 type DispatchMatchedPageOptions<TRoute> = {
   bypassInterceptionContextCache: boolean;
+  cachePathname: string;
   clientReuseManifest: ClientReuseManifestParseResult;
   cleanPathname: string;
   displayPathname: string;
@@ -86,6 +87,12 @@ type DispatchMatchedPageOptions<TRoute> = {
   renderMode: AppRscRenderMode;
 };
 type DispatchMatchedRouteHandlerOptions<TRoute> = {
+  /**
+   * Legacy transported cache-bypass bit. Also covers request/cache route-identity
+   * divergence so the response cannot be published under another route's key.
+   */
+  bypassInterceptionContextCache: boolean;
+  cachePathname: string;
   cleanPathname: string;
   middlewareContext: AppRscMiddlewareContext;
   /**
@@ -207,7 +214,7 @@ export type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
   /** Request-only entries dynamically load the response graph for local bypasses. */
   renderResponseStageLocally?: RenderAppWorkerResponseStageLocally;
   handleProgressiveActionRequest?: (options: HandleProgressiveActionRequestOptions<TRoute>) => Promise<Response | ProgressiveActionFormStateResult | null>;
-  handleMetadataRouteRequest?: (cleanPathname: string) => Promise<Response | null>;
+  handleMetadataRouteRequest?: (cleanPathname: string, routePathname: string) => Promise<Response | null>;
   isMetadataRoutePath?: (cleanPathname: string) => boolean | Promise<boolean>;
   getPrerenderMetadataRoutePaths?: () => Promise<unknown>;
   createPprFallbackShells?: (route: Pick<AppRscHandlerRoute, "params" | "pattern" | "rootParamNames">, params: AppPageParams) => AppPagePprFallbackCacheShell[];