tailwind-hyperclay 0.1.2 → 0.1.4

package/index.js

@@ -34,13 +34,17 @@ export async function compileTailwind(html) {
       try {
         resolved = require.resolve(id, { paths: searchPaths });
       } catch {
-        // If that fails, try with /index.css suffix (for package imports like "tailwindcss")
-        resolved = require.resolve(`${id}/index.css`, { paths: searchPaths });
+        // If that fails, try resolving the package main entry and construct path to index.css
+        // This avoids subpath exports which can fail in Electron asar bundles
+        const mainEntry = require.resolve(id, { paths: searchPaths });
+        const pkgRoot = path.resolve(path.dirname(mainEntry), '..');
+        resolved = path.join(pkgRoot, 'index.css');
       }
 
-      // If resolved to a JS file, try the CSS variant
+      // If resolved to a JS file, find package root and use index.css
       if (resolved.endsWith('.js') || resolved.endsWith('.mjs')) {
-        resolved = require.resolve(`${id}/index.css`, { paths: searchPaths });
+        const pkgRoot = path.resolve(path.dirname(resolved), '..');
+        resolved = path.join(pkgRoot, 'index.css');
       }
 
       const content = await readFile(resolved, 'utf-8');
@@ -80,16 +84,12 @@ export function extractCandidates(html) {
   return Array.from(candidates);
 }
 
-function parseTailwindUrl(urlString) {
-  try {
-    const url = new URL(urlString);
-    if (url.host === 'hyperclay.com' &&
-        url.pathname.startsWith('/tailwindcss/') &&
-        url.pathname.endsWith('.css')) {
-      return url.pathname.slice(13, -4); // extract app name between /tailwindcss/ and .css
-    }
-  } catch {}
-  return null;
+function getTailwindName(urlString) {
+  // Match relative path: /tailwindcss/name.css
+  // Or full URL: https://hyperclay.com/tailwindcss/name.css
+  // With optional query params (?v=123) or fragments (#section)
+  const match = urlString.match(/^(?:https:\/\/hyperclay\.com)?\/tailwindcss\/([^?#]+)\.css(?:[?#].*)?$/);
+  return match ? match[1] : null;
 }
 
 function extractHrefs(html) {
@@ -102,19 +102,27 @@ function extractHrefs(html) {
   return hrefs;
 }
 
+export function getTailwindCssName(html) {
+  for (const href of extractHrefs(html)) {
+    const name = getTailwindName(href);
+    if (name) return name;
+  }
+  return null;
+}
+
 export function hasTailwindLink(html, appName) {
-  return extractHrefs(html).some(url => parseTailwindUrl(url) === appName);
+  return extractHrefs(html).some(url => getTailwindName(url) === appName);
 }
 
 export function hasAnyTailwindLink(html) {
-  return extractHrefs(html).some(url => parseTailwindUrl(url) !== null);
+  return extractHrefs(html).some(url => getTailwindName(url) !== null);
 }
 
 export function replaceTailwindLink(html, newName) {
   return html.replace(
     /(href\s*=\s*["'])([^"']+)(["'])/gi,
     (match, prefix, url, suffix) => {
-      if (parseTailwindUrl(url) !== null) {
+      if (getTailwindName(url) !== null) {
         return `${prefix}https://hyperclay.com/tailwindcss/${newName}.css${suffix}`;
       }
       return match;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-hyperclay",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "On-save Tailwind CSS generator for Hyperclay",
   "type": "module",
   "main": "index.js",