vinext 0.1.8 → 0.2.1

package/dist/init.js

@@ -1,10 +1,10 @@
-import { detectPackageManager, detectPackageManagerName, ensureESModule, hasAppDir, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
+import { detectPackageManager, detectPackageManagerName, detectProject, ensureESModule, findViteConfigPath, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
 import { formatReport, runCheck } from "./check.js";
-import { normalizePathSeparators } from "./utils/path.js";
-import { createRequire } from "node:module";
+import { setupCloudflarePlatform, usesCommonJsViteConfig, validateCloudflarePlatformSetup } from "./init-cloudflare.js";
+import { getReactUpgradeDeps } from "./utils/react-version.js";
 import fs from "node:fs";
 import path from "node:path";
-import { execFileSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 //#region src/init.ts
 /**
 * vinext init — one-command project migration for Next.js apps.
@@ -12,23 +12,58 @@ import { execFileSync } from "node:child_process";
 * Automates the steps needed to run a Next.js app under vinext:
 *
 *   1. Run `vinext check` to show compatibility report
-*   2. Install dependencies (vite, @vitejs/plugin-react, and App Router deps)
-*   3. Add "type": "module" to package.json
-*   4. Rename CJS config files to .cjs
-*   5. Add vinext scripts to package.json
-*   6. Generate vite.config.ts
-*   7. Update .gitignore to include /dist/ and .vinext/
+*   2. Add "type": "module" to package.json
+*   3. Rename CJS config files to .cjs
+*   4. Add vinext scripts to package.json
+*   5. Generate vite.config.ts and platform files
+*   6. Update .gitignore to include /dist/ and .vinext/
+*   7. Install dependencies (vite, @vitejs/plugin-react, and App Router deps)
 *   8. Print summary
 *
 * Non-destructive: does NOT modify next.config, tsconfig, or source files.
 * The project should work with both Next.js and vinext simultaneously.
 */
-function generateViteConfig(_isAppRouter) {
+const terminalStyle = {
+	bold: (value) => process.stdout.isTTY ? `\x1b[1m${value}\x1b[0m` : value,
+	cyan: (value) => process.stdout.isTTY ? `\x1b[36m${value}\x1b[0m` : value,
+	green: (value) => process.stdout.isTTY ? `\x1b[32m${value}\x1b[0m` : value,
+	yellow: (value) => process.stdout.isTTY ? `\x1b[33m${value}\x1b[0m` : value
+};
+function formatList(items, indent) {
+	return items.map((item) => `${indent}- ${item}`).join("\n");
+}
+function isApproveBuildsError(error) {
+	const details = [
+		error instanceof Error ? error.message : String(error),
+		typeof error === "object" && error && "output" in error ? String(error.output) : "",
+		typeof error === "object" && error && "stdout" in error ? String(error.stdout) : "",
+		typeof error === "object" && error && "stderr" in error ? String(error.stderr) : ""
+	].join("\n");
+	return /approve-builds|ERR_PNPM_.*BUILD/i.test(details) || /pnpm/i.test(details) && /(ignored build scripts|blocked build scripts)/i.test(details);
+}
+function hasAutomaticallyIgnoredBuilds(output) {
+	const automaticallyIgnored = output.match(/Automatically ignored builds during installation:\s*\n([\s\S]*?)(?:\n\s*\n|$)/i)?.[1];
+	if (!automaticallyIgnored) return false;
+	return automaticallyIgnored.split("\n").map((line) => line.trim()).some((line) => line.length > 0 && !/^none\.?$/i.test(line) && !/^cannot identify\b/i.test(line));
+}
+function inspectPnpmIgnoredBuilds(root) {
+	const result = spawnSync("pnpm", ["ignored-builds"], {
+		cwd: root,
+		encoding: "utf-8",
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	return `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
+}
+function generateViteConfig(_isAppRouter, prerender = false) {
 	return `import vinext from "vinext";
 import { defineConfig } from "vite";
 
 export default defineConfig({
-  plugins: [vinext()],
+  plugins: [${prerender ? `vinext({ prerender: { routes: "*" } })` : "vinext()"}],
 });
 `;
 }
@@ -62,7 +97,7 @@ function addScripts(root, port) {
 		return [];
 	}
 }
-function getInitDeps(isAppRouter) {
+function getInitDeps(isAppRouter, platform) {
 	const deps = [
 		"vinext",
 		"vite",
@@ -72,6 +107,7 @@ function getInitDeps(isAppRouter) {
 		deps.push("@vitejs/plugin-rsc");
 		deps.push("react-server-dom-webpack");
 	}
+	if (platform === "cloudflare") deps.push("@cloudflare/vite-plugin", "@vinext/cloudflare", "wrangler");
 	return deps;
 }
 function isDepInstalled(root, dep) {
@@ -102,68 +138,50 @@ function isDepInstalled(root, dep) {
 *
 * Returns ["react@latest", "react-dom@latest"] if upgrade is needed, [] otherwise.
 */
-function getReactUpgradeDeps(root) {
-	try {
-		const version = findPackageVersion(createRequire(path.join(root, "package.json")).resolve("react"), "react");
-		if (!version) return [];
-		const parts = version.split(".");
-		const major = parseInt(parts[0], 10);
-		const minor = parseInt(parts[1], 10);
-		const patch = parseInt(parts[2], 10);
-		if (major < 19 || major === 19 && minor < 2 || major === 19 && minor === 2 && patch < 6) return ["react@latest", "react-dom@latest"];
-		return [];
-	} catch {
-		return [];
-	}
-}
-/**
-* Walk up from a resolved module entry to find its package.json and return
-* the version field. Uses the same approach as PR #18's findReactServerPackages.
-*/
-function findPackageVersion(resolvedEntry, packageName) {
-	let dir = path.dirname(resolvedEntry);
-	while (dir !== path.dirname(dir)) {
-		const candidate = path.join(dir, "package.json");
-		try {
-			const pkg = JSON.parse(fs.readFileSync(candidate, "utf-8"));
-			if (pkg.name === packageName) return pkg.version ?? null;
-		} catch {}
-		dir = path.dirname(dir);
-	}
-	return null;
-}
-function installDeps(root, deps, exec, { dev = true } = {}) {
-	if (deps.length === 0) return;
+async function installDeps(root, deps, exec, { dev = true } = {}) {
+	if (deps.length === 0) return "";
 	const baseCmd = detectPackageManager(root);
-	exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.join(" ")}`, {
+	return await exec(`${dev ? baseCmd : baseCmd.replace(/ -D$/, "")} ${deps.join(" ")}`, {
 		cwd: root,
 		stdio: "inherit"
-	});
+	}) ?? "";
 }
 /**
 * Ensure vinext-generated output directories are listed in .gitignore.
 * Creates the file if it doesn't exist. Returns true if the file was modified
 * (or created), false if all entries were already present.
 */
-function updateGitignore(root) {
+function updateGitignore(root, platform = "node") {
 	const gitignorePath = path.join(root, ".gitignore");
-	const entries = [{
-		entry: "/dist/",
-		coveredBy: new Set([
-			"/dist/",
-			"/dist",
-			"dist/",
-			"dist"
-		])
-	}, {
-		entry: ".vinext/",
-		coveredBy: new Set([
-			"/.vinext/",
-			"/.vinext",
-			".vinext/",
-			".vinext"
-		])
-	}];
+	const entries = [
+		{
+			entry: "/dist/",
+			coveredBy: new Set([
+				"/dist/",
+				"/dist",
+				"dist/",
+				"dist"
+			])
+		},
+		{
+			entry: ".vinext/",
+			coveredBy: new Set([
+				"/.vinext/",
+				"/.vinext",
+				".vinext/",
+				".vinext"
+			])
+		},
+		...platform === "cloudflare" ? [{
+			entry: ".wrangler/",
+			coveredBy: new Set([
+				"/.wrangler/",
+				"/.wrangler",
+				".wrangler/",
+				".wrangler"
+			])
+		}] : []
+	];
 	let content = "";
 	let lines = [];
 	if (fs.existsSync(gitignorePath)) {
@@ -176,78 +194,170 @@ function updateGitignore(root) {
 	fs.writeFileSync(gitignorePath, content + separator + missingEntries.join("\n") + "\n", "utf-8");
 	return true;
 }
+function setupNodePlatform(context) {
+	if (context.viteConfigExists && !context.force) return {
+		generatedViteConfig: false,
+		skippedViteConfig: true,
+		generatedPlatformFiles: [],
+		nextSteps: []
+	};
+	fs.writeFileSync(context.existingViteConfigPath ?? path.join(context.root, "vite.config.ts"), generateViteConfig(context.isAppRouter, context.prerender), "utf-8");
+	return {
+		generatedViteConfig: true,
+		skippedViteConfig: false,
+		generatedPlatformFiles: [],
+		nextSteps: []
+	};
+}
 async function init(options) {
-	const root = normalizePathSeparators(path.resolve(options.root));
+	const root = path.resolve(options.root);
 	const port = options.port ?? 3001;
-	const exec = options._exec ?? ((cmd, opts) => {
-		const [program, ...args] = cmd.split(" ");
-		execFileSync(program, args, {
-			...opts,
-			shell: true
+	if (!options.platform) throw new Error("A deployment platform must be selected before running vinext init.");
+	const platform = options.platform;
+	if (platform === "cloudflare" && !options.cloudflare) throw new Error("Cloudflare init options must be resolved before running vinext init.");
+	const exec = options._exec ?? ((cmd, opts) => new Promise((resolve, reject) => {
+		const child = spawn(cmd, {
+			cwd: opts.cwd,
+			shell: true,
+			stdio: [
+				"inherit",
+				"pipe",
+				"pipe"
+			]
 		});
-	});
+		let output = "";
+		child.stdout.on("data", (chunk) => {
+			const text = chunk.toString();
+			output += text;
+			process.stdout.write(text);
+		});
+		child.stderr.on("data", (chunk) => {
+			const text = chunk.toString();
+			output += text;
+			process.stderr.write(text);
+		});
+		child.on("error", (error) => reject(Object.assign(error, { output })));
+		child.on("close", (status) => {
+			if (status === 0) resolve(output);
+			else reject(Object.assign(/* @__PURE__ */ new Error(`Command failed with exit code ${status}: ${cmd}`), {
+				status,
+				output
+			}));
+		});
+	}));
 	const pkgPath = path.join(root, "package.json");
 	if (!fs.existsSync(pkgPath)) {
 		console.error("  Error: No package.json found in the current directory.");
 		console.error("  Run this command from the root of a Next.js project.\n");
 		process.exit(1);
 	}
+	let existingViteConfigPath = findViteConfigPath(root);
+	if (existingViteConfigPath?.endsWith("vite.config.js")) {
+		const existingConfig = fs.readFileSync(existingViteConfigPath, "utf-8");
+		const cjsPath = existingViteConfigPath.replace(/\.js$/, ".cjs");
+		if (usesCommonJsViteConfig(existingViteConfigPath, existingConfig) && fs.existsSync(cjsPath)) throw new Error("Cannot rename CommonJS vite.config.js because vite.config.cjs already exists. Remove or consolidate one of the files, then rerun vinext init.");
+	}
 	const viteConfigExists = hasViteConfig(root);
-	const isApp = hasAppDir(root);
+	const isApp = detectProject(root).isAppRouter;
 	const pmName = detectPackageManagerName(root);
+	if (platform === "cloudflare") validateCloudflarePlatformSetup({
+		root,
+		isAppRouter: isApp,
+		existingViteConfigPath,
+		prerender: options.prerender,
+		today: options._today
+	}, options.cloudflare);
 	if (!options.skipCheck) {
 		console.log("  Running compatibility check...\n");
 		const checkResult = runCheck(root);
 		console.log(formatReport(checkResult, { calledFromInit: true }));
 		console.log();
 	}
-	const missingDeps = getInitDeps(isApp).filter((dep) => !isDepInstalled(root, dep));
+	const renamedConfigs = renameCJSConfigs(root);
+	if (existingViteConfigPath?.endsWith("vite.config.js") && usesCommonJsViteConfig(existingViteConfigPath, fs.readFileSync(existingViteConfigPath, "utf-8"))) {
+		const renamedPath = existingViteConfigPath.replace(/\.js$/, ".cjs");
+		fs.renameSync(existingViteConfigPath, renamedPath);
+		renamedConfigs.push([path.basename(existingViteConfigPath), path.basename(renamedPath)]);
+		existingViteConfigPath = renamedPath;
+	}
+	const addedTypeModule = ensureESModule(root);
+	const addedScripts = addScripts(root, port);
+	const setupContext = {
+		root,
+		isAppRouter: isApp,
+		existingViteConfigPath,
+		viteConfigExists,
+		force: options.force ?? false,
+		prerender: options.prerender,
+		today: options._today
+	};
+	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));
+	let dependencyInstallNeedsApproval = false;
+	let dependenciesAdded = false;
 	if (isApp && missingDeps.includes("react-server-dom-webpack")) {
 		const reactUpgrade = getReactUpgradeDeps(root);
 		if (reactUpgrade.length > 0) {
-			console.log(`  Upgrading ${reactUpgrade.map((d) => d.replace(/@latest$/, "")).join(", ")}...`);
-			installDeps(root, reactUpgrade, exec, { dev: false });
+			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;
+			} catch (error) {
+				if (pmName !== "pnpm" || !isApproveBuildsError(error)) throw error;
+				dependencyInstallNeedsApproval = true;
+			}
 		}
 	}
 	if (missingDeps.length > 0) {
-		console.log(`  Installing ${missingDeps.join(", ")}...`);
-		installDeps(root, missingDeps, exec);
+		console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Installing dependencies:"))}`);
+		console.log(formatList(missingDeps, "    "));
+		try {
+			const installOutput = await installDeps(root, missingDeps, exec);
+			dependenciesAdded = true;
+			if (isApproveBuildsError(installOutput)) dependencyInstallNeedsApproval = true;
+		} catch (error) {
+			if (pmName !== "pnpm" || !isApproveBuildsError(error)) throw error;
+			dependencyInstallNeedsApproval = true;
+		}
 		console.log();
 	}
-	const renamedConfigs = renameCJSConfigs(root);
-	const addedTypeModule = ensureESModule(root);
-	const addedScripts = addScripts(root, port);
-	let generatedViteConfig = false;
-	const skippedViteConfig = viteConfigExists && !options.force;
-	if (!skippedViteConfig) {
-		const configContent = generateViteConfig(isApp);
-		fs.writeFileSync(path.join(root, "vite.config.ts"), configContent, "utf-8");
-		generatedViteConfig = true;
+	if (pmName === "pnpm" && !dependencyInstallNeedsApproval && !options._exec && hasAutomaticallyIgnoredBuilds(inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
+	else if (pmName === "pnpm" && !dependencyInstallNeedsApproval && options._inspectPnpmIgnoredBuilds && hasAutomaticallyIgnoredBuilds(options._inspectPnpmIgnoredBuilds(root))) dependencyInstallNeedsApproval = true;
+	console.log(`  ${terminalStyle.green(terminalStyle.bold("vinext init complete!"))}\n`);
+	if (dependenciesAdded) {
+		console.log(`    ${terminalStyle.green("✓")} Added dependencies to devDependencies:`);
+		console.log(formatList(missingDeps, "      "));
 	}
-	const updatedGitignore = updateGitignore(root);
-	console.log("  vinext init complete!\n");
-	if (missingDeps.length > 0) console.log(`    \u2713 Added ${missingDeps.join(", ")} to devDependencies`);
-	if (addedTypeModule) console.log(`    \u2713 Added "type": "module" to package.json`);
-	for (const [oldName, newName] of renamedConfigs) console.log(`    \u2713 Renamed ${oldName} \u2192 ${newName}`);
-	for (const script of addedScripts) console.log(`    \u2713 Added ${script} script`);
-	if (generatedViteConfig) console.log(`    \u2713 Generated vite.config.ts`);
-	if (skippedViteConfig) console.log(`    - Skipped vite.config.ts (already exists, use --force to overwrite)`);
-	if (updatedGitignore) console.log(`    \u2713 Added vinext output directories to .gitignore`);
+	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`);
+	for (const [oldName, newName] of renamedConfigs) console.log(`    ${terminalStyle.green("✓")} Renamed ${oldName} \u2192 ${newName}`);
+	for (const script of addedScripts) console.log(`    ${terminalStyle.green("✓")} Added ${script} script`);
+	if (generatedViteConfig) console.log(`    ${terminalStyle.green("✓")} Generated vite.config.ts`);
+	for (const file of generatedPlatformFiles) console.log(`    ${terminalStyle.green("✓")} Generated ${file}`);
+	if (skippedViteConfig) console.log(`    ${terminalStyle.yellow("-")} Skipped vite.config.ts (already exists, use --force to overwrite)`);
+	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");
 	console.log(`
-  Next steps:
+  ${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)
 `);
 	return {
-		installedDeps: missingDeps,
+		installedDeps: dependenciesAdded ? missingDeps : [],
 		addedTypeModule,
 		renamedConfigs,
 		addedScripts,
 		generatedViteConfig,
 		skippedViteConfig,
-		updatedGitignore
+		updatedGitignore,
+		platform,
+		generatedPlatformFiles
 	};
 }
 //#endregion