vinext 0.2.1 → 1.0.0-beta.0

package/dist/init-cloudflare.js

@@ -1,12 +1,13 @@
 import { detectProject } from "./utils/project.js";
+import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
-import { parseSync } from "vite";
 import MagicString from "magic-string";
 //#region src/init-cloudflare.ts
+const require = createRequire(import.meta.url);
 const DEFAULT_CLOUDFLARE_INIT_OPTIONS = {
 	dataCache: "kv",
-	cdnCache: "data-cache",
+	cdnCache: "workers-cache",
 	imageOptimization: "cloudflare-images"
 };
 function validateCloudflarePlatformSetup(context, cloudflare) {
@@ -382,6 +383,14 @@ export default defineConfig({
 `;
 }
 function parseViteConfig(filePath, code) {
+	let parseSync;
+	try {
+		({parseSync} = require("vite"));
+	} catch (error) {
+		const maybeNodeError = error;
+		if (maybeNodeError.code === "MODULE_NOT_FOUND" && maybeNodeError.message.includes("vite")) throw new Error(`Could not update ${path.basename(filePath)} because the "vite" package is not available to parse the existing config. Install dependencies first, or remove the existing Vite config and rerun vinext init.`);
+		throw error;
+	}
 	const extension = path.extname(filePath).slice(1);
 	const lang = extension === "ts" || extension === "mts" || extension === "cts" ? "ts" : "js";
 	const parsed = parseSync(path.basename(filePath), code, {
@@ -758,7 +767,7 @@ function updateViteConfigForCloudflare(filePath, code, options) {
 	const program = parseViteConfig(filePath, code);
 	const cacheOptions = options.cache ?? {
 		dataCache: "none",
-		cdnCache: "data-cache",
+		cdnCache: "workers-cache",
 		imageOptimization: "cloudflare-images"
 	};
 	const config = findConfigObject(program);

package/dist/init-platform.d.ts

@@ -9,6 +9,7 @@ type CloudflareInitOptions = {
   dataCache: InitDataCache;
   cdnCache: InitCdnCache;
   imageOptimization: InitImageOptimization;
+  warmCdnCache?: boolean;
 };
 declare const INIT_PLATFORMS: {
   cloudflare: {
@@ -27,14 +28,22 @@ type PlatformPromptOptions = {
   isInteractive?: boolean;
   question?: (prompt: string) => Promise<string>;
 };
+type ResolvedInitOptions = {
+  platform: InitPlatform;
+  cloudflare?: CloudflareInitOptions;
+  prerender: boolean;
+};
 declare function isAgentEnvironment(env?: Record<string, string | undefined>): boolean;
 declare function parsePlatformArg(args: string[]): InitPlatform | undefined;
 declare function parseDataCacheArg(args: string[]): InitDataCache | undefined;
 declare function parseCdnCacheArg(args: string[]): InitCdnCache | undefined;
 declare function parseImageOptimizationArg(args: string[]): InitImageOptimization | undefined;
 declare function parsePrerenderArg(args: string[]): boolean | undefined;
+declare function parseWarmCdnCacheArg(args: string[]): boolean | undefined;
 declare function resolveInitPlatform(args: string[], options?: PlatformPromptOptions): Promise<InitPlatform>;
+declare function resolveInitOptions(args: string[], options?: PlatformPromptOptions): Promise<ResolvedInitOptions>;
 declare function resolveInitPrerender(args: string[], options?: PlatformPromptOptions): Promise<boolean>;
+declare function resolveInitWarmCdnCache(args: string[], options?: PlatformPromptOptions): Promise<boolean>;
 declare function resolveCloudflareInitOptions(args: string[], options?: PlatformPromptOptions): Promise<CloudflareInitOptions>;
 //#endregion
-export { CloudflareInitOptions, INIT_PLATFORMS, InitCdnCache, InitDataCache, InitImageOptimization, InitPlatform, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, resolveCloudflareInitOptions, resolveInitPlatform, resolveInitPrerender };
+export { CloudflareInitOptions, INIT_PLATFORMS, InitCdnCache, InitDataCache, InitImageOptimization, InitPlatform, PlatformPromptOptions, ResolvedInitOptions, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };

package/dist/init-platform.js

@@ -52,20 +52,26 @@ function parseDataCacheArg(args) {
 	return parseChoiceArg(args, "--data-cache", ["kv", "none"]);
 }
 function parseCdnCacheArg(args) {
-	return parseChoiceArg(args, "--cdn-cache", ["data-cache", "workers-cache"], ["data-cache"]);
+	return parseChoiceArg(args, "--cdn-cache", ["workers-cache", "data-cache"]);
 }
 function parseImageOptimizationArg(args) {
 	return parseChoiceArg(args, "--image-optimization", ["cloudflare-images", "none"]);
 }
 function parsePrerenderArg(args) {
+	return parseBooleanArg(args, "--prerender", "--no-prerender", "--prerender expects true or false when using the \"--prerender=value\" form.");
+}
+function parseWarmCdnCacheArg(args) {
+	return parseBooleanArg(args, "--experimental-warm-cdn-cache", "--no-experimental-warm-cdn-cache", "--experimental-warm-cdn-cache expects true or false when using the \"--experimental-warm-cdn-cache=value\" form.");
+}
+function parseBooleanArg(args, enabledFlag, disabledFlag, errorMessage) {
 	for (const arg of args) {
-		if (arg === "--prerender") return true;
-		if (arg === "--no-prerender") return false;
-		if (!arg.startsWith("--prerender=")) continue;
-		const value = arg.slice(12).toLowerCase();
+		if (arg === enabledFlag) return true;
+		if (arg === disabledFlag) return false;
+		if (!arg.startsWith(`${enabledFlag}=`)) continue;
+		const value = arg.slice(enabledFlag.length + 1).toLowerCase();
 		if (value === "true" || value === "yes" || value === "1") return true;
 		if (value === "false" || value === "no" || value === "0") return false;
-		throw new Error("--prerender expects true or false when using the \"--prerender=value\" form.");
+		throw new Error(errorMessage);
 	}
 }
 async function resolveInitPlatform(args, options = {}) {
@@ -98,6 +104,24 @@ async function resolveInitPlatform(args, options = {}) {
 		readline?.close();
 	}
 }
+async function resolveInitOptions(args, options = {}) {
+	const platform = await resolveInitPlatform(args, options);
+	const platformOptions = await INIT_PLATFORMS[platform].options(args, options);
+	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
+	if (platform === "cloudflare" && platformOptions?.cdnCache !== "workers-cache") {
+		if (explicitWarmCdnCache === true) throw new Error("--experimental-warm-cdn-cache requires --cdn-cache=workers-cache.");
+	}
+	const prerender = await resolveInitPrerender(args, options);
+	const warmCdnCache = platform === "cloudflare" && platformOptions?.cdnCache === "workers-cache" ? await resolveInitWarmCdnCache(args, options) : false;
+	return {
+		platform,
+		prerender,
+		cloudflare: platform === "cloudflare" && platformOptions ? {
+			...platformOptions,
+			warmCdnCache
+		} : void 0
+	};
+}
 async function resolveInitPrerender(args, options = {}) {
 	const explicitPrerender = parsePrerenderArg(args);
 	if (explicitPrerender !== void 0) return explicitPrerender;
@@ -132,21 +156,55 @@ async function resolveInitPrerender(args, options = {}) {
 		readline?.close();
 	}
 }
+async function resolveInitWarmCdnCache(args, options = {}) {
+	const explicitWarmCdnCache = parseWarmCdnCacheArg(args);
+	if (explicitWarmCdnCache !== void 0) return explicitWarmCdnCache;
+	const env = options.env ?? process.env;
+	const input = options.input ?? process.stdin;
+	const output = options.output ?? process.stdout;
+	const isInteractive = options.isInteractive ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
+	if (isAgentEnvironment(env) || !isInteractive) return false;
+	const readline = options.question ? void 0 : createInterface({
+		input,
+		output
+	});
+	const question = options.question ?? ((prompt) => readline.question(prompt));
+	try {
+		while (true) {
+			const answer = (await question("  Enable Workers Cache experimental pre-warm during deploy? [y/N]: ")).trim().toLowerCase();
+			if (answer === "") {
+				output.write("\n");
+				return false;
+			}
+			if (answer === "y" || answer === "yes") {
+				output.write("\n");
+				return true;
+			}
+			if (answer === "n" || answer === "no") {
+				output.write("\n");
+				return false;
+			}
+			output.write("  Please answer yes or no.\n");
+		}
+	} finally {
+		readline?.close();
+	}
+}
 async function resolveCloudflareInitOptions(args, options = {}) {
 	const explicitDataCache = parseDataCacheArg(args);
 	const explicitCdnCache = parseCdnCacheArg(args);
 	const explicitImageOptimization = parseImageOptimizationArg(args);
-	if (explicitDataCache && explicitImageOptimization) return {
+	if (explicitCdnCache && explicitDataCache && explicitImageOptimization) return {
 		dataCache: explicitDataCache,
-		cdnCache: explicitCdnCache ?? "data-cache",
+		cdnCache: explicitCdnCache,
 		imageOptimization: explicitImageOptimization
 	};
-	if (isAgentEnvironment(options.env ?? process.env)) throw new Error("vinext init needs Cloudflare cache and image choices. Ask the user which data cache (kv or none) and image optimization (cloudflare-images or none) they want, then re-run with --data-cache=... and --image-optimization=....");
+	if (isAgentEnvironment(options.env ?? process.env)) throw new Error("vinext init needs Cloudflare cache and image choices. Ask the user which CDN cache (workers-cache or data-cache), data cache (kv or none), and image optimization (cloudflare-images or none) they want, then re-run with --cdn-cache=..., --data-cache=..., and --image-optimization=....");
 	const input = options.input ?? process.stdin;
 	const output = options.output ?? process.stdout;
 	if (!(options.isInteractive ?? Boolean(process.stdin.isTTY && process.stdout.isTTY))) return {
 		dataCache: explicitDataCache ?? "kv",
-		cdnCache: explicitCdnCache ?? "data-cache",
+		cdnCache: explicitCdnCache ?? "workers-cache",
 		imageOptimization: explicitImageOptimization ?? "cloudflare-images"
 	};
 	const readline = options.question ? void 0 : createInterface({
@@ -171,6 +229,14 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 				output.write(`  ${error}\n`);
 			}
 		};
+		const cdnCache = await promptChoice(explicitCdnCache, "  Choose a CDN cache:\n    1. Workers Cache (default)\n    2. Data cache\n  CDN cache [1]: ", {
+			"1": "workers-cache",
+			"workers-cache": "workers-cache",
+			workers: "workers-cache",
+			"2": "data-cache",
+			"data-cache": "data-cache",
+			data: "data-cache"
+		}, "workers-cache", "Please choose Workers Cache (1) or Data cache (2).");
 		return {
 			dataCache: await promptChoice(explicitDataCache, "  Choose a data cache:\n    1. Cloudflare KV (default)\n    2. None\n  Data cache [1]: ", {
 				"1": "kv",
@@ -178,7 +244,7 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 				"2": "none",
 				none: "none"
 			}, "kv", "Please choose Cloudflare KV (1) or None (2)."),
-			cdnCache: explicitCdnCache ?? "data-cache",
+			cdnCache,
 			imageOptimization: await promptChoice(explicitImageOptimization, "  Choose image optimization:\n    1. Cloudflare Images (default)\n    2. None\n  Image optimization [1]: ", {
 				"1": "cloudflare-images",
 				"cloudflare-images": "cloudflare-images",
@@ -192,4 +258,4 @@ async function resolveCloudflareInitOptions(args, options = {}) {
 	}
 }
 //#endregion
-export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, resolveCloudflareInitOptions, resolveInitPlatform, resolveInitPrerender };
+export { INIT_PLATFORMS, isAgentEnvironment, parseCdnCacheArg, parseDataCacheArg, parseImageOptimizationArg, parsePlatformArg, parsePrerenderArg, parseWarmCdnCacheArg, resolveCloudflareInitOptions, resolveInitOptions, resolveInitPlatform, resolveInitPrerender, resolveInitWarmCdnCache };

package/dist/init.d.ts

@@ -9,7 +9,8 @@ type InitOptions = {
   force?: boolean; /** Deployment target selected by the user */
   platform?: InitPlatform; /** Configure build-time pre-rendering for all discovered static routes */
   prerender?: boolean; /** Cloudflare cache and image choices. */
-  cloudflare?: CloudflareInitOptions; /** @internal — override exec for testing (avoids ESM spy issues) */
+  cloudflare?: CloudflareInitOptions; /** Install missing dependencies with the detected package manager (default: true). */
+  install?: boolean; /** @internal — override exec for testing (avoids ESM spy issues) */
   _exec?: (cmd: string, opts: {
     cwd: string;
     stdio: string;
@@ -33,7 +34,14 @@ declare function generateViteConfig(_isAppRouter: boolean, prerender?: boolean):
  * Add vinext scripts to package.json without overwriting existing scripts.
  * Returns the list of script names that were added.
  */
-declare function addScripts(root: string, port: number): string[];
+declare function addScripts(root: string, port: number, platform?: InitPlatform, options?: {
+  warmCdnCache?: boolean;
+}): string[];
+type InitDependencyGroups = {
+  dependencies: string[];
+  devDependencies: string[];
+};
+declare function getInitDependencyGroups(isAppRouter: boolean, platform: InitPlatform): InitDependencyGroups;
 declare function getInitDeps(isAppRouter: boolean, platform: InitPlatform): string[];
 declare function isDepInstalled(root: string, dep: string): boolean;
 /**
@@ -44,4 +52,4 @@ declare function isDepInstalled(root: string, dep: string): boolean;
 declare function updateGitignore(root: string, platform?: InitPlatform): boolean;
 declare function init(options: InitOptions): Promise<InitResult>;
 //#endregion
-export { InitOptions, addScripts, generateViteConfig, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };
+export { InitDependencyGroups, InitOptions, addScripts, generateViteConfig, getInitDependencyGroups, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };

package/dist/init.js

@@ -1,5 +1,4 @@
 import { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
-import { formatReport, runCheck } from "./check.js";
 import { setupCloudflarePlatform, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
 import { getReactUpgradeDeps } from "./utils/react-version.js";
 import fs from "node:fs";
@@ -71,7 +70,7 @@ export default defineConfig({
 * Add vinext scripts to package.json without overwriting existing scripts.
 * Returns the list of script names that were added.
 */
-function addScripts(root, port) {
+function addScripts(root, port, platform = "node", options = {}) {
 	const pkgPath = path.join(root, "package.json");
 	if (!fs.existsSync(pkgPath)) return [];
 	try {
@@ -88,27 +87,38 @@ function addScripts(root, port) {
 			added.push("build:vinext");
 		}
 		if (!pkg.scripts["start:vinext"]) {
-			pkg.scripts["start:vinext"] = "vinext start";
+			pkg.scripts["start:vinext"] = platform === "cloudflare" ? "wrangler dev --config dist/server/wrangler.json" : "vinext start";
 			added.push("start:vinext");
 		}
+		if (platform === "cloudflare" && !pkg.scripts["deploy:vinext"]) {
+			pkg.scripts["deploy:vinext"] = options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json";
+			added.push("deploy:vinext");
+		}
 		if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
 		return added;
 	} catch {
 		return [];
 	}
 }
-function getInitDeps(isAppRouter, platform) {
-	const deps = [
-		"vinext",
-		"vite",
-		"@vitejs/plugin-react"
-	];
+function getInitDependencyGroups(isAppRouter, platform) {
+	const dependencies = ["vinext"];
+	const devDependencies = ["vite", "@vitejs/plugin-react"];
 	if (isAppRouter) {
-		deps.push("@vitejs/plugin-rsc");
-		deps.push("react-server-dom-webpack");
+		dependencies.push("react-server-dom-webpack");
+		devDependencies.push("@vitejs/plugin-rsc");
+	}
+	if (platform === "cloudflare") {
+		dependencies.push("@vinext/cloudflare");
+		devDependencies.push("@cloudflare/vite-plugin", "wrangler");
 	}
-	if (platform === "cloudflare") deps.push("@cloudflare/vite-plugin", "@vinext/cloudflare", "wrangler");
-	return deps;
+	return {
+		dependencies,
+		devDependencies
+	};
+}
+function getInitDeps(isAppRouter, platform) {
+	const groups = getInitDependencyGroups(isAppRouter, platform);
+	return [...groups.dependencies, ...groups.devDependencies];
 }
 function isDepInstalled(root, dep) {
 	const pkgPath = path.join(root, "package.json");
@@ -124,6 +134,55 @@ function isDepInstalled(root, dep) {
 		return false;
 	}
 }
+function parseDependencySpecifier(specifier) {
+	if (specifier.startsWith("@")) {
+		const versionSeparator = specifier.indexOf("@", 1);
+		if (versionSeparator !== -1) return {
+			name: specifier.slice(0, versionSeparator),
+			version: specifier.slice(versionSeparator + 1),
+			hasExplicitVersion: true
+		};
+		return {
+			name: specifier,
+			version: "latest",
+			hasExplicitVersion: false
+		};
+	}
+	const versionSeparator = specifier.indexOf("@");
+	if (versionSeparator !== -1) return {
+		name: specifier.slice(0, versionSeparator),
+		version: specifier.slice(versionSeparator + 1),
+		hasExplicitVersion: true
+	};
+	return {
+		name: specifier,
+		version: "latest",
+		hasExplicitVersion: false
+	};
+}
+function addDependencyEntries(root, deps, { dev }) {
+	if (deps.length === 0) return [];
+	const pkgPath = path.join(root, "package.json");
+	if (!fs.existsSync(pkgPath)) return [];
+	const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+	const targetKey = dev ? "devDependencies" : "dependencies";
+	const target = pkg[targetKey] ??= {};
+	const added = [];
+	for (const dep of deps) {
+		const { name, version, hasExplicitVersion } = parseDependencySpecifier(dep);
+		const existingTarget = pkg.dependencies?.[name] !== void 0 ? pkg.dependencies : pkg.devDependencies?.[name] !== void 0 ? pkg.devDependencies : void 0;
+		if (existingTarget) {
+			if (!hasExplicitVersion || existingTarget[name] === version) continue;
+			existingTarget[name] = version;
+			added.push(name);
+			continue;
+		}
+		target[name] = version;
+		added.push(name);
+	}
+	if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
+	return added;
+}
 /**
 * Check if react/react-dom need upgrading for react-server-dom-webpack compatibility.
 *
@@ -260,6 +319,7 @@ async function init(options) {
 	const viteConfigExists = hasViteConfig(root);
 	const isApp = detectProject(root).isAppRouter;
 	const pmName = detectPackageManagerName(root);
+	const shouldInstall = options.install ?? true;
 	if (platform === "cloudflare") validateCloudflarePlatformSetup({
 		root,
 		isAppRouter: isApp,
@@ -269,6 +329,7 @@ async function init(options) {
 	}, options.cloudflare);
 	if (!options.skipCheck) {
 		console.log("  Running compatibility check...\n");
+		const { runCheck, formatReport } = await import("./check.js");
 		const checkResult = runCheck(root);
 		console.log(formatReport(checkResult, { calledFromInit: true }));
 		console.log();
@@ -281,7 +342,7 @@ async function init(options) {
 		existingViteConfigPath = renamedPath;
 	}
 	const addedTypeModule = ensureESModule(root);
-	const addedScripts = addScripts(root, port);
+	const addedScripts = addScripts(root, port, platform, { warmCdnCache: options.cloudflare?.warmCdnCache ?? false });
 	const setupContext = {
 		root,
 		isAppRouter: isApp,
@@ -294,41 +355,76 @@ async function init(options) {
 	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, options.cloudflare) : setupNodePlatform(setupContext);
 	const { generatedViteConfig, skippedViteConfig, generatedPlatformFiles } = platformSetup;
 	const updatedGitignore = updateGitignore(root, platform);
-	const missingDeps = getInitDeps(isApp, platform).filter((dep) => !isDepInstalled(root, dep));
+	const neededDeps = getInitDependencyGroups(isApp, platform);
+	const missingDependencies = neededDeps.dependencies.filter((dep) => !isDepInstalled(root, dep));
+	const missingDevDependencies = neededDeps.devDependencies.filter((dep) => !isDepInstalled(root, dep));
 	let dependencyInstallNeedsApproval = false;
-	let dependenciesAdded = false;
-	if (isApp && missingDeps.includes("react-server-dom-webpack")) {
+	const dependencyEntriesAdded = [];
+	const devDependencyEntriesAdded = [];
+	if (isApp && missingDependencies.includes("react-server-dom-webpack")) {
 		const reactUpgrade = getReactUpgradeDeps(root);
 		if (reactUpgrade.length > 0) {
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
 			try {
-				if (isApproveBuildsError(await installDeps(root, reactUpgrade, exec, { dev: false }))) dependencyInstallNeedsApproval = true;
+				if (shouldInstall) {
+					if (isApproveBuildsError(await installDeps(root, reactUpgrade, exec, { dev: false }))) dependencyInstallNeedsApproval = true;
+				} else {
+					const added = addDependencyEntries(root, reactUpgrade, { dev: false });
+					dependencyEntriesAdded.push(...added);
+				}
 			} catch (error) {
 				if (pmName !== "pnpm" || !isApproveBuildsError(error)) throw error;
 				dependencyInstallNeedsApproval = true;
 			}
 		}
 	}
-	if (missingDeps.length > 0) {
+	if (missingDependencies.length > 0) {
 		console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Installing dependencies:"))}`);
-		console.log(formatList(missingDeps, "    "));
+		console.log(formatList(missingDependencies, "    "));
 		try {
-			const installOutput = await installDeps(root, missingDeps, exec);
-			dependenciesAdded = true;
-			if (isApproveBuildsError(installOutput)) dependencyInstallNeedsApproval = true;
+			if (shouldInstall) {
+				const installOutput = await installDeps(root, missingDependencies, exec, { dev: false });
+				dependencyEntriesAdded.push(...missingDependencies);
+				if (isApproveBuildsError(installOutput)) dependencyInstallNeedsApproval = true;
+			} else {
+				const added = addDependencyEntries(root, missingDependencies, { dev: false });
+				dependencyEntriesAdded.push(...added);
+			}
 		} catch (error) {
 			if (pmName !== "pnpm" || !isApproveBuildsError(error)) throw error;
 			dependencyInstallNeedsApproval = true;
 		}
 		console.log();
 	}
-	if (pmName === "pnpm" && !dependencyInstallNeedsApproval && !options._exec && hasAutomaticallyIgnoredBuilds(inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
-	else if (pmName === "pnpm" && !dependencyInstallNeedsApproval && options._inspectPnpmIgnoredBuilds && hasAutomaticallyIgnoredBuilds(options._inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
+	if (missingDevDependencies.length > 0) {
+		console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Installing devDependencies:"))}`);
+		console.log(formatList(missingDevDependencies, "    "));
+		try {
+			if (shouldInstall) {
+				const installOutput = await installDeps(root, missingDevDependencies, exec);
+				devDependencyEntriesAdded.push(...missingDevDependencies);
+				if (isApproveBuildsError(installOutput)) dependencyInstallNeedsApproval = true;
+			} else {
+				const added = addDependencyEntries(root, missingDevDependencies, { dev: true });
+				devDependencyEntriesAdded.push(...added);
+			}
+		} catch (error) {
+			if (pmName !== "pnpm" || !isApproveBuildsError(error)) throw error;
+			dependencyInstallNeedsApproval = true;
+		}
+		console.log();
+	}
+	if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && !options._exec && hasAutomaticallyIgnoredBuilds(inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
+	else if (pmName === "pnpm" && shouldInstall && !dependencyInstallNeedsApproval && options._inspectPnpmIgnoredBuilds && hasAutomaticallyIgnoredBuilds(options._inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
 	console.log(`  ${terminalStyle.green(terminalStyle.bold("vinext init complete!"))}\n`);
-	if (dependenciesAdded) {
+	if (dependencyEntriesAdded.length > 0) {
+		console.log(`    ${terminalStyle.green("✓")} Added dependencies to dependencies:`);
+		console.log(formatList(dependencyEntriesAdded, "      "));
+	}
+	if (devDependencyEntriesAdded.length > 0) {
 		console.log(`    ${terminalStyle.green("✓")} Added dependencies to devDependencies:`);
-		console.log(formatList(missingDeps, "      "));
+		console.log(formatList(devDependencyEntriesAdded, "      "));
 	}
 	if (dependencyInstallNeedsApproval) console.log(`    ${terminalStyle.yellow("!")} Dependency installation is waiting for build-script approval`);
 	if (addedTypeModule) console.log(`    ${terminalStyle.green("✓")} Added "type": "module" to package.json`);
@@ -340,16 +436,18 @@ async function init(options) {
 	if (updatedGitignore) console.log(`    ${terminalStyle.green("✓")} Added vinext output directories to .gitignore`);
 	const nextSteps = [...platformSetup.nextSteps];
 	if (dependencyInstallNeedsApproval) nextSteps.push("Dependency installation is incomplete because pnpm blocked dependency build scripts:", "1. Review and approve the required build scripts:", "   pnpm approve-builds", "2. Finish installing dependencies:", "   pnpm install");
+	const deployCommandStep = platform === "cloudflare" ? `    ${pmName} run deploy:vinext Deploy to Cloudflare Workers\n` : "";
+	const startCommandDescription = platform === "cloudflare" ? "Start the built Worker locally with Wrangler" : "Start vinext production server";
 	console.log(`
   ${terminalStyle.cyan(terminalStyle.bold("Next steps:"))}
 ${nextSteps.map((step) => `    ${step}`).join("\n")}${nextSteps.length > 0 ? "\n" : ""}
     ${pmName} run dev:vinext    Start the vinext dev server
     ${pmName} run build:vinext  Build production output
-    ${pmName} run start:vinext  Start vinext production server
-    ${pmName} run dev           Start Next.js (still works as before)
+    ${pmName} run start:vinext  ${startCommandDescription}
+${deployCommandStep}    ${pmName} run dev           Start Next.js (still works as before)
 `);
 	return {
-		installedDeps: dependenciesAdded ? missingDeps : [],
+		installedDeps: [...new Set([...dependencyEntriesAdded, ...devDependencyEntriesAdded])],
 		addedTypeModule,
 		renamedConfigs,
 		addedScripts,
@@ -361,4 +459,4 @@ ${nextSteps.map((step) => `    ${step}`).join("\n")}${nextSteps.length > 0 ? "\n
 	};
 }
 //#endregion
-export { addScripts, generateViteConfig, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };
+export { addScripts, generateViteConfig, getInitDependencyGroups, getInitDeps, getReactUpgradeDeps, init, isDepInstalled, updateGitignore };

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

@@ -1,6 +1,5 @@
 import { VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI } from "./app-rsc-render-mode.js";
 import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
 import { installWindowNext, setWindowNextInternalSourcePage } from "../client/window-next.js";
@@ -17,6 +16,9 @@ import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscR
 import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
+import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
@@ -24,9 +26,6 @@ import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js
 import { navigationPlanner } from "./navigation-planner.js";
 import { resolveHybridClientRewriteHref } from "../shims/internal/hybrid-client-route-owner.js";
 import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
-import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
@@ -888,8 +887,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
 					const shouldBypassNavigationCache = earlyIntentDecision?.kind === "flightNavigation" && earlyIntentDecision.bypassNavigationCache;
 					const requestHeaders = createRscRequestHeaders({
 						interceptionContext: requestInterceptionContext,
-						mountedSlotsHeader,
-						renderMode: navigationKind === "refresh" ? APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI : void 0
+						mountedSlotsHeader
 					});
 					const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
 					const rewrittenNavigationHref = navigationKind === "navigate" ? resolveHybridClientRewriteHref(currentHref, __basePath) : null;

package/dist/server/app-browser-navigation-controller.js

@@ -1,8 +1,8 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
+import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";
@@ -449,8 +449,11 @@ function createAppBrowserNavigationController(deps = {}) {
 				return;
 			}
 			if (latestApproval.approvedCommit) {
-				dispatchSynchronousVisibleCommit(latestApproval.approvedCommit);
-				syncHistoryStatePreviousNextUrl(latestApproval.approvedCommit.previousNextUrl, latestApproval.approvedCommit.action.bfcacheIds);
+				const approvedRevalidationCommit = latestApproval.approvedCommit;
+				startTransition(() => {
+					dispatchSynchronousVisibleCommit(approvedRevalidationCommit);
+				});
+				syncHistoryStatePreviousNextUrl(approvedRevalidationCommit.previousNextUrl, approvedRevalidationCommit.action.bfcacheIds);
 			} else notifyDiscardedServerActionRevalidation(lifecycleOptions);
 		} else if (decision.disposition === "no-commit") notifyDiscardedServerActionRevalidation(lifecycleOptions);
 		if (returnValue) {

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

@@ -6,12 +6,12 @@ import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,8 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
-import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
+import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");

package/dist/server/app-layout-param-observation.d.ts

@@ -1,7 +1,7 @@
-import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 import { RenderRequestApiKind } from "./cache-proof.js";
 import { ClientReuseManifestRejectionCode, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 
 //#region src/server/app-layout-param-observation.d.ts
 type AppLayoutParamAccessObservation = Readonly<{

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

@@ -1,8 +1,8 @@
-import { CacheControlMetadata } from "../shims/cache-handler.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { CacheControlMetadata } from "../shims/cache-handler.js";
 import { createAppPageRenderObservation } from "./app-page-render-observation.js";
 import { ReactNode } from "react";
 

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

@@ -1,5 +1,4 @@
 import { ClassificationReason } from "../build/layout-classification-types.js";
-import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
@@ -8,6 +7,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
+import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PprFallbackShellState } from "../shims/ppr-fallback-shell.js";