@normed/bundle 4.5.0 → 4.5.2

package/bundles/index.js

@@ -69240,6 +69240,7 @@ async function processHtmlAssets(html, pugFilePath, options) {
           const hashedPath = await processAsset(
             assetPath,
             pugDir,
+            pugFilePath,
             outdir,
             outbase,
             assetNames,
@@ -69269,6 +69270,7 @@ async function processHtmlAssets(html, pugFilePath, options) {
       const hashedPath = await processAsset(
         value,
         pugDir,
+        pugFilePath,
         outdir,
         outbase,
         assetNames,
@@ -69287,7 +69289,7 @@ async function processHtmlAssets(html, pugFilePath, options) {
   }
   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);
@@ -69305,7 +69307,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,
@@ -69748,7 +69758,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) {
             }
@@ -69773,7 +69787,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) || [];
@@ -69857,8 +69871,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,