@webmate-studio/builder 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmate-studio/builder",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "description": "Webmate Studio Component Builder",
   "keywords": [
@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "@tailwindcss/cli": "^4.1.0",
-    "@webmate-studio/builder": "^0.1.7",
     "@webmate-studio/core": "^0.1.0",
     "@webmate-studio/parser": "^0.1.0",
     "alpinejs": "^3.15.0",

package/src/tailwind-generator.js

@@ -5,7 +5,7 @@
 
 import { exec } from 'child_process';
 import { promisify } from 'util';
-import { writeFileSync, unlinkSync, mkdtempSync } from 'fs';
+import { writeFileSync, unlinkSync, mkdtempSync, existsSync } from 'fs';
 import { join, dirname } from 'path';
 import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
@@ -25,22 +25,47 @@ const require = createRequire(import.meta.url);
  * @returns {string} Path to tailwindcss CLI
  */
 function getTailwindCommand() {
-	try {
-		// Try to resolve @tailwindcss/cli package which contains the actual binary
-		const cliPath = require.resolve('@tailwindcss/cli');
-		return cliPath;
-	} catch (e) {
-		// Fallback: try to find tailwindcss package and use its CLI
+	// Try multiple strategies to find @tailwindcss/cli
+	const strategies = [
+		// Strategy 1: Direct resolve of main entry
+		() => require.resolve('@tailwindcss/cli'),
+
+		// Strategy 2: Resolve package.json and build path
+		() => {
+			const pkgPath = require.resolve('@tailwindcss/cli/package.json');
+			return join(dirname(pkgPath), 'dist', 'index.js');
+		},
+
+		// Strategy 3: From builder's node_modules
+		() => {
+			const builderDir = dirname(import.meta.url.replace('file://', ''));
+			return join(builderDir, '..', 'node_modules', '@tailwindcss', 'cli', 'dist', 'index.js');
+		},
+
+		// Strategy 4: Relative to tailwindcss package
+		() => {
+			const tailwindPkg = require.resolve('tailwindcss/package.json');
+			const tailwindDir = dirname(tailwindPkg);
+			return join(tailwindDir, '..', '@tailwindcss', 'cli', 'dist', 'index.js');
+		}
+	];
+
+	for (const strategy of strategies) {
 		try {
-			const tailwindPackagePath = require.resolve('tailwindcss/package.json');
-			const tailwindDir = dirname(tailwindPackagePath);
-			// Tailwind v4 uses @tailwindcss/cli
-			const cliPath = join(tailwindDir, '..', '@tailwindcss', 'cli', 'dist', 'index.js');
-			return cliPath;
-		} catch (e2) {
-			throw new Error('Could not find @tailwindcss/cli. Please install it: npm install @tailwindcss/cli');
+			const cliPath = strategy();
+			// Verify the file exists
+			if (existsSync(cliPath)) {
+				return cliPath;
+			}
+		} catch (e) {
+			// Try next strategy
+			continue;
 		}
 	}
+
+	throw new Error(
+		'Could not find @tailwindcss/cli. Please ensure @tailwindcss/cli is installed.'
+	);
 }
 
 /**