@pauldvlp/vp-react-ts-shadcn 0.3.2 → 0.4.0

package/dist/index.js

@@ -4,59 +4,12 @@
 import { runTemplateCLI } from "bingo";
 
 // src/template.ts
-import fs from "node:fs";
-import path from "node:path";
+import path2 from "node:path";
 import { fileURLToPath } from "node:url";
-import { createTemplate } from "bingo";
-import { z } from "zod";
 
-// package.json
-var package_default = {
-  name: "@pauldvlp/vp-react-ts-shadcn",
-  version: "0.3.2",
-  description: "Vite+ monorepo template: one frontend app (website) + a shared shadcn UI package, themeable via shadcn presets.",
-  author: "pauldvlp (https://github.com/pauldvlp/vp-templates)",
-  homepage: "https://github.com/pauldvlp/vp-templates",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/pauldvlp/vp-templates.git",
-    directory: "packages/vp-react-ts-shadcn"
-  },
-  bugs: "https://github.com/pauldvlp/vp-templates/issues",
-  keywords: [
-    "vite-plus-generator",
-    "vite-plus",
-    "shadcn",
-    "react",
-    "template"
-  ],
-  bin: "./dist/index.js",
-  type: "module",
-  files: [
-    "dist",
-    "template"
-  ],
-  scripts: {
-    build: "esbuild bin/index.ts --bundle --outfile=dist/index.js --format=esm --platform=node --target=node22 --packages=external",
-    dev: "node bin/index.ts",
-    prepack: "pnpm run build"
-  },
-  dependencies: {
-    bingo: "^0.9.3",
-    zod: "^3.25.76"
-  },
-  devDependencies: {
-    "@types/node": "^24",
-    esbuild: "^0.25.0",
-    typescript: "^5"
-  },
-  engines: {
-    node: ">=22.18.0"
-  }
-};
-
-// src/template.ts
-var TEMPLATE_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "template");
+// ../template-kit/src/index.ts
+import fs from "node:fs";
+import path from "node:path";
 var RENAME = {
   _gitignore: ".gitignore"
 };
@@ -105,6 +58,118 @@ function patchJson(tree, relPath, mutate) {
   node[key] = `${JSON.stringify(json, null, 2)}
 `;
 }
