vinext 1.0.0-beta.3 → 1.0.0-beta.4

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/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/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,7 +99,8 @@ 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 */
+  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;
@@ -382,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

@@ -702,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: {},
@@ -718,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 = [];
@@ -876,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.js

@@ -58,7 +58,7 @@ function interceptTargetsRoute(interceptTargetPattern, route) {
 	return patternsStructurallyEquivalent(splitPatternParts(interceptTargetPattern), route.patternParts);
 }
 function hasLoadingBoundary(route, hasSiblingInterceptLoading) {
-	return route.loadingPath !== null || (route.loadingPaths?.length ?? 0) > 0 || route.parallelSlots.some((slot) => slot.loadingPath !== null || (slot.loadingPaths?.length ?? 0) > 0 || slot.interceptingRoutes.some((intercept) => interceptTargetsRoute(intercept.targetPattern, route) && (intercept.loadingPaths?.length ?? 0) > 0)) || hasSiblingInterceptLoading;
+	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, hasSiblingInterceptLoading = route.siblingIntercepts.some((intercept) => interceptTargetsRoute(intercept.targetPattern, route) && (intercept.loadingPaths?.length ?? 0) > 0)) {

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

@@ -414,7 +414,7 @@ function findIntercept(pathname, sourcePathname = null) {
   return __routeMatcher.findIntercept(pathname, sourcePathname);
 }
 
-async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath) {
+async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath, scriptNonce) {
   // Hydrate lazy page/route-handler modules before any synchronous read.
   await __ensureRouteLoaded(route);
   return __buildPageElements({
@@ -433,6 +433,7 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
     basePath: __basePath,
     trailingSlash: __trailingSlash,
     htmlLimitedBots: __htmlLimitedBots,
+    scriptNonce,
   });
 }
 
@@ -598,7 +599,7 @@ export default createAppRscHandler({
           observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
           serveStreamingMetadata: buildOptions?.serveStreamingMetadata,
           isProduction: process.env.NODE_ENV === "production",
-        }, layoutParamAccess, displayPathname);
+        }, layoutParamAccess, displayPathname, scriptNonce);
       },
       clientReuseManifest,
       cleanPathname,
