Merge pull request #100 from bejamas/fix/shadcn-v3

fix(bejamas): pin shadcn CLI to v3.8.5 for init and add

Author: thomkrupa

.changeset/friendly-suns-compete.md

@@ -0,0 +1,5 @@
+---
+"bejamas": patch
+---
+
+Pin Bejamas-managed `shadcn` calls back to `shadcn@3.8.5` for compatibility with the current Bejamas registry/init flow. This restores the legacy `init --base-color` behavior and stops routing `init` and `add` through `shadcn@latest`.

apps/web/src/content/docs/docs/cli.md

@@ -42,7 +42,7 @@ Base tokens & CSS variables
 
 components.json (shadcn schema)
 
-Compatibility note: `--base-color` is deprecated and ignored on the current shadcn v4-backed init flow. To use a different base color, update `tailwind.baseColor` in `components.json` after init.
+Compatibility note: Bejamas currently pins `shadcn` v3.8.5 internally for `init` and `add`. This keeps the pre-v4 init/add behavior, including `init --base-color`.
 
 ### add <name>
 

bun.lock

@@ -8,7 +8,7 @@ Use the `init` command to initialize dependencies for a new project.
 
 The `init` command installs dependencies, adds the `cn` util, and configures CSS variables for the project.
 
-`--base-color` is deprecated and ignored on current shadcn-backed init flows. If you want a different base color, update `tailwind.baseColor` in `components.json` after initialization.
+Bejamas currently pins `shadcn` v3.8.5 internally for `init` and `add` compatibility. The legacy `--base-color` flow remains supported on `init`.
 
 ```bash
 npx bejamas init

packages/bejamas/README.md

@@ -48,7 +48,7 @@
     "kleur": "^4.1.5",
     "ora": "^9.0.0",
     "prompts": "^2.4.2",
-    "shadcn": "^3.3.1",
+    "shadcn": "3.8.5",
     "ts-morph": "^27.0.0",
     "tsconfig-paths": "^4.2.0",
     "zod": "^4.1.9"

packages/bejamas/package.json

@@ -5,9 +5,9 @@ import prompts from "prompts";
 import { logger } from "@/src/utils/logger";
 import { spinner } from "@/src/utils/spinner";
 import { highlighter } from "@/src/utils/highlighter";
-import { getPackageRunner } from "@/src/utils/get-package-manager";
 import { fixAstroImports } from "@/src/utils/astro-imports";
 import { getConfig, getWorkspaceConfig } from "@/src/utils/get-config";
+import { buildPinnedShadcnInvocation } from "@/src/utils/shadcn-cli";
 import {
   reorganizeComponents,
   fetchRegistryItem,
@@ -336,40 +336,15 @@ async function addComponents(
   isSilent: boolean,
   subfolderMapResult: SubfolderMapResult,
 ): Promise<ParsedOutput> {
-  const runner = await getPackageRunner(process.cwd());
   const env = {
     ...process.env,
     REGISTRY_URL: process.env.REGISTRY_URL || DEFAULT_REGISTRY_URL,
   };
-  // Always pass --yes for non-interactive mode (skips "Add components?" confirmation)
-  // Note: we don't pass --overwrite by default to respect user customizations
-  const autoFlags: string[] = [];
-  if (!forwardedOptions.includes("--yes")) {
-    autoFlags.push("--yes");
-  }
-  const baseArgs = [
-    "shadcn@latest",
-    "add",
-    ...packages,
-    ...autoFlags,
-    ...forwardedOptions,
-  ];
-
-  let cmd = "npx";
-  let args: string[] = ["-y", ...baseArgs];
-  if (runner === "bunx") {
-    cmd = "bunx";
-    args = baseArgs;
-  } else if (runner === "pnpm dlx") {
-    cmd = "pnpm";
-    args = ["dlx", ...baseArgs];
-  } else if (runner === "npx") {
-    cmd = "npx";
-    args = ["-y", ...baseArgs];
-  }
+  const shadcnArgs = buildShadcnAddArgs(packages, forwardedOptions);
+  const invocation = buildPinnedShadcnInvocation(shadcnArgs);
 
   if (isVerbose) {
-    logger.info(`[bejamas-ui] ${cmd} ${args.join(" ")}`);
+    logger.info(`[bejamas-ui] ${invocation.cmd} ${invocation.args.join(" ")}`);
   }
 
   // Show our own spinner for checking registry
@@ -379,7 +354,7 @@ async function addComponents(
   try {
     // Run shadcn and capture output
     // Pipe "n" to stdin to answer "no" to any overwrite prompts (respects user customizations)
-    const result = await execa(cmd, args, {
+    const result = await execa(invocation.cmd, invocation.args, {
       env,
       input: "n\nn\nn\nn\nn\nn\nn\nn\nn\nn\n", // Answer "no" to up to 10 overwrite prompts
       stdout: "pipe",
@@ -425,9 +400,28 @@ async function addComponents(
   }
 }
 
+export function buildShadcnAddArgs(
+  packages: string[],
+  forwardedOptions: string[],
+) {
+  // Always pass --yes for non-interactive mode (skips "Add components?" confirmation)
+  // Note: we don't pass --overwrite by default to respect user customizations
+  const autoFlags: string[] = [];
+  if (!forwardedOptions.includes("--yes")) {
+    autoFlags.push("--yes");
+  }
+
+  return [
+    "add",
+    ...packages,
+    ...autoFlags,
+    ...forwardedOptions,
+  ];
+}
+
 export const add = new Command()
   .name("add")
-  .description("Add components via shadcn@latest using registry URLs")
+  .description("Add components via the pinned shadcn registry flow")
   .argument("[components...]", "Component package names to add")
   .option("-y, --yes", "skip confirmation prompt.", false)
   .option("-o, --overwrite", "overwrite existing files.", false)

packages/bejamas/src/commands/add.ts

@@ -1,4 +1,3 @@
-import { promises as fs } from "fs";
 import path from "path";
 import { preFlightInit } from "@/src/preflights/preflight-init";
 
@@ -10,9 +9,9 @@ import { getConfig } from "@/src/utils/get-config";
 import { handleError } from "@/src/utils/handle-error";
 import { highlighter } from "@/src/utils/highlighter";
 import { logger } from "@/src/utils/logger";
+import { buildPinnedShadcnInvocation } from "@/src/utils/shadcn-cli";
 import { Command } from "commander";
 import { execa } from "execa";
-import fsExtra from "fs-extra";
 import { z } from "zod";
 
 // process.on("exit", (code) => {
@@ -30,7 +29,6 @@ import { z } from "zod";
 // Default fallback registry endpoint for shadcn (expects /r)
 const DEFAULT_REGISTRY_URL = "https://ui.bejamas.com/r";
 export const DEFAULT_COMPONENTS_BASE_COLOR = "neutral";
-const SHADCN_INIT_ARGS = ["init"] as const;
 
 export const initOptionsSchema = z.object({
   cwd: z.string(),
@@ -60,121 +58,10 @@ export const initOptionsSchema = z.object({
   baseStyle: z.boolean(),
 });
 
-export function buildShadcnInitInvocation(
-  localShadcnPath: string,
-  hasLocalShadcn: boolean,
-  localShadcnVersion?: string | null,
-) {
-  if (hasLocalShadcn) {
-    const args = [...SHADCN_INIT_ARGS];
-    if (usesLegacyBaseColorFlag(localShadcnVersion)) {
-      args.push("--base-color", DEFAULT_COMPONENTS_BASE_COLOR);
-    }
-
-    return {
-      cmd: localShadcnPath,
-      args,
-    };
-  }
-
-  return {
-    cmd: "npx",
-    args: ["-y", "shadcn@latest", ...SHADCN_INIT_ARGS],
-  };
-}
-
-export function usesLegacyBaseColorFlag(version?: string | null) {
-  if (!version) {
-    return false;
-  }
-
-  const major = Number.parseInt(version.split(".")[0] ?? "", 10);
-  return Number.isFinite(major) && major > 0 && major < 4;
-}
-
-export async function getLocalShadcnVersion(cwd: string) {
-  const filePath = path.resolve(cwd, "node_modules", "shadcn", "package.json");
-
-  try {
-    const contents = await fs.readFile(filePath, "utf8");
-    const parsed = JSON.parse(contents) as { version?: unknown };
-    return typeof parsed.version === "string" ? parsed.version : null;
-  } catch {
-    return null;
-  }
-}
-
-export function getDeprecatedBaseColorWarning(baseColor?: string) {
-  if (!baseColor) {
-    return null;
-  }
-
-  return [
-    "The --base-color option is deprecated and ignored.",
-    "Bejamas now aligns with shadcn CLI v4.",
-    `Edit ${highlighter.info("components.json")} to change`,
-    `${highlighter.info("tailwind.baseColor")} after init.`,
-  ].join(" ");
-}
-
-export async function normalizeComponentsBaseColor(
-  cwd: string,
+export function buildShadcnInitArgs(
   baseColor = DEFAULT_COMPONENTS_BASE_COLOR,
 ) {
-  const filePath = path.resolve(cwd, "components.json");
-
-  let originalContents: string;
-  try {
-    originalContents = await fs.readFile(filePath, "utf8");
-  } catch {
-    throw new Error(
-      `Failed to read ${highlighter.info(
-        filePath,
-      )} after shadcn init. Make sure the command completed successfully and created a valid components.json file.`,
-    );
-  }
-
-  let parsedConfig: Record<string, unknown>;
-  try {
-    const parsed = JSON.parse(originalContents);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-      throw new Error("Expected a JSON object.");
-    }
-    parsedConfig = parsed as Record<string, unknown>;
-  } catch {
-    throw new Error(
-      `Failed to parse ${highlighter.info(
-        filePath,
-      )} after shadcn init. Expected a valid JSON object with a tailwind configuration.`,
-    );
-  }
-
-  const tailwind = parsedConfig.tailwind;
-  if (!tailwind || typeof tailwind !== "object" || Array.isArray(tailwind)) {
-    throw new Error(
-      `Invalid ${highlighter.info(
-        filePath,
-      )} generated by shadcn init. Expected a ${highlighter.info(
-        "tailwind",
-      )} object so Bejamas can normalize ${highlighter.info("baseColor")}.`,
-    );
-  }
-
-  const normalizedConfig = {
-    ...parsedConfig,
-    tailwind: {
-      ...(tailwind as Record<string, unknown>),
-      baseColor,
-    },
-  };
-  const normalizedContents = `${JSON.stringify(normalizedConfig, null, 2)}\n`;
-
-  if (normalizedContents === originalContents) {
-    return false;
-  }
-
-  await fs.writeFile(filePath, normalizedContents, "utf8");
-  return true;
+  return ["init", "--base-color", baseColor];
 }
 
 export const init = new Command()
@@ -187,7 +74,7 @@ export const init = new Command()
   )
   .option(
     "-b, --base-color <base-color>",
-    "deprecated: accepted for compatibility but ignored. Edit components.json to change tailwind.baseColor.",
+    "the base color to use. (neutral, gray, zinc, stone, slate)",
     undefined,
   )
   .option("-y, --yes", "skip confirmation prompt.", true)
@@ -227,11 +114,6 @@ export async function runInit(
     skipPreflight?: boolean;
   },
 ) {
-  const baseColorWarning = getDeprecatedBaseColorWarning(options.baseColor);
-  if (baseColorWarning && !options.silent) {
-    logger.warn(baseColorWarning);
-  }
-
   let newProjectTemplate;
   if (!options.skipPreflight) {
     const preflight = await preFlightInit(options);
@@ -266,27 +148,13 @@ export async function runInit(
 
   // const projectConfig = await getProjectConfig(options.cwd, projectInfo);
 
-  const shadcnBin = process.platform === "win32" ? "shadcn.cmd" : "shadcn";
-  const localShadcnPath = path.resolve(
-    options.cwd,
-    "node_modules",
-    ".bin",
-    shadcnBin,
-  );
-
   try {
     const env = {
       ...process.env,
       REGISTRY_URL: process.env.REGISTRY_URL || DEFAULT_REGISTRY_URL,
     };
-    const hasLocalShadcn = await fsExtra.pathExists(localShadcnPath);
-    const localShadcnVersion = hasLocalShadcn
-      ? await getLocalShadcnVersion(options.cwd)
-      : null;
-    const invocation = buildShadcnInitInvocation(
-      localShadcnPath,
-      hasLocalShadcn,
-      localShadcnVersion,
+    const invocation = buildPinnedShadcnInvocation(
+      buildShadcnInitArgs(options.baseColor ?? DEFAULT_COMPONENTS_BASE_COLOR),
     );
 
     await execa(invocation.cmd, invocation.args, {
@@ -298,6 +166,4 @@ export async function runInit(
     // shadcn already printed the detailed error to stdio, avoid double-reporting
     process.exit(1);
   }
-
-  await normalizeComponentsBaseColor(options.cwd);
 }

packages/bejamas/src/commands/init.ts

@@ -274,7 +274,7 @@ export class ConfigMissingError extends RegistryError {
       code: RegistryErrorCode.NOT_CONFIGURED,
       context: { cwd },
       suggestion:
-        "Run 'npx shadcn@latest init' to create a components.json file, or check that you're in the correct directory.",
+        "Run 'npx bejamas init' to create a components.json file, or check that you're in the correct directory.",
     });
     this.name = "ConfigMissingError";
   }
@@ -298,7 +298,7 @@ export class ConfigParseError extends RegistryError {
       cause: parseError,
       context: { cwd },
       suggestion:
-        "Check your components.json file for syntax errors or invalid configuration. Run 'npx shadcn@latest init' to regenerate a valid configuration.",
+        "Check your components.json file for syntax errors or invalid configuration. Run 'npx bejamas init' to regenerate a valid configuration.",
     });
     this.name = "ConfigParseError";
   }

packages/bejamas/src/registry/errors.ts

@@ -0,0 +1,39 @@
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+
+export const PINNED_SHADCN_VERSION = "3.8.5";
+export const PINNED_SHADCN_PACKAGE = `shadcn@${PINNED_SHADCN_VERSION}`;
+
+export interface ShadcnInvocation {
+  cmd: string;
+  args: string[];
+  source: "bundled" | "fallback";
+}
+
+export function resolveBundledShadcnEntrypoint() {
+  try {
+    return require.resolve("shadcn");
+  } catch {
+    return null;
+  }
+}
+
+export function buildPinnedShadcnInvocation(
+  shadcnArgs: string[],
+  bundledEntrypoint = resolveBundledShadcnEntrypoint(),
+): ShadcnInvocation {
+  if (bundledEntrypoint) {
+    return {
+      cmd: process.execPath,
+      args: [bundledEntrypoint, ...shadcnArgs],
+      source: "bundled",
+    };
+  }
+
+  return {
+    cmd: "npx",
+    args: ["-y", PINNED_SHADCN_PACKAGE, ...shadcnArgs],
+    source: "fallback",
+  };
+}