vinext 1.0.0-beta.2 → 1.0.0-beta.4

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/build/precompress.js

@@ -1,9 +1,9 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { ASSET_PREFIX_URL_DIR } from "../utils/asset-prefix.js";
 import fsp from "node:fs/promises";
+import { promisify } from "node:util";
 import os from "node:os";
 import zlib from "node:zlib";
-import { promisify } from "node:util";
 //#region src/build/precompress.ts
 /**
 * Build-time precompression for hashed static assets.

package/dist/build/prerender.d.ts

@@ -23,7 +23,8 @@ type PrerenderRouteResult = {
    */
   path?: string; /** Which router produced this route. Used by cache seeding. */
   router: "app" | "pages"; /** Response headers that must be replayed with the prerendered artifact. */
-  headers?: Record<string, string>; /** Set to true when this is a PPR fallback shell. */
+  headers?: Record<string, string>; /** Cache tags collected while rendering this route. */
+  tags?: string[]; /** Set to true when this is a PPR fallback shell. */
   fallback?: boolean;
 } | {
   route: string;

package/dist/build/prerender.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-matcher.js";
 import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
-import { VINEXT_PRERENDER_CACHE_LIFE_HEADER } from "../server/headers.js";
+import { NEXT_CACHE_TAGS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER } from "../server/headers.js";
 import { classifyAppRoute, classifyPagesRoute, getAppRouteRenderEntryPath } from "./report.js";
 import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cache-handler.js";
 import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
@@ -760,6 +760,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					const cacheControl = response.headers.get("cache-control") ?? "";
 					const linkHeader = response.headers.get("link");
 					const responseCacheLife = readPrerenderCacheLifeHeader(response.headers);
+					const cacheTags = readPrerenderCacheTagsHeader(response.headers);
 					if (!response.ok || cacheControl.includes("no-store")) {
 						await response.body?.cancel();
 						return {
@@ -768,6 +769,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 							html: null,
 							ok: response.ok,
 							requestCacheLife: null,
+							tags: [],
 							status: response.status
 						};
 					}
@@ -779,7 +781,8 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 						html,
 						ok: true,
 						requestCacheLife: responseCacheLife ?? processCacheLife,
-						status: response.status
+						status: response.status,
+						tags: cacheTags
 					};
 				});
 				const htmlCacheControl = htmlRender.cacheControl;
@@ -842,6 +845,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					revalidate: renderedRevalidate,
 					...typeof renderedRevalidate === "number" ? { expire: renderedCacheControl.expire } : {},
 					router: "app",
+					...htmlRender.tags.length > 0 ? { tags: htmlRender.tags } : {},
 					...htmlRender.linkHeader ? { headers: { link: htmlRender.linkHeader } } : {},
 					...urlPath !== routePattern ? { path: urlPath } : {},
 					...isFallback ? { fallback: true } : {}
@@ -945,6 +949,11 @@ function readPrerenderCacheLifeHeader(headers) {
 		return null;
 	}
 }
