@homebound/truss 2.29.10 → 2.29.12

package/build/plugin/index.js

@@ -2586,16 +2586,18 @@ function parseTrussCss(cssText) {
   }
   return { rules, properties, arbitraryCssBlocks };
 }
-function serializeTrussCss(css) {
+function serializeTrussCss(css, annotate = true) {
   const lines = [];
   for (const rule of css.rules) {
-    lines.push(`/* @truss p:${rule.priority} c:${rule.className} */`, rule.cssText);
+    if (annotate) lines.push(`/* @truss p:${rule.priority} c:${rule.className} */`);
+    lines.push(rule.cssText);
   }
   for (const prop of css.properties) {
-    lines.push(`/* @truss @property */`, prop.cssText);
+    if (annotate) lines.push(`/* @truss @property */`);
+    lines.push(prop.cssText);
   }
   for (const block of css.arbitraryCssBlocks) {
-    lines.push(annotateArbitraryCssBlock(block.cssText));
+    lines.push(annotate ? annotateArbitraryCssBlock(block.cssText) : block.cssText.trim());
   }
   return lines.join("\n");
 }
@@ -3717,13 +3719,13 @@ function createTrussTransformSession(options) {
     }
     return result;
   }
-  function collectCss() {
+  function collectCss(annotate = true) {
     const mapping2 = ensureMapping();
     const appCss = generateCssData(cssRegistry);
     const allArbitrary = Array.from(arbitraryCssRegistry.entries()).sort((a, b) => compareClassNames(a[0], b[0])).map((entry) => entry[1]).join("\n\n");
     if (allArbitrary.length > 0) appCss.arbitraryCssBlocks.push({ cssText: allArbitrary });
     const libs = loadLibraries();
-    const body = serializeTrussCss(libs.length === 0 ? appCss : mergeTrussCssData([...libs, appCss]));
+    const body = serializeTrussCss(libs.length === 0 ? appCss : mergeTrussCssData([...libs, appCss]), annotate);
     if (body.length === 0) return "";
     return `${rootSpacingPreludeCss(mapping2.increment)}
 ${body}`;
@@ -3819,11 +3821,11 @@ function trussPlugin(opts) {
   let debug = false;
   let isTest = false;
   let isBuild = false;
+  let annotate = true;
   let devSocket;
   const libraryPaths = opts.libraries ?? [];
   let emittedCssFileName = null;
-  let cssVersion = 0;
-  let lastSentVersion = 0;
+  let cssUpdateTimer;
   function mappingPath() {
     return resolve4(projectRoot || process.cwd(), opts.mapping);
   }
@@ -3837,7 +3839,11 @@ function trussPlugin(opts) {
     projectRoot: () => projectRoot || process.cwd(),
     libraries: libraryPaths,
     onCssChanged() {
-      cssVersion++;
+      if (!devSocket || cssUpdateTimer !== void 0) return;
+      cssUpdateTimer = setTimeout(() => {
+        cssUpdateTimer = void 0;
+        devSocket?.send({ type: "custom", event: "truss:css-update" });
+      }, 0);
     }
   });
   return {
@@ -3848,12 +3854,13 @@ function trussPlugin(opts) {
       debug = config.command === "serve" || config.mode === "development" || config.mode === "test";
       isTest = config.mode === "test";
       isBuild = config.command === "build";
+      annotate = !isBuild || Boolean(config.build?.lib);
     },
     buildStart() {
       session.ensureMapping();
       session.reset();
-      cssVersion = 0;
-      lastSentVersion = 0;
+      clearTimeout(cssUpdateTimer);
+      cssUpdateTimer = void 0;
     },
     // -- Dev mode HMR --
     configureServer(server) {
@@ -3861,19 +3868,15 @@ function trussPlugin(opts) {
       devSocket = server.ws;
       server.middlewares.use((req, res, next) => {
         if (req.url !== VIRTUAL_CSS_ENDPOINT) return next();
-        const css = session.collectCss();
+        const css = session.collectCss(annotate);
         res.setHeader("Content-Type", "text/css");
         res.setHeader("Cache-Control", "no-store");
         res.end(css);
       });
-      const interval = setInterval(() => {
-        if (cssVersion !== lastSentVersion && server.ws) {
-          lastSentVersion = cssVersion;
-          server.ws.send({ type: "custom", event: "truss:css-update" });
-        }
-      }, 150);
       server.httpServer?.on("close", () => {
-        clearInterval(interval);
+        clearTimeout(cssUpdateTimer);
+        cssUpdateTimer = void 0;
+        devSocket = void 0;
       });
     },
     transformIndexHtml(html) {
@@ -3887,11 +3890,6 @@ function trussPlugin(opts) {
       return html.replace("</head>", `    ${tag}
   </head>`);
     },
-    handleHotUpdate(ctx) {
-      if (ctx.server?.ws) {
-        ctx.server.ws.send({ type: "custom", event: "truss:css-update" });
-      }
-    },
     // -- Virtual module resolution --
     resolveId(source, importer) {
       if (source === VIRTUAL_RUNTIME_ID || source === "/" + VIRTUAL_RUNTIME_ID) {
@@ -3929,9 +3927,6 @@ function trussPlugin(opts) {
 
   if (import.meta.hot) {
     import.meta.hot.on("truss:css-update", fetchCss);
-    import.meta.hot.on("vite:afterUpdate", () => {
-      setTimeout(fetchCss, 50);
-    });
   }
 })();
 `;
@@ -3995,7 +3990,7 @@ import "${VIRTUAL_TEST_CSS_ID}";` : rewrittenImports.code;
     // -- Production CSS emission --
     generateBundle(_options, _bundle) {
       if (!isBuild) return;
-      const css = session.collectCss();
+      const css = session.collectCss(annotate);
       if (!css) return;
       const hash = createHash("sha256").update(css).digest("hex").slice(0, 8);
       const fileName = `assets/truss-${hash}.css`;