html-minifier-next 5.1.0 → 5.1.2

package/dist/htmlminifier.cjs

@@ -2,8 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var entities = require('entities');
-
 /*
  * HTML Parser By John Resig (ejohn.org)
  * Modified by Juriy “kangax” Zaytsev
@@ -1387,12 +1385,15 @@ function collapseWhitespaceSmart(str, prevTag, nextTag, prevAttrs, nextAttrs, op
 
 // Collapse/trim whitespace for given tag
 
+const noCollapseWsTags = new Set(['script', 'style', 'pre', 'textarea']);
+const noTrimWsTags = new Set(['pre', 'textarea']);
+
 function canCollapseWhitespace(tag) {
-  return !/^(?:script|style|pre|textarea)$/.test(tag);
+  return !noCollapseWsTags.has(tag);
 }
 
 function canTrimWhitespace(tag) {
-  return !/^(?:pre|textarea)$/.test(tag);
+  return !noTrimWsTags.has(tag);
 }
 
 /**
@@ -2052,6 +2053,16 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, getS
 // Imports
 
 
+// Lazy-load entities only when `decodeEntities` is enabled
+
+let decodeHTMLStrictPromise;
+async function getDecodeHTMLStrict() {
+  if (!decodeHTMLStrictPromise) {
+    decodeHTMLStrictPromise = import('entities').then(m => m.decodeHTMLStrict);
+  }
+  return decodeHTMLStrictPromise;
+}
+
 // Validators
 
 function isConditionalComment(text) {
@@ -2212,31 +2223,45 @@ function isBooleanAttribute(attrName, attrValue) {
     (attrValue === '' && emptyCollapsible.has(attrName));
 }
 
+const uriTypeAttributes = new Map([
+  ['a', new Set(['href'])],
+  ['area', new Set(['href'])],
+  ['link', new Set(['href'])],
+  ['base', new Set(['href'])],
+  ['img', new Set(['src', 'longdesc', 'usemap'])],
+  ['object', new Set(['classid', 'codebase', 'data', 'usemap'])],
+  ['q', new Set(['cite'])],
+  ['blockquote', new Set(['cite'])],
+  ['ins', new Set(['cite'])],
+  ['del', new Set(['cite'])],
+  ['form', new Set(['action'])],
+  ['input', new Set(['src', 'usemap'])],
+  ['head', new Set(['profile'])],
+  ['script', new Set(['src', 'for'])]
+]);
+
 function isUriTypeAttribute(attrName, tag) {
-  return (
-    (/^(?:a|area|link|base)$/.test(tag) && attrName === 'href') ||
-    (tag === 'img' && /^(?:src|longdesc|usemap)$/.test(attrName)) ||
-    (tag === 'object' && /^(?:classid|codebase|data|usemap)$/.test(attrName)) ||
-    (tag === 'q' && attrName === 'cite') ||
-    (tag === 'blockquote' && attrName === 'cite') ||
-    ((tag === 'ins' || tag === 'del') && attrName === 'cite') ||
-    (tag === 'form' && attrName === 'action') ||
-    (tag === 'input' && (attrName === 'src' || attrName === 'usemap')) ||
-    (tag === 'head' && attrName === 'profile') ||
-    (tag === 'script' && (attrName === 'src' || attrName === 'for'))
-  );
+  const set = uriTypeAttributes.get(tag);
+  return set ? set.has(attrName) : false;
 }
 
+const numberTypeAttributes = new Map([
+  ['a', new Set(['tabindex'])],
+  ['area', new Set(['tabindex'])],
+  ['object', new Set(['tabindex'])],
+  ['button', new Set(['tabindex'])],
+  ['input', new Set(['maxlength', 'tabindex'])],
+  ['select', new Set(['size', 'tabindex'])],
+  ['textarea', new Set(['rows', 'cols', 'tabindex'])],
+  ['colgroup', new Set(['span'])],
+  ['col', new Set(['span'])],
+  ['th', new Set(['rowspan', 'colspan'])],
+  ['td', new Set(['rowspan', 'colspan'])]
+]);
+
 function isNumberTypeAttribute(attrName, tag) {
-  return (
-    (/^(?:a|area|object|button)$/.test(tag) && attrName === 'tabindex') ||
-    (tag === 'input' && (attrName === 'maxlength' || attrName === 'tabindex')) ||
-    (tag === 'select' && (attrName === 'size' || attrName === 'tabindex')) ||
-    (tag === 'textarea' && /^(?:rows|cols|tabindex)$/.test(attrName)) ||
-    (tag === 'colgroup' && attrName === 'span') ||
-    (tag === 'col' && attrName === 'span') ||
-    ((tag === 'th' || tag === 'td') && (attrName === 'rowspan' || attrName === 'colspan'))
-  );
+  const set = numberTypeAttributes.get(tag);
+  return set ? set.has(attrName) : false;
 }
 
 function isLinkType(tag, attrs, value) {
@@ -2467,7 +2492,7 @@ async function normalizeAttr(attr, attrs, tag, options, minifyHTML) {
   if (options.decodeEntities && attrValue) {
     // Fast path: Only decode when entities are present
     if (attrValue.indexOf('&') !== -1) {
-      attrValue = entities.decodeHTMLStrict(attrValue);
+      attrValue = (await getDecodeHTMLStrict())(attrValue);
     }
   }
 
@@ -2891,6 +2916,14 @@ async function getSvgo() {
   return svgoPromise;
 }
 
+let decodeHTMLPromise;
+async function getDecodeHTML() {
+  if (!decodeHTMLPromise) {
+    decodeHTMLPromise = import('entities').then(m => m.decodeHTML);
+  }
+  return decodeHTMLPromise;
+}
+
 // Minification caches (initialized on first use with configurable sizes)
 let cssMinifyCache = null;
 let jsMinifyCache = null;
@@ -3675,6 +3708,7 @@ async function minifyHTML(value, options, partialMarkup) {
   let currentAttrs = [];
   const stackNoTrimWhitespace = [];
   const stackNoCollapseWhitespace = [];
+  let preTextareaDepth = 0; // Count of `pre`/`textarea` entries in `stackNoTrimWhitespace`
   let optionalStartTag = '';
   let optionalEndTag = '';
   let optionalEndTagEmitted = false;
@@ -3835,7 +3869,7 @@ async function minifyHTML(value, options, partialMarkup) {
     let charsIndex = buffer.length - 1;
     if (buffer.length > 1) {
       const item = buffer[buffer.length - 1];
-      if (/^(?:<!|$)/.test(item) && item.indexOf(uidIgnore) === -1) {
+      if (/^(?:<!|$)/.test(item) && (!uidIgnore || item.indexOf(uidIgnore) === -1)) {
         charsIndex--;
       }
     }
@@ -3929,6 +3963,7 @@ async function minifyHTML(value, options, partialMarkup) {
         if (!unary) {
           if (!canTrimWhitespace$1(tag, attrs) || stackNoTrimWhitespace.length) {
             stackNoTrimWhitespace.push(tag);
+            if (tag === 'pre' || tag === 'textarea') preTextareaDepth++;
           }
           if (!canCollapseWhitespace$1(tag, attrs) || stackNoCollapseWhitespace.length) {
             stackNoCollapseWhitespace.push(tag);
@@ -3958,11 +3993,14 @@ async function minifyHTML(value, options, partialMarkup) {
         options.sortAttributes(tag, attrs);
       }
 
+      const normalizedAttrs = await Promise.all(
+        attrs.map(attr => normalizeAttr(attr, attrs, tag, options, minifyHTML))
+      );
       const parts = [];
-      for (let i = attrs.length, isLast = true; --i >= 0;) {
-        const normalized = await normalizeAttr(attrs[i], attrs, tag, options, minifyHTML);
-        if (normalized) {
-          parts.push(buildAttr(normalized, hasUnarySlash, options, isLast, uidAttr));
+      let isLast = true;
+      for (let i = normalizedAttrs.length - 1; i >= 0; i--) {
+        if (normalizedAttrs[i]) {
+          parts.push(buildAttr(normalizedAttrs[i], hasUnarySlash, options, isLast, uidAttr));
           isLast = false;
         }
       }
@@ -3998,6 +4036,7 @@ async function minifyHTML(value, options, partialMarkup) {
       if (options.collapseWhitespace) {
         if (stackNoTrimWhitespace.length) {
           if (tag === stackNoTrimWhitespace[stackNoTrimWhitespace.length - 1]) {
+            if (tag === 'pre' || tag === 'textarea') preTextareaDepth--;
             stackNoTrimWhitespace.pop();
           }
         } else {
@@ -4091,7 +4130,7 @@ async function minifyHTML(value, options, partialMarkup) {
       nextAttrs = nextAttrs || [];
       if (options.decodeEntities && text && !specialContentElements.has(currentTag)) {
         if (text.indexOf('&') !== -1) {
-          text = entities.decodeHTML(text);
+          text = (await getDecodeHTML())(text);
         }
       }
       // Trim outermost newline-based whitespace inside `pre`/`textarea` elements
@@ -4099,7 +4138,7 @@ async function minifyHTML(value, options, partialMarkup) {
       // Only trims single trailing newlines (multiple newlines are likely intentional formatting)
       if (options.collapseWhitespace && stackNoTrimWhitespace.length) {
         const topTag = stackNoTrimWhitespace[stackNoTrimWhitespace.length - 1];
-        if (stackNoTrimWhitespace.includes('pre') || stackNoTrimWhitespace.includes('textarea')) {
+        if (preTextareaDepth > 0) {
           // Trim trailing whitespace only if it ends with a single newline (not multiple)
           // Multiple newlines are likely intentional formatting, single newline is often a template artifact
           // Treat CRLF (`\r\n`), CR (`\r`), and LF (`\n`) as single line-ending units
@@ -4112,7 +4151,7 @@ async function minifyHTML(value, options, partialMarkup) {
         if (!stackNoTrimWhitespace.length) {
           if (prevTag === 'comment') {
             const prevComment = buffer[buffer.length - 1];
-            if (prevComment.indexOf(uidIgnore) === -1) {
+            if (!uidIgnore || prevComment.indexOf(uidIgnore) === -1) {
               if (!prevComment) {
                 prevTag = charsPrevTag;
               }

package/dist/types/htmlminifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"htmlminifier.d.ts","sourceRoot":"","sources":["../../src/htmlminifier.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"htmlminifier.d.ts","sourceRoot":"","sources":["../../src/htmlminifier.js"],"names":[],"mappings":"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"}

package/dist/types/lib/attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../../src/lib/attributes.js"],"names":[],"mappings":"AA0BA,yDAEC;AAED,mEAOC;AAED,uEAWC;AAED,8DAGC;AAED,4EAOC;AAgCD,mGAuCC;AAED,mEAGC;AAED,qEAGC;AAED,kEAWC;AAED,sEAGC;AAED,8DAWC;AAED,2EAIC;AAED,qEAaC;AAED,wEAUC;AAED,sEAUC;AAED,2EAEC;AAED,2DAEC;AAED,8DAUC;AAED,uEAUC;AAED,oGASC;AAED,4DAOC;AAID,0IAqIC;AAsBD;;;;GAsCC;AAED,6GAuHC;AA7gBD;;;;;;;GAOG;AACH,mEAHW,OAAO,SAuBjB"}
+{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../../src/lib/attributes.js"],"names":[],"mappings":"AAmCA,yDAEC;AAED,mEAOC;AAED,uEAWC;AAED,8DAGC;AAED,4EAOC;AAgCD,mGAuCC;AAED,mEAGC;AAED,qEAGC;AAED,kEAWC;AAED,sEAGC;AAED,8DAWC;AAED,2EAIC;AAmBD,qEAGC;AAgBD,wEAGC;AAED,sEAUC;AAED,2EAEC;AAED,2DAEC;AAED,8DAUC;AAED,uEAUC;AAED,oGASC;AAED,4DAOC;AAID,0IAqIC;AAsBD;;;;GAsCC;AAED,6GAuHC;AA3hBD;;;;;;;GAOG;AACH,mEAHW,OAAO,SAuBjB"}

package/dist/types/lib/whitespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whitespace.d.ts","sourceRoot":"","sources":["../../../src/lib/whitespace.js"],"names":[],"mappings":"AAiBA,8CAOC;AAID,qDAgBC;AAID,iHAqFC;AAID,0KAwEC;AAID,yDAEC;AAED,qDAEC"}
+{"version":3,"file":"whitespace.d.ts","sourceRoot":"","sources":["../../../src/lib/whitespace.js"],"names":[],"mappings":"AAiBA,8CAOC;AAID,qDAgBC;AAID,iHAqFC;AAID,0KAwEC;AAOD,yDAEC;AAED,qDAEC"}

package/package.json

@@ -14,12 +14,12 @@
   "description": "Super-configurable and well-tested web page minifier (enhanced successor of HTML Minifier)",
   "devDependencies": {
     "@commitlint/cli": "^20.3.1",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@swc/core": "^1.15.11",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.0",
     "rollup": "^4.57.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "typescript": "^5.9.3",
@@ -31,12 +31,12 @@
       "import": "./src/htmlminifier.js",
       "require": "./dist/htmlminifier.cjs"
     },
-    "./dist/*": "./dist/*.js",
     "./package.json": "./package.json"
   },
   "files": [
     "cli.js",
-    "dist/",
+    "dist/htmlminifier.cjs",
+    "dist/types/",
     "src/"
   ],
   "funding": "https://github.com/j9t/html-minifier-next?sponsor=1",
@@ -95,5 +95,5 @@
   },
   "type": "module",
   "types": "./dist/types/htmlminifier.d.ts",
-  "version": "5.1.0"
-}
+  "version": "5.1.2"
+}

package/src/htmlminifier.js

@@ -1,6 +1,5 @@
 // Imports
 
-import { decodeHTML } from 'entities';
 import { HTMLParser, endTag } from './htmlparser.js';
 import TokenChain from './tokenchain.js';
 import { presets, getPreset, getPresetNames } from './presets.js';
@@ -100,6 +99,14 @@ async function getSvgo() {
   return svgoPromise;
 }
 
+let decodeHTMLPromise;
+async function getDecodeHTML() {
+  if (!decodeHTMLPromise) {
+    decodeHTMLPromise = import('entities').then(m => m.decodeHTML);
+  }
+  return decodeHTMLPromise;
+}
+
 // Minification caches (initialized on first use with configurable sizes)
 let cssMinifyCache = null;
 let jsMinifyCache = null;
@@ -888,6 +895,7 @@ async function minifyHTML(value, options, partialMarkup) {
   let currentAttrs = [];
   const stackNoTrimWhitespace = [];
   const stackNoCollapseWhitespace = [];
+  let preTextareaDepth = 0; // Count of `pre`/`textarea` entries in `stackNoTrimWhitespace`
   let optionalStartTag = '';
   let optionalEndTag = '';
   let optionalEndTagEmitted = false;
@@ -1048,7 +1056,7 @@ async function minifyHTML(value, options, partialMarkup) {
     let charsIndex = buffer.length - 1;
     if (buffer.length > 1) {
       const item = buffer[buffer.length - 1];
-      if (/^(?:<!|$)/.test(item) && item.indexOf(uidIgnore) === -1) {
+      if (/^(?:<!|$)/.test(item) && (!uidIgnore || item.indexOf(uidIgnore) === -1)) {
         charsIndex--;
       }
     }
@@ -1142,6 +1150,7 @@ async function minifyHTML(value, options, partialMarkup) {
         if (!unary) {
           if (!canTrimWhitespace(tag, attrs) || stackNoTrimWhitespace.length) {
             stackNoTrimWhitespace.push(tag);
+            if (tag === 'pre' || tag === 'textarea') preTextareaDepth++;
           }
           if (!canCollapseWhitespace(tag, attrs) || stackNoCollapseWhitespace.length) {
             stackNoCollapseWhitespace.push(tag);
@@ -1171,11 +1180,14 @@ async function minifyHTML(value, options, partialMarkup) {
         options.sortAttributes(tag, attrs);
       }
 
+      const normalizedAttrs = await Promise.all(
+        attrs.map(attr => normalizeAttr(attr, attrs, tag, options, minifyHTML))
+      );
       const parts = [];
-      for (let i = attrs.length, isLast = true; --i >= 0;) {
-        const normalized = await normalizeAttr(attrs[i], attrs, tag, options, minifyHTML);
-        if (normalized) {
-          parts.push(buildAttr(normalized, hasUnarySlash, options, isLast, uidAttr));
+      let isLast = true;
+      for (let i = normalizedAttrs.length - 1; i >= 0; i--) {
+        if (normalizedAttrs[i]) {
+          parts.push(buildAttr(normalizedAttrs[i], hasUnarySlash, options, isLast, uidAttr));
           isLast = false;
         }
       }
@@ -1211,6 +1223,7 @@ async function minifyHTML(value, options, partialMarkup) {
       if (options.collapseWhitespace) {
         if (stackNoTrimWhitespace.length) {
           if (tag === stackNoTrimWhitespace[stackNoTrimWhitespace.length - 1]) {
+            if (tag === 'pre' || tag === 'textarea') preTextareaDepth--;
             stackNoTrimWhitespace.pop();
           }
         } else {
@@ -1304,7 +1317,7 @@ async function minifyHTML(value, options, partialMarkup) {
       nextAttrs = nextAttrs || [];
       if (options.decodeEntities && text && !specialContentElements.has(currentTag)) {
         if (text.indexOf('&') !== -1) {
-          text = decodeHTML(text);
+          text = (await getDecodeHTML())(text);
         }
       }
       // Trim outermost newline-based whitespace inside `pre`/`textarea` elements
@@ -1312,7 +1325,7 @@ async function minifyHTML(value, options, partialMarkup) {
       // Only trims single trailing newlines (multiple newlines are likely intentional formatting)
       if (options.collapseWhitespace && stackNoTrimWhitespace.length) {
         const topTag = stackNoTrimWhitespace[stackNoTrimWhitespace.length - 1];
-        if (stackNoTrimWhitespace.includes('pre') || stackNoTrimWhitespace.includes('textarea')) {
+        if (preTextareaDepth > 0) {
           // Trim trailing whitespace only if it ends with a single newline (not multiple)
           // Multiple newlines are likely intentional formatting, single newline is often a template artifact
           // Treat CRLF (`\r\n`), CR (`\r`), and LF (`\n`) as single line-ending units
@@ -1325,7 +1338,7 @@ async function minifyHTML(value, options, partialMarkup) {
         if (!stackNoTrimWhitespace.length) {
           if (prevTag === 'comment') {
             const prevComment = buffer[buffer.length - 1];
-            if (prevComment.indexOf(uidIgnore) === -1) {
+            if (!uidIgnore || prevComment.indexOf(uidIgnore) === -1) {
               if (!prevComment) {
                 prevTag = charsPrevTag;
               }

package/src/lib/attributes.js

@@ -1,6 +1,5 @@
 // Imports
 
-import { decodeHTMLStrict } from 'entities';
 import {
   RE_CONDITIONAL_COMMENT,
   RE_EVENT_ATTR_DEFAULT,
@@ -22,6 +21,16 @@ import {
 import { trimWhitespace, collapseWhitespaceAll } from './whitespace.js';
 import { shouldMinifyInnerHTML } from './options.js';
 
+// Lazy-load entities only when `decodeEntities` is enabled
+
+let decodeHTMLStrictPromise;
+async function getDecodeHTMLStrict() {
+  if (!decodeHTMLStrictPromise) {
+    decodeHTMLStrictPromise = import('entities').then(m => m.decodeHTMLStrict);
+  }
+  return decodeHTMLStrictPromise;
+}
+
 // Validators
 
 function isConditionalComment(text) {
@@ -182,31 +191,45 @@ function isBooleanAttribute(attrName, attrValue) {
     (attrValue === '' && emptyCollapsible.has(attrName));
 }
 
+const uriTypeAttributes = new Map([
+  ['a', new Set(['href'])],
+  ['area', new Set(['href'])],
+  ['link', new Set(['href'])],
+  ['base', new Set(['href'])],
+  ['img', new Set(['src', 'longdesc', 'usemap'])],
+  ['object', new Set(['classid', 'codebase', 'data', 'usemap'])],
+  ['q', new Set(['cite'])],
+  ['blockquote', new Set(['cite'])],
+  ['ins', new Set(['cite'])],
+  ['del', new Set(['cite'])],
+  ['form', new Set(['action'])],
+  ['input', new Set(['src', 'usemap'])],
+  ['head', new Set(['profile'])],
+  ['script', new Set(['src', 'for'])]
+]);
+
 function isUriTypeAttribute(attrName, tag) {
-  return (
-    (/^(?:a|area|link|base)$/.test(tag) && attrName === 'href') ||
-    (tag === 'img' && /^(?:src|longdesc|usemap)$/.test(attrName)) ||
-    (tag === 'object' && /^(?:classid|codebase|data|usemap)$/.test(attrName)) ||
-    (tag === 'q' && attrName === 'cite') ||
-    (tag === 'blockquote' && attrName === 'cite') ||
-    ((tag === 'ins' || tag === 'del') && attrName === 'cite') ||
-    (tag === 'form' && attrName === 'action') ||
-    (tag === 'input' && (attrName === 'src' || attrName === 'usemap')) ||
-    (tag === 'head' && attrName === 'profile') ||
-    (tag === 'script' && (attrName === 'src' || attrName === 'for'))
-  );
+  const set = uriTypeAttributes.get(tag);
+  return set ? set.has(attrName) : false;
 }
 
+const numberTypeAttributes = new Map([
+  ['a', new Set(['tabindex'])],
+  ['area', new Set(['tabindex'])],
+  ['object', new Set(['tabindex'])],
+  ['button', new Set(['tabindex'])],
+  ['input', new Set(['maxlength', 'tabindex'])],
+  ['select', new Set(['size', 'tabindex'])],
+  ['textarea', new Set(['rows', 'cols', 'tabindex'])],
+  ['colgroup', new Set(['span'])],
+  ['col', new Set(['span'])],
+  ['th', new Set(['rowspan', 'colspan'])],
+  ['td', new Set(['rowspan', 'colspan'])]
+]);
+
 function isNumberTypeAttribute(attrName, tag) {
-  return (
-    (/^(?:a|area|object|button)$/.test(tag) && attrName === 'tabindex') ||
-    (tag === 'input' && (attrName === 'maxlength' || attrName === 'tabindex')) ||
-    (tag === 'select' && (attrName === 'size' || attrName === 'tabindex')) ||
-    (tag === 'textarea' && /^(?:rows|cols|tabindex)$/.test(attrName)) ||
-    (tag === 'colgroup' && attrName === 'span') ||
-    (tag === 'col' && attrName === 'span') ||
-    ((tag === 'th' || tag === 'td') && (attrName === 'rowspan' || attrName === 'colspan'))
-  );
+  const set = numberTypeAttributes.get(tag);
+  return set ? set.has(attrName) : false;
 }
 
 function isLinkType(tag, attrs, value) {
@@ -437,7 +460,7 @@ async function normalizeAttr(attr, attrs, tag, options, minifyHTML) {
   if (options.decodeEntities && attrValue) {
     // Fast path: Only decode when entities are present
     if (attrValue.indexOf('&') !== -1) {
-      attrValue = decodeHTMLStrict(attrValue);
+      attrValue = (await getDecodeHTMLStrict())(attrValue);
     }
   }
 

package/src/lib/whitespace.js

@@ -211,12 +211,15 @@ function collapseWhitespaceSmart(str, prevTag, nextTag, prevAttrs, nextAttrs, op
 
 // Collapse/trim whitespace for given tag
 
+const noCollapseWsTags = new Set(['script', 'style', 'pre', 'textarea']);
+const noTrimWsTags = new Set(['pre', 'textarea']);
+
 function canCollapseWhitespace(tag) {
-  return !/^(?:script|style|pre|textarea)$/.test(tag);
+  return !noCollapseWsTags.has(tag);
 }
 
 function canTrimWhitespace(tag) {
-  return !/^(?:pre|textarea)$/.test(tag);
+  return !noTrimWsTags.has(tag);
 }
 
 // Exports