@normed/bundle 4.5.5 → 4.5.7

package/bundles/index.js

@@ -69683,22 +69683,26 @@ var ts = __toESM(require("typescript"));
 var import_path8 = __toESM(require("path"));
 var import_fs7 = __toESM(require("fs"));
 import_chalk3.default.level = 3;
-function rewritePugReferencesInHtml(html, pugReferences, pugToOutputPath) {
+function rewritePugReferencesInHtml(html, pugReferences, pugToOutputPath, htmlOutputDir, outdir) {
   let result = html;
   for (const ref of pugReferences) {
     const outputPath = pugToOutputPath.get(ref.absolutePath);
     if (outputPath) {
-      result = result.split(ref.originalHref).join(outputPath);
+      const absoluteOutputPath = import_path8.default.join(outdir, outputPath);
+      const relativePath = import_path8.default.relative(htmlOutputDir, absoluteOutputPath);
+      result = result.split(ref.originalHref).join(relativePath);
     }
   }
   return result;
 }
-function rewriteLessReferencesInHtml(html, lessReferences, lessToOutputPath) {
+function rewriteLessReferencesInHtml(html, lessReferences, lessToOutputPath, htmlOutputDir, outdir) {
   let result = html;
   for (const ref of lessReferences) {
     const outputPath = lessToOutputPath.get(ref.absolutePath);
     if (outputPath) {
-      result = result.split(ref.originalHref).join(outputPath);
+      const absoluteOutputPath = import_path8.default.join(outdir, outputPath);
+      const relativePath = import_path8.default.relative(htmlOutputDir, absoluteOutputPath);
+      result = result.split(ref.originalHref).join(relativePath);
     }
   }
   return result;
@@ -70012,7 +70016,7 @@ var esbuilder = {
             );
             for (const lessSourcePath of newEntryPoints) {
               processedLessFiles.add(lessSourcePath);
-              const entryNames = finalConfig.assetNames?.replace("[ext]", "") || "[name]-[hash]";
+              const entryNames = finalConfig.assetNames?.replace("[ext]", "") || "[dir]/[name]-[hash]";
               const lessConfig = {
                 ...finalConfig,
                 entryPoints: [lessSourcePath],
@@ -70023,13 +70027,13 @@ var esbuilder = {
                 const relativeFilePath = import_path8.default.relative(outdir, file.path);
                 if (relativeFilePath.endsWith(".css")) {
                   lessToOutputPath.set(lessSourcePath, relativeFilePath);
-                  await fileWriter.writeFile(file.path, file.contents, {
-                    encoding: "utf-8"
-                  });
                   log_default.debug(
                     `Built less file: ${import_path8.default.relative(indir, lessSourcePath)} -> ${relativeFilePath}`
                   );
                 }
+                await fileWriter.writeFile(file.path, file.contents, {
+                  encoding: "utf-8"
+                });
               }
             }
           }
@@ -70039,18 +70043,23 @@ var esbuilder = {
           const htmlWriters = [];
           for (const [_sourcePath, output] of pugHtmlOutputs.entries()) {
             let html = output.content;
+            const htmlOutputDir = import_path8.default.dirname(output.outputPath);
             if (output.pugReferences.length > 0) {
               html = rewritePugReferencesInHtml(
                 html,
                 output.pugReferences,
-                pugToOutputPath
+                pugToOutputPath,
+                htmlOutputDir,
+                outdir
               );
             }
             if (output.lessReferences.length > 0) {
               html = rewriteLessReferencesInHtml(
                 html,
                 output.lessReferences,
-                lessToOutputPath
+                lessToOutputPath,
+                htmlOutputDir,
+                outdir
               );
             }
             const promise = fileWriter.writeFile(output.outputPath, html, {