@@ -842,6 +843,7 @@ export default createAppRscHandler({
     middlewareContext,
     mountedSlotsHeader,
     request,
+    scriptNonce,
     routeMatch,
     routePathname,
     searchParams,
@@ -884,7 +886,7 @@ export default createAppRscHandler({
           renderMode: actionRenderMode,
           observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
           observePageSearchParamsAccess: observePageSearchParamsAccess === true,
-        });
+        }, undefined, actionCleanPathname, scriptNonce);
       },
       cleanPathname,
       clearRequestContext() {
@@ -984,6 +986,19 @@ export default createAppRscHandler({
   },` : ""}
   matchRoute,
   matchRequestRoute,
+  matchInterceptRoute(pathname, sourcePathname) {
+    const intercept = findIntercept(pathname, sourcePathname);
+    if (!intercept) return null;
+    const route = routes[intercept.sourceRouteIndex];
+    if (!route) return null;
+    const params = Object.create(null);
+    for (const name of route.params) {
+      if (Object.prototype.hasOwnProperty.call(intercept.sourceMatchedParams, name)) {
+        params[name] = intercept.sourceMatchedParams[name];
+      }
+    }
+    return { route, params };
+  },
   ${middlewarePath ? `runMiddleware({ cleanPathname, context, hadBasePath, isDataRequest, request }) {
     return __applyAppMiddleware({
       basePath: __basePath,

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

@@ -77,6 +77,7 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		htmlLimitedBots: nextConfig?.htmlLimitedBots,
 		i18n: nextConfig?.i18n ?? null,
 		disableOptimizedLoading: nextConfig?.disableOptimizedLoading === true,
+		crossOrigin: nextConfig?.crossOrigin,
 		clientTraceMetadata: nextConfig?.clientTraceMetadata,
 		images: {
 			deviceSizes: nextConfig?.images?.deviceSizes,
@@ -298,6 +299,7 @@ const _renderPage = __createPagesPageHandler({
     htmlLimitedBots: vinextConfig.htmlLimitedBots,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,
     disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+    crossOrigin: vinextConfig.crossOrigin,
   },
   buildId,
   hasMiddleware,
@@ -385,11 +387,12 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 
-export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin) {
+export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker") {
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({
     ctx,
+    edgeRuntime,
     match,
     nextConfig: vinextConfig,
     request,

package/dist/index.js

@@ -41,6 +41,7 @@ import { planRouteClassificationInjection } from "./build/route-classification-i
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { loadDotenv } from "./config/dotenv.js";
 import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
@@ -97,7 +98,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 { createLogger, loadEnv, parseAst, transformWithOxc } from "vite";
+import { createLogger, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { createHash, randomBytes } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
@@ -984,7 +985,7 @@ function vinext(options = {}) {
 			transform: {
 				filter: { id: /\.m?js(?:\?.*)?$/ },
 				async handler(code, id) {
-					const cleanId = id.split("?")[0];
+					const cleanId = toSlash(stripViteModuleQuery(id));
 					if (isInsideDirectory(__dirname, cleanId)) return;
 					if (cleanId.includes("/node_modules/")) {
 						if (!code.includes("use client") && !code.includes("use server")) return;
@@ -1032,11 +1033,13 @@ function vinext(options = {}) {
 				let tsconfigPathAliases = {};
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
-				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
-				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
+				if (config.envDir !== false) loadDotenv({
+					root: config.envDir ?? root,
+					mode
+				});
 				let resolvedNodeEnv;
-				if (mode === "test") resolvedNodeEnv = "test";
-				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
+				if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
+				else if (mode === "test") resolvedNodeEnv = "test";
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
 				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
@@ -1118,6 +1121,7 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
 				defines["process.env.__NEXT_APP_NAV_FAIL_HANDLING"] = JSON.stringify(nextConfig.appNavFailHandling);
+				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.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
@@ -2518,7 +2522,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
-									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime)
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();

package/dist/plugins/client-reference-dedup.js

@@ -1,3 +1,4 @@
+import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { readFile } from "node:fs/promises";
 //#region src/plugins/client-reference-dedup.ts
@@ -156,14 +157,15 @@ function clientReferenceDedupPlugin(options = {}) {
 			async handler(id, importer) {
 				if (this.environment?.name !== "client") return;
 				if (!importer || !importer.includes(PROXY_MARKER)) return;
-				if (!id.startsWith("/") || !id.includes("/node_modules/")) return;
-				const packageName = extractPackageName(id);
+				const normalizedId = toSlash(id);
+				if (!path.isAbsolute(normalizedId) || !normalizedId.includes("/node_modules/")) return;
+				const packageName = extractPackageName(normalizedId);
 				if (!packageName) return;
 				if (excludeSet.has(packageName)) return;
-				let packageImportPromise = packageImportCache.get(id);
+				let packageImportPromise = packageImportCache.get(normalizedId);
 				if (!packageImportPromise) {
-					packageImportPromise = extractPackageImportSpecifier(id, readPackageJson);
-					packageImportCache.set(id, packageImportPromise);
+					packageImportPromise = extractPackageImportSpecifier(normalizedId, readPackageJson);
+					packageImportCache.set(normalizedId, packageImportPromise);
 				}
 				const packageImport = await packageImportPromise;
 				if (!packageImport) return;

package/dist/plugins/sass.js

@@ -3,7 +3,7 @@ import { markCssUrlAssetReferences, rebaseCssUrlAssetReferences } from "../build
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { preprocessCSS } from "vite";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 //#region src/plugins/sass.ts
 /**
 * Map a Next.js `sassOptions` object onto Vite's
@@ -130,8 +130,7 @@ function createSassCssUrlAssetImporter() {
 			if (!fs.statSync(candidate, { throwIfNoEntry: false })?.isFile()) continue;
 			const prepared = prepareStylesheet(candidate, entryDirectory);
 			if (prepared === null) return match;
-			const canonicalUrl = pathToFileURL(candidate);
-			markedStylesheets.set(canonicalUrl.href, prepared);
+			markedStylesheets.set(candidate, prepared);
 			const namespace = rule === "use" && !/\bas\s+(?:\*|[-\w]+)/.test(suffix) ? ` as ${deriveSassNamespace(importUrl)}` : "";
 			return `${prefix}${quote}${importUrlPrefix}${encodeURIComponent(candidate)}${quote}${namespace}${suffix}`;
 		}
@@ -143,7 +142,7 @@ function createSassCssUrlAssetImporter() {
 			return pathToFileURL(decodeURIComponent(url.slice(21)));
 		},
 		load(canonicalUrl) {
-			return markedStylesheets.get(canonicalUrl.href) ?? null;
+			return markedStylesheets.get(toSlash(fileURLToPath(canonicalUrl))) ?? null;
 		},
 		rewriteImports
 	};