html-minifier-next 5.1.5 → 5.1.7

package/README.md

@@ -38,7 +38,7 @@ Use `html-minifier-next --help` to check all available options:
 | `--ignore-dir <patterns>`, `-X <patterns>` | Exclude directories—relative to input directory—from processing (comma-separated, overrides config file setting) | `--ignore-dir=libs`, `--ignore-dir=libs,vendor,node_modules` |
 | `--output-dir <dir>`, `-O <dir>` | Specify an output directory | `--output-dir=dist` |
 | `--output <file>`, `-o <file>` | Specify output file (reads from file arguments or STDIN) | File to file: `html-minifier-next input.html -o output.html`<br>Pipe to file: `cat input.html \| html-minifier-next -o output.html`<br>File to STDOUT: `html-minifier-next input.html` |
-| `--file-ext <extensions>`, `-f <extensions>` | Specify file extension(s) to process (comma-separated, overrides config file setting); defaults to `html,htm,xhtml,shtml`; use `*` for all files | `--file-ext=html,php`, `--file-ext='*'` |
+| `--file-ext <extensions>`, `-f <extensions>` | Specify file extension(s) to process (comma-separated, overrides config file setting); defaults to `html,htm,shtml,shtm`; use `*` for all files | `--file-ext=html,php`, `--file-ext='*'` |
 | `--preset <name>`, `-p <name>` | Use a preset configuration (conservative or comprehensive) | `--preset=conservative` |
 | `--config-file <file>`, `-c <file>` | Use a configuration file | `--config-file=html-minifier.json` |
 | `--verbose`, `-v` | Show detailed processing information (active options, file statistics) | `html-minifier-next --input-dir=src --output-dir=dist --verbose --collapse-whitespace` |
@@ -400,7 +400,7 @@ npx html-minifier-next --input-dir=test --preset comprehensive --output-dir exam
 **Process specific files and directories:**
 
 ```shell
-# Process default extensions (html, htm, xhtml, shtml)
+# Process default extensions (html, htm, shtml, shtm)
 html-minifier-next --collapse-whitespace --input-dir=src --output-dir=dist
 
 # Process only specific extensions

package/cli.js

@@ -47,7 +47,7 @@ import { optionDefinitions } from './src/lib/option-definitions.js';
 const require = createRequire(import.meta.url);
 const pkg = require('./package.json');
 
-const DEFAULT_FILE_EXTENSIONS = ['html', 'htm', 'xhtml', 'shtml'];
+const DEFAULT_FILE_EXTENSIONS = ['html', 'htm', 'shtml', 'shtm'];
 
 const program = new Command();
 program.name(pkg.name);
@@ -240,7 +240,7 @@ let config = {};
 program.option('-I --input-dir <dir>', 'Specify an input directory');
 program.option('-X --ignore-dir <patterns>', 'Exclude directories—relative to input directory—from processing (comma-separated), e.g., “libs” or “libs,vendor,node_modules”');
 program.option('-O --output-dir <dir>', 'Specify an output directory');
-program.option('-f --file-ext <extensions>', 'Specify file extension(s) to process (comma-separated); defaults to “html,htm,xhtml,shtml”; use “*” for all files');
+program.option('-f --file-ext <extensions>', 'Specify file extension(s) to process (comma-separated); defaults to “html,htm,shtml,shtm”; use “*” for all files');
 program.option('-p --preset <name>', `Use a preset configuration (${getPresetNames().join(', ')})`);
 program.option('-c --config-file <file>', 'Use config file');
 program.option('--cache-css <size>', 'Set CSS minification cache size (number of entries, default: 500)', parseValidInt('cacheCSS'));
@@ -266,7 +266,7 @@ program.helpOption('-h, --help', 'Display help for command');
   const jsonOptionKeys = ['minifyCss', 'minifyJs', 'minifyUrls'];
   for (const key of jsonOptionKeys) {
     const value = programOptions[key];
-    if (typeof value === 'string' && /\.(html?|php|xml|svg|xhtml|jsx|tsx|vue|ejs|hbs|mustache|twig)$/i.test(value)) {
+    if (typeof value === 'string' && /\.(html?|shtml?|xhtml?|php|xml|svg|jsx|tsx|vue|ejs|hbs|mustache|twig)$/i.test(value)) {
       // The option consumed a filename - inject it back
       programOptions[key] = true;
       capturedFiles.push(value);

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
 
@@ -2245,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/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)",
@@ -95,5 +95,5 @@
   },
   "type": "module",
   "types": "./dist/types/htmlminifier.d.ts",
-  "version": "5.1.5"
+  "version": "5.1.7"
 }

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,