@normed/bundle 4.5.1 → 4.5.2

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.2
+
+* PATCH: Fixes incorrect asset path resolution in pug templates when using custom `assetNames` configuration. Asset paths are now correctly computed relative to the HTML output location.
+
 # 4.5.1
 
 * PATCH: Fixes discovered pug files being output with `.pug` extension instead of `.html`.

package/bundles/bin/cli.js

@@ -69226,6 +69226,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
           const hashedPath = await processAsset(
             assetPath,
             pugDir,
+            pugFilePath,
             outdir,
             outbase,
             assetNames,
@@ -69255,6 +69256,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
       const hashedPath = await processAsset(
         value,
         pugDir,
+        pugFilePath,
         outdir,
         outbase,
         assetNames,
@@ -69273,7 +69275,7 @@ async function processHtmlAssets(html, pugFilePath, options2) {
   }
   return { html: modifiedHtml, assets, pugReferences };
 }
-async function processAsset(assetPath, pugDir, outdir, outbase, assetNames, publicPath, assets, processedAssets) {
+async function processAsset(assetPath, pugDir, pugFilePath, outdir, outbase, assetNames, publicPath, assets, processedAssets) {
   const absoluteSource = import_path5.default.resolve(pugDir, assetPath);
   if (processedAssets.has(absoluteSource)) {
     return processedAssets.get(absoluteSource);
@@ -69291,7 +69293,15 @@ async function processAsset(assetPath, pugDir, outdir, outbase, assetNames, publ
       outbase
     );
     const absoluteOutput = import_path5.default.join(outdir, hashedFilename);
-    const htmlPath = publicPath ? publicPath.replace(/\/$/, "") + "/" + hashedFilename : hashedFilename;
+    const pugRelativeToOutbase = import_path5.default.relative(outbase, pugFilePath);
+    const htmlOutputPath = import_path5.default.join(outdir, pugRelativeToOutbase);
+    const htmlOutputDir = import_path5.default.dirname(htmlOutputPath);
+    let htmlPath;
+    if (publicPath) {
+      htmlPath = publicPath.replace(/\/$/, "") + "/" + hashedFilename;
+    } else {
+      htmlPath = import_path5.default.relative(htmlOutputDir, absoluteOutput);
+    }
     assets.push({
       originalPath: assetPath,
       hashedPath: htmlPath,