@stacksjs/stx 0.2.112 → 0.2.113

package/dist/dev-server/crosswind.js

@@ -49,8 +49,8 @@ async function tryImportCrosswind(importPath) {
   } catch {}
   return null;
 }
-function findCrosswindPaths() {
-  const paths = [], homeDir = process.env.HOME || process.env.USERPROFILE || "";
+function findProjectCrosswindPaths() {
+  const paths = [];
   let currentDir = process.cwd();
   while (currentDir !== path.dirname(currentDir)) {
     paths.push(path.join(currentDir, "node_modules", "@cwcss", "crosswind", "dist", "index.js"));
@@ -61,6 +61,10 @@ function findCrosswindPaths() {
     paths.push(path.join(currentDir, "pantry", "@stacksjs", "crosswind", "dist", "index.js"));
     currentDir = path.dirname(currentDir);
   }
+  return paths;
+}
+function findDevCrosswindPaths() {
+  const paths = [], homeDir = process.env.HOME || process.env.USERPROFILE || "";
   if (homeDir) {
     const devPaths = [
       path.join(homeDir, "Code", "Tools", "crosswind", "packages", "crosswind", "dist", "index.js"),
@@ -81,6 +85,23 @@ export async function loadCrosswind() {
     return crosswindModule;
   crosswindLoadAttempted = !0;
   try {
+    const loadFrom = async (candidates) => {
+      for (const candidate of candidates) {
+        if (!await Bun.file(candidate).exists())
+          continue;
+        const result = await tryImportCrosswind(candidate);
+        if (result) {
+          if (!process.env.STACKS_DEV_QUIET)
+            console.log(`${colors.green}[Crosswind]${colors.reset} CSS engine loaded from ${path.dirname(path.dirname(candidate))}`);
+          return result;
+        }
+      }
+      return null;
+    }, projectModule = await loadFrom(findProjectCrosswindPaths());
+    if (projectModule) {
+      crosswindModule = projectModule;
+      return crosswindModule;
+    }
     const importPaths = [
       "@cwcss/crosswind",
       "@cwcss/crosswind/dist/index.js",
@@ -96,17 +117,11 @@ export async function loadCrosswind() {
         return crosswindModule;
       }
     }
-    const localPaths = findCrosswindPaths();
-    for (const localPath of localPaths)
-      if (await Bun.file(localPath).exists()) {
-        const result = await tryImportCrosswind(localPath);
-        if (result) {
-          crosswindModule = result;
-          if (!process.env.STACKS_DEV_QUIET)
-            console.log(`${colors.green}[Crosswind]${colors.reset} CSS engine loaded from ${path.dirname(path.dirname(localPath))}`);
-          return crosswindModule;
-        }
-      }
+    const devModule = await loadFrom(findDevCrosswindPaths());
+    if (devModule) {
+      crosswindModule = devModule;
+      return crosswindModule;
+    }
     throw Error("Crosswind CSSGenerator not found in any location");
   } catch {
     console.warn(`${colors.yellow}[Crosswind] CSS engine not available, Tailwind styles will not be generated${colors.reset}`);