@normed/bundle 4.5.5 → 4.5.6

package/CHANGELOG.md

@@ -6,6 +6,10 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 2. MINOR version when you add functionality in a backwards compatible manner, and
 3. PATCH version when you make backwards compatible bug fixes.
 
+# 4.5.6
+
+* PATCH: Fix pug and less file reference paths to be relative to the HTML output location. Previously, paths could be absolute or incorrect when files were in subdirectories. Now paths like `./css/styles.less` are correctly rewritten to `css/styles-hash.css` relative to the HTML file.
+
 # 4.5.5
 
 * PATCH: Fix `url()` references in less files referenced from pug templates not being processed. Less files are now built through esbuild's CSS pipeline, which properly resolves `url()` references, copies assets to the output directory, and rewrites paths to hashed filenames.

package/bundles/bin/cli.js

@@ -69669,22 +69669,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;
@@ -69998,7 +70002,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],
@@ -70025,18 +70029,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, {