html-minifier-next 4.1.1 → 4.2.2

package/README.md

@@ -4,7 +4,7 @@
 
 HTML Minifier Next (HMN) is a highly **configurable, well-tested, JavaScript-based HTML minifier**.
 
-The project has been based on [Terser’s html-minifier-terser](https://github.com/terser/html-minifier-terser), which in turn had been based on [Juriy Zaytsev’s html-minifier](https://github.com/kangax/html-minifier) (HMN offers additional features, but is compatible with both). It was set up because as of 2025, both html-minifier-terser and html-minifier have been unmaintained for some time. As the project seems maintainable [to me, [Jens](https://meiert.com/)]—even more so with community support—, it’s being updated and documented further in this place.
+The project has been based on [HTML Minifier Terser](https://github.com/terser/html-minifier-terser), which in turn had been based on [Juriy Zaytsev’s HTML Minifier](https://github.com/kangax/html-minifier) (HMN offers additional features, but is compatible with both). It was set up because as of 2025, both HTML Minifier Terser and HTML Minifier have been unmaintained for some time. As the project seems maintainable [to me, [Jens](https://meiert.com/)]—even more so with community support—, it’s being updated and documented further in this place.
 
 ## Installation
 

package/cli.js

@@ -180,8 +180,8 @@ program.option('-d --dry', 'Dry run: process and report statistics without writi
 function readFile(file) {
   try {
     return fs.readFileSync(file, { encoding: 'utf8' });
-  } catch (e) {
-    fatal('Cannot read ' + file + '\n' + e.message);
+  } catch (err) {
+    fatal('Cannot read ' + file + '\n' + err.message);
   }
 }
 
@@ -196,7 +196,7 @@ async function loadConfigFromPath(configPath) {
   // Try JSON first
   try {
     return JSON.parse(data);
-  } catch (je) {
+  } catch (jsonErr) {
     const abs = path.resolve(configPath);
 
     // Try CJS require
@@ -204,13 +204,13 @@ async function loadConfigFromPath(configPath) {
       const result = require(abs);
       // Handle ESM interop: if `require()` loads an ESM file, it may return `{__esModule: true, default: …}`
       return (result && result.__esModule && result.default) ? result.default : result;
-    } catch (ne) {
+    } catch (cjsErr) {
       // Try ESM import
       try {
         const mod = await import(pathToFileURL(abs).href);
         return mod.default || mod;
-      } catch (ee) {
-        fatal('Cannot read the specified config file.\nAs JSON: ' + je.message + '\nAs CJS: ' + ne.message + '\nAs ESM: ' + ee.message);
+      } catch (esmErr) {
+        fatal('Cannot read the specified config file.\nAs JSON: ' + jsonErr.message + '\nAs CJS: ' + cjsErr.message + '\nAs ESM: ' + esmErr.message);
       }
     }
   }
@@ -307,8 +307,8 @@ program.option('--file-ext <extensions>', 'Specify file extension(s) to process
     let minified;
     try {
       minified = await minify(data, createOptions());
-    } catch (e) {
-      fatal('Minification error on ' + inputFile + '\n' + e.message);
+    } catch (err) {
+      fatal('Minification error on ' + inputFile + '\n' + err.message);
     }
 
     const stats = calculateStats(data, minified);
@@ -466,8 +466,8 @@ program.option('--file-ext <extensions>', 'Specify file extension(s) to process
 
     try {
       minified = await minify(content, minifierOptions);
-    } catch (e) {
-      fatal('Minification error:\n' + e.message);
+    } catch (err) {
+      fatal('Minification error:\n' + err.message);
     }
 
     const stats = calculateStats(content, minified);

package/dist/htmlminifier.cjs

@@ -1328,8 +1328,8 @@ const processOptions = (inputOptions) => {
         try {
           const result = await terser.minify(code, terserOptions);
           return result.code.replace(/;$/, '');
-        } catch (error) {
-          options.log(error);
+        } catch (err) {
+          options.log(err);
           return text;
         }
       };

package/dist/htmlminifier.esm.bundle.js

@@ -22332,8 +22332,8 @@ function remove_initializers(var_statement) {
     return decls.length ? make_node(AST_Var, var_statement, { definitions: decls }) : null;
 }
 
-/** Called on code which we know is unreachable, to keep elements that affect outside of it. */
-function trim_unreachable_code(compressor, stat, target) {
+/** Called on code which won't be executed but has an effect outside of itself: `var`, `function` statements, `export`, `import`. */
+function extract_from_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
             const no_initializers = remove_initializers(node);
@@ -22358,7 +22358,8 @@ function trim_unreachable_code(compressor, stat, target) {
             target.push(node);
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Scope || node instanceof AST_Class) {
+            // Do not go into nested scopes
             return true;
         }
     });
@@ -23382,7 +23383,7 @@ function tighten_body(statements, compressor) {
         CHANGED = n != len;
         if (has_quit)
             has_quit.forEach(function (stat) {
-                trim_unreachable_code(compressor, stat, statements);
+                extract_from_unreachable_code(compressor, stat, statements);
             });
     }
 
@@ -24565,6 +24566,11 @@ class Compressor extends TreeWalker {
         }
     }
 
+    /** True if compressor.self()'s result will be turned into a 32-bit integer.
+     * ex:
+     * ~{expr}
+     * (1, 2, {expr}) | 0
+     **/
     in_32_bit_context(other_operand_must_be_number) {
         if (!this.option("evaluate")) return false;
         var self = this.self();
@@ -24582,9 +24588,10 @@ class Compressor extends TreeWalker {
             if (
                 p instanceof AST_Binary
                     && (
-                        p.operator == "&&"
-                        || p.operator == "||"
-                        || p.operator == "??"
+                        // Don't talk about p.left. Can change branch taken
+                        p.operator == "&&" && p.right === self
+                        || p.operator == "||" && p.right === self
+                        || p.operator == "??" && p.right === self
                     )
                 || p instanceof AST_Conditional && p.condition !== self
                 || p.tail_node() === self
@@ -25187,7 +25194,7 @@ function if_break_in_loop(self, compressor) {
                 body: self.condition
             }));
         }
-        trim_unreachable_code(compressor, self.body, body);
+        extract_from_unreachable_code(compressor, self.body, body);
         return make_node(AST_BlockStatement, self, {
             body: body
         });
@@ -25258,7 +25265,7 @@ def_optimize(AST_For, function(self, compressor) {
             if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
             if (!cond) {
                 var body = [];
-                trim_unreachable_code(compressor, self.body, body);
+                extract_from_unreachable_code(compressor, self.body, body);
                 if (self.init instanceof AST_Statement) {
                     body.push(self.init);
                 } else if (self.init) {
@@ -25294,7 +25301,7 @@ def_optimize(AST_If, function(self, compressor) {
         if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
         if (!cond) {
             var body = [];
-            trim_unreachable_code(compressor, self.body, body);
+            extract_from_unreachable_code(compressor, self.body, body);
             body.push(make_node(AST_SimpleStatement, self.condition, {
                 body: self.condition
             }));
@@ -25307,7 +25314,7 @@ def_optimize(AST_If, function(self, compressor) {
             }));
             body.push(self.body);
             if (self.alternative) {
-                trim_unreachable_code(compressor, self.alternative, body);
+                extract_from_unreachable_code(compressor, self.alternative, body);
             }
             return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
         }
@@ -25435,6 +25442,9 @@ def_optimize(AST_Switch, function(self, compressor) {
     var body = [];
     var default_branch;
     var exact_match;
+    // - compress self.body into `body`
+    // - find and deduplicate default branch
+    // - find the exact match (`case 1234` inside `switch(1234)`)
     for (var i = 0, len = self.body.length; i < len && !exact_match; i++) {
         branch = self.body[i];
         if (branch instanceof AST_Default) {
@@ -25464,6 +25474,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         }
         body.push(branch);
     }
+    // i < len if we found an exact_match. eliminate the rest
     while (i < len) eliminate_branch(self.body[i++], body[body.length - 1]);
     self.body = body;
 
@@ -25535,7 +25546,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         let i = body.length - 1;
         for (; i >= 0; i--) {
             let bbody = body[i].body;
-            if (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
+            while (is_break(bbody[bbody.length - 1], compressor)) bbody.pop();
             if (!is_inert_body(body[i])) break;
         }
         // i now points to the index of a branch that contains a body. By incrementing, it's
@@ -25551,9 +25562,9 @@ def_optimize(AST_Switch, function(self, compressor) {
                 let branch = body[j];
                 if (branch === default_or_exact) {
                     default_or_exact = null;
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else if (!branch.expression.has_side_effects(compressor)) {
-                    body.pop();
+                    eliminate_branch(body.pop());
                 } else {
                     break;
                 }
@@ -25667,15 +25678,16 @@ def_optimize(AST_Switch, function(self, compressor) {
         // and there's a side-effect somewhere. Just let the below paths take care of it.
     }
 
+    // Reintegrate `decl` (var statements)
     if (body.length > 0) {
         body[0].body = decl.concat(body[0].body);
     }
-
     if (body.length == 0) {
         return make_node(AST_BlockStatement, self, {
             body: decl.concat(statement(self.expression))
         }).optimize(compressor);
     }
+
     if (body.length == 1 && !has_nested_break(self)) {
         // This is the last case body, and we've already pruned any breaks, so it's
         // safe to hoist.
@@ -25755,7 +25767,7 @@ def_optimize(AST_Switch, function(self, compressor) {
         if (prev && !aborts(prev)) {
             prev.body = prev.body.concat(branch.body);
         } else {
-            trim_unreachable_code(compressor, branch, decl);
+            extract_from_unreachable_code(compressor, branch, decl);
         }
     }
     function branches_equivalent(branch, prev, insertBreak) {
@@ -25809,7 +25821,7 @@ def_optimize(AST_Try, function(self, compressor) {
     if (compressor.option("dead_code") && self.body.body.every(is_empty)) {
         var body = [];
         if (self.bcatch) {
-            trim_unreachable_code(compressor, self.bcatch, body);
+            extract_from_unreachable_code(compressor, self.bcatch, body);
         }
         if (self.bfinally) body.push(...self.bfinally.body);
         return make_node(AST_BlockStatement, self, {
@@ -40369,8 +40381,8 @@ const processOptions = (inputOptions) => {
         try {
           const result = await minify$1(code, terserOptions);
           return result.code.replace(/;$/, '');
-        } catch (error) {
-          options.log(error);
+        } catch (err) {
+          options.log(err);
           return text;
         }
       };

package/package.json

@@ -11,7 +11,7 @@
     "entities": "^7.0.0",
     "lightningcss": "^1.28.2",
     "relateurl": "^0.2.7",
-    "terser": "^5.44.0"
+    "terser": "^5.44.1"
   },
   "description": "Highly configurable, well-tested, JavaScript-based HTML minifier",
   "devDependencies": {
@@ -84,5 +84,5 @@
     "test:watch": "node --test --watch tests/*.spec.js"
   },
   "type": "module",
-  "version": "4.1.1"
+  "version": "4.2.2"
 }

package/src/htmlminifier.js

@@ -798,8 +798,8 @@ const processOptions = (inputOptions) => {
         try {
           const result = await terser(code, terserOptions);
           return result.code.replace(/;$/, '');
-        } catch (error) {
-          options.log(error);
+        } catch (err) {
+          options.log(err);
           return text;
         }
       };