html-minifier 3.5.11 → 3.5.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "html-minifier",
   "description": "Highly configurable, well-tested, JavaScript-based HTML minifier.",
-  "version": "3.5.11",
+  "version": "3.5.12",
   "keywords": [
     "cli",
     "compress",

package/src/htmlminifier.js

@@ -1153,11 +1153,6 @@ function minify(value, options, partialMarkup) {
             trimTrailingWhitespace(buffer.length - 1, nextTag);
           }
         }
-        else if (uidPattern) {
-          text = text.replace(uidPattern, function(match, prefix, index) {
-            return ignoredCustomMarkupChunks[+index][0];
-          });
-        }
         if (!stackNoCollapseWhitespace.length && nextTag !== 'html' && !(prevTag && nextTag)) {
           text = collapseWhitespace(text, options, false, false, true);
         }
@@ -1191,6 +1186,11 @@ function minify(value, options, partialMarkup) {
         // https://mathiasbynens.be/notes/ambiguous-ampersands
         text = text.replace(/&(#?[0-9a-zA-Z]+;)/g, '&amp$1').replace(/</g, '&lt;');
       }
+      if (uidPattern && options.collapseWhitespace && stackNoTrimWhitespace.length) {
+        text = text.replace(uidPattern, function(match, prefix, index) {
+          return ignoredCustomMarkupChunks[+index][0];
+        });
+      }
       currentChars += text;
       if (text) {
         hasChars = true;