+function readPrerenderCacheTagsHeader(headers) {
+	const value = headers.get(NEXT_CACHE_TAGS_HEADER);
+	if (!value) return [];
+	return [...new Set(value.split(",").filter(Boolean))];
+}
 function resolveRenderedExpireSeconds(options) {
 	const { fallbackExpireSeconds, sMaxage, staleWhileRevalidate } = options;
 	if (sMaxage === void 0 || staleWhileRevalidate === void 0) return fallbackExpireSeconds;
@@ -976,6 +985,7 @@ function writePrerenderIndex(routes, outDir, options) {
 			revalidate: r.revalidate,
 			...typeof r.revalidate === "number" ? { expire: r.expire } : {},
 			router: r.router,
+			...r.tags && r.tags.length > 0 ? { tags: r.tags } : {},
 			...r.headers ? { headers: r.headers } : {},
 			...r.path ? { path: r.path } : {},
 			...r.fallback ? { fallback: true } : {}

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/cli-args.d.ts

@@ -3,12 +3,13 @@
  * CLI argument parser for the vinext CLI.
  *
  * Parses flags for `vinext dev`, `vinext start`, `vinext build`, etc.
- * Validates that value-taking flags (`--port`, `--hostname`) have actual values
+ * Validates that value-taking flags (`--port`, `--hostname`, `--mode`) have actual values
  * rather than silently consuming the next flag or returning NaN/undefined.
  */
 type ParsedArgs = {
   port?: number;
   hostname?: string;
+  mode?: string;
   help?: boolean;
   verbose?: boolean;
   turbopack?: boolean;

package/dist/cli-args.js

@@ -96,6 +96,10 @@ function parseArgs(args) {
 				result.hostname = takeValue(arg, args, i);
 				i++;
 				break;
+			case "--mode":
+				result.mode = takeValue(arg, args, i);
+				i++;
+				break;
 			default: {
 				const eqRaw = tryEqualsForm(arg, "port");
 				if (eqRaw !== null) {
@@ -108,6 +112,12 @@ function parseArgs(args) {
 					result.hostname = hostRaw;
 					break;
 				}
+				const modeRaw = tryEqualsForm(arg, "mode");
+				if (modeRaw !== null) {
+					if (modeRaw === "") throw new Error(`--mode requires a value, but none was provided.`);
+					result.mode = modeRaw;
+					break;
+				}
 				const prerenderConcurrencyRaw = tryEqualsForm(arg, "prerender-concurrency");
 				if (prerenderConcurrencyRaw !== null) {
 					result.prerenderConcurrency = parsePositiveIntegerArg(prerenderConcurrencyRaw, "--prerender-concurrency");

package/dist/cli.js

@@ -6,6 +6,7 @@ import { parseArgs } from "./cli-args.js";
 import { createDevServerConfigPlugin, normalizeDevServerHostname } from "./cli-dev-config.js";
 import { PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { createRscCompatibilityId, findVinextNextConfigInPlugins, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { loadDotenv } from "./config/dotenv.js";
 import { generateRouteTypes } from "./typegen.js";
 import { clearPagesClientAssetsBuildMetadata } from "./build/pages-client-assets-module.js";
 import { runWithPreviewBuildCredentials } from "./build/preview-credentials.js";
@@ -16,7 +17,6 @@ import { emitPrerenderPathManifest } from "./build/prerender-paths.js";
 import { getReactUpgradeDeps } from "./utils/react-version.js";
 import { init } from "./init.js";
 import { resolveInitOptions } from "./init-platform.js";
-import { loadDotenv } from "./config/dotenv.js";
 import { resolveVinextPackageRoot } from "./utils/vinext-root.js";
 import { emitStandaloneOutput } from "./build/standalone.js";
 import { cleanBuildOutput } from "./build/clean-output.js";
@@ -125,7 +125,7 @@ function createBuildLogger(vite) {
 function hasPagesDir() {
 	return fs.existsSync(path.join(process.cwd(), "pages")) || fs.existsSync(path.join(process.cwd(), "src", "pages"));
 }
-async function loadBuildViteConfigMetadata(vite, root) {
+async function loadBuildViteConfigMetadata(vite, root, mode) {
 	if (!hasViteConfig(root)) return {
 		nextConfig: null,
 		prerenderConfig: null,
@@ -133,7 +133,7 @@ async function loadBuildViteConfigMetadata(vite, root) {
 	};
 	const loaded = await vite.loadConfigFromFile({
 		command: "build",
-		mode: "production"
+		mode
 	}, void 0, root);
 	const emptyOutDir = loaded?.config.build?.emptyOutDir;
 	return {
@@ -148,14 +148,16 @@ async function loadBuildViteConfigMetadata(vite, root) {
 * project, Vite will merge our config with it (theirs takes precedence).
 * If there's no vite.config, this provides everything needed.
 */
-function buildViteConfig(overrides = {}, logger) {
+function buildViteConfig(overrides = {}, logger, mode) {
 	if (hasViteConfig(process.cwd())) return {
 		root: process.cwd(),
+		...mode ? { mode } : {},
 		...logger ? { customLogger: logger } : {},
 		...overrides
 	};
 	return {
 		root: process.cwd(),
+		...mode ? { mode } : {},
 		configFile: false,
 		plugins: [vinext()],
 		resolve: { dedupe: [
@@ -274,10 +276,12 @@ async function dev() {
 async function buildApp() {
 	const parsed = parseArgs(rawArgs);
 	if (parsed.help) return printHelp("build");
+	const buildMode = parsed.mode ?? "production";
+	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", "production");
 	if (parsed.precompress) process.env.VINEXT_PRECOMPRESS = "1";
 	loadDotenv({
 		root: process.cwd(),
-		mode: "production"
+		mode: buildMode
 	});
 	applyViteConfigCompatibility(process.cwd());
 	const vite = await loadVite();
@@ -285,7 +289,7 @@ async function buildApp() {
 	console.log(`\n  vinext build  (Vite ${getViteVersion()})\n`);
 	const root = toSlash(process.cwd());
 	const isApp = hasAppDir(root);
-	const buildConfigMetadata = await loadBuildViteConfigMetadata(vite, root);
+	const buildConfigMetadata = await loadBuildViteConfigMetadata(vite, root, buildMode);
 	const resolvedNextConfig = await resolveNextConfig(buildConfigMetadata.nextConfig ? await resolveNextConfigInput(buildConfigMetadata.nextConfig, PHASE_PRODUCTION_BUILD) : await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root);
 	process.env.__VINEXT_SHARED_BUILD_ID = resolvedNextConfig.buildId;
 	process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID = createRscCompatibilityId(resolvedNextConfig);
@@ -322,7 +326,7 @@ async function buildApp() {
 	if (pagesClientAssetsBuildSession) process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION = pagesClientAssetsBuildSession;
 	await runWithPreviewBuildCredentials(async () => {
 		try {
-			const config = buildViteConfig({}, logger);
+			const config = buildViteConfig({}, logger, buildMode);
 			await (await vite.createBuilder(config)).buildApp();
 			if (isHybrid) {
 				console.log("  Building Pages Router server (hybrid)...");
@@ -331,13 +335,14 @@ async function buildApp() {
 				if (hasViteConfig(process.cwd())) {
 					const loaded = await vite.loadConfigFromFile({
 						command: "build",
-						mode: "production",
+						mode: buildMode,
 						isSsrBuild: true
 					}, void 0, root);
 					if (loaded?.config.plugins) userTransformPlugins = loaded.config.plugins.flat(Infinity).filter((p) => !!p && typeof p.name === "string" && !p.name.startsWith("vinext:") && !p.name.startsWith("vite:react") && !p.name.startsWith("rsc:") && p.name !== "vite-rsc-load-module-dev-proxy" && !p.name.startsWith("vite-plugin-cloudflare"));
 				}
 				await vite.build({
 					root,
+					mode: buildMode,
 					configFile: false,
 					plugins: [...userTransformPlugins, vinext({ disableAppRouter: true })],
 					resolve: { dedupe: [
@@ -536,6 +541,7 @@ function printHelp(cmd) {
                          to vinext({ prerender: true }) and takes priority.
     --prerender-concurrency <count>
                          Maximum number of routes to pre-render in parallel
+    --mode <mode>        Load .env.<mode>* files and pass mode to Vite
     --precompress        Precompress static assets at build time (.br, .gz, .zst)
     -h, --help           Show this help
 `);

package/dist/client/navigation-runtime.d.ts

@@ -18,6 +18,10 @@ type NavigationRuntimeRscBootstrap = {
 type NavigationRuntimeKind = "navigate" | "traverse" | "refresh";
 type NavigationRuntimeHistoryUpdateMode = "push" | "replace";
 type NavigationRuntimeVisibleCommitMode = "transition" | "synchronous";
+type NavigationRuntimePrefetchRouterState = {
+  pathAndSearch: string;
+  routeId: string;
+};
 type NavigationRuntimeTraversalIntent = {
   direction: "back" | "forward" | "unknown";
   historyState: unknown;
@@ -29,6 +33,7 @@ type NavigationRuntimeFunctions = {
   commitHashNavigation?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode, scroll: boolean) => void;
   navigateExternal?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode) => Promise<void>;
   navigate?: NavigationRuntimeNavigate;
+  getPrefetchRouterState?: () => NavigationRuntimePrefetchRouterState | null;
   /**
    * Called at the start of every App Router navigation so the <Link> shim can
    * reset any link that is still showing a `useLinkStatus()` pending state but
@@ -38,6 +43,7 @@ type NavigationRuntimeFunctions = {
    */
   notifyLinkNavigationStart?: () => void;
   pingVisibleLinks?: () => void;
+  preparePrefetchResponse?: (response: Response) => Promise<unknown>;
 };
 type NavigationRuntimeBootstrap = {
   routeManifest: RouteManifest | null;

package/dist/client/navigation-runtime.js

@@ -31,7 +31,7 @@ function readRuntimeWindow() {
 }
 function isNavigationRuntimeFunctions(value) {
 	if (!isUnknownRecord(value)) return false;
-	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks"));
+	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse"));
 }
 function isNavigationRuntimeRscChunk(value) {
 	if (typeof value === "string") return true;

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/dotenv.d.ts

@@ -1,5 +1,4 @@
 //#region src/config/dotenv.d.ts
-type VinextEnvMode = "development" | "production" | "test";
 /**
  * Environment-variable bag accepted by {@link loadDotenv}.
  *
@@ -12,18 +11,18 @@ type VinextEnvMode = "development" | "production" | "test";
 type EnvBag = Record<string, string | undefined>;
 type LoadDotenvOptions = {
   root: string;
-  mode: VinextEnvMode;
+  mode: string;
   processEnv?: EnvBag;
 };
 type LoadDotenvResult = {
-  mode: VinextEnvMode;
+  mode: string;
   loadedFiles: string[];
   loadedEnv: Record<string, string>;
 };
 /**
  * Next.js-compatible dotenv lookup order (highest priority first).
  */
-declare function getDotenvFiles(mode: VinextEnvMode): string[];
+declare function getDotenvFiles(mode: string): string[];
 /**
  * Load .env files into processEnv with Next.js-like precedence:
  * process.env > .env.<mode>.local > .env.local > .env.<mode> > .env.

package/dist/config/dotenv.js

@@ -56,33 +56,41 @@ function loadDotenv({ root, mode, processEnv = process.env }) {
 		loadedEnv
 	};
 }
-const ENV_REF_RE = /(\\)?\$(?:\{([A-Za-z_][A-Za-z0-9_]*)\}|([A-Za-z_][A-Za-z0-9_]*))/g;
 function expandEnv(parsed, processEnv) {
-	const expanded = {};
-	const resolving = /* @__PURE__ */ new Set();
-	const context = {
+	const expanded = { ...parsed };
+	for (const key of Object.keys(expanded)) {
+		const processValue = processEnv[key];
+		expanded[key] = (processValue && processValue !== expanded[key] ? processValue : expandValue(expanded[key], processEnv, expanded)).replace(/\\\$/g, "$");
+	}
+	return expanded;
+}
+function expandValue(value, processEnv, parsed) {
+	const env = {
 		...parsed,
 		...processEnv
 	};
-	function resolveValue(key) {
-		const cached = expanded[key];
-		if (cached !== void 0) return cached;
-		if (resolving.has(key)) return context[key] ?? "";
-		const raw = context[key];
-		if (raw === void 0) return "";
-		resolving.add(key);
-		let value = raw.replace(ENV_REF_RE, (match, escaped, braced, bare) => {
-			if (escaped) return match.slice(1);
-			return resolveValue(braced || bare);
-		});
-		value = value.replace(/\\\$/g, "$");
-		resolving.delete(key);
-		expanded[key] = value;
-		context[key] = value;
-		return value;
+	const envRefRe = /(?<!\\)\${([^{}]+)}|(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)/g;
+	const seen = /* @__PURE__ */ new Set();
+	let result = value;
+	let match;
+	while ((match = envRefRe.exec(result)) !== null) {
+		seen.add(result);
+		const [template, braced, bare] = match;
+		const expression = braced || bare;
+		const operator = expression.match(/(:\+|\+|:-|-)/)?.[0];
+		const parts = operator ? expression.split(operator) : [expression];
+		const refKey = parts.shift();
+		const operand = parts.join(operator ?? "");
+		const refValue = env[refKey];
+		let replacement;
+		if (operator === ":+" || operator === "+") replacement = refValue ? operand : "";
+		else if (refValue) replacement = seen.has(refValue) ? operand : refValue;
+		else replacement = operand;
+		result = result.replace(template, replacement);
+		if (result === parsed[refKey]) break;
+		envRefRe.lastIndex = 0;
 	}
-	for (const key of Object.keys(parsed)) resolveValue(key);
-	return expanded;
+	return result;
 }
 //#endregion
 export { getDotenvFiles, loadDotenv };

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

@@ -99,8 +99,13 @@ type NextConfig = {
    * `basePath` affects route URLs; `assetPrefix` only affects asset URLs.
    * @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 */
+  assetPrefix?: string; /** Cross-origin mode applied to framework scripts and preload links. */
+  crossOrigin?: "anonymous" | "use-credentials"; /** Whether to add trailing slashes */
+  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 +222,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 +272,9 @@ type ResolvedNextConfig = {
    */
   assetPrefix: string;
   trailingSlash: boolean;
+  typescript: {
+    tsconfigPath?: string;
+  };
   output: "" | "export" | "standalone";
   pageExtensions: string[];
   resolveExtensions: string[] | null;
@@ -295,7 +304,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). */
@@ -373,7 +383,8 @@ type ResolvedNextConfig = {
    * `defer={!disableOptimizedLoading}`) and the upstream
    * `test/e2e/optimized-loading` test fixture.
    */
-  disableOptimizedLoading: boolean;
+  disableOptimizedLoading: boolean; /** Cross-origin mode applied to framework scripts and preload links. */
+  crossOrigin: "anonymous" | "use-credentials" | undefined;
   /**
    * Resolved `reactStrictMode` from next.config, preserved as `boolean | null`
    * so each router can apply its own default (Next.js resolves `null` to OFF

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],
@@ -700,6 +702,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			sassOptions: null,
 			removeConsole: false,
 			disableOptimizedLoading: false,
+			crossOrigin: void 0,
 			reactStrictMode: null,
 			scrollRestoration: false,
 			compilerDefine: {},
@@ -716,6 +719,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		detectNextIntlConfig(root, resolved);
 		return resolved;
 	}
+	if (config.crossOrigin !== void 0 && config.crossOrigin !== "anonymous" && config.crossOrigin !== "use-credentials") console.warn("Invalid next.config options detected:\n    Invalid option at \"crossOrigin\": expected \"anonymous\" or \"use-credentials\"\nSee more info here: https://nextjs.org/docs/messages/invalid-next-config");
 	warnDeprecatedConfigOptions(config, root);
 	const i18n = normalizeI18nConfig(config.i18n);
 	let redirects = [];
@@ -833,6 +837,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 +856,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,
@@ -872,6 +878,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		sassOptions: readOptionalRecord(config.sassOptions) ?? null,
 		removeConsole: config.compiler?.removeConsole === true ? true : isUnknownRecord(config.compiler?.removeConsole) ? { exclude: readStringArray(config.compiler.removeConsole.exclude) } : false,
 		disableOptimizedLoading: experimental?.disableOptimizedLoading === true,
+		crossOrigin: config.crossOrigin === "anonymous" || config.crossOrigin === "use-credentials" ? config.crossOrigin : void 0,
 		reactStrictMode: typeof config.reactStrictMode === "boolean" ? config.reactStrictMode : null,
 		scrollRestoration: experimental?.scrollRestoration === true,
 		compilerDefine: serializeCompilerDefine(config.compiler?.define),

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?.some((_, index) => (route.loadingTreePositions?.[index] ?? 0) > 0) ?? false) || 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 };