@homebound/truss 2.21.2 → 2.21.3

package/build/plugin/index.js

@@ -1,6 +1,6 @@
 // src/plugin/index.ts
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync, readdirSync } from "fs";
-import { resolve as resolve2, dirname, isAbsolute, join as join2 } from "path";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync2, readdirSync } from "fs";
+import { resolve as resolve3, dirname as dirname2, isAbsolute, join as join2 } from "path";
 import { createHash } from "crypto";
 
 // src/plugin/emit-truss.ts
@@ -3598,14 +3598,17 @@ ${body}
 }
 
 // src/plugin/rewrite-css-ts-imports.ts
+import { existsSync } from "fs";
+import { dirname, resolve } from "path";
 import { parse as parse3 } from "@babel/parser";
 import _generate3 from "@babel/generator";
 import * as t7 from "@babel/types";
 var generate3 = _generate3.default ?? _generate3;
 function rewriteCssTsImports(code, filename) {
-  if (!code.includes(".css.ts")) {
+  if (!code.includes(".css")) {
     return { code, changed: false };
   }
+  const importerDir = dirname(filename);
   const ast = parse3(code, {
     sourceType: "module",
     plugins: ["typescript", "jsx"],
@@ -3617,7 +3620,7 @@ function rewriteCssTsImports(code, filename) {
   for (const node of ast.program.body) {
     if (!t7.isImportDeclaration(node)) continue;
     if (typeof node.source.value !== "string") continue;
-    if (!node.source.value.endsWith(".css.ts")) continue;
+    if (!isCssTsImport(node.source.value, importerDir)) continue;
     if (node.specifiers.length === 0) {
       node.source = t7.stringLiteral(toVirtualCssSpecifier(node.source.value));
       existingCssSideEffects.add(node.source.value);
@@ -3645,8 +3648,16 @@ function rewriteCssTsImports(code, filename) {
   });
   return { code: output.code, changed: true };
 }
+function isCssTsImport(specifier, importerDir) {
+  if (specifier.endsWith(".css.ts")) return true;
+  if (specifier.endsWith(".css")) {
+    return existsSync(resolve(importerDir, `${specifier}.ts`));
+  }
+  return false;
+}
 function toVirtualCssSpecifier(source) {
-  return `${source}?truss-css`;
+  const normalized = source.endsWith(".css.ts") ? source : `${source}.ts`;
+  return `${normalized}?truss-css`;
 }
 
 // src/plugin/merge-css.ts
@@ -3763,7 +3774,7 @@ function mergeTrussCss(sources) {
 
 // src/plugin/esbuild-plugin.ts
 import { readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
-import { resolve, join } from "path";
+import { resolve as resolve2, join } from "path";
 function trussEsbuildPlugin(opts) {
   const cssRegistry = /* @__PURE__ */ new Map();
   const arbitraryCssRegistry = /* @__PURE__ */ new Map();
@@ -3777,7 +3788,7 @@ function trussEsbuildPlugin(opts) {
         const code = readFileSync2(args.path, "utf8");
         if (args.path.endsWith(".css.ts")) {
           if (!mapping) {
-            mapping = loadMapping(resolve(process.cwd(), opts.mapping));
+            mapping = loadMapping(resolve2(process.cwd(), opts.mapping));
           }
           const css = annotateArbitraryCssBlock(transformCssTs(code, args.path, mapping));
           if (css.length > 0) {
@@ -3789,7 +3800,7 @@ function trussEsbuildPlugin(opts) {
         }
         if (!code.includes("Css") && !code.includes("css=")) return void 0;
         if (!mapping) {
-          mapping = loadMapping(resolve(process.cwd(), opts.mapping));
+          mapping = loadMapping(resolve2(process.cwd(), opts.mapping));
         }
         const result = transformTruss(code, args.path, mapping);
         if (!result) return void 0;
@@ -3809,8 +3820,8 @@ function trussEsbuildPlugin(opts) {
         );
         const css = cssParts.join("\n");
         const cssFileName = opts.outputCss ?? "truss.css";
-        const cssPath = resolve(outDir ?? join(process.cwd(), "dist"), cssFileName);
-        mkdirSync(resolve(cssPath, ".."), { recursive: true });
+        const cssPath = resolve2(outDir ?? join(process.cwd(), "dist"), cssFileName);
+        mkdirSync(resolve2(cssPath, ".."), { recursive: true });
         writeFileSync(cssPath, css, "utf8");
       });
     }
@@ -3845,7 +3856,7 @@ function trussPlugin(opts) {
   let cssVersion = 0;
   let lastSentVersion = 0;
   function mappingPath() {
-    return resolve2(projectRoot || process.cwd(), opts.mapping);
+    return resolve3(projectRoot || process.cwd(), opts.mapping);
   }
   function ensureMapping() {
     if (!mapping) {
@@ -3857,7 +3868,7 @@ function trussPlugin(opts) {
   function loadLibraries() {
     if (!libraryCache) {
       libraryCache = libraryPaths.map((libPath) => {
-        const resolved = resolve2(projectRoot || process.cwd(), libPath);
+        const resolved = resolve3(projectRoot || process.cwd(), libPath);
         return readTrussCss(resolved);
       });
     }
@@ -3946,7 +3957,7 @@ function trussPlugin(opts) {
       }
       if (!source.endsWith(CSS_TS_QUERY)) return null;
       const absolutePath = resolveImportPath(source.slice(0, -CSS_TS_QUERY.length), importer, projectRoot);
-      if (!existsSync(absolutePath)) return null;
+      if (!existsSync2(absolutePath)) return null;
       return VIRTUAL_CSS_PREFIX + absolutePath.slice(0, -3);
     },
     load(id) {
@@ -4072,9 +4083,9 @@ function resolveImportPath(source, importer, projectRoot) {
     return source;
   }
   if (importer) {
-    return resolve2(dirname(importer), source);
+    return resolve3(dirname2(importer), source);
   }
-  return resolve2(projectRoot || process.cwd(), source);
+  return resolve3(projectRoot || process.cwd(), source);
 }
 function stripQueryAndHash(id) {
   const queryIndex = id.indexOf("?");