@betterstart/cli 0.1.26 → 0.1.27

package/dist/cli.js

@@ -7640,9 +7640,6 @@ function detectPackageManager(cwd) {
   }
   return "npm";
 }
-function installCommand(pm) {
-  return pm === "yarn" ? "yarn" : `${pm} install`;
-}
 function runCommand(pm, script) {
   switch (pm) {
     case "pnpm":
@@ -11678,7 +11675,6 @@ var CORE_DEPS = [
   "input-otp",
   "react-resizable-panels",
   "recharts",
-  "shadcn",
   "tw-animate-css",
   "usehooks-ts",
   "vaul"
@@ -12021,6 +12017,7 @@ import { authClient } from '@cms/auth/client'
 import { Button } from '@cms/components/ui/button'
 import { Input } from '@cms/components/ui/input'
 import { Label } from '@cms/components/ui/label'
+import { LoaderCircle } from 'lucide-react'
 import { useRouter } from 'next/navigation'
 import * as React from 'react'
 
@@ -12093,6 +12090,7 @@ export function LoginForm() {
       </div>
 
       <Button type="submit" className="w-full" size="lg" disabled={isLoading}>
+        {isLoading && <LoaderCircle className="animate-spin" />}
         {isLoading ? 'Signing in...' : 'Sign In'}
       </Button>
     </form>
@@ -13513,9 +13511,32 @@ const auth = betterAuth({
 const EMAIL = process.env.SEED_EMAIL!
 const PASSWORD = process.env.SEED_PASSWORD!
 const NAME = process.env.SEED_NAME || 'Admin'
+const OVERWRITE = process.env.SEED_OVERWRITE === 'true'
 
 async function main() {
-  console.log('\\n  Creating admin user...')
+  // Check if user already exists
+  const existing = await db
+    .select({ id: schema.user.id, name: schema.user.name })
+    .from(schema.user)
+    .where(eq(schema.user.email, EMAIL))
+    .then((rows: { id: string; name: string }[]) => rows[0])
+
+  if (existing && !OVERWRITE) {
+    // Exit code 2 signals "user exists" to the CLI
+    console.log(\`EXISTING_USER:\${existing.name}\`)
+    process.exit(2)
+  }
+
+  if (existing && OVERWRITE) {
+    console.log('\\n  Replacing existing admin user...')
+    // Remove existing account + session rows first (foreign key refs)
+    await db.delete(schema.session).where(eq(schema.session.userId, existing.id))
+    await db.delete(schema.account).where(eq(schema.account.userId, existing.id))
+    await db.delete(schema.user).where(eq(schema.user.id, existing.id))
+  } else {
+    console.log('\\n  Creating admin user...')
+  }
+
   console.log(\`  Email: \${EMAIL}\\n\`)
 
   const result = await auth.api.signUpEmail({
@@ -13532,7 +13553,7 @@ async function main() {
     .set({ role: 'admin' })
     .where(eq(schema.user.id, result.user.id))
 
-  console.log(\`  Admin user created: \${EMAIL}\`)
+  console.log(\`  Admin user \${existing ? 'replaced' : 'created'}: \${EMAIL}\`)
   console.log('  Role: admin\\n')
   process.exit(0)
 }
@@ -13590,22 +13611,52 @@ var seedCommand = new Command2("seed").description("Create the initial admin use
     fs31.mkdirSync(scriptsDir, { recursive: true });
   }
   fs31.writeFileSync(seedPath, buildSeedScript(), "utf-8");
-  const spinner4 = clack.spinner();
-  spinner4.start("Creating admin user...");
-  try {
-    const { execFileSync: execFileSync5 } = await import("child_process");
-    const tsxBin = path36.join(cwd, "node_modules", ".bin", "tsx");
-    execFileSync5(tsxBin, [seedPath], {
+  const { execFile } = await import("child_process");
+  const tsxBin = path36.join(cwd, "node_modules", ".bin", "tsx");
+  const runSeed2 = (overwrite) => new Promise((resolve, reject) => {
+    execFile(tsxBin, [seedPath], {
       cwd,
-      stdio: "pipe",
       env: {
         ...process.env,
         SEED_EMAIL: email,
         SEED_PASSWORD: password3,
-        SEED_NAME: name || "Admin"
+        SEED_NAME: name || "Admin",
+        ...overwrite ? { SEED_OVERWRITE: "true" } : {}
+      }
+    }, (err, stdout, stderr) => {
+      if (err && "code" in err && err.code === 2) {
+        resolve({ code: 2, stdout });
+      } else if (err) {
+        reject(new Error(stderr || err.message));
+      } else {
+        resolve({ code: 0, stdout });
       }
     });
-    spinner4.stop("Admin user created");
+  });
+  const spinner4 = clack.spinner();
+  spinner4.start("Creating admin user...");
+  try {
+    const result = await runSeed2(false);
+    if (result.code === 2) {
+      const existingName = result.stdout.split("\n").find((l) => l.startsWith("EXISTING_USER:"))?.replace("EXISTING_USER:", "")?.trim() || "unknown";
+      spinner4.stop(`Account already exists for ${email}`);
+      const overwrite = await clack.confirm({
+        message: `An admin account (${existingName}) already exists with this email. Replace it?`
+      });
+      if (clack.isCancel(overwrite) || !overwrite) {
+        clack.cancel("Seed cancelled.");
+        try {
+          fs31.unlinkSync(seedPath);
+        } catch {
+        }
+        process.exit(0);
+      }
+      spinner4.start("Replacing admin user...");
+      await runSeed2(true);
+      spinner4.stop("Admin user replaced");
+    } else {
+      spinner4.stop("Admin user created");
+    }
   } catch (err) {
     spinner4.stop("Failed to create admin user");
     const errMsg = err instanceof Error ? err.message : String(err);
@@ -14481,44 +14532,6 @@ function findNextNonEmptyLine(lines, startIndex) {
   }
   return null;
 }
-function cleanPackageJsonDeps(pkgPath, allDeps, allDevDeps) {
-  if (!fs34.existsSync(pkgPath)) return { removed: [], removedDev: [] };
-  const content = fs34.readFileSync(pkgPath, "utf-8");
-  let pkg;
-  try {
-    pkg = JSON.parse(content);
-  } catch {
-    return { removed: [], removedDev: [] };
-  }
-  const deps = pkg.dependencies ?? {};
-  const devDeps = pkg.devDependencies ?? {};
-  const depNames = new Set(allDeps.map((d) => d.split("@").slice(0, d.startsWith("@") ? 2 : 1).join("@")));
-  const devDepNames = new Set(
-    allDevDeps.map((d) => d.split("@").slice(0, d.startsWith("@") ? 2 : 1).join("@"))
-  );
-  const removed = [];
-  for (const name of Object.keys(deps)) {
-    if (depNames.has(name)) {
-      delete deps[name];
-      removed.push(name);
-    }
-  }
-  const removedDev = [];
-  for (const name of Object.keys(devDeps)) {
-    if (devDepNames.has(name)) {
-      delete devDeps[name];
-      removedDev.push(name);
-    }
-  }
-  if (removed.length === 0 && removedDev.length === 0) {
-    return { removed: [], removedDev: [] };
-  }
-  pkg.dependencies = deps;
-  pkg.devDependencies = devDeps;
-  fs34.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
-`, "utf-8");
-  return { removed, removedDev };
-}
 
 // src/commands/uninstall.ts
 function findMainCss2(cwd) {
@@ -14637,32 +14650,6 @@ function buildUninstallPlan(cwd) {
       });
     }
   }
-  const pkgPath = path40.join(cwd, "package.json");
-  if (fs35.existsSync(pkgPath)) {
-    const allCoreDeps = [...CORE_DEPS, ...EMAIL_DEPS];
-    const allDevDeps = [...DEV_DEPS, ...BIOME_DEV_DEPS];
-    const coreNames = new Set(
-      allCoreDeps.map((d) => d.split("@").slice(0, d.startsWith("@") ? 2 : 1).join("@"))
-    );
-    const devNames = new Set(
-      allDevDeps.map((d) => d.split("@").slice(0, d.startsWith("@") ? 2 : 1).join("@"))
-    );
-    const pkgContent = JSON.parse(fs35.readFileSync(pkgPath, "utf-8"));
-    const deps = Object.keys(pkgContent.dependencies ?? {}).filter((n) => coreNames.has(n));
-    const devDeps = Object.keys(pkgContent.devDependencies ?? {}).filter((n) => devNames.has(n));
-    if (deps.length > 0 || devDeps.length > 0) {
-      const items = [];
-      if (deps.length > 0) items.push(`${deps.length} dependencies`);
-      if (devDeps.length > 0) items.push(`${devDeps.length} devDependencies`);
-      steps.push({
-        label: "package.json dependencies",
-        items,
-        execute() {
-          cleanPackageJsonDeps(pkgPath, allCoreDeps, allDevDeps);
-        }
-      });
-    }
-  }
   return steps;
 }
 var uninstallCommand = new Command6("uninstall").description("Remove all CMS files and undo modifications made by betterstart init").option("-f, --force", "Skip all confirmation prompts", false).option("--cwd <path>", "Project root path").action(async (options) => {
@@ -14674,30 +14661,26 @@ var uninstallCommand = new Command6("uninstall").description("Remove all CMS fil
     p5.outro("Done");
     return;
   }
-  p5.log.warn(
-    `Found ${steps.length} ${steps.length === 1 ? "area" : "areas"} to clean up:`
-  );
-  let completedCount = 0;
+  p5.log.warn("The following will be removed/modified:\n");
   for (const step of steps) {
-    p5.log.message("");
-    p5.log.step(pc3.bold(step.label));
+    p5.log.message(`  ${pc3.bold(step.label)}`);
     for (const item of step.items) {
-      p5.log.message(`  ${pc3.dim("\u2022")} ${item}`);
+      p5.log.message(`    ${pc3.red("\xD7")} ${pc3.dim(item)}`);
     }
-    if (!options.force) {
-      const confirmed = await p5.confirm({
-        message: `Remove ${step.label}?`,
-        initialValue: true
-      });
-      if (p5.isCancel(confirmed)) {
-        p5.cancel("Uninstall cancelled.");
-        process.exit(0);
-      }
-      if (!confirmed) {
-        p5.log.info(pc3.dim(`Skipped: ${step.label}`));
-        continue;
-      }
+    p5.log.message("");
+  }
+  if (!options.force) {
+    const confirmed = await p5.confirm({
+      message: `Proceed with uninstall? (${steps.length} ${steps.length === 1 ? "area" : "areas"})`,
+      initialValue: false
+    });
+    if (p5.isCancel(confirmed) || !confirmed) {
+      p5.cancel("Uninstall cancelled.");
+      process.exit(0);
     }
+  }
+  let completedCount = 0;
+  for (const step of steps) {
     step.execute();
     completedCount++;
     p5.log.success(`Removed: ${step.label}`);
@@ -14706,13 +14689,8 @@ var uninstallCommand = new Command6("uninstall").description("Remove all CMS fil
   if (completedCount === 0) {
     p5.log.info("No changes were made.");
   } else {
-    const pm = detectPackageManager(cwd);
     p5.note(
-      [
-        `Run ${pc3.cyan(installCommand(pm))} to clean up node_modules.`,
-        "",
-        pc3.dim("Database tables were NOT dropped \u2014 drop them manually if needed.")
-      ].join("\n"),
+      pc3.dim("Database tables were NOT dropped \u2014 drop them manually if needed."),
       "Next steps"
     );
   }