+function addIconDeps(pkg, iconLibrary) {
+  const iconDeps = ICON_LIBS[iconLibrary] ?? ICON_LIBS.hugeicons;
+  pkg.dependencies = { ...pkg.dependencies, ...iconDeps };
+}
+function withRequiredComponents(csv, required = ["button", "badge"]) {
+  const requested = csv.split(",").map((c) => c.trim()).filter(Boolean);
+  return Array.from(/* @__PURE__ */ new Set([...required, ...requested]));
+}
+function uiComponentsJson(theme) {
+  const { scope, base, cssVariables, iconLibrary, rtl } = theme;
+  return {
+    $schema: "https://ui.shadcn.com/schema.json",
+    style: `${base}-nova`,
+    rsc: false,
+    tsx: true,
+    tailwind: { config: "", css: "./src/styles/globals.css", baseColor: "neutral", cssVariables },
+    iconLibrary,
+    rtl,
+    base,
+    aliases: {
+      components: `${scope}/ui/components`,
+      ui: `${scope}/ui/components`,
+      lib: `${scope}/ui/lib`,
+      utils: `${scope}/ui/lib/utils`,
+      hooks: `${scope}/ui/hooks`
+    }
+  };
+}
+function appComponentsJson(theme) {
+  const { scope, base, cssVariables, iconLibrary, rtl, cssPath } = theme;
+  return {
+    $schema: "https://ui.shadcn.com/schema.json",
+    style: `${base}-nova`,
+    rsc: false,
+    tsx: true,
+    tailwind: { config: "", css: cssPath, baseColor: "neutral", cssVariables },
+    iconLibrary,
+    rtl,
+    aliases: {
+      components: "@/components",
+      hooks: "@/hooks",
+      lib: "@/lib",
+      utils: `${scope}/ui/lib/utils`,
+      ui: `${scope}/ui/components`
+    }
+  };
+}
+function shadcnInitFlags(opts) {
+  return [
+    `--base ${opts.base}`,
+    `--preset ${opts.preset}`,
+    opts.cssVariables ? "--css-variables" : "--no-css-variables",
+    opts.rtl ? "--rtl" : "--no-rtl",
+    opts.pointer ? "--pointer" : "--no-pointer",
+    "--no-reinstall",
+    "-y",
+    "-f"
+  ].join(" ");
+}
+
+// src/template.ts
+import { createTemplate } from "bingo";
+import { z } from "zod";
+
+// package.json
+var package_default = {
+  name: "@pauldvlp/vp-react-ts-shadcn",
+  version: "0.4.0",
+  description: "Vite+ monorepo template: one frontend app (website) + a shared shadcn UI package, themeable via shadcn presets.",
+  author: "pauldvlp (https://github.com/pauldvlp/vp-templates)",
+  homepage: "https://github.com/pauldvlp/vp-templates",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/pauldvlp/vp-templates.git",
+    directory: "packages/vp-react-ts-shadcn"
+  },
+  bugs: "https://github.com/pauldvlp/vp-templates/issues",
+  keywords: [
+    "vite-plus-generator",
+    "vite-plus",
+    "shadcn",
+    "react",
+    "template"
+  ],
+  bin: "./dist/index.js",
+  type: "module",
+  files: [
+    "dist",
+    "template"
+  ],
+  scripts: {
+    build: "esbuild bin/index.ts --bundle --outfile=dist/index.js --format=esm --platform=node --target=node22 --packages=external",
+    dev: "node bin/index.ts",
+    prepack: "pnpm run build"
+  },
+  dependencies: {
+    bingo: "^0.9.3",
+    zod: "^3.25.76"
+  },
+  devDependencies: {
+    "@pauldvlp/template-kit": "workspace:*",
+    "@types/node": "^24",
+    esbuild: "^0.25.0",
+    typescript: "^5"
+  },
+  engines: {
+    node: ">=22.18.0"
+  }
+};
+
+// src/template.ts
+var TEMPLATE_DIR = path2.join(path2.dirname(fileURLToPath(import.meta.url)), "..", "template");
 var template_default = createTemplate({
   about: {
     name: package_default.name,
@@ -113,9 +178,12 @@ var template_default = createTemplate({
   options: {
     name: z.string().describe("Root project / package name").default("my-app"),
     scope: z.string().describe("npm scope for workspace packages, e.g. @acme (defaults to @<name>)"),
-    base: z.enum(["radix", "base"]).describe("shadcn component library base (radix-ui or @base-ui)").default("radix"),
+    // Unions of literals (not z.enum) so the value is settable on Bingo's CLI: bingo's arg parser
+    // handles ZodUnion/ZodLiteral but not ZodEnum (a bare `--base radix` would otherwise mis-parse to
+    // `base: true`). Both still render as an interactive `select`.
+    base: z.union([z.literal("radix"), z.literal("base")]).describe("shadcn component library base (radix-ui or @base-ui)").default("radix"),
     preset: z.string().describe("shadcn preset: a style name (nova, vega, maia, lyra, mira, luma, sera, rhea) or a code from ui.shadcn.com").default(DEFAULT_PRESET),
-    iconLibrary: z.enum(["lucide", "hugeicons", "radix", "tabler"]).describe("Icon library").default("hugeicons"),
+    iconLibrary: z.union([z.literal("lucide"), z.literal("hugeicons"), z.literal("radix"), z.literal("tabler")]).describe("Icon library").default("hugeicons"),
     cssVariables: z.boolean().describe("Use CSS variables for theming").default(true),
     rtl: z.boolean().describe("Enable RTL support").default(false),
     pointer: z.boolean().describe("Use pointer cursor on interactive elements").default(false),
@@ -135,62 +203,20 @@ var template_default = createTemplate({
       TEMPLATE_DIR,
       (_rel, content) => content.split("@app").join(scope).split("__PROJECT_NAME__").join(options.name)
     );
-    const uiComponentsJson = {
-      $schema: "https://ui.shadcn.com/schema.json",
-      style: `${options.base}-nova`,
-      rsc: false,
-      tsx: true,
-      tailwind: { config: "", css: "./src/styles/globals.css", baseColor: "neutral", cssVariables: options.cssVariables },
-      iconLibrary: options.iconLibrary,
-      rtl: options.rtl,
-      base: options.base,
-      aliases: {
-        components: `${scope}/ui/components`,
-        ui: `${scope}/ui/components`,
-        lib: `${scope}/ui/lib`,
-        utils: `${scope}/ui/lib/utils`,
-        hooks: `${scope}/ui/hooks`
-      }
-    };
-    const websiteComponentsJson = {
-      $schema: "https://ui.shadcn.com/schema.json",
-      style: `${options.base}-nova`,
-      rsc: false,
-      tsx: true,
-      tailwind: { config: "", css: "../../packages/ui/src/styles/globals.css", baseColor: "neutral", cssVariables: options.cssVariables },
-      iconLibrary: options.iconLibrary,
-      rtl: options.rtl,
-      aliases: {
-        components: "@/components",
-        hooks: "@/hooks",
-        lib: "@/lib",
-        utils: `${scope}/ui/lib/utils`,
-        ui: `${scope}/ui/components`
-      }
-    };
-    setPath(files, "packages/ui/components.json", `${JSON.stringify(uiComponentsJson, null, 2)}
+    setPath(files, "packages/ui/components.json", `${JSON.stringify(uiComponentsJson({ ...options, scope }), null, 2)}
 `);
-    setPath(files, "apps/website/components.json", `${JSON.stringify(websiteComponentsJson, null, 2)}
-`);
-    const iconDeps = ICON_LIBS[options.iconLibrary] ?? ICON_LIBS.hugeicons;
+    setPath(
+      files,
+      "apps/website/components.json",
+      `${JSON.stringify(appComponentsJson({ ...options, scope, cssPath: "../../packages/ui/src/styles/globals.css" }), null, 2)}
+`
+    );
     for (const rel of ["packages/ui/package.json", "apps/website/package.json"]) {
-      patchJson(files, rel, (pkg) => {
-        pkg.dependencies = { ...pkg.dependencies, ...iconDeps };
-      });
+      patchJson(files, rel, (pkg) => addIconDeps(pkg, options.iconLibrary));
     }
-    const requested = options.components.split(",").map((c) => c.trim()).filter(Boolean);
-    const adds = Array.from(/* @__PURE__ */ new Set(["button", "badge", ...requested]));
+    const adds = withRequiredComponents(options.components);
     const ui = `${scope}/ui`;
-    const initFlags = [
-      `--base ${options.base}`,
-      `--preset ${options.preset}`,
-      options.cssVariables ? "--css-variables" : "--no-css-variables",
-      options.rtl ? "--rtl" : "--no-rtl",
-      options.pointer ? "--pointer" : "--no-pointer",
-      "--no-reinstall",
-      "-y",
-      "-f"
-    ].join(" ");
+    const initFlags = shadcnInitFlags(options);
     const scripts = options.install ? [
       { commands: ["pnpm install --silent"], phase: 0 },
       { commands: [`pnpm --filter ${ui} exec shadcn init ${initFlags}`], phase: 1 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pauldvlp/vp-react-ts-shadcn",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Vite+ monorepo template: one frontend app (website) + a shared shadcn UI package, themeable via shadcn presets.",
   "author": "pauldvlp (https://github.com/pauldvlp/vp-templates)",
   "homepage": "https://github.com/pauldvlp/vp-templates",
@@ -29,7 +29,8 @@
   "devDependencies": {
     "@types/node": "^24",
     "esbuild": "^0.25.0",
-    "typescript": "^5"
+    "typescript": "^5",
+    "@pauldvlp/template-kit": "0.0.0"
   },
   "engines": {
     "node": ">=22.18.0"