@srcroot/ui 0.0.19 → 0.0.21

package/dist/index.js

@@ -511,12 +511,35 @@ async function init(options) {
   const allDeps = { ...pkg.dependencies, ...pkg.devDependencies };
   const tailwindVersion = allDeps["tailwindcss"] || "";
   const isTailwind4 = tailwindVersion.includes("^4") || tailwindVersion.startsWith("4") || allDeps["@tailwindcss/postcss"];
-  const srcDir = fs.existsSync(path.join(cwd, "src")) ? path.join(cwd, "src") : cwd;
-  const appDir = path.join(srcDir, "app");
-  const isAppRouter = fs.existsSync(appDir);
-  const libDir = path.join(srcDir, "lib");
-  const componentsDir = path.join(srcDir, "components", "ui");
-  const globalsPath = isAppRouter ? path.join(appDir, "globals.css") : path.join(srcDir, "styles", "globals.css");
+  const hasSrc = fs.existsSync(path.join(cwd, "src"));
+  const srcPath = hasSrc ? path.join(cwd, "src") : cwd;
+  const appPath = path.join(srcPath, "app");
+  const pagesPath = path.join(srcPath, "pages");
+  const hasAppDir = fs.existsSync(appPath);
+  const hasPagesDir = fs.existsSync(pagesPath);
+  const libDir = path.join(srcPath, "lib");
+  const componentsDir = path.join(srcPath, "components", "ui");
+  let globalsPath = "";
+  if (hasAppDir) {
+    if (fs.existsSync(path.join(appPath, "globals.css"))) {
+      globalsPath = path.join(appPath, "globals.css");
+    } else if (fs.existsSync(path.join(appPath, "global.css"))) {
+      globalsPath = path.join(appPath, "global.css");
+    } else {
+      globalsPath = path.join(appPath, "globals.css");
+    }
+  } else if (hasPagesDir) {
+    const stylesPath = path.join(srcPath, "styles");
+    if (fs.existsSync(path.join(stylesPath, "globals.css"))) {
+      globalsPath = path.join(stylesPath, "globals.css");
+    } else if (fs.existsSync(path.join(stylesPath, "global.css"))) {
+      globalsPath = path.join(stylesPath, "global.css");
+    } else {
+      globalsPath = path.join(stylesPath, "globals.css");
+    }
+  } else {
+    globalsPath = path.join(srcPath, "globals.css");
+  }
   let selectedTheme = options.theme || "slate";
   if (!options.yes && !options.theme) {
     const themeChoices = Object.entries(THEMES).map(([key, theme]) => ({
@@ -556,96 +579,24 @@ async function init(options) {
     } else {
       spinner.info(`Tailwind 4 detected - skipping ${chalk.cyan("tailwind.config.ts")}`);
     }
-    spinner.start("Checking dependencies...");
-    const currentPkg = await fs.readJson(packageJsonPath);
-    const currentDeps = { ...currentPkg.dependencies, ...currentPkg.devDependencies };
-    const missing = [];
-    const requiredDeps = {
-      "clsx": "clsx",
-      "tailwind-merge": "tailwind-merge",
-      "class-variance-authority": "class-variance-authority",
-      "lucide-react": "lucide-react"
-    };
-    if (!isTailwind4) {
-      requiredDeps["tailwindcss-animate"] = "tailwindcss-animate";
-    }
-    for (const [depName, installCmd2] of Object.entries(requiredDeps)) {
-      if (!currentDeps[depName]) {
-        missing.push(installCmd2);
-      }
-    }
-    if (missing.length === 0) {
-      spinner.succeed(chalk.green("All dependencies already installed"));
-    } else {
-      spinner.info(`Found ${chalk.cyan(missing.length)} missing ${missing.length === 1 ? "dependency" : "dependencies"}: ${chalk.dim(missing.map((d) => d.split("@")[0]).join(", "))}`);
-    }
-    async function runCommand(command, cwd2) {
-      const { exec } = await import("child_process");
-      const { promisify } = await import("util");
-      const execAsync = promisify(exec);
-      return await execAsync(command, { cwd: cwd2 });
-    }
-    async function installOneByOne(spinner2, packageManager2, installCmd2, missing2, cwd2) {
-      spinner2.warn("Batch installation failed. Attempting to install dependencies one by one...");
-      let allSucceeded = true;
-      const installFlags = packageManager2 === "npm" ? "--legacy-peer-deps" : "";
-      for (const dep of missing2) {
-        spinner2.start(`Installing ${chalk.cyan(dep)} via ${packageManager2}${installFlags ? " (with --legacy-peer-deps)" : ""}...`);
-        try {
-          const command = installFlags ? `${packageManager2} ${installCmd2} ${installFlags} ${dep}` : `${packageManager2} ${installCmd2} ${dep}`;
-          await runCommand(command, cwd2);
-          spinner2.succeed(`Installed ${chalk.green(dep)}`);
-        } catch (depError) {
-          allSucceeded = false;
-          spinner2.fail(`Failed to install ${chalk.red(dep)}`);
-          if (depError.stdout) {
-            console.log(chalk.dim(`
-=== stdout for ${dep} ===`));
-            console.log(chalk.dim(depError.stdout.toString()));
-          }
-          if (depError.stderr) {
-            console.log(chalk.red(`
-=== stderr for ${dep} ===`));
-            console.error(chalk.red(depError.stderr.toString()));
-          }
-        }
-      }
-      if (allSucceeded) {
-        console.log(chalk.green("\n\u2705 All dependencies installed successfully!\n"));
-      } else {
-        console.log(chalk.yellow("\n\u26A0 Some dependencies failed to install."));
-        const manualCmd = installFlags ? `${packageManager2} ${installCmd2} ${installFlags} ${missing2.join(" ")}` : `${packageManager2} ${installCmd2} ${missing2.join(" ")}`;
-        console.log(chalk.dim(`
-Please manually run: ${manualCmd}
-`));
-      }
-    }
-    if (missing.length > 0) {
-      spinner.start(`Installing dependencies via ${packageManager}: ${missing.join(", ")}...`);
-      try {
-        await runCommand(`${packageManager} ${installCmd} ${missing.join(" ")}`, cwd);
-        spinner.succeed("Dependencies installed");
-      } catch (error) {
-        const stderr = error.stderr?.toString() || "";
-        if (packageManager === "npm" && (stderr.includes("ERESOLVE") || stderr.includes("peer dependency") || stderr.includes("conflicting peer dependency") || stderr.includes("Cannot read properties of null"))) {
-          spinner.start("Batch installation failed. Retrying with --legacy-peer-deps...");
-          try {
-            await runCommand(`npm install --legacy-peer-deps ${missing.join(" ")}`, cwd);
-            spinner.succeed("Dependencies installed (used --legacy-peer-deps)");
-          } catch (retryError) {
-            await installOneByOne(spinner, packageManager, installCmd, missing, cwd);
-          }
-        } else {
-          await installOneByOne(spinner, packageManager, installCmd, missing, cwd);
-        }
-      }
-    }
     console.log(chalk.green("\n\u2705 Project initialized successfully!\n"));
     console.log(`Theme: ${chalk.cyan(THEMES[selectedTheme].name)}`);
     console.log(`Tailwind: ${chalk.cyan(isTailwind4 ? "v4" : "v3")}`);
-    console.log("\nNext steps:");
-    console.log(chalk.dim("  npx @srcroot/ui add button"));
-    console.log(chalk.dim("  npx @srcroot/ui add --all"));
+    const requiredDeps = [
+      "clsx",
+      "tailwind-merge",
+      "class-variance-authority",
+      "lucide-react"
+    ];
+    if (!isTailwind4) {
+      requiredDeps.push("tailwindcss-animate");
+    }
+    console.log(chalk.cyan("\n\u{1F4E6} Required dependencies:"));
+    console.log(chalk.dim(`  ${packageManager} ${installCmd} ${requiredDeps.join(" ")}`));
+    console.log("\n\u2728 Next steps:");
+    console.log(chalk.dim("  1. Install dependencies (command above)"));
+    console.log(chalk.dim("  2. npx @srcroot/ui add button"));
+    console.log(chalk.dim("  3. npx @srcroot/ui add --all"));
     console.log();
   } catch (error) {
     spinner.fail("Failed to initialize project");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srcroot/ui",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "A shadcn-style CLI UI library with polymorphic, accessible React components",
   "type": "module",
   "bin": {