create-next-style-guide 0.1.3 → 0.1.5

package/dist/index.js

@@ -3,7 +3,7 @@
 // src/index.ts
 import * as p4 from "@clack/prompts";
 import color4 from "picocolors";
-import path30 from "path";
+import path31 from "path";
 
 // src/constants.ts
 import path from "path";
@@ -78,6 +78,7 @@ var PRESET_SEEDS = {
     auth: "none",
     styling: "none",
     ui: "none",
+    shadcnSet: "minimal",
     data: "rsc",
     store: "none",
     icons: "none",
@@ -90,7 +91,7 @@ var PRESET_SEEDS = {
     eslint: false,
     prettier: false,
     husky: false,
-    docker: false,
+    deploy: "none",
     ci: false,
     testing: false,
     playwright: false
@@ -100,6 +101,7 @@ var PRESET_SEEDS = {
     auth: "jwt",
     styling: "tailwind",
     ui: "shadcn",
+    shadcnSet: "starter",
     data: "tanstack-query",
     store: "zustand",
     icons: "lucide",
@@ -112,7 +114,7 @@ var PRESET_SEEDS = {
     eslint: true,
     prettier: true,
     husky: true,
-    docker: false,
+    deploy: "none",
     ci: true,
     testing: true,
     playwright: false
@@ -122,6 +124,7 @@ var PRESET_SEEDS = {
     auth: "none",
     styling: "tailwind",
     ui: "shadcn",
+    shadcnSet: "minimal",
     data: "rsc",
     store: "none",
     icons: "lucide",
@@ -134,7 +137,7 @@ var PRESET_SEEDS = {
     eslint: true,
     prettier: true,
     husky: true,
-    docker: false,
+    deploy: "vercel",
     ci: true,
     testing: true,
     playwright: false
@@ -144,6 +147,7 @@ var PRESET_SEEDS = {
     auth: "none",
     styling: "tailwind",
     ui: "shadcn",
+    shadcnSet: "starter",
     data: "tanstack-query",
     store: "zustand",
     icons: "lucide",
@@ -156,7 +160,7 @@ var PRESET_SEEDS = {
     eslint: true,
     prettier: true,
     husky: true,
-    docker: false,
+    deploy: "none",
     ci: true,
     testing: true,
     playwright: false
@@ -166,19 +170,20 @@ function describePreset(id) {
   const seed = PRESET_SEEDS[id];
   return [
     `styling=${seed.styling}`,
-    seed.ui === "shadcn" ? "shadcn" : null,
+    seed.ui === "shadcn" ? `shadcn:${seed.shadcnSet}` : null,
     `auth=${seed.auth}`,
     seed.store !== "none" ? `store=${seed.store}` : null,
     `validation=${seed.validation}`,
     seed.endpoints ? "endpoints" : null,
     seed.data === "tanstack-query" ? "query" : null,
     seed.darkMode ? "dark" : null,
+    seed.deploy !== "none" ? `deploy=${seed.deploy}` : null,
     seed.seo ? "seo" : null,
     seed.i18n ? "i18n" : null,
     seed.testing ? "vitest" : null
   ].filter(Boolean).join(" \xB7 ");
 }
-function collectOptionWarnings(options) {
+function collectOptionWarnings(options, { verbose = false } = {}) {
   const warnings = [];
   if (options.auth === "jwt" && !options.endpoints) {
     warnings.push(
@@ -199,9 +204,9 @@ function collectOptionWarnings(options) {
   if (options.playwright && !options.testing) {
     warnings.push("Playwright was requested without Vitest \u2014 enabling testing.");
   }
-  if (options.store !== "none" && options.data === "tanstack-query") {
+  if (verbose && options.store !== "none" && options.data === "tanstack-query") {
     warnings.push(
-      "Client store + TanStack Query: use Query for server cache; store for UI/session client state only."
+      "Tip: Query = server cache; store = UI/session only. See docs/style-guide/overview/architecture.md"
     );
   }
   return warnings;
@@ -217,6 +222,7 @@ var DEFAULT_OPTIONS = {
   auth: "none",
   styling: "none",
   ui: "none",
+  shadcnSet: "minimal",
   data: "rsc",
   store: "none",
   icons: "none",
@@ -230,7 +236,7 @@ var DEFAULT_OPTIONS = {
   eslint: true,
   prettier: true,
   husky: true,
-  docker: false,
+  deploy: "none",
   ci: true,
   testing: true,
   playwright: false,
@@ -245,6 +251,9 @@ function normalizeOptions(options) {
   if (next.styling !== "tailwind" && next.ui === "shadcn") {
     next = { ...next, ui: "none" };
   }
+  if (next.ui !== "shadcn") {
+    next = { ...next, shadcnSet: "minimal" };
+  }
   if (next.styling !== "tailwind" && next.darkMode) {
     next = { ...next, darkMode: false };
   }
@@ -283,6 +292,7 @@ async function promptCustomOptions(base) {
     })
   );
   let ui = "none";
+  let shadcnSet = "minimal";
   let darkMode = false;
   if (styling === "tailwind") {
     const useShadcn = assertNotCancel(
@@ -292,6 +302,26 @@ async function promptCustomOptions(base) {
       })
     );
     ui = useShadcn ? "shadcn" : "none";
+    if (useShadcn) {
+      shadcnSet = assertNotCancel(
+        await p.select({
+          message: "shadcn component set?",
+          options: [
+            {
+              value: "minimal",
+              label: "Minimal",
+              hint: "Button only"
+            },
+            {
+              value: "starter",
+              label: "Starter",
+              hint: "Button \xB7 Input \xB7 Card \xB7 Dialog"
+            }
+          ],
+          initialValue: base.shadcnSet
+        })
+      );
+    }
     darkMode = assertNotCancel(
       await p.confirm({
         message: "Add dark mode (next-themes)?",
@@ -439,10 +469,27 @@ async function promptCustomOptions(base) {
       initialValue: base.husky
     })
   );
-  const docker = assertNotCancel(
-    await p.confirm({
-      message: "Add Docker production image?",
-      initialValue: base.docker
+  const deploy = assertNotCancel(
+    await p.select({
+      message: "Deployment target?",
+      options: [
+        {
+          value: "none",
+          label: "None",
+          hint: "no deploy files"
+        },
+        {
+          value: "vercel",
+          label: "Vercel",
+          hint: "vercel.json + docs"
+        },
+        {
+          value: "docker",
+          label: "Docker",
+          hint: "standalone production image"
+        }
+      ],
+      initialValue: base.deploy
     })
   );
   const ci = assertNotCancel(
@@ -455,6 +502,7 @@ async function promptCustomOptions(base) {
     ...base,
     styling,
     ui,
+    shadcnSet,
     darkMode,
     icons,
     validation,
@@ -470,7 +518,7 @@ async function promptCustomOptions(base) {
     eslint,
     prettier,
     husky,
-    docker,
+    deploy,
     ci
   };
 }
@@ -482,9 +530,10 @@ async function runPrompts(initialName) {
       placeholder: "my-app",
       initialValue: initialName ?? "my-app",
       validate(value) {
-        if (!value.trim()) return "Name is required.";
+        const next = value ?? "";
+        if (!next.trim()) return "Name is required.";
         try {
-          slugify(value);
+          slugify(next);
         } catch (error) {
           return error instanceof Error ? error.message : "Invalid name.";
         }
@@ -576,12 +625,36 @@ async function runPrompts(initialName) {
 }
 
 // src/scaffold.ts
-import fs27 from "fs-extra";
-import path28 from "path";
+import fs28 from "fs-extra";
+import path29 from "path";
+import { execFileSync } from "child_process";
 import * as p2 from "@clack/prompts";
-import { execSync } from "child_process";
 import color2 from "picocolors";
 
+// src/helpers/run-package-install.ts
+import { spawn } from "child_process";
+function runPackageInstall(projectDir, pm) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(pm.id, pm.installArgs, {
+      cwd: projectDir,
+      stdio: "inherit",
+      env: process.env,
+      shell: process.platform === "win32"
+    });
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`${pm.id} ${pm.installArgs.join(" ")} exited with ${code}`));
+    });
+  });
+}
+function yieldUi() {
+  return new Promise((resolve) => setImmediate(resolve));
+}
+
 // src/helpers/replace-tokens.ts
 import fs from "fs-extra";
 import path2 from "path";
@@ -1771,7 +1844,7 @@ CMD ["node", "server.js"]
 }
 var dockerInstaller = {
   id: "docker",
-  active: (o) => o.docker,
+  active: (o) => o.deploy === "docker",
   async run({ projectDir, options }) {
     const addon = path11.join(ADDONS_DIR, "docker");
     const pm = getPackageManager(options.packageManager);
@@ -1916,7 +1989,7 @@ var huskyInstaller = {
       },
       "devDependencies"
     );
-    await addScripts(projectDir, { prepare: "husky" });
+    await addScripts(projectDir, { prepare: "husky || true" });
     const tsHooks = [];
     if (options.prettier) tsHooks.push("prettier --write");
     if (options.eslint) tsHooks.push("eslint --fix");
@@ -2424,7 +2497,154 @@ export function Button({
   );
 }
 `;
-var RULE10 = `---
+var INPUT = `import type { ComponentProps } from "react";
+
+import { cn } from "@/lib/utils";
+
+export function Input({ className, type, ...props }: ComponentProps<"input">) {
+  return (
+    <input
+      type={type}
+      className={cn(
+        "flex h-9 w-full rounded-md border border-neutral-300 bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-neutral-400 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+`;
+var CARD = `import type { ComponentProps } from "react";
+
+import { cn } from "@/lib/utils";
+
+export function Card({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <div
+      className={cn(
+        "rounded-xl border border-neutral-200 bg-white text-neutral-950 shadow-sm",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export function CardHeader({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <div className={cn("flex flex-col gap-1.5 p-6", className)} {...props} />
+  );
+}
+
+export function CardTitle({ className, ...props }: ComponentProps<"h3">) {
+  return (
+    <h3
+      className={cn("font-semibold leading-none tracking-tight", className)}
+      {...props}
+    />
+  );
+}
+
+export function CardDescription({ className, ...props }: ComponentProps<"p">) {
+  return (
+    <p className={cn("text-sm text-neutral-500", className)} {...props} />
+  );
+}
+
+export function CardContent({ className, ...props }: ComponentProps<"div">) {
+  return <div className={cn("p-6 pt-0", className)} {...props} />;
+}
+
+export function CardFooter({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <div className={cn("flex items-center p-6 pt-0", className)} {...props} />
+  );
+}
+`;
+var DIALOG = `"use client";
+
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import type { ComponentProps } from "react";
+
+import { cn } from "@/lib/utils";
+
+export const Dialog = DialogPrimitive.Root;
+export const DialogTrigger = DialogPrimitive.Trigger;
+export const DialogClose = DialogPrimitive.Close;
+export const DialogPortal = DialogPrimitive.Portal;
+
+export function DialogOverlay({
+  className,
+  ...props
+}: ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
+      className={cn(
+        "fixed inset-0 z-50 bg-black/50 data-[state=open]:animate-in data-[state=closed]:animate-out",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export function DialogContent({
+  className,
+  children,
+  ...props
+}: ComponentProps<typeof DialogPrimitive.Content>) {
+  return (
+    <DialogPortal>
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        className={cn(
+          "fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border border-neutral-200 bg-white p-6 shadow-lg duration-200 sm:rounded-xl",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  );
+}
+
+export function DialogHeader({ className, ...props }: ComponentProps<"div">) {
+  return (
+    <div
+      className={cn("flex flex-col gap-1.5 text-center sm:text-left", className)}
+      {...props}
+    />
+  );
+}
+
+export function DialogTitle({
+  className,
+  ...props
+}: ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      className={cn("text-lg font-semibold leading-none", className)}
+      {...props}
+    />
+  );
+}
+
+export function DialogDescription({
+  className,
+  ...props
+}: ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      className={cn("text-sm text-neutral-500", className)}
+      {...props}
+    />
+  );
+}
+`;
+function ruleFor(set) {
+  const setLine = set === "starter" ? "- Starter set: `button`, `input`, `card`, `dialog`." : "- Minimal set: `button` only.";
+  return `---
 description: shadcn/ui conventions
 globs: components.json,src/components/ui/**,src/lib/utils.ts
 alwaysApply: false
@@ -2433,41 +2653,59 @@ alwaysApply: false
 # shadcn
 
 - Primitives live flat in \`src/components/ui/*\` (CLI-compatible).
-- Starter \`Button\` is included \u2014 add more with \`npx shadcn@latest add \u2026\`.
+${setLine}
+- Add more with \`npx shadcn@latest add \u2026\`.
 - \`cn()\` from \`@/lib/utils\` for class merging.
 - Config: \`components.json\`. Requires Tailwind.
 `;
+}
 var shadcnInstaller = {
   id: "shadcn",
   active: (o) => o.ui === "shadcn" && o.styling === "tailwind",
   async run({ projectDir, options }) {
     const iconLibrary = options.icons === "tabler" ? "tabler" : "lucide";
+    const set = options.shadcnSet;
+    const uiDir = path21.join(projectDir, "src", "components", "ui");
     await fs20.writeFile(
       path21.join(projectDir, "components.json"),
       componentsJson(iconLibrary),
       "utf8"
     );
-    await fs20.ensureDir(path21.join(projectDir, "src", "components", "ui"));
-    await fs20.writeFile(
-      path21.join(projectDir, "src", "components", "ui", "button.tsx"),
-      BUTTON,
-      "utf8"
-    );
-    await fs20.remove(path21.join(projectDir, "src", "components", "ui", ".gitkeep"));
+    await fs20.ensureDir(uiDir);
+    await fs20.writeFile(path21.join(uiDir, "button.tsx"), BUTTON, "utf8");
+    if (set === "starter") {
+      await fs20.writeFile(path21.join(uiDir, "input.tsx"), INPUT, "utf8");
+      await fs20.writeFile(path21.join(uiDir, "card.tsx"), CARD, "utf8");
+      await fs20.writeFile(path21.join(uiDir, "dialog.tsx"), DIALOG, "utf8");
+    }
+    await fs20.remove(path21.join(uiDir, ".gitkeep"));
     await fs20.remove(path21.join(projectDir, "src", "components", ".gitkeep"));
     await fs20.writeFile(
       path21.join(projectDir, ".cursor", "rules", "shadcn.mdc"),
-      RULE10,
+      ruleFor(set),
       "utf8"
     );
+    await fs20.outputFile(
+      path21.join(projectDir, "docs", "style-guide", "ui", "shadcn.md"),
+      `# shadcn/ui
+
+Set: **${set}**
+${set === "starter" ? "- `button` \xB7 `input` \xB7 `card` \xB7 `dialog`\n" : "- `button`\n"}
+Add more: \`npx shadcn@latest add \u2026\`
+`
+    );
     if (options.icons === "none") {
       await addDependencies(projectDir, {
         "lucide-react": "^0.469.0"
       });
     }
-    await addDependencies(projectDir, {
+    const deps = {
       "class-variance-authority": "^0.7.1"
-    });
+    };
+    if (set === "starter") {
+      deps["@radix-ui/react-dialog"] = "^1.1.4";
+    }
+    await addDependencies(projectDir, deps);
   }
 };
 
@@ -2651,9 +2889,10 @@ function stackLines(options) {
     options.eslint ? "Enhanced ESLint" : "Minimal ESLint",
     options.prettier ? "Prettier" : "No Prettier",
     options.husky ? "Husky + lint-staged" : "No git hooks",
-    options.docker ? "Docker standalone image" : "No Docker",
+    options.ui === "shadcn" ? `shadcn set: ${options.shadcnSet}` : null,
+    options.deploy === "docker" ? "Deploy: Docker standalone image" : options.deploy === "vercel" ? "Deploy: Vercel" : "No deploy target",
     options.ci ? "GitHub Actions CI" : "No CI workflow"
-  ];
+  ].filter((line) => line !== null);
 }
 function welcomeCardSource(options) {
   const items = stackLines(options).map((line) => `        <li>${escapeJsx(line)}</li>`).join("\n");
@@ -2712,6 +2951,7 @@ function docsIndex(options) {
       "Layers: app / components / lib / utils"
     ],
     ["[Project structure](overview/project-structure.md)", "Folder map"],
+    ["[Environment](ops/env.md)", "`.env.example` \xB7 staging \xB7 production"],
     ["[HTTP client](http/client.md)", "`apiFetch` helper"],
     [
       `[Validation](validation/${options.validation}.md)`,
@@ -2755,7 +2995,10 @@ function docsIndex(options) {
     rows.push(["Tailwind", "See `.cursor/rules/tailwind.mdc`"]);
   }
   if (options.ui === "shadcn") {
-    rows.push(["shadcn/ui", "See `.cursor/rules/shadcn.mdc` + `components.json`"]);
+    rows.push([
+      "[shadcn/ui](ui/shadcn.md)",
+      `set=${options.shadcnSet}`
+    ]);
   }
   if (options.styling === "mui") {
     rows.push(["MUI", "See `.cursor/rules/mui.mdc`"]);
@@ -2784,9 +3027,12 @@ function docsIndex(options) {
   if (options.husky) {
     rows.push(["[Husky](tooling/husky.md)", "Pre-commit hooks"]);
   }
-  if (options.docker) {
+  if (options.deploy === "docker") {
     rows.push(["[Docker](ops/docker.md)", "Standalone production image"]);
   }
+  if (options.deploy === "vercel") {
+    rows.push(["[Vercel](ops/vercel.md)", "vercel.json + env notes"]);
+  }
   if (options.ci) {
     rows.push(["[CI](ops/ci.md)", "GitHub Actions"]);
   }
@@ -2977,7 +3223,7 @@ export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 `;
-var RULE11 = `---
+var RULE10 = `---
 description: Tailwind CSS v4 conventions
 globs: src/app/globals.css,src/**/*.{tsx,css},postcss.config.mjs
 alwaysApply: false
@@ -3010,7 +3256,7 @@ var tailwindInstaller = {
     );
     await fs23.writeFile(
       path24.join(projectDir, ".cursor", "rules", "tailwind.mdc"),
-      RULE11,
+      RULE10,
       "utf8"
     );
     await addDependencies(projectDir, {
@@ -3058,7 +3304,7 @@ export function QueryProvider({ children }: { children: ReactNode }) {
   return <QueryClientProvider client={client}>{children}</QueryClientProvider>;
 }
 `;
-var RULE12 = `---
+var RULE11 = `---
 description: TanStack Query conventions
 globs: src/providers/**,src/hooks/**,src/endpoints/**,src/**/*query*.{ts,tsx},src/**/use-*.{ts,tsx}
 alwaysApply: false
@@ -3091,7 +3337,7 @@ var tanstackQueryInstaller = {
     await fs24.ensureDir(ruleDir);
     await fs24.writeFile(
       path25.join(ruleDir, "tanstack-query.mdc"),
-      RULE12,
+      RULE11,
       "utf8"
     );
   }
@@ -3373,6 +3619,53 @@ Forms: \`@hookform/resolvers/${options.validation}\` when using RHF.
   }
 };
 
+// src/installers/vercel.ts
+import fs27 from "fs-extra";
+import path28 from "path";
+var VERCEL_JSON = `{
+  "framework": "nextjs",
+  "regions": ["iad1"]
+}
+`;
+var RULE12 = `---
+description: Vercel deployment conventions
+globs: vercel.json
+alwaysApply: false
+---
+
+# Vercel
+
+- Config: \`vercel.json\` (framework Next.js).
+- Set \`NEXT_PUBLIC_APP_URL\` / \`NEXT_PUBLIC_API_URL\` (and \`AUTH_SECRET\` if Auth.js) in the Vercel project env.
+- Prefer Preview env for staging; Production for live.
+- Do not commit \`.vercel\` or production secrets.
+`;
+var vercelInstaller = {
+  id: "vercel",
+  active: (o) => o.deploy === "vercel",
+  async run({ projectDir }) {
+    await fs27.writeFile(
+      path28.join(projectDir, "vercel.json"),
+      VERCEL_JSON,
+      "utf8"
+    );
+    await fs27.writeFile(
+      path28.join(projectDir, ".cursor", "rules", "vercel.mdc"),
+      RULE12,
+      "utf8"
+    );
+    await fs27.outputFile(
+      path28.join(projectDir, "docs", "style-guide", "ops", "vercel.md"),
+      `# Vercel
+
+- \`vercel.json\` \u2014 Next.js framework hint
+- Link the repo in the Vercel dashboard (or \`npx vercel\`)
+- Env: copy from \`.env.production.example\` into Project \u2192 Settings \u2192 Environment Variables
+`
+    );
+  }
+};
+
 // src/installers/index.ts
 var installers = [
   packageManagerInstaller,
@@ -3396,14 +3689,23 @@ var installers = [
   prettierInstaller,
   huskyInstaller,
   dockerInstaller,
+  vercelInstaller,
   ciInstaller,
   appProvidersInstaller,
   surfaceInstaller
 ];
-async function runInstallers(ctx) {
+async function runInstallers(ctx, onProgress) {
+  const active = installers.filter(
+    (installer) => installer.active(ctx.options)
+  );
   const ran = [];
-  for (const installer of installers) {
-    if (!installer.active(ctx.options)) continue;
+  for (let i = 0; i < active.length; i += 1) {
+    const installer = active[i];
+    await onProgress?.({
+      id: installer.id,
+      index: i + 1,
+      total: active.length
+    });
     await installer.run(ctx);
     ran.push(installer.id);
   }
@@ -3412,10 +3714,10 @@ async function runInstallers(ctx) {
 
 // src/scaffold.ts
 async function scaffold(options) {
-  const projectDir = path28.resolve(process.cwd(), options.name);
+  const projectDir = path29.resolve(process.cwd(), options.name);
   const pm = getPackageManager(options.packageManager);
-  if (await fs27.pathExists(projectDir)) {
-    const entries = await fs27.readdir(projectDir);
+  if (await fs28.pathExists(projectDir)) {
+    const entries = await fs28.readdir(projectDir);
     if (entries.length > 0) {
       throw new Error(
         `Target directory already exists and is not empty: ${projectDir}`
@@ -3424,46 +3726,68 @@ async function scaffold(options) {
   }
   const spin = p2.spinner();
   spin.start("Copying template");
-  if (!await fs27.pathExists(TEMPLATE_DIR)) {
+  await yieldUi();
+  if (!await fs28.pathExists(TEMPLATE_DIR)) {
     spin.stop("Template missing");
     throw new Error(`Template directory not found at ${TEMPLATE_DIR}`);
   }
-  await fs27.copy(TEMPLATE_DIR, projectDir, {
+  await fs28.copy(TEMPLATE_DIR, projectDir, {
     filter: (src) => {
-      const base = path28.basename(src);
+      const base = path29.basename(src);
       return base !== "node_modules" && base !== ".next" && base !== "dist";
     }
   });
-  const gitignoreSrc = path28.join(projectDir, "gitignore");
-  const gitignoreDest = path28.join(projectDir, ".gitignore");
-  if (await fs27.pathExists(gitignoreSrc)) {
-    await fs27.move(gitignoreSrc, gitignoreDest, { overwrite: true });
+  const gitignoreSrc = path29.join(projectDir, "gitignore");
+  const gitignoreDest = path29.join(projectDir, ".gitignore");
+  if (await fs28.pathExists(gitignoreSrc)) {
+    await fs28.move(gitignoreSrc, gitignoreDest, { overwrite: true });
   }
   spin.message("Applying project tokens");
+  await yieldUi();
   await replaceTokensInTree(projectDir, {
     __PROJECT_NAME__: options.name,
     __PROJECT_SLUG__: options.slug,
     __PACKAGE_MANAGER__: pm.id
   });
-  spin.message("Running installers");
-  const ran = await runInstallers({ projectDir, options });
+  const ran = await runInstallers({ projectDir, options }, async (step) => {
+    spin.message(`Installer (${step.index}/${step.total}): ${step.id}`);
+    await yieldUi();
+  });
+  spin.stop(
+    ran.length ? `Scaffold ready \xB7 ${ran.length} installer${ran.length === 1 ? "" : "s"}` : "Scaffold ready \xB7 base template"
+  );
   if (!options.noInstall) {
-    spin.message(`Installing dependencies (${pm.id})`);
+    if (options.husky) {
+      try {
+        execFileSync("git", ["init"], {
+          cwd: projectDir,
+          stdio: "ignore"
+        });
+      } catch {
+      }
+    }
+    p2.log.step(
+      `Installing dependencies with ${color2.cyan(pm.id)} \u2014 live output below\u2026`
+    );
     try {
-      execSync(`${pm.id} ${pm.installArgs.join(" ")}`, {
-        cwd: projectDir,
-        stdio: "ignore"
-      });
-    } catch {
+      await runPackageInstall(projectDir, pm);
+      p2.log.success("Dependencies installed");
+    } catch (error) {
       if (pm.id !== "npm") {
-        spin.message(`${pm.id} failed \u2014 trying npm`);
-        execSync("npm install", { cwd: projectDir, stdio: "ignore" });
+        p2.log.warn(`${pm.id} failed \u2014 retrying with npm\u2026`);
+        const npm = getPackageManager("npm");
+        await runPackageInstall(projectDir, npm);
+        p2.log.success("Dependencies installed (npm)");
       } else {
-        throw new Error("npm install failed");
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Dependency install failed: ${message}`);
       }
     }
+  } else {
+    p2.log.info(
+      color2.dim(`Skipped install \xB7 run ${pm.id} install in the project folder`)
+    );
   }
-  spin.stop("Project ready");
   if (ran.length) {
     p2.log.info(`Installers: ${ran.join(", ")}`);
   } else {
@@ -3473,8 +3797,8 @@ async function scaffold(options) {
 }
 
 // src/upgrade.ts
-import fs28 from "fs-extra";
-import path29 from "path";
+import fs29 from "fs-extra";
+import path30 from "path";
 import * as p3 from "@clack/prompts";
 import color3 from "picocolors";
 var TRACKED = [
@@ -3484,17 +3808,17 @@ var TRACKED = [
   ".cursor/rules/forms.mdc"
 ];
 function rel(projectDir, file) {
-  return path29.join(projectDir, file);
+  return path30.join(projectDir, file);
 }
 function templatePath(file) {
-  return path29.join(TEMPLATE_DIR, file);
+  return path30.join(TEMPLATE_DIR, file);
 }
 async function runUpgrade(options) {
   const { projectDir, apply } = options;
-  if (!await fs28.pathExists(path29.join(projectDir, "package.json"))) {
+  if (!await fs29.pathExists(path30.join(projectDir, "package.json"))) {
     throw new Error(`Not an app directory (missing package.json): ${projectDir}`);
   }
-  if (!await fs28.pathExists(TEMPLATE_DIR)) {
+  if (!await fs29.pathExists(TEMPLATE_DIR)) {
     throw new Error(`Template missing at ${TEMPLATE_DIR}`);
   }
   p3.intro(color3.bgCyan(color3.black(" next-style-guide upgrade ")));
@@ -3507,14 +3831,14 @@ async function runUpgrade(options) {
   for (const file of TRACKED) {
     const from = templatePath(file);
     const to = rel(projectDir, file);
-    if (!await fs28.pathExists(from)) {
+    if (!await fs29.pathExists(from)) {
       p3.log.warn(`Template missing ${file}`);
       continue;
     }
-    const next = await fs28.readFile(from, "utf8");
+    const next = await fs29.readFile(from, "utf8");
     let outgoing = next;
-    if (file === "AGENTS.md" && await fs28.pathExists(to)) {
-      const current2 = await fs28.readFile(to, "utf8");
+    if (file === "AGENTS.md" && await fs29.pathExists(to)) {
+      const current2 = await fs29.readFile(to, "utf8");
       const nameMatch = current2.match(/^# Agents \((.+)\)$/m);
       if (nameMatch?.[1]) {
         outgoing = outgoing.replace("__PROJECT_NAME__", nameMatch[1]);
@@ -3527,18 +3851,18 @@ async function runUpgrade(options) {
         }
       }
     }
-    outgoing = outgoing.replaceAll("__PROJECT_NAME__", path29.basename(projectDir)).replaceAll("__PACKAGE_MANAGER__", "pnpm").replaceAll("__PROJECT_SLUG__", path29.basename(projectDir));
-    if (!await fs28.pathExists(to)) {
+    outgoing = outgoing.replaceAll("__PROJECT_NAME__", path30.basename(projectDir)).replaceAll("__PACKAGE_MANAGER__", "pnpm").replaceAll("__PROJECT_SLUG__", path30.basename(projectDir));
+    if (!await fs29.pathExists(to)) {
       missing += 1;
       p3.log.warn(`missing  ${file}`);
       if (apply) {
-        await fs28.ensureDir(path29.dirname(to));
-        await fs28.writeFile(to, outgoing, "utf8");
+        await fs29.ensureDir(path30.dirname(to));
+        await fs29.writeFile(to, outgoing, "utf8");
         p3.log.success(`wrote    ${file}`);
       }
       continue;
     }
-    const current = await fs28.readFile(to, "utf8");
+    const current = await fs29.readFile(to, "utf8");
     if (current === outgoing) {
       same += 1;
       p3.log.step(color3.dim(`same     ${file}`));
@@ -3547,7 +3871,7 @@ async function runUpgrade(options) {
     changed += 1;
     p3.log.warn(`differs  ${file}`);
     if (apply) {
-      await fs28.writeFile(to, outgoing, "utf8");
+      await fs29.writeFile(to, outgoing, "utf8");
       p3.log.success(`updated  ${file}`);
     }
   }
@@ -3569,6 +3893,8 @@ var VALIDATION_VALUES = /* @__PURE__ */ new Set(["zod", "yup"]);
 var AUTH_VALUES = /* @__PURE__ */ new Set(["none", "jwt", "authjs"]);
 var STORE_VALUES = /* @__PURE__ */ new Set(["none", "zustand", "redux"]);
 var PM_VALUES = /* @__PURE__ */ new Set(["pnpm", "npm", "yarn"]);
+var SHADCN_SET_VALUES = /* @__PURE__ */ new Set(["minimal", "starter"]);
+var DEPLOY_VALUES = /* @__PURE__ */ new Set(["none", "vercel", "docker"]);
 var PRESET_VALUES = /* @__PURE__ */ new Set([
   "custom",
   "minimal",
@@ -3604,7 +3930,8 @@ function parseArgs(argv) {
     noInstall: false,
     yes: false,
     upgrade: false,
-    apply: false
+    apply: false,
+    verbose: false
   };
   for (let i = 0; i < args.length; i += 1) {
     const arg = args[i];
@@ -3621,6 +3948,10 @@ function parseArgs(argv) {
       out.apply = false;
       continue;
     }
+    if (arg === "--verbose" || arg === "-V") {
+      out.verbose = true;
+      continue;
+    }
     if (arg === "--no-install") {
       out.noInstall = true;
       continue;
@@ -3645,7 +3976,6 @@ function parseArgs(argv) {
       ["eslint", "--eslint", "--no-eslint"],
       ["prettier", "--prettier", "--no-prettier"],
       ["husky", "--husky", "--no-husky"],
-      ["docker", "--docker", "--no-docker"],
       ["ci", "--ci", "--no-ci"],
       ["shadcn", "--shadcn", "--no-shadcn"]
     ];
@@ -3713,6 +4043,29 @@ function parseArgs(argv) {
       i = icons.nextIndex;
       continue;
     }
+    const shadcnSet = readChoice(arg, "--shadcn-set", SHADCN_SET_VALUES, args, i);
+    if (shadcnSet) {
+      out.shadcnSet = shadcnSet.value;
+      out.shadcn = true;
+      i = shadcnSet.nextIndex;
+      continue;
+    }
+    const deploy = readChoice(arg, "--deploy", DEPLOY_VALUES, args, i);
+    if (deploy) {
+      out.deploy = deploy.value;
+      i = deploy.nextIndex;
+      continue;
+    }
+    if (arg === "--docker") {
+      out.deploy = "docker";
+      continue;
+    }
+    if (arg === "--no-docker") {
+      if (out.deploy === void 0 || out.deploy === "docker") {
+        out.deploy = "none";
+      }
+      continue;
+    }
     if (!arg.startsWith("-") && !out.name) {
       out.name = arg;
     }
@@ -3736,6 +4089,7 @@ Options:
   --store none|zustand|redux
   --styling none|tailwind|mui
   --shadcn | --no-shadcn
+  --shadcn-set minimal|starter
   --dark-mode | --no-dark-mode
   --validation zod|yup
   --auth none|jwt|authjs
@@ -3750,8 +4104,10 @@ Options:
   --eslint | --no-eslint
   --prettier | --no-prettier
   --husky | --no-husky
-  --docker | --no-docker
+  --deploy none|vercel|docker
+  --docker | --no-docker   (alias for --deploy docker / none)
   --ci | --no-ci
+  --verbose, -V       advisory tips (e.g. Query vs store)
   --help, -h
 
 Upgrade:
@@ -3767,6 +4123,10 @@ function applyFlagOverrides(options, flags) {
   if (flags.icons !== void 0) next.icons = flags.icons;
   if (flags.styling !== void 0) next.styling = flags.styling;
   if (flags.shadcn !== void 0) next.ui = flags.shadcn ? "shadcn" : "none";
+  if (flags.shadcnSet !== void 0) {
+    next.shadcnSet = flags.shadcnSet;
+    next.ui = "shadcn";
+  }
   if (flags.validation !== void 0) next.validation = flags.validation;
   if (flags.auth !== void 0) next.auth = flags.auth;
   if (flags.store !== void 0) next.store = flags.store;
@@ -3783,14 +4143,14 @@ function applyFlagOverrides(options, flags) {
   if (flags.eslint !== void 0) next.eslint = flags.eslint;
   if (flags.prettier !== void 0) next.prettier = flags.prettier;
   if (flags.husky !== void 0) next.husky = flags.husky;
-  if (flags.docker !== void 0) next.docker = flags.docker;
+  if (flags.deploy !== void 0) next.deploy = flags.deploy;
   if (flags.ci !== void 0) next.ci = flags.ci;
   return normalizeOptions(next);
 }
 async function main() {
   const flags = parseArgs(process.argv);
   if (flags.upgrade) {
-    const projectDir2 = path30.resolve(process.cwd(), flags.name ?? ".");
+    const projectDir2 = path31.resolve(process.cwd(), flags.name ?? ".");
     await runUpgrade({ projectDir: projectDir2, apply: flags.apply });
     return;
   }
@@ -3813,8 +4173,8 @@ async function main() {
         `Non-interactive: ${options.name} (${options.slug})`,
         flags.preset ? `preset=${flags.preset}` : null,
         `pm=${options.packageManager}`,
-        `styling=${options.styling} ui=${options.ui} auth=${options.auth} store=${options.store}`,
-        `endpoints=${options.endpoints} seo=${options.seo} i18n=${options.i18n} testing=${options.testing}`
+        `styling=${options.styling} ui=${options.ui}${options.ui === "shadcn" ? `:${options.shadcnSet}` : ""} auth=${options.auth} store=${options.store}`,
+        `deploy=${options.deploy} endpoints=${options.endpoints} seo=${options.seo} i18n=${options.i18n} testing=${options.testing}`
       ].filter(Boolean).join(" \xB7 ")
     );
   } else {
@@ -3822,16 +4182,16 @@ async function main() {
     options.noInstall = flags.noInstall;
     options = applyFlagOverrides(options, flags);
   }
-  const warnings = collectOptionWarnings(options);
+  const warnings = collectOptionWarnings(options, { verbose: flags.verbose });
   for (const warning of warnings) {
     p4.log.warn(warning);
   }
   const projectDir = await scaffold(options);
   const pm = getPackageManager(options.packageManager);
   const nextSteps = [
-    `cd ${path30.relative(process.cwd(), projectDir) || "."}`,
+    `cd ${path31.relative(process.cwd(), projectDir) || "."}`,
     options.noInstall ? `${pm.id} ${pm.installArgs.filter((a) => a !== "--ignore-workspace").join(" ")}`.trim() : null,
-    options.ui === "shadcn" ? "npx shadcn@latest add input   # optional" : null,
+    options.ui === "shadcn" && options.shadcnSet === "minimal" ? "npx shadcn@latest add input   # or re-scaffold with --shadcn-set starter" : null,
     options.endpoints ? `${pm.runScript("endpoints:generate")}   # when API schema is up` : null,
     options.testing ? pm.runScript("test") : null,
     pm.runScript("dev")