@normed/bundle 4.8.4 → 4.8.7

package/CHANGELOG.md

@@ -6,6 +6,14 @@ 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.8.6
+
+* PATCH: Fix pug-to-pug auto-discovery failing for `<a href="...pug">` links (and other elements) because the AST-based asset collector only checked a hardcoded element whitelist. Linking attributes (`src`, `srcset`, `href`) are now matched universally on all elements, with element-specific extras (`video[poster]`, `form[action]`, `object[data]`).
+
+# 4.8.5
+
+* PATCH: Fix asset attribute regex in pug plugin incorrectly matching strings inside inline `<script>` blocks. Asset references are now resolved exclusively from the pug AST (via `createAssetCollectorPlugin`), which is element-aware and only matches attributes on actual asset-bearing elements.
+
 # 4.8.3
 
 * PATCH: Add `--short` CLI flag and automatic coding agent detection (`CLAUDECODE`, `CURSOR_AGENT`, `AGENT` env vars) for condensed build output — prints file counts instead of file lists. Respects the `NO_COLOR` convention. Internal warnings in the pug plugin now go through the logger instead of `console.warn`.

package/bundles/bin/cli.js

@@ -68797,19 +68797,17 @@ function computeContentHash(content) {
   const num = hash.readUInt32BE(0);
   return num.toString(36).toUpperCase().padStart(8, "0").slice(0, 8);
 }
-var ASSET_ATTRIBUTES = {
-  img: ["src", "srcset"],
-  video: ["src", "poster"],
-  audio: ["src"],
-  source: ["src", "srcset"],
-  link: ["href"],
-  script: ["src"],
+var UNIVERSAL_LINKING_ATTRS = ["src", "srcset", "href"];
+var ELEMENT_SPECIFIC_LINKING_ATTRS = {
+  form: ["action"],
   object: ["data"],
-  embed: ["src"],
-  track: ["src"],
-  input: ["src"]
-  // for type="image"
+  video: ["poster"]
 };
+function getLinkingAttrs(elementName) {
+  if (!elementName) return void 0;
+  const extra = ELEMENT_SPECIFIC_LINKING_ATTRS[elementName];
+  return extra ? [...UNIVERSAL_LINKING_ATTRS, ...extra] : UNIVERSAL_LINKING_ATTRS;
+}
 function isRelativeAssetPath(assetPath) {
   if (!assetPath) return false;
   if (assetPath.startsWith("#")) return false;
@@ -68948,7 +68946,7 @@ function computeHtmlAssetPath(opts) {
   }
   return path5.relative(opts.htmlOutputDir, opts.absoluteOutput);
 }
-async function processHtmlAssets(html, pugFilePath, options2, webRoot, collectedReferences) {
+async function processHtmlAssets(html, pugFilePath, options2, webRoot, collectedReferences = []) {
   const assets = [];
   const pugReferences = [];
   const lessReferences = [];
@@ -68969,28 +68967,9 @@ async function processHtmlAssets(html, pugFilePath, options2, webRoot, collected
   );
   const processedAssets = /* @__PURE__ */ new Map();
   let modifiedHtml = html;
-  const matches = [];
-  if (collectedReferences && collectedReferences.length > 0) {
-    for (const ref of collectedReferences) {
-      matches.push({ attr: ref.attr, value: ref.value });
-    }
-  } else {
-    const allAttrs = [...new Set(Object.values(ASSET_ATTRIBUTES).flat())].join(
-      "|"
-    );
-    const attrRegex = new RegExp(
-      `(${allAttrs})\\s*=\\s*["']([^"']+)["']`,
-      "gi"
-    );
-    let match;
-    while ((match = attrRegex.exec(html)) !== null) {
-      const attr = match[1];
-      const value = match[2];
-      if (attr && value) {
-        matches.push({ attr: attr.toLowerCase(), value });
-      }
-    }
-  }
+  const matches = collectedReferences.map(
+    (ref) => ({ attr: ref.attr, value: ref.value })
+  );
   const discoveredPugPaths = /* @__PURE__ */ new Set();
   const discoveredLessPaths = /* @__PURE__ */ new Set();
   const discoveredScriptPaths = /* @__PURE__ */ new Set();
@@ -69381,11 +69360,11 @@ function createRebaseAssetsPlugin(entryFilePath) {
         if (node.nodes) {
           pending.push(...node.nodes);
         }
-        const assetAttrs = ASSET_ATTRIBUTES[node.name];
-        if (!assetAttrs) continue;
+        const linkingAttrs = getLinkingAttrs(node.name);
+        if (!linkingAttrs) continue;
         if (!node.attrs) continue;
         for (const attr of node.attrs) {
-          if (!assetAttrs.includes(attr.name)) continue;
+          if (!linkingAttrs.includes(attr.name)) continue;
           const sourceFile = attr.filename || node.filename;
           if (!sourceFile) continue;
           const sourceDir = path5.dirname(sourceFile);
@@ -69435,11 +69414,11 @@ function createAssetCollectorPlugin(collectedReferences) {
         if (node.nodes) {
           pending.push(...node.nodes);
         }
-        const assetAttrs = ASSET_ATTRIBUTES[node.name];
-        if (!assetAttrs) continue;
+        const linkingAttrs = getLinkingAttrs(node.name);
+        if (!linkingAttrs) continue;
         if (!node.attrs) continue;
         for (const attr of node.attrs) {
-          if (!assetAttrs.includes(attr.name)) continue;
+          if (!linkingAttrs.includes(attr.name)) continue;
           const extracted = extractStaticString(attr.val);
           if (!extracted) continue;
           collectedReferences.push({