vinext 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/index.js

@@ -35,7 +35,7 @@ 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";
@@ -46,6 +46,7 @@ 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 +84,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";
@@ -114,6 +116,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 +534,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 +815,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 +955,7 @@ function vinext(options = {}) {
 			return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
 		}
 	};
+	const cachedTypeofWindowTransform = createTransformCache();
 	const plugins = [
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
@@ -967,10 +1028,9 @@ 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;
@@ -1017,6 +1077,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);
@@ -1222,7 +1286,7 @@ function vinext(options = {}) {
 							"react/jsx-runtime",
 							"react/jsx-dev-runtime"
 						],
-						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
+						...shouldAutoEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
 					oxc: {
 						jsx: { runtime: "automatic" },
@@ -1840,6 +1904,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 +2233,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 +2377,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 +2498,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 +2518,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)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2561,7 +2645,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 +2825,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 +2838,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 +2873,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;

package/dist/init-cloudflare.js

@@ -16,7 +16,7 @@ function validateCloudflarePlatformSetup(context, cloudflare) {
 	const projectInfo = detectProject(context.root);
 	const wranglerPath = ["wrangler.jsonc", "wrangler.json"].map((fileName) => path.join(context.root, fileName)).find((candidate) => fs.existsSync(candidate));
 	const wranglerCode = wranglerPath ? fs.readFileSync(wranglerPath, "utf-8") : void 0;
-	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare) : void 0;
+	const updatedWranglerCode = wranglerCode ? updateWranglerConfigForCloudflare(wranglerCode, cloudflare, { root: context.root }) : void 0;
 	const imagesBinding = updatedWranglerCode ? getWranglerImagesBinding(updatedWranglerCode) : "IMAGES";
 	if (context.existingViteConfigPath) updateViteConfigForCloudflare(context.existingViteConfigPath, fs.readFileSync(context.existingViteConfigPath, "utf-8"), {
 		isAppRouter: context.isAppRouter,
@@ -56,7 +56,7 @@ function setupCloudflarePlatform(context, cloudflare) {
 		fs.writeFileSync(path.join(context.root, "wrangler.jsonc"), generateWranglerConfig(projectInfo, cloudflare, context.today), "utf-8");
 		generatedPlatformFiles.push("wrangler.jsonc");
 	} else if (wranglerCode) {
-		const updatedConfig = updateWranglerConfigForCloudflare(wranglerCode, cloudflare);
+		const updatedConfig = updateWranglerConfigForCloudflare(wranglerCode, cloudflare, { root: context.root });
 		if (updatedConfig !== wranglerCode) {
 			fs.writeFileSync(wranglerPath, updatedConfig, "utf-8");
 			generatedPlatformFiles.push(path.basename(wranglerPath));
@@ -79,8 +79,19 @@ function setupCloudflarePlatform(context, cloudflare) {
 		] : []
 	};
 }
+/**
+* `main` is what makes a Wrangler config a Worker rather than a static-assets
+* project. A custom `worker/index.*` wins when present; otherwise the
+* router-selected entry resolves to the App or Pages Router handler at build
+* time.
+*/
+function resolveWorkerEntry(root) {
+	if (fs.existsSync(path.join(root, "worker", "index.ts"))) return "./worker/index.ts";
+	if (fs.existsSync(path.join(root, "worker", "index.js"))) return "./worker/index.js";
+	return "vinext/server/fetch-handler";
+}
 function generateWranglerConfig(info, options = DEFAULT_CLOUDFLARE_INIT_OPTIONS, today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0]) {
-	const workerEntry = (fs.existsSync(path.join(info.root, "worker", "index.ts")) ? "./worker/index.ts" : fs.existsSync(path.join(info.root, "worker", "index.js")) ? "./worker/index.js" : void 0) ?? "vinext/server/fetch-handler";
+	const workerEntry = resolveWorkerEntry(info.root);
 	const config = {
 		$schema: "node_modules/wrangler/config-schema.json",
 		name: info.projectName,
@@ -258,13 +269,20 @@ function appendTopLevelJsonProperty(code, property) {
 	const structuralBefore = stripJsonComments(before);
 	return `${before}${!/,\s*$/.test(structuralBefore) && !/{\s*$/.test(structuralBefore) ? "," : ""}\n${property}\n${code.slice(closing)}`;
 }
-function updateWranglerConfigForCloudflare(code, options) {
+function updateWranglerConfigForCloudflare(code, options, context = {}) {
+	let config;
 	try {
-		JSON.parse(stripJsonComments(code));
+		config = JSON.parse(stripJsonComments(code));
 	} catch (cause) {
 		throw new Error("Could not parse the existing Wrangler JSON/JSONC config.", { cause });
 	}
+	if (Object.hasOwn(config, "pages_build_output_dir")) throw new Error("The existing Wrangler config uses \"pages_build_output_dir\", which cannot be combined with the Worker \"main\" required by vinext. Remove \"pages_build_output_dir\" and rerun vinext init.");
 	let output = code;
+	if (!findTopLevelJsonProperty(output, "main")) {
+		const workerEntry = resolveWorkerEntry(context.root ?? process.cwd());
+		output = appendTopLevelJsonProperty(output, `  "main": ${JSON.stringify(workerEntry)}`);
+	}
+	if (!findTopLevelJsonProperty(output, "assets")) output = appendTopLevelJsonProperty(output, "  \"assets\": { \"directory\": \"dist/client\", \"not_found_handling\": \"none\", \"binding\": \"ASSETS\" }");
 	if (options.cdnCache === "workers-cache") {
 		const cacheProperty = findTopLevelJsonProperty(output, "cache");
 		if (!cacheProperty) output = appendTopLevelJsonProperty(output, "  \"cache\": { \"enabled\": true }");
@@ -613,6 +631,41 @@ function endsWithCommaIgnoringWhitespaceAndComments(code) {
 function cloudflarePluginExpression(isAppRouter, binding) {
 	return isAppRouter ? `${binding}({\n  viteEnvironment: {\n    name: "rsc",\n    childEnvironments: ["ssr"],\n  },\n})` : `${binding}()`;
 }
+/**
+* An existing bare `cloudflare()` call is left as-is by `ensurePlugins`, which
+* only adds plugins that are absent. For the App Router that silently drops
+* `viteEnvironment`, so the RSC environment never runs in workerd.
+*/
+function ensureCloudflareViteEnvironment(output, config, binding, isAppRouter, code) {
+	if (!isAppRouter) return;
+	const call = findPluginCall(config, binding);
+	if (!call) return;
+	const viteEnvironment = `viteEnvironment: { name: "rsc", childEnvironments: ["ssr"] }`;
+	const firstArgument = call.arguments[0];
+	if (!firstArgument) {
+		output.appendLeft(call.end - 1, `{ ${viteEnvironment} }`);
+		return;
+	}
+	if (firstArgument.type === "SpreadElement" || firstArgument.type !== "ObjectExpression") throw new Error("The cloudflare() plugin options must be a static object for vinext init to configure the App Router Vite environment.");
+	const argumentObject = firstArgument;
+	const existingViteEnvironment = argumentObject.properties.filter((property) => property.type === "Property" && propertyName(property) === "viteEnvironment").at(-1);
+	if (existingViteEnvironment) {
+		const propertyIndex = argumentObject.properties.lastIndexOf(existingViteEnvironment);
+		if (argumentObject.properties.slice(propertyIndex + 1).some((property) => property.type === "SpreadElement")) throw new Error("The cloudflare() viteEnvironment option must appear after any spread properties so vinext init can verify it.");
+		if (existingViteEnvironment.value.type !== "ObjectExpression") throw new Error("The cloudflare() viteEnvironment option must be a static object with name: \"rsc\" and childEnvironments containing \"ssr\".");
+		const environmentObject = existingViteEnvironment.value;
+		const nameProperties = environmentObject.properties.filter((property) => property.type === "Property" && propertyName(property) === "name");
+		const childEnvironmentProperties = environmentObject.properties.filter((property) => property.type === "Property" && propertyName(property) === "childEnvironments");
+		const name = nameProperties[0];
+		const childEnvironments = childEnvironmentProperties[0];
+		const hasAmbiguousProperties = environmentObject.properties.some((property) => property.type === "SpreadElement") || nameProperties.length !== 1 || childEnvironmentProperties.length !== 1;
+		const hasRequiredName = name?.value.type === "Literal" && name.value.value === "rsc";
+		const hasRequiredChild = childEnvironments?.value.type === "ArrayExpression" && childEnvironments.value.elements.some((element) => element?.type === "Literal" && element.value === "ssr");
+		if (hasAmbiguousProperties || !hasRequiredName || !hasRequiredChild) throw new Error("The cloudflare() viteEnvironment option must statically set name: \"rsc\" and include \"ssr\" in childEnvironments.");
+		return;
+	}
+	insertObjectProperty(output, argumentObject, `${code.slice(0, call.start).split("\n").at(-1)?.match(/^\s*/)?.[0] ?? ""}  ${viteEnvironment},`, code);
+}
 function findPluginCall(config, binding) {
 	const plugins = findProperty(config, "plugins");
 	if (!plugins || plugins.value.type !== "ArrayExpression") return void 0;
@@ -819,6 +872,7 @@ function updateViteConfigForCloudflare(filePath, code, options) {
 		expression: cloudflarePluginExpression(options.isAppRouter, cloudflareBinding),
 		binding: cloudflareBinding
 	}], code);
+	ensureCloudflareViteEnvironment(output, config, cloudflareBinding, options.isAppRouter, code);
 	if (existingVinextCall) if (existingVinextCall.arguments.length === 0 && (cacheAdditions.length > 0 || imageOptimizerExpression || needsPrerender)) {
 		const properties = [];
 		if (cacheAdditions.length > 0) properties.push(`cache: { ${cacheAdditions.map(({ name, expression }) => `${name}: ${expression}`).join(", ")} }`);

package/dist/plugins/extensionless-dynamic-import.js

@@ -1,4 +1,5 @@
 import { DYNAMIC_IMPORT_PRESCAN, forEachAstChild, hasRange, isAstRecord, nodeArray } from "./ast-utils.js";
+import { createTransformCache } from "./transform-cache.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/extensionless-dynamic-import.ts
@@ -23,6 +24,7 @@ const TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
 ]);
 function createExtensionlessDynamicImportPlugin() {
 	let moduleExtensions = MODULE_EXTENSIONS;
+	const cached = createTransformCache();
 	return {
 		name: "vinext:extensionless-dynamic-import",
 		enforce: "pre",
@@ -38,28 +40,31 @@ function createExtensionlessDynamicImportPlugin() {
 				code: DYNAMIC_IMPORT_PRESCAN
 			},
 			handler(code, id) {
-				const lang = langForId(id);
-				let ast;
-				try {
-					ast = parseAst(code, { lang });
-				} catch {
-					return null;
-				}
-				const imports = collectExtensionlessImports(ast, code, moduleExtensions);
-				if (imports.length === 0) return null;
-				const output = new MagicString(code);
-				for (const dynamicImport of imports) {
-					const source = code.slice(dynamicImport.sourceStart, dynamicImport.sourceEnd);
-					output.overwrite(dynamicImport.start, dynamicImport.end, buildReplacement(source, dynamicImport.globPattern, dynamicImport.moduleExtensions));
-				}
-				return {
-					code: output.toString(),
-					map: output.generateMap({ hires: "boundary" })
-				};
+				return cached(id, code, moduleExtensions, () => transformExtensionlessImports(code, id, moduleExtensions));
 			}
 		}
 	};
 }
+function transformExtensionlessImports(code, id, moduleExtensions) {
+	const lang = langForId(id);
+	let ast;
+	try {
+		ast = parseAst(code, { lang });
+	} catch {
+		return null;
+	}
+	const imports = collectExtensionlessImports(ast, code, moduleExtensions);
+	if (imports.length === 0) return null;
+	const output = new MagicString(code);
+	for (const dynamicImport of imports) {
+		const source = code.slice(dynamicImport.sourceStart, dynamicImport.sourceEnd);
+		output.overwrite(dynamicImport.start, dynamicImport.end, buildReplacement(source, dynamicImport.globPattern, dynamicImport.moduleExtensions));
+	}
+	return {
+		code: output.toString(),
+		map: output.generateMap({ hires: "boundary" })
+	};
+}
 function langForId(id) {
 	const clean = id.split("?", 1)[0];
 	const dot = clean.lastIndexOf(".");

package/dist/plugins/ignore-dynamic-requests.js

@@ -1,5 +1,6 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { DYNAMIC_IMPORT_PRESCAN, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, mayContainDynamicImport, nodeArray } from "./ast-utils.js";
+import { createTransformCache } from "./transform-cache.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { parseAst } from "vite";
 import { fileURLToPath } from "node:url";
@@ -505,6 +506,7 @@ function transformVeryDynamicRequests(code, id) {
 	};
 }
 function createIgnoreDynamicRequestsPlugin(getTranspiledPackages = () => []) {
+	const cached = createTransformCache();
 	return {
 		name: "vinext:ignore-dynamic-requests",
 		enforce: "pre",
@@ -519,7 +521,7 @@ function createIgnoreDynamicRequestsPlugin(getTranspiledPackages = () => []) {
 				if (!shouldTransformVeryDynamicRequests(this.environment, cleanId, getTranspiledPackages())) return null;
 				const absoluteId = path.resolve(cleanId);
 				if (absoluteId === VINEXT_SOURCE_ROOT || absoluteId.startsWith(`${VINEXT_SOURCE_ROOT}/`) || PLUGIN_RSC_PATH.test(absoluteId)) return null;
-				return transformVeryDynamicRequests(code, id);
+				return cached(id, code, void 0, () => transformVeryDynamicRequests(code, id));
 			}
 		}
 	};

package/dist/plugins/import-meta-url.js

@@ -19,6 +19,7 @@ const TRANSFORMABLE_SCRIPT_EXTENSIONS = /* @__PURE__ */ new Set([
 function createImportMetaUrlPlugin(options) {
 	let rootPaths;
 	let outputDirs = [];
+	const transformCache = /* @__PURE__ */ new Map();
 	function getRootPaths() {
 		const root = options.getRoot();
 		if (!root) return rootPaths;
@@ -46,12 +47,22 @@ function createImportMetaUrlPlugin(options) {
 				if (!paths) return null;
 				const canonicalId = transformableModuleCanonicalId(cleanModuleId(id), paths);
 				if (!canonicalId) return null;
-				const rewritten = rewriteCanonicalSourceIdentity(code, canonicalId, paths, this.environment?.name === "client" ? "client" : "server");
-				if (!rewritten) return null;
-				return {
-					code: rewritten.code,
-					map: rewritten.map
-				};
+				const environment = this.environment?.name === "client" ? "client" : "server";
+				let entry = transformCache.get(id);
+				if (!entry || entry.source !== code || entry.canonicalRoot !== paths.canonicalRoot || entry.canonicalId !== canonicalId) {
+					entry = {
+						source: code,
+						canonicalRoot: paths.canonicalRoot,
+						canonicalId,
+						results: /* @__PURE__ */ new Map()
+					};
+					transformCache.set(id, entry);
+				}
+				const cached = entry.results.get(environment);
+				if (cached) return cached.value;
+				const value = rewriteCanonicalSourceIdentity(code, canonicalId, paths, environment);
+				entry.results.set(environment, { value });
+				return value;
 			}
 		}
 	};

package/dist/plugins/require-context.js

@@ -1,4 +1,5 @@
 import { forEachAstChild, hasRange, isAstRecord, nodeArray } from "./ast-utils.js";
+import { createTransformCache } from "./transform-cache.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/require-context.ts
@@ -13,6 +14,7 @@ const TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
 	".cts"
 ]);
 function createRequireContextPlugin() {
+	const cached = createTransformCache();
 	return {
 		name: "vinext:require-context",
 		enforce: "pre",
@@ -22,25 +24,28 @@ function createRequireContextPlugin() {
 				code: /\brequire\b[\s\S]*\.context/
 			},
 			handler(code, id) {
-				const lang = langForId(id);
-				let ast;
-				try {
-					ast = parseAst(code, { lang });
-				} catch {
-					return null;
-				}
-				const calls = collectRequireContextCalls(ast);
-				if (calls.length === 0) return null;
-				const output = new MagicString(code);
-				for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
-				return {
-					code: output.toString(),
-					map: output.generateMap({ hires: "boundary" })
-				};
+				return cached(id, code, void 0, () => transformRequireContext(code, id));
 			}
 		}
 	};
 }
+function transformRequireContext(code, id) {
+	const lang = langForId(id);
+	let ast;
+	try {
+		ast = parseAst(code, { lang });
+	} catch {
+		return null;
+	}
+	const calls = collectRequireContextCalls(ast);
+	if (calls.length === 0) return null;
+	const output = new MagicString(code);
+	for (const call of calls) output.overwrite(call.range.start, call.range.end, buildReplacement(call));
+	return {
+		code: output.toString(),
+		map: output.generateMap({ hires: "boundary" })
+	};
+}
 function langForId(id) {
 	const clean = id.split("?", 1)[0];
 	const dot = clean.lastIndexOf(".");

package/dist/plugins/transform-cache.d.ts

@@ -0,0 +1,19 @@
+//#region src/plugins/transform-cache.d.ts
+/**
+ * Memoizes a pure per-module transform across the repeated build passes
+ * (scan client/server references + rsc/client/ssr builds), which feed the
+ * same module source through the same transform up to five times.
+ *
+ * Entries are keyed by module id and replaced when the source changes, so dev
+ * rebuilds retain at most one source version per id. `variant` distinguishes
+ * results that also depend on an environment-derived input (e.g. the
+ * typeof-window replacement); callers must pass a primitive or stable
+ * reference. Cached values include `null` ("no transform applies") so the
+ * negative case is not recomputed either.
+ *
+ * Only safe for transforms whose result depends solely on (id, source,
+ * variant) — no filesystem or plugin-state reads inside `compute`.
+ */
+declare function createTransformCache<V, R>(): (id: string, source: string, variant: V, compute: () => R) => R;
+//#endregion
+export { createTransformCache };