@makerkit/cli 2.0.7 → 2.0.9

package/dist/index.mjs

@@ -8,6 +8,7 @@ import { execa, execaCommand } from "execa";
 import fs from "fs-extra";
 import invariant from "tiny-invariant";
 import { homedir, tmpdir } from "os";
+import { spawn } from "node:child_process";
 import { config } from "dotenv";
 //#region src/version.ts
 const CLI_VERSION = "2.0.3";
@@ -31,7 +32,10 @@ const VARIANT_REPO_MAP = {
 	"next-supabase": "makerkit/next-supabase-saas-kit-turbo",
 	"next-drizzle": "makerkit/next-drizzle-saas-kit-turbo",
 	"next-prisma": "makerkit/next-prisma-saas-kit-turbo",
-	"react-router-supabase": "makerkit/react-router-supabase-saas-kit-turbo"
+	"react-router-supabase": "makerkit/react-router-supabase-saas-kit-turbo",
+	"tanstack-supabase": "makerkit/tanstack-supabase-saas-kit-turbo",
+	"tanstack-drizzle": "makerkit/tanstack-drizzle-saas-kit-turbo",
+	"tanstack-prisma": "makerkit/tanstack-prisma-saas-kit-turbo"
 };
 function sshUrl(repo) {
 	return `git@github.com:${repo}`;
@@ -167,6 +171,51 @@ const VARIANT_CATALOG = [
 		database: "PostgreSQL (Supabase)",
 		auth: "Supabase Auth",
 		status: "stable"
+	},
+	{
+		id: "tanstack-supabase",
+		name: "TanStack Start + Supabase",
+		description: "Full-stack SaaS kit with TanStack Start and Supabase",
+		repo: VARIANT_REPO_MAP["tanstack-supabase"],
+		tech: [
+			"TanStack Start",
+			"Supabase",
+			"Tailwind CSS",
+			"shadcn/ui"
+		],
+		database: "PostgreSQL (Supabase)",
+		auth: "Supabase Auth",
+		status: "stable"
+	},
+	{
+		id: "tanstack-drizzle",
+		name: "TanStack Start + Drizzle",
+		description: "Full-stack SaaS kit with TanStack Start and Drizzle ORM",
+		repo: VARIANT_REPO_MAP["tanstack-drizzle"],
+		tech: [
+			"TanStack Start",
+			"Drizzle",
+			"Tailwind CSS",
+			"shadcn/ui"
+		],
+		database: "PostgreSQL",
+		auth: "Better Auth",
+		status: "stable"
+	},
+	{
+		id: "tanstack-prisma",
+		name: "TanStack Start + Prisma",
+		description: "Full-stack SaaS kit with TanStack Start and Prisma ORM",
+		repo: VARIANT_REPO_MAP["tanstack-prisma"],
+		tech: [
+			"TanStack Start",
+			"Prisma",
+			"Tailwind CSS",
+			"shadcn/ui"
+		],
+		database: "PostgreSQL",
+		auth: "Better Auth",
+		status: "stable"
 	}
 ];
 //#endregion
