stackpatch 1.1.6 → 1.1.7

package/README.md

@@ -78,17 +78,15 @@ npx stackpatch create my-app
 # Or without project name (will prompt)
 npx stackpatch create
 
-# Using npm create (requires package to be published)
-npm create stackpatch@latest my-app
-
-# Using bunx (Bun's npx equivalent)
+# Using bunx (Bun's npx equivalent - if you have Bun installed)
 bunx create-stackpatch@latest my-app
 ```
 
 > **Note:**
 > - `npx stackpatch create` works immediately and doesn't require the package to be published
-> - `npm create` and `npx create-stackpatch@latest` require the package to be published to npm first
+> - `npm create stackpatch@latest` will work after the package is published to npm
 > - All commands will prompt you for a project name if not provided
+> - The CLI automatically detects and uses Bun if available, otherwise falls back to Node.js with tsx
 
 ### Revert an Installation
 

package/bin/stackpatch.js

@@ -11,6 +11,7 @@ import { spawn, spawnSync } from "child_process";
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
 import { existsSync } from "fs";
+import { createRequire } from "module";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -29,6 +30,57 @@ function hasBun() {
   }
 }
 
+// Find tsx executable
+function findTsx() {
+  // First, try to resolve tsx from the package's node_modules using require.resolve
+  // This works when the package is installed locally or via npx
+  try {
+    const require = createRequire(import.meta.url);
+
+    // Try to resolve tsx/cli.mjs directly
+    try {
+      const tsxBinPath = require.resolve("tsx/cli.mjs");
+      if (existsSync(tsxBinPath)) {
+        return ["node", tsxBinPath];
+      }
+    } catch {
+      // tsx/cli.mjs not found
+    }
+
+    // Try to find tsx package and locate cli.mjs
+    try {
+      const tsxPackagePath = require.resolve("tsx/package.json");
+      const tsxDir = dirname(tsxPackagePath);
+      const tsxBin = join(tsxDir, "cli.mjs");
+
+      if (existsSync(tsxBin)) {
+        return ["node", tsxBin];
+      }
+    } catch {
+      // tsx package not found
+    }
+  } catch {
+    // require.resolve failed - package might not be installed yet
+  }
+
+  // Try node_modules/.bin/tsx in various locations
+  const possibleTsxPaths = [
+    join(__dirname, "../node_modules/.bin/tsx"),
+    join(__dirname, "../../node_modules/.bin/tsx"),
+    join(process.cwd(), "node_modules/.bin/tsx"),
+  ];
+
+  for (const tsxPath of possibleTsxPaths) {
+    if (existsSync(tsxPath)) {
+      return [tsxPath];
+    }
+  }
+
+  // Final fallback: use npx to download and run tsx
+  // This is the most reliable method when package is downloaded via npx
+  return ["npx", "-y", "tsx"];
+}
+
 // Execute with appropriate runtime
 const args = process.argv.slice(2);
 
@@ -39,41 +91,53 @@ if (hasBun()) {
     cwd: process.cwd(),
   });
   bun.on("exit", (code) => process.exit(code || 0));
+  bun.on("error", (err) => {
+    console.error("Error running Bun:", err.message);
+    process.exit(1);
+  });
 } else {
   // Use tsx for Node.js
-  // Try multiple possible locations for tsx
-  const possibleTsxPaths = [
-    join(__dirname, "../node_modules/.bin/tsx"), // Local installation
-    join(__dirname, "../../node_modules/.bin/tsx"), // Monorepo structure
-    join(process.cwd(), "node_modules/.bin/tsx"), // Project's node_modules
-  ];
+  // Try to find tsx locally first, then fall back to npx
+  const tsxCommand = findTsx();
 
-  let tsxPath = null;
-  for (const path of possibleTsxPaths) {
-    if (existsSync(path)) {
-      tsxPath = path;
-      break;
+  // If we're using npx, it will handle downloading tsx if needed
+  // This is the most reliable method when package is downloaded via npx
+  const tsx = spawn(tsxCommand[0], [...tsxCommand.slice(1), tsFile, ...args], {
+    stdio: "inherit",
+    cwd: process.cwd(),
+    shell: tsxCommand[0] === "npx", // Use shell for npx to handle PATH correctly
+  });
+
+  tsx.on("exit", (code) => {
+    if (code !== 0 && code !== null) {
+      process.exit(code);
     }
-  }
+    process.exit(0);
+  });
 
-  if (tsxPath) {
-    const tsx = spawn(tsxPath, [tsFile, ...args], {
-      stdio: "inherit",
-      cwd: process.cwd(),
-    });
-    tsx.on("exit", (code) => process.exit(code || 0));
-  } else {
-    // Fallback: try tsx from PATH or use npx
-    const tsx = spawn("npx", ["-y", "tsx", tsFile, ...args], {
-      stdio: "inherit",
-      cwd: process.cwd(),
-    });
-    tsx.on("exit", (code) => {
-      if (code !== 0) {
-        console.error("Error: Could not execute TypeScript file. Please ensure tsx is available.");
+  tsx.on("error", (err) => {
+    // If npx fails, try one more time with explicit node
+    if (tsxCommand[0] !== "npx") {
+      console.error("Error: Could not execute TypeScript file.");
+      console.error("Trying with npx...");
+
+      const npxTsx = spawn("npx", ["-y", "tsx", tsFile, ...args], {
+        stdio: "inherit",
+        cwd: process.cwd(),
+        shell: true,
+      });
+
+      npxTsx.on("exit", (code) => process.exit(code || 0));
+      npxTsx.on("error", () => {
+        console.error("Error: Could not execute TypeScript file.");
+        console.error("Please ensure tsx is available: npm install -g tsx");
         process.exit(1);
-      }
-      process.exit(code || 0);
-    });
-  }
+      });
+    } else {
+      console.error("Error: Could not execute TypeScript file.");
+      console.error("Please ensure tsx is available: npm install -g tsx");
+      console.error("Original error:", err.message);
+      process.exit(1);
+    }
+  });
 }

package/bin/stackpatch.ts

@@ -1,4 +1,6 @@
-#!/usr/bin/env tsx
+#!/usr/bin/env node
+// This file should be executed via bin/stackpatch.js wrapper
+// Direct execution is not recommended - use the wrapper instead
 // This file works with both Bun and Node.js
 // - Bun can execute TypeScript files directly
 // - Node.js uses tsx (installed as dependency) to execute TypeScript

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackpatch",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Composable frontend features for modern React & Next.js apps - Add authentication, UI components, and more with zero configuration",
   "main": "bin/stackpatch.ts",
   "type": "module",