html-minifier-next 5.1.4 → 5.1.6

package/dist/htmlminifier.cjs

@@ -1133,10 +1133,14 @@ const isSimpleBoolean = new Set(['allowfullscreen', 'async', 'autofocus', 'autop
 
 const isBooleanValue = new Set(['true', 'false']);
 
-// Attributes where empty value can be collapsed to just the attribute name
-// `crossorigin=""` → `crossorigin` (empty string equals anonymous mode)
-// `contenteditable=""` → `contenteditable` (empty string equals `true`)
-const emptyCollapsible = new Set(['crossorigin', 'contenteditable']);
+// Attributes where certain values can be collapsed to just the attribute name;
+// maps each attribute name to the set of values that collapse to the bare attribute:
+// - `crossorigin=""` and `crossorigin="anonymous"` → `crossorigin` (anonymous is the default)
+// - `contenteditable=""` → `contenteditable` (empty string means inherit/true)
+const collapsibleValues = new Map([
+  ['crossorigin', new Set(['', 'anonymous'])],
+  ['contenteditable', new Set([''])]
+]);
 
 // `srcset` elements
 
@@ -1738,19 +1742,21 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, getS
     });
   };
 
-  // Apply preset first if specified (so user options can override preset values)
+  // Merge preset with user options so all values go through normalization
+  // User options take precedence over preset values
+  let effectiveInput = inputOptions;
   if (inputOptions.preset) {
     const preset = getPreset(inputOptions.preset);
     if (preset) {
-      Object.assign(options, preset);
+      effectiveInput = { ...preset, ...inputOptions };
     } else {
       const available = getPresetNames().join(', ');
       console.warn(`HTML Minifier Next: Unknown preset “${inputOptions.preset}”. Available presets: ${available}`);
     }
   }
 
