@webmate-studio/builder 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmate-studio/builder",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "description": "Webmate Studio Component Builder",
   "keywords": [

package/src/tailwind-generator-v4.js

@@ -16,25 +16,33 @@ const execAsync = promisify(exec);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Find tailwindcss binary - try multiple locations
+// Import createRequire for resolving packages
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-let tailwindBinary;
-try {
-	// Try to resolve tailwindcss package
-	const tailwindPackagePath = require.resolve('tailwindcss/package.json');
-	const tailwindDir = dirname(tailwindPackagePath);
-
-	// Check if we're on Windows
-	const isWindows = process.platform === 'win32';
-	const binName = isWindows ? 'tailwindcss.cmd' : 'tailwindcss';
-
-	// Use npx to run tailwindcss from the resolved package
-	tailwindBinary = `npx tailwindcss`;
-} catch (e) {
-	// Fallback to old method
-	tailwindBinary = join(__dirname, '..', 'node_modules', '.bin', 'tailwindcss');
+/**
+ * Get tailwindcss command for execution
+ * @returns {string} Command to run tailwindcss
+ */
+function getTailwindCommand() {
+	try {
+		// Try to resolve tailwindcss package
+		const tailwindPackagePath = require.resolve('tailwindcss/package.json');
+		const tailwindDir = dirname(tailwindPackagePath);
+
+		// Check if we're on Windows
+		const isWindows = process.platform === 'win32';
+		const binName = isWindows ? 'tailwindcss.cmd' : 'tailwindcss';
+
+		// Build path to bin
+		const binPath = join(tailwindDir, '..', '.bin', binName);
+
+		// Return just npx command - will be resolved at runtime
+		return 'npx tailwindcss';
+	} catch (e) {
+		// Fallback to npx
+		return 'npx tailwindcss';
+	}
 }
 
 /**
@@ -277,8 +285,8 @@ ${themeCSS}
 
 		// Run Tailwind v4 CLI
 		// Tailwind v4 auto-detects HTML files in the same directory
-		const command = `node "${tailwindBinary}" -i "${inputPath}" ${minify ? '--minify' : ''}`;
-
+		const tailwindCmd = getTailwindCommand();
+		const command = `${tailwindCmd} -i "${inputPath}" ${minify ? '--minify' : ''}`;
 
 		// Set NODE_PATH so tailwindcss module can be resolved
 		const builderNodeModules = join(__dirname, "..", "node_modules");

package/src/tailwind-generator.js

@@ -16,25 +16,33 @@ const execAsync = promisify(exec);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Find tailwindcss binary - try multiple locations
+// Import createRequire for resolving packages
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
-let tailwindBinary;
-try {
-	// Try to resolve tailwindcss package
-	const tailwindPackagePath = require.resolve('tailwindcss/package.json');
-	const tailwindDir = dirname(tailwindPackagePath);
-
-	// Check if we're on Windows
-	const isWindows = process.platform === 'win32';
-	const binName = isWindows ? 'tailwindcss.cmd' : 'tailwindcss';
-
-	// Use npx to run tailwindcss from the resolved package
-	tailwindBinary = `npx tailwindcss`;
-} catch (e) {
-	// Fallback to old method
-	tailwindBinary = join(__dirname, '..', 'node_modules', '.bin', 'tailwindcss');
+/**
+ * Get tailwindcss command for execution
+ * @returns {string} Command to run tailwindcss
+ */
+function getTailwindCommand() {
+	try {
+		// Try to resolve tailwindcss package
+		const tailwindPackagePath = require.resolve('tailwindcss/package.json');
+		const tailwindDir = dirname(tailwindPackagePath);
+
+		// Check if we're on Windows
+		const isWindows = process.platform === 'win32';
+		const binName = isWindows ? 'tailwindcss.cmd' : 'tailwindcss';
+
+		// Build path to bin
+		const binPath = join(tailwindDir, '..', '.bin', binName);
+
+		// Return just npx command - will be resolved at runtime
+		return 'npx tailwindcss';
+	} catch (e) {
+		// Fallback to npx
+		return 'npx tailwindcss';
+	}
 }
 
 /**
@@ -255,8 +263,9 @@ export async function generateTailwindCSS(classes, options = {}) {
 		const dummyHTML = `<div class="${classArray.join(' ')}"></div>`;
 		writeFileSync(htmlPath, dummyHTML);
 
-		// Run Tailwind CLI using node to execute the CLI script
-		const command = `node "${tailwindBinary}" -c "${configPath}" -i "${inputPath}" ${minify ? '--minify' : ''}`;
+		// Run Tailwind CLI
+		const tailwindCmd = getTailwindCommand();
+		const command = `${tailwindCmd} -c "${configPath}" -i "${inputPath}" ${minify ? '--minify' : ''}`;
 
 		const { stdout } = await execAsync(command, {
 			maxBuffer: 10 * 1024 * 1024 // 10MB buffer