vinext 1.0.0-beta.8 → 1.0.0

package/dist/cli.js

@@ -1,34 +1,22 @@
 #!/usr/bin/env node
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { detectPackageManager, ensureViteConfigCompatibility, hasAppDir, hasViteConfig } from "./utils/project.js";
+import { detectPackageManager, ensureViteConfigCompatibility, findViteConfigPath } from "./utils/project.js";
 import { formatReport, runCheck } from "./check.js";
 import { parseArgs } from "./cli-args.js";
-import { createDevServerConfigPlugin, normalizeDevServerHostname } from "./cli-dev-config.js";
-import { PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
-import { createRscCompatibilityId, findVinextNextConfigInPlugins, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { loadDotenv } from "./config/dotenv.js";
-import { generateRouteTypes } from "./typegen.js";
-import { clearPagesClientAssetsBuildMetadata } from "./build/pages-client-assets-module.js";
-import { runWithPreviewBuildCredentials } from "./build/preview-credentials.js";
-import { findVinextPrerenderConfigInPlugins, findVinextRouteRootConfigInPlugins, formatVinextPrerenderLabel, resolveVinextPrerenderDecision } from "./config/prerender.js";
-import vinext from "./index.js";
-import { runPrerender } from "./build/run-prerender.js";
-import { emitPrerenderPathManifest } from "./build/prerender-paths.js";
-import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { findViteRoot, getViteCliInvocation, valueOptionName } from "./utils/vite-cli-invocation.js";
 import { init } from "./init.js";
 import { resolveInitOptions } from "./init-platform.js";
-import { resolveVinextPackageRoot } from "./utils/vinext-root.js";
-import { emitStandaloneOutput } from "./build/standalone.js";
-import { cleanBuildOutput } from "./build/clean-output.js";
-import { formatAlreadyRunningError, tryAcquireLockfile } from "./server/dev-lockfile.js";
+import { loadDotenv } from "./config/dotenv.js";
+import { PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
+import { loadNextConfig, resolveNextConfig } from "./config/next-config.js";
+import { generateRouteTypes } from "./typegen.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { randomBytes } from "node:crypto";
 import { execFileSync } from "node:child_process";
 //#region src/cli.ts
 /**
-* vinext CLI — drop-in replacement for the `next` command
+* vinext CLI — migration and compatibility commands for vinext projects
 *
 *   vinext dev     Start development server (Vite)
 *   vinext build   Build for production
@@ -36,379 +24,103 @@ import { execFileSync } from "node:child_process";
 *   vinext typegen Generate App Router route helper types
 *   vinext lint    Run linter (delegates to eslint/oxlint)
 *
-* Automatically configures Vite with the vinext plugin — no vite.config.ts
-* needed for most Next.js apps.
-*/
-let _viteModule = null;
-/**
-* Dynamically load Vite from the project root. Falls back to the bundled
-* copy if the project doesn't have its own Vite installation.
-*/
-async function loadVite() {
-	if (_viteModule) return _viteModule;
-	const projectRoot = process.cwd();
-	let vitePath;
-	try {
-		vitePath = createRequire(path.join(projectRoot, "package.json")).resolve("vite");
-	} catch {
-		vitePath = "vite";
-	}
-	const vite = await (vitePath === "vite" ? import(vitePath) : import(pathToFileURL(vitePath).href));
-	_viteModule = vite;
-	return vite;
-}
-/**
-* Get the Vite version string. Returns "unknown" before loadVite() is called.
+* The dev and build commands delegate to the project-local Vite CLI.
 */
-function getViteVersion() {
-	return _viteModule?.version ?? "unknown";
-}
 const VERSION = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8")).version;
 const command = process.argv[2];
 const rawArgs = process.argv.slice(3);
-/**
-* Create a custom Vite logger for build output.
-*
-* By default Vite/Rollup emit a lot of build noise: version banners, progress
-* lines, chunk size tables, minChunkSize diagnostics, and various internal
-* warnings that are either not actionable or already handled by vinext at
-* runtime. This logger suppresses all of that while keeping the things that
-* actually matter:
-*
-*   KEPT
-*   ✓ N modules transformed.     — confirms the transform phase completed
-*   ✓ built in Xs                — build timing (useful perf signal)
-*   Genuine warnings/errors      — anything the user may need to act on
-*
-*   SUPPRESSED (info)
-*   vite vX.Y.Z building...      — Vite version banner
-*   transforming... / rendering chunks... / computing gzip size...
-*   Initially, there are N chunks...  — Rollup minChunkSize diagnostics
-*   After merging chunks, there are...
-*   X are below minChunkSize.
-*   Blank lines
-*   Chunk/asset size table rows  — e.g. "  dist/client/assets/foo.js  42 kB"
-*   [rsc] / [ssr] / [client] / [worker] — RSC plugin env section headers
-*
-*   SUPPRESSED (warn)
-*   "dynamic import will not move module into another chunk"  — internal chunking note
-*   "X is not exported by virtual:vinext-*"  — handled gracefully at runtime
-*/
-function createBuildLogger(vite) {
-	const logger = vite.createLogger("info", { allowClearScreen: false });
-	const originalInfo = logger.info.bind(logger);
-	const originalWarn = logger.warn.bind(logger);
-	const strip = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
-	logger.info = (msg, options) => {
-		const plain = strip(msg);
-		if (plain.trimStart().startsWith("✓")) {
-			originalInfo(msg, options);
-			return;
-		}
-		if (/^vite v\d/.test(plain.trim())) return;
-		if (/^(transforming|rendering chunks|computing gzip size)/.test(plain.trim())) return;
-		if (/^(Initially,|After merging|are below minChunkSize)/.test(plain.trim())) return;
-		if (/^\s*$/.test(plain)) return;
-		if (/^\s*(dist\/|\.\/)/.test(plain)) return;
-		// @vitejs/plugin-rsc environment section headers ("[rsc]", "[ssr]", "[client]", "[worker]").
-		if (/^\s*\[(rsc|ssr|client|worker)\]/.test(plain)) return;
-		originalInfo(msg, options);
-	};
-	logger.warn = (msg, options) => {
-		const plain = strip(msg);
-		if (plain.includes("dynamic import will not move module into another chunk")) return;
-		if (plain.includes("is not exported by") && plain.includes("virtual:vinext")) return;
-		originalWarn(msg, options);
-	};
-	return logger;
-}
-function hasPagesDir() {
-	return fs.existsSync(path.join(process.cwd(), "pages")) || fs.existsSync(path.join(process.cwd(), "src", "pages"));
-}
-async function loadBuildViteConfigMetadata(vite, root, mode) {
-	if (!hasViteConfig(root)) return {
-		nextConfig: null,
-		prerenderConfig: null,
-		routeRootConfig: null
-	};
-	const loaded = await vite.loadConfigFromFile({
-		command: "build",
-		mode
-	}, void 0, root);
-	const emptyOutDir = loaded?.config.build?.emptyOutDir;
-	return {
-		emptyOutDir: typeof emptyOutDir === "boolean" ? emptyOutDir : void 0,
-		nextConfig: await findVinextNextConfigInPlugins(loaded?.config.plugins),
-		prerenderConfig: await findVinextPrerenderConfigInPlugins(loaded?.config.plugins),
-		routeRootConfig: await findVinextRouteRootConfigInPlugins(loaded?.config.plugins)
-	};
+const retiredVinextFlags = {
+	"-p": "This was a dev-server option; use --port with Vite dev instead.",
+	"-H": "This was a dev-server option; use --host with Vite dev instead.",
+	"--hostname": "This was a dev-server option; use --host with Vite dev instead.",
+	"--turbopack": "This was a no-op: vinext always uses Vite.",
+	"--experimental-https": "This was a no-op. Configure server.https in vite.config.ts for HTTPS.",
+	"--verbose": "Vite controls its own output; use --debug for more detail.",
+	"--prerender-all": "Configure vinext({ prerender: { routes: \"*\" } }) in vite.config.ts.",
+	"--prerender-concurrency": "Configure vinext({ prerender: { routes: \"*\", concurrency: 4 } }) in vite.config.ts.",
+	"--precompress": "Configure vinext({ precompress: true }) in vite.config.ts."
+};
+function rejectRetiredVinextFlags() {
+	for (const arg of rawArgs) {
+		if (arg === "--") break;
+		const flag = arg.split("=", 1)[0];
+		const reason = retiredVinextFlags[flag];
+		if (reason) throw new Error(`[vinext] ${flag} is no longer supported. ${reason}`);
+	}
 }
-/**
-* Build the Vite config automatically. If a vite.config.ts exists in the
-* project, Vite will merge our config with it (theirs takes precedence).
-* If there's no vite.config, this provides everything needed.
-*/
-function buildViteConfig(overrides = {}, logger, mode) {
-	if (hasViteConfig(process.cwd())) return {
-		root: process.cwd(),
-		...mode ? { mode } : {},
-		...logger ? { customLogger: logger } : {},
-		...overrides
-	};
-	return {
-		root: process.cwd(),
-		...mode ? { mode } : {},
-		configFile: false,
-		plugins: [vinext()],
-		resolve: { dedupe: [
-			"react",
-			"react-dom",
-			"react/jsx-runtime",
-			"react/jsx-dev-runtime"
-		] },
-		...logger ? { customLogger: logger } : {},
-		...overrides
+function configPreflight(command) {
+	const cwd = process.cwd();
+	const { root: positionalRoot, shouldPreflight } = findViteRoot(command, rawArgs);
+	const root = positionalRoot ? path.resolve(cwd, positionalRoot) : cwd;
+	if (!shouldPreflight) return { root };
+	let explicitConfig;
+	let explicitConfigCount = 0;
+	for (let index = 0; index < rawArgs.length; index += 1) {
+		const arg = rawArgs[index];
+		if (arg === "--") break;
+		if (valueOptionName(arg) !== "--config" && valueOptionName(arg) !== "-c") continue;
+		if (++explicitConfigCount > 1) return { root };
+		explicitConfig = arg.includes("=") ? arg.slice(arg.indexOf("=") + 1) : rawArgs[++index];
+		if (!explicitConfig || explicitConfig.startsWith("-")) return { root };
+	}
+	const configPath = explicitConfig ? path.resolve(cwd, explicitConfig) : findViteConfigPath(root);
+	if (configPath && fs.existsSync(configPath)) return {
+		root,
+		configPath
 	};
+	throw new Error(`[vinext] No Vite config was found for this project. Run \`vinext init\` to create one, then retry \`vinext ${command}\`.`);
 }
-/**
-* Ensure the project's package.json has `"type": "module"` before Vite loads
-* the vite.config.ts. This prevents the esbuild CJS-bundling path that Vite
-* takes for projects without `"type": "module"`, which produces a `.mjs` temp
-* file containing `require()` calls — calls that fail on Node 22 when
-* targeting pure-ESM packages like `@cloudflare/vite-plugin`.
-*
-* This mirrors what `vinext init` does, but is applied lazily at dev/build
-* time for projects that were set up before `vinext init` added the step, or
-* that were migrated manually.
-*/
-function applyViteConfigCompatibility(root) {
-	const result = ensureViteConfigCompatibility(root);
-	if (!result) return;
-	for (const [oldName, newName] of result.renamed) console.warn(`  [vinext] Renamed ${oldName} → ${newName} (required for "type": "module")`);
-	if (result.addedTypeModule) console.warn("  [vinext] Added \"type\": \"module\" to package.json (required for Vite ESM config loading).\n  Run `vinext init` to review all project configuration.");
-}
-async function dev() {
-	const parsed = parseArgs(rawArgs);
-	if (parsed.help) return printHelp("dev");
-	loadDotenv({
-		root: process.cwd(),
-		mode: "development"
-	});
-	applyViteConfigCompatibility(process.cwd());
-	const vite = await loadVite();
-	const initialPort = parsed.port ?? 3e3;
-	const initialHost = parsed.hostname ?? "localhost";
-	let lockfile;
-	const startedAt = Date.now();
-	if (process.env.VINEXT_NO_DEV_LOCK !== "1") {
-		const root = process.cwd();
-		const initialDisplayHost = initialHost === "0.0.0.0" ? "localhost" : initialHost;
-		const acquired = tryAcquireLockfile({
-			root,
-			info: {
-				pid: process.pid,
-				port: initialPort,
-				hostname: initialHost,
-				appUrl: `http://${initialDisplayHost}:${initialPort}`,
-				startedAt,
-				cwd: root
-			}
-		});
-		if (!acquired.ok) {
-			console.error("\n  " + formatAlreadyRunningError({
-				existing: acquired.existing,
-				cwd: root,
-				lockfilePath: acquired.lockfilePath
-			}).replace(/\n/g, "\n  ") + "\n");
-			process.exit(1);
-		}
-		lockfile = acquired.lockfile;
-	}
-	console.log(`\n  vinext dev  (Vite ${getViteVersion()})\n`);
-	const config = buildViteConfig();
-	(config.plugins ??= []).push(createDevServerConfigPlugin(parsed));
-	let server;
-	try {
-		server = await vite.createServer(config);
-		const port = server.config.server.port ?? 3e3;
-		const host = normalizeDevServerHostname(server.config.server.host);
-		lockfile?.update({
-			pid: process.pid,
-			port,
-			hostname: host,
-			appUrl: `http://${host === "0.0.0.0" ? "localhost" : host}:${port}`,
-			startedAt,
-			cwd: process.cwd()
-		});
-		await server.listen();
-	} catch (err) {
-		lockfile?.release();
-		throw err;
-	}
-	server.printUrls();
-	if (lockfile) {
-		const configuredPort = server.config.server.port ?? 3e3;
-		const configuredHost = normalizeDevServerHostname(server.config.server.host);
-		const resolved = server.resolvedUrls?.local[0];
-		let actualPort = configuredPort;
-		let appUrl;
-		if (resolved) {
-			appUrl = resolved.replace(/\/$/, "");
-			try {
-				const parsed = new URL(appUrl);
-				actualPort = parsed.port ? Number.parseInt(parsed.port, 10) : actualPort;
-			} catch {}
-		} else {
-			const address = server.httpServer?.address();
-			actualPort = typeof address === "object" && address ? address.port : configuredPort;
-			appUrl = `http://${configuredHost === "0.0.0.0" ? "localhost" : configuredHost}:${actualPort}`;
+function resolveProjectViteCli(root) {
+	const cwd = process.cwd();
+	const candidates = /* @__PURE__ */ new Set([root, cwd]);
+	for (const candidate of candidates) {
+		const require = createRequire(path.join(candidate, "package.json"));
+		let packagePath;
+		try {
+			packagePath = require.resolve("vite/package.json");
+		} catch {
+			continue;
 		}
-		lockfile.update({
-			pid: process.pid,
-			port: actualPort,
-			hostname: configuredHost,
-			appUrl,
-			startedAt,
-			cwd: process.cwd()
-		});
+		const packageRoot = path.dirname(packagePath);
+		const packageJson = JSON.parse(fs.readFileSync(packagePath, "utf-8"));
+		const bin = typeof packageJson.bin === "string" ? packageJson.bin : packageJson.bin?.vite;
+		const cliPath = bin ? path.resolve(packageRoot, bin) : path.join(path.dirname(require.resolve("vite")), "cli.js");
+		if (fs.existsSync(cliPath)) return cliPath;
 	}
+	throw new Error("[vinext] Could not resolve the project-local Vite CLI. Run `vinext init` to install it.");
 }
-async function buildApp() {
-	const parsed = parseArgs(rawArgs);
-	if (parsed.help) return printHelp("build");
-	const buildMode = parsed.mode ?? "production";
-	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", "production");
-	if (parsed.precompress) process.env.VINEXT_PRECOMPRESS = "1";
-	loadDotenv({
-		root: process.cwd(),
-		mode: buildMode
-	});
-	applyViteConfigCompatibility(process.cwd());
-	const vite = await loadVite();
-	const withBuildBundlerOptions = (bundlerOptions) => ({ rolldownOptions: bundlerOptions });
-	console.log(`\n  vinext build  (Vite ${getViteVersion()})\n`);
-	const root = toSlash(process.cwd());
-	const isApp = hasAppDir(root);
-	const buildConfigMetadata = await loadBuildViteConfigMetadata(vite, root, buildMode);
-	const resolvedNextConfig = await resolveNextConfig(buildConfigMetadata.nextConfig ? await resolveNextConfigInput(buildConfigMetadata.nextConfig, PHASE_PRODUCTION_BUILD) : await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root);
-	process.env.__VINEXT_SHARED_BUILD_ID = resolvedNextConfig.buildId;
-	process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID = createRscCompatibilityId(resolvedNextConfig);
-	if (!process.env.__VINEXT_SHARED_REVALIDATE_SECRET) process.env.__VINEXT_SHARED_REVALIDATE_SECRET = randomBytes(32).toString("hex");
-	const outputMode = resolvedNextConfig.output;
-	const distDir = path.resolve(root, "dist");
-	if (outputMode === "standalone") {
-		const vinextDistDir = path.join(resolveVinextPackageRoot(), "dist");
-		if (!fs.existsSync(vinextDistDir)) {
-			console.error(`  Error: vinext dist/ not found at ${vinextDistDir}. Run \`pnpm run build\` in the vinext package first.`);
-			process.exit(1);
-		}
-	}
-	const logger = parsed.verbose ? vite.createLogger("info", { allowClearScreen: false }) : createBuildLogger(vite);
-	if (isApp) {
-		const reactUpgrade = getReactUpgradeDeps(process.cwd());
-		if (reactUpgrade.length > 0) {
-			const [pm, ...pmArgs] = detectPackageManager(process.cwd()).replace(/ -D$/, "").split(" ");
-			console.log("  Upgrading React for RSC compatibility...");
-			execFileSync(pm, [...pmArgs, ...reactUpgrade], {
-				cwd: process.cwd(),
-				stdio: "inherit",
-				shell: process.platform === "win32"
+async function proxyVite(command) {
+	console.warn(`[vinext] Tip: migrate from \`vinext ${command}\` to \`vite ${command}\`.`);
+	rejectRetiredVinextFlags();
+	const { root, configPath } = configPreflight(command);
+	const cliPath = resolveProjectViteCli(root);
+	process.argv = [
+		process.execPath,
+		cliPath,
+		command,
+		...rawArgs
+	];
+	if (configPath) {
+		const invocation = getViteCliInvocation();
+		if (invocation) {
+			if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", command === "build" ? "production" : invocation.mode === "test" ? "test" : "development");
+			loadDotenv({
+				root,
+				mode: invocation.mode
 			});
 		}
-	}
-	cleanBuildOutput({
-		root,
-		outDir: distDir,
-		emptyOutDir: buildConfigMetadata.emptyOutDir
-	});
-	const isHybrid = isApp && hasPagesDir();
-	const pagesClientAssetsBuildSession = isHybrid ? randomBytes(16).toString("hex") : null;
-	if (pagesClientAssetsBuildSession) process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION = pagesClientAssetsBuildSession;
-	await runWithPreviewBuildCredentials(async () => {
-		try {
-			const config = buildViteConfig({}, logger, buildMode);
-			await (await vite.createBuilder(config)).buildApp();
-			if (isHybrid) {
-				console.log("  Building Pages Router server (hybrid)...");
-				const root = process.cwd();
-				let userTransformPlugins = [];
-				if (hasViteConfig(process.cwd())) {
-					const loaded = await vite.loadConfigFromFile({
-						command: "build",
-						mode: buildMode,
-						isSsrBuild: true
-					}, void 0, root);
-					if (loaded?.config.plugins) userTransformPlugins = loaded.config.plugins.flat(Infinity).filter((p) => !!p && typeof p.name === "string" && !p.name.startsWith("vinext:") && !p.name.startsWith("vite:react") && !p.name.startsWith("rsc:") && p.name !== "vite-rsc-load-module-dev-proxy" && !p.name.startsWith("vite-plugin-cloudflare"));
-				}
-				await vite.build({
-					root,
-					mode: buildMode,
-					configFile: false,
-					plugins: [...userTransformPlugins, vinext({ disableAppRouter: true })],
-					resolve: { dedupe: [
-						"react",
-						"react-dom",
-						"react/jsx-runtime",
-						"react/jsx-dev-runtime"
-					] },
-					...logger ? { customLogger: logger } : {},
-					build: {
-						outDir: "dist/server",
-						emptyOutDir: false,
-						ssr: "virtual:vinext-server-entry",
-						...withBuildBundlerOptions({ output: { entryFileNames: "entry.js" } })
-					}
-				});
-			}
-		} finally {
-			if (pagesClientAssetsBuildSession) {
-				clearPagesClientAssetsBuildMetadata(pagesClientAssetsBuildSession);
-				if (process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION === pagesClientAssetsBuildSession) delete process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
+		if (configPath === findViteConfigPath(root)) {
+			const migrated = ensureViteConfigCompatibility(root);
+			if (migrated) {
+				for (const [oldName, newName] of migrated.renamed) console.warn(`  [vinext] Renamed ${oldName} → ${newName} (required for "type": "module")`);
+				console.warn("  [vinext] Added \"type\": \"module\" to package.json (required for Vite ESM config loading).\n  Run `vinext init` to review all project configuration.");
 			}
 		}
-	});
-	if (outputMode === "standalone") {
-		const standalone = emitStandaloneOutput({
-			root: process.cwd(),
-			outDir: distDir
-		});
-		console.log(`  Generated standalone output in ${path.relative(process.cwd(), standalone.standaloneDir)}/`);
-		console.log("  Start it with: node dist/standalone/server.js\n");
-		return process.exit(0);
-	}
-	let prerenderResult;
-	const prerenderDecision = resolveVinextPrerenderDecision({
-		prerenderAllFlag: parsed.prerenderAll,
-		vinextPrerenderConfig: buildConfigMetadata.prerenderConfig,
-		nextOutput: resolvedNextConfig.output
-	});
-	if (prerenderDecision) {
-		if (resolvedNextConfig.enablePrerenderSourceMaps) {
-			process.setSourceMapsEnabled(true);
-			Error.stackTraceLimit = Math.max(Error.stackTraceLimit, 50);
-		}
-		process.stdout.write("\x1B[0m");
-		console.log(`  ${formatVinextPrerenderLabel(prerenderDecision)}`);
-		prerenderResult = await runPrerender({
-			root,
-			concurrency: parsed.prerenderConcurrency,
-			nextConfig: resolvedNextConfig
-		});
-		await emitPrerenderPathManifest({
-			root,
-			nextConfig: resolvedNextConfig,
-			routeRootConfig: buildConfigMetadata.routeRootConfig
-		});
 	}
-	process.stdout.write("\x1B[0m");
-	const { printBuildReport } = await import("./build/report.js");
-	await printBuildReport({
-		root,
-		pageExtensions: resolvedNextConfig.pageExtensions,
-		prerenderResult: prerenderResult ?? void 0
-	});
-	console.log("\n  Build complete. Run `vinext start` to start the production server.\n");
-	process.exit(0);
+	await import(
+		/* @vite-ignore */
+		pathToFileURL(cliPath).href
+);
 }
 async function start() {
 	const parsed = parseArgs(rawArgs);
@@ -487,9 +199,10 @@ async function typegen() {
 		root,
 		mode: "production"
 	});
+	const resolvedNextConfig = await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root);
 	const result = await generateRouteTypes({
 		root,
-		pageExtensions: (await resolveNextConfig(await loadNextConfig(root, PHASE_PRODUCTION_BUILD), root)).pageExtensions
+		pageExtensions: resolvedNextConfig.pageExtensions
 	});
 	const nextEnvMessage = result.nextEnvStatus === "unchanged" ? `${path.relative(root, result.nextEnvPath)} is up to date` : `${result.nextEnvStatus === "created" ? "Created" : "Updated"} ${path.relative(root, result.nextEnvPath)}`;
 	console.log(`\n  Generated route types at ${path.relative(root, result.routeTypesPath)}\n  ${nextEnvMessage}\n`);
@@ -498,55 +211,21 @@ async function initCommand() {
 	const parsed = parseArgs(rawArgs);
 	if (parsed.help) return printHelp("init");
 	console.log(`\n  vinext init\n`);
-	const port = parsed.port ?? 3001;
 	const skipCheck = rawArgs.includes("--skip-check");
 	const force = rawArgs.includes("--force");
+	const install = !rawArgs.includes("--no-install");
 	const initOptions = await resolveInitOptions(rawArgs);
 	await init({
 		root: process.cwd(),
-		port,
+		port: parsed.port,
 		skipCheck,
+		skipCssModules: rawArgs.includes("--skip-css-modules"),
 		force,
+		install,
 		...initOptions
 	});
 }
 function printHelp(cmd) {
-	if (cmd === "dev") {
-		console.log(`
-  vinext dev - Start development server
-
-  Usage: vinext dev [options]
-
-  Options:
-    -p, --port <port>        Port to listen on (default: 3000)
-    -H, --hostname <host>    Hostname to bind to (default: localhost)
-    --turbopack              Accepted for compatibility (no-op, Vite is always used)
-    -h, --help               Show this help
-`);
-		return;
-	}
-	if (cmd === "build") {
-		console.log(`
-  vinext build - Build for production
-
-  Usage: vinext build [options]
-
-  Automatically detects App Router (app/) or Pages Router (pages/) and
-  runs the appropriate multi-environment build via Vite.
-  If next.config sets output: "standalone", also emits dist/standalone/server.js.
-
-  Options:
-    --verbose            Show full Vite/Rollup build output (suppressed by default)
-    --prerender-all      Pre-render discovered routes after building. Equivalent
-                         to vinext({ prerender: true }) and takes priority.
-    --prerender-concurrency <count>
-                         Maximum number of routes to pre-render in parallel
-    --mode <mode>        Load .env.<mode>* files and pass mode to Vite
-    --precompress        Precompress static assets at build time (.br, .gz, .zst)
-    -h, --help           Show this help
-`);
-		return;
-	}
 	if (cmd === "start") {
 		console.log(`
   vinext start - Start production server
@@ -591,18 +270,23 @@ function printHelp(cmd) {
   setup continues to work alongside vinext.
 
   Options:
-    -p, --port <port>    Dev server port for the vinext script (default: 3001)
+    -p, --port <port>    Dev server port for the generated Vite script (default: 3001)
     --skip-check         Skip the compatibility check step
+    --no-install         Update dependency entries without installing them
     --force              Overwrite existing vite.config.ts
     --platform <target>  Deployment target: cloudflare or node
-    --prerender          Configure vinext build to pre-render all static routes
-                         (default: prompt, with No selected by default)
-    --experimental-warm-cdn-cache
-                         Add experimental CDN pre-warming to the Cloudflare deploy script
-                         (Workers Cache CDN only, default: prompt with No)
-    --cdn-cache <type>   Cloudflare CDN cache: workers-cache or data-cache
-                         (default: workers-cache)
-    --data-cache <type>  Cloudflare data cache: kv or none (default: kv)
+    --prerender          Configure Vite builds to pre-render static routes
+                         (Cloudflare deploy won't serve them unless using Static Assets)
+    --warm-cache         Add cache warming to the Cloudflare deploy script
+                         (Response Store or Workers Cache, default: prompt with No)
+    --legacy-wrangler-cloudflare-init
+                         Use the legacy Wrangler setup instead of cf
+    --cdn-cache <type>   Cloudflare CDN cache: none, response-store, workers-cache,
+                         static-assets, or data-cache
+                         (default: none; response-store is the default cache choice)
+    --response-store-mode <type>
+                         Workers Response Store mode: service-binding or self-contained
+    --data-cache <type>  Cloudflare data cache: kv or none
     --image-optimization <type>
                          Cloudflare image optimization: cloudflare-images or none
     -h, --help           Show this help
@@ -610,15 +294,20 @@ function printHelp(cmd) {
   Examples:
     vinext init                   Prompt for a deployment platform
     vinext init --platform=cloudflare  Configure Cloudflare Workers (default)
+    vinext init --platform=cloudflare --cdn-cache=response-store
+                                Configure Workers Response Store (recommended)
     vinext init --platform=cloudflare --cdn-cache=data-cache
                                 Fall through CDN caching to the data cache
+    vinext init --platform=cloudflare --cdn-cache=static-assets
+                                Package prerendered routes as read-only Static Assets
     vinext init --platform=cloudflare --data-cache=kv
                                 Configure the default Cloudflare cache handlers
     vinext init --platform=cloudflare --image-optimization=none
                                 Do not configure Cloudflare Images
-    vinext init --prerender     Add prerender: { routes: "*" } to vite.config.ts
-    vinext init --experimental-warm-cdn-cache
-                                Add experimental CDN pre-warming to deploy:vinext
+    vinext init --platform=node --prerender
+                                Add prerender: { routes: "*" } to vite.config.ts
+    vinext init --warm-cache
+                                Add cache warming to deploy:vinext
     vinext init --platform=node   Configure a Node deployment
     vinext init -p 4000           Use port 4000 for dev:vinext
     vinext init --force           Overwrite existing vite.config.ts
@@ -675,7 +364,7 @@ function printHelp(cmd) {
 
   Examples:
     vinext dev                         Start dev server on port 3000
-    vinext dev -p 4000                 Start dev server on port 4000
+    vinext dev --port 4000             Start dev server on port 4000
     vinext build                       Build for production
     vinext typegen                     Generate route helper types
     vinext start                       Start production server
@@ -685,8 +374,8 @@ function printHelp(cmd) {
     npx @vinext/cloudflare deploy      Deploy to Cloudflare Workers
     vp exec vinext-cloudflare deploy   Deploy to Cloudflare Workers with Vite+
 
-  vinext is a drop-in replacement for the \`next\` CLI.
-  No vite.config.ts needed — just run \`vinext dev\` in your Next.js project.
+  The dev and build commands are thin proxies to the project-local Vite CLI.
+  Run \`vinext init\` first if the project does not have a Vite config.
 `);
 }
 if (command === "--version" || command === "-v") {
@@ -699,14 +388,14 @@ if (command === "--help" || command === "-h" || !command) {
 }
 switch (command) {
 	case "dev":
-		dev().catch((e) => {
-			console.error(e);
+		proxyVite("dev").catch((error) => {
+			console.error(error instanceof Error ? error.message : error);
 			process.exit(1);
 		});
 		break;
 	case "build":
-		buildApp().catch((e) => {
-			console.error(e);
+		proxyVite("build").catch((error) => {
+			console.error(error instanceof Error ? error.message : error);
 			process.exit(1);
 		});
 		break;