@@ -665,30 +714,65 @@ async function installRegistryFiles(variant, pluginId, username, majorVersion) {
 //#endregion
 //#region src/utils/run-codemod.ts
 const CODEMOD_TIMEOUT_MS = 300 * 1e3;
+const IDLE_KILL_MS = 3e3;
 async function runCodemod(variant, pluginId, codemodVersion, options) {
 	try {
 		const localPath = process.env.MAKERKIT_CODEMODS_PATH;
 		const runner = process.env.MAKERKIT_PACKAGE_RUNNER ?? "npx --yes";
 		const versionTag = codemodVersion ? `@${codemodVersion}` : "";
-		const { stdout, stderr } = await execaCommand(localPath ? `${runner} codemod@latest workflow run --allow-dirty -w ${localPath}/codemods/${variant}/${pluginId}` : `${runner} codemod@latest run @makerkit/${variant}-${pluginId}${versionTag} --allow-dirty --no-interactive`, {
-			stdio: options?.captureOutput ? "pipe" : [
-				"ignore",
-				"inherit",
-				"inherit"
-			],
-			timeout: CODEMOD_TIMEOUT_MS
+		const noInteractive = options?.noInteractive ?? true;
+		const flags = ["--allow-dirty", noInteractive && "--no-interactive"].filter(Boolean).join(" ");
+		const command = localPath ? `${runner} codemod@latest workflow run ${flags} -w ${localPath}/codemods/${variant}/${pluginId}` : `${runner} codemod@latest run @makerkit/${variant}-${pluginId}${versionTag} ${flags}`;
+		return await new Promise((resolve, reject) => {
+			const child = spawn(command, {
+				shell: true,
+				stdio: noInteractive ? [
+					"ignore",
+					"pipe",
+					"pipe"
+				] : "inherit"
+			});
+			let idleTimer = null;
+			const resetIdle = () => {
+				if (idleTimer) clearTimeout(idleTimer);
+				idleTimer = setTimeout(() => {
+					child.kill();
+				}, IDLE_KILL_MS);
+			};
+			if (child.stdout) {
+				child.stdout.pipe(process.stdout);
+				child.stdout.on("data", () => resetIdle());
+			}
+			if (child.stderr) {
+				child.stderr.pipe(process.stderr);
+				child.stderr.on("data", () => resetIdle());
+			}
+			resetIdle();
+			const globalTimer = setTimeout(() => {
+				if (idleTimer) clearTimeout(idleTimer);
+				child.kill();
+				resolve({
+					success: false,
+					output: `Codemod timed out after ${CODEMOD_TIMEOUT_MS / 1e3}s`
+				});
+			}, CODEMOD_TIMEOUT_MS);
+			child.on("exit", (code) => {
+				clearTimeout(globalTimer);
+				if (idleTimer) clearTimeout(idleTimer);
+				resolve({
+					success: code === 0 || code === null,
+					output: code === 0 || code === null ? "" : `Command failed with exit code ${code}`
+				});
+			});
+			child.on("error", (err) => {
+				clearTimeout(globalTimer);
+				if (idleTimer) clearTimeout(idleTimer);
+				reject(err);
+			});
 		});
-		return {
-			success: true,
-			output: stdout || stderr || ""
-		};
 	} catch (error) {
 		let message = "Unknown error during codemod";
-		if (error instanceof Error) {
-			message = error.message;
-			if ("stderr" in error && error.stderr) message += `\n${error.stderr}`;
-			if ("timedOut" in error && error.timedOut) message = `Codemod timed out after ${CODEMOD_TIMEOUT_MS / 1e3}s (the workflow engine may have stalled after an error)`;
-		}
+		if (error instanceof Error) message = error.message;
 		return {
 			success: false,
 			output: message
@@ -757,8 +841,14 @@ async function detectVariant() {
 	const dbDeps = await readDeps(join(cwd, "packages", "database", "package.json"));
 	const hasSupabase = !!webDeps["@supabase/supabase-js"];
 	const hasReactRouter = !!webDeps["@react-router/node"];
+	const hasTanstack = !!webDeps["@tanstack/react-start"];
 	const hasDrizzle = !!webDeps["drizzle-orm"] || !!dbDeps["drizzle-orm"];
 	const hasPrisma = !!webDeps["@prisma/client"] || !!dbDeps["@prisma/client"];
+	if (hasTanstack) {
+		if (hasSupabase) return "tanstack-supabase";
+		if (hasDrizzle) return "tanstack-drizzle";
+		if (hasPrisma) return "tanstack-prisma";
+	}
 	if (hasReactRouter && hasSupabase) return "react-router-supabase";
 	if (hasSupabase) return "next-supabase";
 	if (hasDrizzle) return "next-drizzle";
@@ -798,7 +888,9 @@ async function addPlugin(options) {
 	};
 	const item = await installRegistryFiles(variant, options.pluginId, username, majorVersion);
 	await saveBaseVersions(options.pluginId, item.files);
-	const codemodResult = await runCodemod(variant, options.pluginId, item.codemodVersion, { captureOutput: options.captureCodemodOutput ?? true });
+	options.onBeforeCodemod?.();
+	const codemodResult = await runCodemod(variant, options.pluginId, item.codemodVersion);
+	options.onAfterCodemod?.();
 	const envVars = getEnvVars(plugin, variant);
 	return {
 		success: true,
@@ -868,7 +960,8 @@ function createAddCommand(parentCommand) {
 						pluginId,
 						githubUsername: username,
 						skipGitCheck: true,
-						captureCodemodOutput: false
+						onBeforeCodemod: () => filesSpinner.stop(),
+						onAfterCodemod: () => filesSpinner.start("Installing plugin...")
 					});
 				} catch (error) {
 					filesSpinner.fail("Failed to install plugin.");
@@ -882,7 +975,8 @@ function createAddCommand(parentCommand) {
 							pluginId,
 							githubUsername: username,
 							skipGitCheck: true,
-							captureCodemodOutput: false
+							onBeforeCodemod: () => retrySpinner.stop(),
+							onAfterCodemod: () => retrySpinner.start("Installing plugin...")
 						});
 					} catch (retryError) {
 						retrySpinner.fail("Failed to install plugin.");