@stacksjs/stx 0.2.111 → 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}`);

package/dist/includes.js

@@ -189,8 +189,8 @@ ${scriptContent}
 ${tail}})();
 `;
 }
-function transformSignalScript(scriptContent, scopeId) {
-  const tail = `
+function buildScopeRegistrationTail(scriptContent, scopeId) {
+  return `
   // Register scope variables for STX runtime
   if (!window.stx._scopes) window.stx._scopes = {};
   var __scopeRegistration = { __destroyCallbacks: __destroyHooks };
@@ -202,7 +202,10 @@ ${extractExports(scriptContent).split(",").map((s) => s.trim()).filter(Boolean).
   // shadowing import. __stxScopeRenames is emitted by bundleClientScript.
   try { if (typeof __stxScopeRenames !== 'undefined' && __stxScopeRenames) { for (var __stxRK in __stxScopeRenames) __scopeRegistration[__stxRK] = __stxScopeRenames[__stxRK]; } } catch (e) { /* no renames */ }
   window.stx._scopes['${scopeId}'] = __scopeRegistration;
-`, head = `
+`;
+}
+function transformSignalScript(scriptContent, scopeId) {
+  const tail = buildScopeRegistrationTail(scriptContent, scopeId), head = `
 (function() {
   var __stxScopeEl = (typeof document !== 'undefined') ? document.querySelector('[data-stx-scope="${scopeId}"]') : null;
   var __stxPrevEl = (typeof window !== 'undefined') ? window.__STX_CURRENT_ELEMENT__ : undefined;
@@ -604,10 +607,7 @@ export async function processIncludes(template, context, filePath, options, depe
         if (!isServerScript && !isSignalScript) {
           const extraAttrs = scriptAttrs.replace(/\bclient\b/i, "").trim();
           signalScopeId = `stx_scope_${path.basename(includeFilePath, ".stx").replace(/[^a-zA-Z0-9]/g, "_")}_${++scopeIdCounter}`;
-          const resolvedContent = transformStoreImports(scriptContent), tail = `
-  if (!window.stx._scopes) window.stx._scopes = {};
-  window.stx._scopes['${signalScopeId}'] = { __destroyCallbacks: __destroyHooks };
-`, wrapped = wrapClientScript(resolvedContent, tail);
+          const resolvedContent = transformStoreImports(scriptContent), tail = buildScopeRegistrationTail(resolvedContent, signalScopeId), wrapped = wrapClientScript(resolvedContent, tail);
           preservedScript += `${vendorStyleTags}<script data-stx-scoped${extraAttrs ? ` ${extraAttrs}` : ""}>${wrapped}</script>
 `;
         }