@normed/bundle 4.5.0 → 4.5.2

package/CHANGELOG.md

@@ -6,6 +6,15 @@ 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`.
+* PATCH: Fixes pug reference rewriting not detecting HTML outputs correctly.
+
 # 4.5.0
 
 * MINOR: Adds asset processing for pug entrypoints. Images, fonts, and other assets referenced in pug files are now hashed, copied to the output directory, and their paths rewritten automatically.

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,
@@ -69734,7 +69744,11 @@ var esbuilder = {
           let transforms = [];
           const oFM_result = currentOutputFilesMap.get(relativeFilePath);
           if (oFM_result) {
-            relativeTarget = oFM_result.entrypoint?.outfile.relative ?? relativeFilePath;
+            if (oFM_result.entrypoint) {
+              relativeTarget = oFM_result.entrypoint.outfile.relative;
+            } else if (relativeFilePath.endsWith(".pug")) {
+              relativeTarget = relativeFilePath.replace(/\.pug$/, ".html");
+            }
             oFM_result.present = true;
             if (expectingSourcemap && oFM_result.mapFileExpected) {
             }
@@ -69759,7 +69773,7 @@ var esbuilder = {
               `Correcting output file name "${relativeFilePath}" to be "${relativeTarget}".`
             );
           }
-          const isHtmlOutput = relativeFilePath.endsWith(".html");
+          const isHtmlOutput = relativeTarget.endsWith(".html");
           const sourcePath = oFM_result?.sourcePath;
           if (isHtmlOutput && sourcePath) {
             const pugRefs = discoveredPugReferences.get(sourcePath) || [];
@@ -69843,8 +69857,7 @@ var esbuilder = {
             const discoveredOutputFilesMap = /* @__PURE__ */ new Map();
             for (const pugSourcePath of newEntryPoints) {
               const relativeSource = import_path7.default.relative(indir, pugSourcePath);
-              const expectedOutput = relativeSource.replace(/\.pug$/, ".html");
-              discoveredOutputFilesMap.set(expectedOutput, {
+              discoveredOutputFilesMap.set(relativeSource, {
                 entrypoint: void 0,
                 sourcePath: pugSourcePath,
                 present: false,