-  Object.keys(inputOptions).forEach(function (key) {
-    const option = inputOptions[key];
+  Object.keys(effectiveInput).forEach(function (key) {
+    const option = effectiveInput[key];
 
     // Skip preset key—it’s already been processed
     if (key === 'preset') {
@@ -2243,7 +2249,7 @@ function isStyleElement(tag, attrs) {
 function isBooleanAttribute(attrName, attrValue) {
   return isSimpleBoolean.has(attrName) ||
     (attrName === 'draggable' && !isBooleanValue.has(attrValue)) ||
-    (attrValue === '' && emptyCollapsible.has(attrName));
+    (collapsibleValues.has(attrName) && collapsibleValues.get(attrName).has(attrValue));
 }
 
 const uriTypeAttributes = new Map([

package/dist/types/lib/constants.d.ts

@@ -78,7 +78,7 @@ export const keepScriptsMimetypes: Set<string>;
 export const jsonScriptTypes: Set<string>;
 export const isSimpleBoolean: Set<string>;
 export const isBooleanValue: Set<string>;
-export const emptyCollapsible: Set<string>;
+export const collapsibleValues: Map<string, Set<string>>;
 export const srcsetElements: Set<string>;
 export const optionalStartTags: Set<string>;
 export const optionalEndTags: Set<string>;

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/constants.js"],"names":[],"mappings":"AAEA,iCAAoC;AACpC,+BAAkC;AAClC,oCAA2C;AAC3C,2CAAmD;AACnD,wCAA8C;AAC9C,4CAAkD;AAClD,4CAA2C;AAC3C,4CAA0D;AAC1D,2CAA8C;AAC9C,+CAA0D;AAC1D,2CAAmC;AACnC,mCAA4C;AAC5C,wCAAwqB;AACxqB,kCAA0B;AAC1B,sCAAuC;AACvC,yCAA4C;AAC5C,qCAAuD;AAKvD,+DAAgb;AAGhb,+DAA6O;AAG7O,yDAAmF;AAGnF,8CAA8G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0C9G,qDAWG;AAEH,+CAEG;AAmBH,0CAUG;AAzBH,0CAAwhB;AAExhB,yCAAkD;AAKlD,2CAAqE;AAIrE,yCAAkD;AAuBlD,4CAAiF;AAEjF,0CAAoM;AAEpM,yCAA4F;AAE5F,8CAAkD;AAElD,yCAAiT;AAEjT,0CAA0F;AAE1F,6CAA8D;AAE9D,gDAAqD;AAErD,yCAAuD;AAEvD,+CAAyD;AAEzD,+CAAkE;AAElE,uCAA2C;AAE3C,2CAA2D;AAE3D,0CAAkD;AAElD,wCAA+D;AAE/D,2CAAkD;AAElD,uCAAmxC;AAInxC,sCAEsD;AAItD,iDAA4D"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/constants.js"],"names":[],"mappings":"AAEA,iCAAoC;AACpC,+BAAkC;AAClC,oCAA2C;AAC3C,2CAAmD;AACnD,wCAA8C;AAC9C,4CAAkD;AAClD,4CAA2C;AAC3C,4CAA0D;AAC1D,2CAA8C;AAC9C,+CAA0D;AAC1D,2CAAmC;AACnC,mCAA4C;AAC5C,wCAAwqB;AACxqB,kCAA0B;AAC1B,sCAAuC;AACvC,yCAA4C;AAC5C,qCAAuD;AAKvD,+DAAgb;AAGhb,+DAA6O;AAG7O,yDAAmF;AAGnF,8CAA8G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0C9G,qDAWG;AAEH,+CAEG;AAuBH,0CAUG;AA7BH,0CAAwhB;AAExhB,yCAAkD;AAMlD,yDAGG;AAIH,yCAAkD;AAuBlD,4CAAiF;AAEjF,0CAAoM;AAEpM,yCAA4F;AAE5F,8CAAkD;AAElD,yCAAiT;AAEjT,0CAA0F;AAE1F,6CAA8D;AAE9D,gDAAqD;AAErD,yCAAuD;AAEvD,+CAAyD;AAEzD,+CAAkE;AAElE,uCAA2C;AAE3C,2CAA2D;AAE3D,0CAAkD;AAElD,wCAA+D;AAE/D,2CAAkD;AAElD,uCAAmxC;AAInxC,sCAEsD;AAItD,iDAA4D"}

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

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/lib/options.js"],"names":[],"mappings":"AAYA,6DAUC;AAID;;;;;;;;;;;GAWG;AACH,6CAXW,OAAO,CAAC,eAAe,CAAC,mGAEhC;IAAuB,eAAe;IACf,SAAS;IACT,MAAM;CAA2B,GAK9C,eAAe,CA6W3B"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/lib/options.js"],"names":[],"mappings":"AAYA,6DAUC;AAID;;;;;;;;;;;GAWG;AACH,6CAXW,OAAO,CAAC,eAAe,CAAC,mGAEhC;IAAuB,eAAe;IACf,SAAS;IACT,MAAM;CAA2B,GAK9C,eAAe,CA+W3B"}

package/package.json

@@ -8,7 +8,7 @@
     "commander": "^14.0.2",
     "entities": "^7.0.1",
     "lightningcss": "^1.31.1",
-    "svgo": "^4.0.0",
+    "svgo": "^4.0.1",
     "terser": "^5.46.0"
   },
   "description": "Super-configurable and well-tested web page minifier (enhanced successor of HTML Minifier)",
@@ -20,7 +20,7 @@
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@swc/core": "^1.15.11",
     "eslint": "^10.0.0",
-    "rollup": "^4.57.1",
+    "rollup": "^4.59.0",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.1"
@@ -95,5 +95,5 @@
   },
   "type": "module",
   "types": "./dist/types/htmlminifier.d.ts",
-  "version": "5.1.4"
+  "version": "5.1.6"
 }

package/src/lib/attributes.js

@@ -14,7 +14,7 @@ import {
   keepScriptsMimetypes,
   isSimpleBoolean,
   isBooleanValue,
-  emptyCollapsible,
+  collapsibleValues,
   srcsetElements,
   reEmptyAttribute
 } from './constants.js';
@@ -189,7 +189,7 @@ function isStyleElement(tag, attrs) {
 function isBooleanAttribute(attrName, attrValue) {
   return isSimpleBoolean.has(attrName) ||
     (attrName === 'draggable' && !isBooleanValue.has(attrValue)) ||
-    (attrValue === '' && emptyCollapsible.has(attrName));
+    (collapsibleValues.has(attrName) && collapsibleValues.get(attrName).has(attrValue));
 }
 
 const uriTypeAttributes = new Map([

package/src/lib/constants.js

@@ -95,10 +95,14 @@ const isSimpleBoolean = new Set(['allowfullscreen', 'async', 'autofocus', 'autop
 
 const isBooleanValue = new Set(['true', 'false']);
 
-// Attributes where empty value can be collapsed to just the attribute name
-// `crossorigin=""` → `crossorigin` (empty string equals anonymous mode)
-// `contenteditable=""` → `contenteditable` (empty string equals `true`)
-const emptyCollapsible = new Set(['crossorigin', 'contenteditable']);
+// Attributes where certain values can be collapsed to just the attribute name;
+// maps each attribute name to the set of values that collapse to the bare attribute:
+// - `crossorigin=""` and `crossorigin="anonymous"` → `crossorigin` (anonymous is the default)
+// - `contenteditable=""` → `contenteditable` (empty string means inherit/true)
+const collapsibleValues = new Map([
+  ['crossorigin', new Set(['', 'anonymous'])],
+  ['contenteditable', new Set([''])]
+]);
 
 // `srcset` elements
 
@@ -208,7 +212,7 @@ export {
   // Boolean sets
   isSimpleBoolean,
   isBooleanValue,
-  emptyCollapsible,
+  collapsibleValues,
 
   // Misc
   srcsetElements,

package/src/lib/options.js

@@ -66,19 +66,21 @@ const processOptions = (inputOptions, { getLightningCSS, getTerser, getSwc, getS
     });
   };
 
-  // Apply preset first if specified (so user options can override preset values)
+  // Merge preset with user options so all values go through normalization
+  // User options take precedence over preset values
+  let effectiveInput = inputOptions;
   if (inputOptions.preset) {
     const preset = getPreset(inputOptions.preset);
     if (preset) {
-      Object.assign(options, preset);
+      effectiveInput = { ...preset, ...inputOptions };
     } else {
       const available = getPresetNames().join(', ');
       console.warn(`HTML Minifier Next: Unknown preset “${inputOptions.preset}”. Available presets: ${available}`);
     }
   }
 
-  Object.keys(inputOptions).forEach(function (key) {
-    const option = inputOptions[key];
+  Object.keys(effectiveInput).forEach(function (key) {
+    const option = effectiveInput[key];
 
     // Skip preset key—it’s already been processed
     if (key === 'preset') {