html-minifier-next 1.1.5 → 1.2.0

package/package.json

@@ -15,22 +15,21 @@
   "description": "Highly configurable, well-tested, JavaScript-based HTML minifier.",
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
-    "@jest/globals": "^30.0.4",
+    "@jest/globals": "^30.0.5",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "alpinejs": "^3.14.9",
     "commitlint-config-non-conventional": "^1.0.1",
-    "eslint": "^9.30.1",
+    "eslint": "^9.32.0",
     "husky": "^9.1.7",
     "is-ci": "^4.1.0",
-    "jest": "^30.0.4",
-    "jest-environment-jsdom": "^30.0.4",
-    "lint-staged": "^16.1.2",
-    "rollup": "^4.44.1",
+    "jest": "^30.0.5",
+    "lint-staged": "^16.1.5",
+    "rollup": "^4.45.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
-    "vite": "^7.0.0"
+    "vite": "^7.0.5"
   },
   "exports": {
     ".": {
@@ -80,11 +79,9 @@
     "lint": "eslint .",
     "prepare": "husky",
     "serve": "npm run build && vite",
-    "test": "npm run test:node",
-    "test:node": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest --verbose",
-    "test:watch": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest verbose --watch",
-    "test:web": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest --verbose --environment=jsdom"
+    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest",
+    "test:watch": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest --watch"
   },
   "type": "module",
-  "version": "1.1.5"
+  "version": "1.2.0"
 }

package/src/htmlminifier.js

@@ -59,14 +59,14 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
   return lineBreakBefore + str + lineBreakAfter;
 }
 
-// non-empty tags that will maintain whitespace around them
-const inlineTags = new Set(['a', 'abbr', 'acronym', 'b', 'bdi', 'bdo', 'big', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i', 'ins', 'kbd', 'label', 'mark', 'math', 'nobr', 'object', 'q', 'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'svg', 'textarea', 'time', 'tt', 'u', 'var']);
-// non-empty tags that will maintain whitespace within them
+// non-empty elements that will maintain whitespace around them
+const inlineHtmlElements = ['a', 'abbr', 'acronym', 'b', 'bdi', 'bdo', 'big', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'mark', 'math', 'meter', 'nobr', 'object', 'output', 'progress', 'q', 'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'svg', 'textarea', 'time', 'tt', 'u', 'var', 'wbr'];
+// non-empty elements that will maintain whitespace within them
 const inlineTextTags = new Set(['a', 'abbr', 'acronym', 'b', 'big', 'del', 'em', 'font', 'i', 'ins', 'kbd', 'mark', 'nobr', 'rp', 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'time', 'tt', 'u', 'var']);
-// self-closing tags that will maintain whitespace around them
+// self-closing elements that will maintain whitespace around them
 const selfClosingInlineTags = new Set(['comment', 'img', 'input', 'wbr']);
 
-function collapseWhitespaceSmart(str, prevTag, nextTag, options) {
+function collapseWhitespaceSmart(str, prevTag, nextTag, options, inlineTags) {
   let trimLeft = prevTag && !selfClosingInlineTags.has(prevTag);
   if (trimLeft && !options.collapseInlineTagWhitespace) {
     trimLeft = prevTag.charAt(0) === '/' ? !inlineTags.has(prevTag.slice(1)) : !inlineTextTags.has(prevTag);
@@ -866,6 +866,10 @@ async function minifyHTML(value, options, partialMarkup) {
   let uidIgnore;
   let uidAttr;
   let uidPattern;
+  // Create inline tags set with backward compatibility for inlineCustomTags
+  const customElements = options.inlineCustomElements ?? options.inlineCustomTags ?? [];
+  const normalizedCustomElements = customElements.map(name => options.name(name));
+  let inlineTags = new Set([...inlineHtmlElements, ...normalizedCustomElements]);
 
   // temporarily replace ignored chunks with comments,
   // so that we don't have to worry what's there.
@@ -997,7 +1001,7 @@ async function minifyHTML(value, options, partialMarkup) {
       const match = str.match(/^<\/([\w:-]+)>$/);
       if (match) {
         endTag = match[1];
-      } else if (/>$/.test(str) || (buffer[index] = collapseWhitespaceSmart(str, null, nextTag, options))) {
+      } else if (/>$/.test(str) || (buffer[index] = collapseWhitespaceSmart(str, null, nextTag, options, inlineTags))) {
         break;
       }
     }
@@ -1208,7 +1212,7 @@ async function minifyHTML(value, options, partialMarkup) {
             }
           }
           if (prevTag || nextTag) {
-            text = collapseWhitespaceSmart(text, prevTag, nextTag, options);
+            text = collapseWhitespaceSmart(text, prevTag, nextTag, options, inlineTags);
           } else {
             text = collapseWhitespace(text, options, true, true);
           }