mick-templates 1.1.4 → 1.1.5

package/bin/cli.js

@@ -2,6 +2,7 @@
 import { spawn } from "child_process";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+import { getUserAgent } from "package-manager-detector";
 
 // Get the directory where this script is located
 const __filename = fileURLToPath(import.meta.url);
@@ -9,8 +10,25 @@ const binDir = dirname(__filename);
 const projectRoot = join(binDir, "..");
 const cliPath = join(projectRoot, "src", "index.tsx");
 
-// Use npx to run tsx (it will find tsx from the package dependencies)
-const child = spawn("npx", ["tsx", cliPath, ...process.argv.slice(2)], {
+// Detect the package manager agent
+const agent = getUserAgent() ?? "npm";
+
+let command;
+let args;
+
+if (agent === "bun") {
+  command = "bun";
+  args = [cliPath, ...process.argv.slice(2)];
+} else {
+  // Use the local tsx from the package's node_modules
+  const isWin = process.platform === "win32";
+  const tsxBin = join(projectRoot, "node_modules", ".bin", "tsx");
+  command = isWin ? `${tsxBin}.cmd` : tsxBin;
+  args = [cliPath, ...process.argv.slice(2)];
+}
+
+// Spawn the command
+const child = spawn(command, args, {
   stdio: "inherit",
   cwd: process.cwd(),
   env: process.env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mick-templates",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "CLI tool for creating projects from templates",
   "bin": {
     "mick-templates": "bin/cli.js"

package/src/lib/pm.ts

@@ -6,8 +6,7 @@ import { spawn } from "child_process";
  * Get the current package manager agent.
  */
 export function getAgent(): AgentName {
-  const ua = getUserAgent();
-  return ua?.name ?? "npm";
+  return getUserAgent() ?? "npm";
 }
 
 /**
@@ -16,7 +15,9 @@ export function getAgent(): AgentName {
 function run(cmd: string, args: string[], cwd: string): Promise<void> {
   return new Promise((resolve, reject) => {
     spawn(cmd, args, { cwd, stdio: "inherit" })
-      .on("close", (code) => (code === 0 ? resolve() : reject(new Error(`Exit ${code}`))))
+      .on("close", (code) =>
+        code === 0 ? resolve() : reject(new Error(`Exit ${code}`))
+      )
       .on("error", reject);
   });
 }
@@ -28,17 +29,21 @@ export async function install(cwd: string): Promise<void> {
   const agent = getAgent();
   const resolved = resolveCommand(agent, "install", []);
   if (!resolved) throw new Error(`Cannot resolve install command for ${agent}`);
-  
+
   await run(resolved.command, resolved.args, cwd);
 }
 
 /**
  * Execute a package binary (npx/bunx/etc).
  */
-export async function execute(cwd: string, pkg: string, args: string[]): Promise<void> {
+export async function execute(
+  cwd: string,
+  pkg: string,
+  args: string[]
+): Promise<void> {
   const agent = getAgent();
   const resolved = resolveCommand(agent, "execute", [pkg, ...args]);
   if (!resolved) throw new Error(`Cannot resolve execute command for ${agent}`);
-  
+
   await run(resolved.command, resolved.args, cwd);
 }