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

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

@@ -195,6 +195,7 @@ import {
   isrGet as __isrGet,
   isrSet as __isrSet,
   isrSetPrerenderedAppPage as __isrSetPrerenderedAppPage,
+  isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest,
   triggerBackgroundRegeneration as __triggerBackgroundRegeneration,
 } from ${JSON.stringify(isrCachePath)};
 // Import server-only state module to register ALS-backed accessors.
@@ -413,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({
@@ -432,10 +433,13 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
     basePath: __basePath,
     trailingSlash: __trailingSlash,
     htmlLimitedBots: __htmlLimitedBots,
+    scriptNonce,
   });
 }
 
 const __i18nConfig = ${JSON.stringify(i18nConfig)};
+export { __i18nConfig };
+export const authorizeOnDemandRevalidate = __isOnDemandRevalidateRequest;
 const __configRedirects = ${JSON.stringify(redirects)};
 const __configRewrites = ${JSON.stringify(rewrites)};
 const __configHeaders = ${JSON.stringify(headers)};
@@ -595,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,
@@ -839,6 +843,7 @@ export default createAppRscHandler({
     middlewareContext,
     mountedSlotsHeader,
     request,
+    scriptNonce,
     routeMatch,
     routePathname,
     searchParams,
@@ -881,7 +886,7 @@ export default createAppRscHandler({
           renderMode: actionRenderMode,
           observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
           observePageSearchParamsAccess: observePageSearchParamsAccess === true,
-        });
+        }, undefined, actionCleanPathname, scriptNonce);
       },
       cleanPathname,
       clearRequestContext() {
@@ -981,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/app-rsc-manifest.js

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

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

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

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

@@ -24,6 +24,7 @@ const _pagesApiRoutePath = resolveEntryPath("../server/pages-api-route.js", impo
 const _serverGlobalsPath = resolveEntryPath("../server/server-globals.js", import.meta.url);
 const _queryUtilsPath = resolveEntryPath("../utils/query.js", import.meta.url);
 const _pagesPageHandlerPath = resolveEntryPath("../server/pages-page-handler.js", import.meta.url);
+const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
 async function getPagesDataKind(filePath) {
 	const source = await readFile(filePath, "utf8");
 	if (hasExportedName(source, "getStaticProps")) return "static";
@@ -71,10 +72,12 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		},
 		headers: nextConfig?.headers ?? [],
 		expireTime: nextConfig?.expireTime,
+		allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys ?? [],
 		cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 		htmlLimitedBots: nextConfig?.htmlLimitedBots,
 		i18n: nextConfig?.i18n ?? null,
 		disableOptimizedLoading: nextConfig?.disableOptimizedLoading === true,
+		crossOrigin: nextConfig?.crossOrigin,
 		clientTraceMetadata: nextConfig?.clientTraceMetadata,
 		images: {
 			deviceSizes: nextConfig?.images?.deviceSizes,
@@ -151,11 +154,17 @@ import { handlePagesApiRoute as __handlePagesApiRoute } from ${JSON.stringify(_p
 import { normalizePagesDataRequest as __normalizePagesDataRequest, buildNextDataNotFoundResponse as __buildNextDataNotFoundResponse } from ${JSON.stringify(_pagesDataRoutePath)};
 import { buildDefaultPagesNotFoundResponse as __buildDefaultPagesNotFoundResponse } from ${JSON.stringify(_pagesDefault404Path)};
 import { createPagesPageHandler as __createPagesPageHandler } from ${JSON.stringify(_pagesPageHandlerPath)};
+import { isOnDemandRevalidateRequest as __isOnDemandRevalidateRequest } from ${JSON.stringify(_isrCachePath)};
 ${instrumentationImportCode}
 ${middlewareImportCode}
 
 ${instrumentationInitCode}
 
+// The outer Node production pipeline runs outside this generated bundle, so
+// it cannot safely validate against its own development fallback secret. Give
+// it a verifier closed over this entry's build-time-baked secret instead.
+export const authorizeOnDemandRevalidate = __isOnDemandRevalidateRequest;
+
 // i18n config (embedded at build time)
 const i18nConfig = ${i18nConfigJson};
 
@@ -290,6 +299,7 @@ const _renderPage = __createPagesPageHandler({
     htmlLimitedBots: vinextConfig.htmlLimitedBots,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,
     disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+    crossOrigin: vinextConfig.crossOrigin,
   },
   buildId,
   hasMiddleware,
@@ -344,7 +354,6 @@ const _renderPage = __createPagesPageHandler({
       ? React.createElement(AppComponent, {
           ...props,
           Component: PageComponent,
-          pageProps: rawPageProps,
           router: Router,
         })
       : React.createElement(PageComponent, pageProps);
@@ -362,7 +371,6 @@ const _renderPage = __createPagesPageHandler({
       ? React.createElement(FinalApp, {
           ...props,
           Component: FinalComp,
-          pageProps: rawPageProps,
           router: Router,
         })
       : React.createElement(FinalComp, pageProps);
@@ -379,14 +387,16 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 
-export async function handleApiRoute(request, url, ctx) {
+export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker") {
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({
     ctx,
+    edgeRuntime,
     match,
     nextConfig: vinextConfig,
     request,
+    trustedRevalidateOrigin,
     url,
     reportRequestError(error, routePattern) {
       console.error("[vinext] API error:", error);

package/dist/index.js

@@ -35,17 +35,19 @@ import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
-import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
+import { generateBrowserEntry, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 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";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
+import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
@@ -83,6 +85,7 @@ import { createClientAssetFileNames, createClientCodeSplittingConfig, createClie
 import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
+import { createTransformCache } from "./plugins/transform-cache.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
@@ -95,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";
@@ -114,6 +117,63 @@ const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-s
 const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 installSocketErrorBackstop();
+function isUseCacheAstNode(value) {
+	return typeof value === "object" && value !== null && typeof Reflect.get(value, "type") === "string";
+}
+function hasInlineUseCacheDirective(node) {
+	const body = isUseCacheAstNode(node.body) && node.body.type === "BlockStatement" ? node.body : null;
+	if (!body || !Array.isArray(body.body)) return false;
+	return body.body.some((statement) => {
+		if (!isUseCacheAstNode(statement) || statement.type !== "ExpressionStatement") return false;
+		const expression = isUseCacheAstNode(statement.expression) ? statement.expression : null;
+		return expression?.type === "Literal" && typeof expression.value === "string" && /^use cache(:\s*\w+)?$/.test(expression.value);
+	});
+}
+function functionAcceptsSecondArgument(node) {
+	const params = Array.isArray(node.params) ? node.params : [];
+	if (params.length >= 2) return true;
+	return params.some((param) => isUseCacheAstNode(param) && param.type === "RestElement");
+}
+function collectInlineUseCacheSecondArgumentUsage(value) {
+	const usage = [];
+	function walk(node) {
+		if (Array.isArray(node)) {
+			for (const child of node) walk(child);
+			return;
+		}
+		if (!isUseCacheAstNode(node)) return;
+		if ((node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && hasInlineUseCacheDirective(node)) usage.push(functionAcceptsSecondArgument(node));
+		for (const [key, child] of Object.entries(node)) {
+			if (key === "type" || key === "start" || key === "end" || key === "loc" || key === "parent") continue;
+			walk(child);
+		}
+	}
+	walk(value);
+	return usage;
+}
+function collectFileUseCacheSecondArgumentUsage(body) {
+	const localFunctions = /* @__PURE__ */ new Map();
+	function collectDeclaration(value) {
+		if (!isUseCacheAstNode(value)) return;
+		if (value.type === "FunctionDeclaration") {
+			const id = isUseCacheAstNode(value.id) ? value.id : null;
+			if (id?.type === "Identifier" && typeof id.name === "string") localFunctions.set(id.name, functionAcceptsSecondArgument(value));
+			return;
+		}
+		if (value.type !== "VariableDeclaration" || !Array.isArray(value.declarations)) return;
+		for (const declaration of value.declarations) {
+			if (!isUseCacheAstNode(declaration) || declaration.type !== "VariableDeclarator") continue;
+			const id = isUseCacheAstNode(declaration.id) ? declaration.id : null;
+			const init = isUseCacheAstNode(declaration.init) ? declaration.init : null;
+			if (id?.type === "Identifier" && typeof id.name === "string" && init && (init.type === "FunctionExpression" || init.type === "ArrowFunctionExpression")) localFunctions.set(id.name, functionAcceptsSecondArgument(init));
+		}
+	}
+	for (const statement of body) {
+		if (!isUseCacheAstNode(statement)) continue;
+		collectDeclaration(statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration" ? statement.declaration : statement);
+	}
+	return localFunctions;
+}
 function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
@@ -475,16 +535,17 @@ const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function sortTsconfigAliasesBySpecificity(aliases) {
 	return Object.fromEntries(Object.entries(aliases).sort((a, b) => b[0].length - a[0].length));
 }
-function resolveTsconfigAliases(projectRoot) {
-	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
+function resolveTsconfigAliases(projectRoot, configuredPath) {
+	const configPath = configuredPath ? path.resolve(projectRoot, configuredPath) : void 0;
+	const cacheKey = configPath ?? projectRoot;
+	if (_tsconfigAliasCache.has(cacheKey)) return _tsconfigAliasCache.get(cacheKey);
 	let aliases = {};
-	for (const name of TSCONFIG_FILES) {
-		const candidate = path.join(projectRoot, name);
+	for (const candidate of configPath ? [configPath] : TSCONFIG_FILES.map((name) => path.join(projectRoot, name))) {
 		if (!fs.existsSync(candidate)) continue;
 		aliases = sortTsconfigAliasesBySpecificity(loadTsconfigPathAliases(candidate, projectRoot));
 		break;
 	}
-	_tsconfigAliasCache.set(projectRoot, aliases);
+	_tsconfigAliasCache.set(cacheKey, aliases);
 	return aliases;
 }
 /**
@@ -755,7 +816,7 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route)) : [];
+		const appPrefetchRoutes = hasAppDir ? toLinkPrefetchRoutes(await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
 			appPrefetchRoutes,
 			instrumentationClientPath,
@@ -895,6 +956,7 @@ function vinext(options = {}) {
 			return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
 		}
 	};
+	const cachedTypeofWindowTransform = createTransformCache();
 	const plugins = [
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
@@ -923,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;
@@ -967,16 +1029,17 @@ function vinext(options = {}) {
 			async config(config, env) {
 				isServeCommand = env.command === "serve";
 				root = toSlash(config.root ?? process.cwd());
-				const shouldEnableNativeTsconfigPaths = config.resolve?.tsconfigPaths === void 0;
-				const tsconfigPathAliases = resolveTsconfigAliases(root);
+				const userResolve = config.resolve;
+				let tsconfigPathAliases = {};
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
-				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				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();
@@ -1017,6 +1080,10 @@ function vinext(options = {}) {
 						buildId: sharedBuildId
 					};
 				}
+				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
+				tsconfigPathAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
+				const shouldAutoEnableNativeTsconfigPaths = userResolve?.tsconfigPaths === void 0 && configuredTsconfigPath === void 0;
+				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				if (rscCompatibilityId === void 0) {
 					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
@@ -1054,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 ?? []));
@@ -1222,7 +1290,7 @@ function vinext(options = {}) {
 							"react/jsx-runtime",
 							"react/jsx-dev-runtime"
 						],
-						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
+						...shouldAutoEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
 					oxc: {
 						jsx: { runtime: "automatic" },
@@ -1840,6 +1908,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
+				const getTrustedDevRevalidateOrigin = () => {
+					const resolved = server.resolvedUrls?.local[0];
+					if (resolved) try {
+						return new URL(resolved).origin;
+					} catch {}
+					const address = server.httpServer?.address();
+					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
+				};
 				let cachedSSRHandler = null;
 				function getPagesRunner() {
 					if (!pagesRunner) pagesRunner = createDirectRunner(server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0]);
@@ -2161,7 +2237,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Forbidden");
 								return;
 							}
-							const requestHost = (Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost";
+							let revalidationHostname = null;
+							if (req.headers["x-vinext-revalidate-host"] !== void 0) {
+								const revalidationHeaders = new Headers();
+								for (const [name, value] of Object.entries(req.headers)) {
+									if (value === void 0 || name.startsWith(":")) continue;
+									revalidationHeaders.set(name, Array.isArray(value) ? value.join(", ") : value);
+								}
+								revalidationHostname = readTrustedRevalidationHostname(revalidationHeaders, nextConfig?.i18n);
+							}
+							const requestHost = revalidationHostname ?? ((Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost");
 							const requestOrigin = `http://${requestHost}`;
 							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
 							if (isImageOptimizationPath(url.split("?")[0])) {
@@ -2296,6 +2381,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
+							if (revalidationHostname) nodeRequestHeaders.set("host", revalidationHostname);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
@@ -2416,6 +2502,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes, {
 									basePath: nextConfig?.basePath,
 									i18n: nextConfig?.i18n,
+									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
+									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
 									trailingSlash: nextConfig?.trailingSlash
 								})) return;
 								if (hasAppDir) return next();
@@ -2434,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)
+									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();
@@ -2561,7 +2649,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (useNativeTypeofWindowFolding && this.environment.config.build.write !== false) return null;
 					const cacheDir = `${toSlash(this.environment.config.cacheDir).replace(/\/$/, "")}/`;
 					if (toSlash(id).startsWith(cacheDir)) return null;
-					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment), id);
+					const replacement = getTypeofWindowReplacement(this.environment);
+					return cachedTypeofWindowTransform(id, code, replacement, () => replaceTypeofWindow(code, replacement, id));
 				}
 			}
 		},
@@ -2740,32 +2829,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				async handler(code, id) {
 					const ast = parseAst(code);
 					const cacheDirective = ast.body.find((node) => node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache"));
-					function nodeHasInlineCacheDirective(node) {
-						if (!node || typeof node !== "object") return false;
-						const fn = node.type === "MethodDefinition" ? node.value : node;
-						const stmts = fn?.body?.type === "BlockStatement" ? fn.body.body : null;
-						if (Array.isArray(stmts)) {
-							for (const stmt of stmts) if (stmt?.type === "ExpressionStatement" && stmt.expression?.type === "Literal" && typeof stmt.expression?.value === "string" && /^use cache(:\s*\w+)?$/.test(stmt.expression.value)) return true;
-						}
-						return false;
-					}
-					function astHasInlineCache(nodes) {
-						for (const node of nodes) {
-							if (!node || typeof node !== "object") continue;
-							if ((node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression" || node.type === "MethodDefinition") && nodeHasInlineCacheDirective(node)) return true;
-							for (const key of Object.keys(node)) {
-								if (key === "type" || key === "start" || key === "end" || key === "loc") continue;
-								const child = node[key];
-								if (Array.isArray(child) && child.some((c) => c && typeof c === "object")) {
-									if (astHasInlineCache(child)) return true;
-								} else if (child && typeof child === "object" && child.type) {
-									if (astHasInlineCache([child])) return true;
-								}
-							}
-						}
-						return false;
-					}
-					const hasInlineCache = !cacheDirective && astHasInlineCache(ast.body);
+					const inlineCacheSecondArgumentUsage = cacheDirective ? [] : collectInlineUseCacheSecondArgumentUsage(ast.body);
+					const hasInlineCache = inlineCacheSecondArgumentUsage.length > 0;
 					if (!cacheDirective && !hasInlineCache) return null;
 					if (!resolvedRscTransformsPath) throw new Error("vinext: 'use cache' requires @vitejs/plugin-rsc to be installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
 					const { transformWrapExport, transformHoistInlineDirective } = await import(pathToFileURL(resolvedRscTransformsPath).href);
@@ -2777,10 +2842,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const moduleFileName = path.basename(modulePath);
 						const isAppPageModule = hasAppDir && isInsideDirectory(appDir, modulePath) && path.parse(moduleFileName).name === "page" && fileMatcher.extensionRegex.test(moduleFileName);
 						const runtimeModuleUrl = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
+						const secondArgumentUsage = collectFileUseCacheSecondArgumentUsage(ast.body);
 						const result = transformWrapExport(code, ast, {
 							runtime: (value, name) => {
-								const pageOptions = name === "default" && isAppPageModule ? `, { appPageDefaultExport: true }` : "";
-								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${pageOptions})`;
+								const runtimeOptions = [];
+								const acceptsSecondArgument = secondArgumentUsage.get(value) ?? true;
+								runtimeOptions.push(`acceptsSecondArgument: ${acceptsSecondArgument}`);
+								if (name === "default" && isAppPageModule) runtimeOptions.push("appPageDefaultExport: true");
+								const optionsArgument = runtimeOptions.length > 0 ? `, { ${runtimeOptions.join(", ")} }` : "";
+								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${optionsArgument})`;
 							},
 							rejectNonAsyncFunction: false,
 							filter: (name, meta) => {
@@ -2807,12 +2877,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasInlineCache) {
 						const runtimeModuleUrl2 = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
 						try {
+							let transformedFunctionIndex = 0;
 							const result = transformHoistInlineDirective(code, ast, {
 								directive: /^use cache(:\s*\w+)?$/,
 								runtime: (value, name, meta) => {
 									const directiveMatch = meta.directiveMatch[0];
 									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").trim();
-									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`;
+									const acceptsSecondArgument = inlineCacheSecondArgumentUsage[transformedFunctionIndex++];
+									const optionsArgument = acceptsSecondArgument === void 0 ? "" : `, { acceptsSecondArgument: ${acceptsSecondArgument} }`;
+									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${optionsArgument})`;
 								},
 								rejectNonAsyncFunction: false
 							});

package/dist/init-cloudflare.d.ts

@@ -25,7 +25,9 @@ type CloudflarePlatformSetupResult = {
 declare function validateCloudflarePlatformSetup(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): void;
 declare function setupCloudflarePlatform(context: CloudflarePlatformSetupContext, cloudflare: CloudflareInitOptions): CloudflarePlatformSetupResult;
 declare function generateWranglerConfig(info: CloudflareProjectInfo, options?: CloudflareInitOptions, today?: string): string;
-declare function updateWranglerConfigForCloudflare(code: string, options: CloudflareInitOptions): string;
+declare function updateWranglerConfigForCloudflare(code: string, options: CloudflareInitOptions, context?: {
+  root?: string;
+}): string;
 declare function getWranglerImagesBinding(code: string): string;
 /** Generate vite.config.ts for App Router */
 declare function generateAppRouterViteConfig(info?: CloudflareProjectInfo, options?: CloudflareInitOptions, imagesBinding?: string, prerender?: boolean): string;