stackpatch 1.1.7 → 1.1.8

package/bin/stackpatch.js

@@ -4,19 +4,24 @@
  *
  * This wrapper detects the runtime (Bun or Node.js) and executes the TypeScript file accordingly.
  * - If Bun is available, uses Bun directly (faster)
- * - Otherwise, uses tsx for Node.js compatibility
+ * - Otherwise, uses tsx via npx for Node.js compatibility
  */
 
 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);
 const tsFile = join(__dirname, "stackpatch.ts");
 
+// Verify the TypeScript file exists
+if (!existsSync(tsFile)) {
+  console.error(`Error: TypeScript file not found: ${tsFile}`);
+  process.exit(1);
+}
+
 // Check if Bun is available
 function hasBun() {
   try {
@@ -30,114 +35,48 @@ 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);
 
 if (hasBun()) {
-  // Use Bun if available
+  // Use Bun if available - Bun can execute TypeScript directly
   const bun = spawn("bun", [tsFile, ...args], {
     stdio: "inherit",
     cwd: process.cwd(),
   });
-  bun.on("exit", (code) => process.exit(code || 0));
+
+  bun.on("exit", (code) => {
+    process.exit(code || 0);
+  });
+
   bun.on("error", (err) => {
     console.error("Error running Bun:", err.message);
-    process.exit(1);
+    // Fallback to npx tsx
+    console.log("Falling back to Node.js with tsx...");
+    runWithTsx();
   });
 } else {
   // Use tsx for Node.js
-  // Try to find tsx locally first, then fall back to npx
-  const tsxCommand = findTsx();
+  runWithTsx();
+}
 
-  // 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], {
+function runWithTsx() {
+  // Always use npx -y tsx - it's the most reliable method
+  // npx will download tsx if needed, and it works in all scenarios
+  const tsx = spawn("npx", ["-y", "tsx", tsFile, ...args], {
     stdio: "inherit",
     cwd: process.cwd(),
-    shell: tsxCommand[0] === "npx", // Use shell for npx to handle PATH correctly
+    shell: true, // Use shell for npx to handle PATH correctly
   });
 
   tsx.on("exit", (code) => {
-    if (code !== 0 && code !== null) {
-      process.exit(code);
-    }
-    process.exit(0);
+    process.exit(code || 0);
   });
 
   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);
-      });
-    } 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);
-    }
+    console.error("Error: Could not execute TypeScript file.");
+    console.error("Please ensure Node.js and npm are properly installed.");
+    console.error("Original error:", err.message);
+    process.exit(1);
   });
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "stackpatch",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "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",
   "bin": {
-    "stackpatch": "bin/stackpatch.js",
-    "create-stackpatch": "bin/stackpatch.js"
+    "stackpatch": "bin/stackpatch.ts",
+    "create-stackpatch": "bin/stackpatch.ts"
   },
   "files": [
     "bin",