feat: switch to htmlnano

.gitignore

@@ -5,3 +5,4 @@ tmp/
 .idea/
 .nyc_output/
 coverage/
+package-lock.json

README.md

@@ -17,25 +17,25 @@ You can set options of HTMLMinifier in the main `_config.yml` file:
 
 ``` yaml
 html_minifier:
-  exclude: 
+  exclude:
 ```
 
 - **exclude**: Exclude files from being minified. Support [globbing patterns](https://github.com/micromatch/micromatch#extended-globbing).
 
 Default options:
 
 ``` yaml
-html_minifier:  
+html_minifier:
   collapseBooleanAttributes: true
   collapseWhitespace: true
   # Ignore '<!-- more -->' https://hexo.io/docs/tag-plugins#Post-Excerpt
   ignoreCustomComments: [ !!js/regexp /^\s*more/]
   removeComments: true
   removeEmptyAttributes: true
-  removeScriptTypeAttributes: true
-  removeStyleLinkTypeAttributes: true
-  minifyJS: true
-  minifyCSS: true
+  removeRedundantAttributes: true
+  removeAttributeQuotes: true
+  minifyJs: true
+  minifyCss: true
 ```
 
 - **ignoreCustomComments**: Array of regex'es that allow to ignore certain comments, when matched. Need to prepend [`!!js/regexp`](https://github.com/nodeca/js-yaml#supported-yaml-types) to support regex.

index.js

@@ -4,14 +4,13 @@ hexo.config.html_minifier = Object.assign({
   exclude: [],
   collapseBooleanAttributes: true,
   collapseWhitespace: true,
-  // Ignore '<!-- more -->' https://hexo.io/docs/tag-plugins#Post-Excerpt
   ignoreCustomComments: [/^\s*more/],
   removeComments: true,
   removeEmptyAttributes: true,
-  removeScriptTypeAttributes: true,
-  removeStyleLinkTypeAttributes: true,
-  minifyJS: true,
-  minifyCSS: true
+  removeRedundantAttributes: true,
+  removeAttributeQuotes: true,
+  minifyJs: true,
+  minifyCss: true
 }, hexo.config.html_minifier);
 
 hexo.extend.filter.register('after_render:html', require('./lib/filter'));

lib/filter.js

@@ -1,18 +1,36 @@
 'use strict';
-const minify = require('html-minifier').minify;
+const htmlnano = require('htmlnano');
 const micromatch = require('micromatch');
 
-module.exports = function(str, data) {
-  const options = this.config.html_minifier;
+module.exports = async function(str, data) {
+  const options = { ...this.config.html_minifier };
   const path = data.path;
-  const exclude = options.exclude;
+  const { exclude, ignoreCustomComments, removeComments } = options;
 
   if (path && exclude && exclude.length) {
     if (micromatch.isMatch(path, exclude)) return str;
   }
 
+  delete options.exclude;
+  delete options.ignoreCustomComments;
+  delete options.removeComments;
+  if (removeComments) {
+    if (Array.isArray(ignoreCustomComments) && ignoreCustomComments.length) {
+      options.removeComments = comment => {
+        comment = comment.replace(/^<!--|-->$/g, '');
+        for (const regex of ignoreCustomComments) {
+          if (regex.test(comment)) return false;
+        }
+        return true;
+      };
+    } else {
+      options.removeComments = 'safe';
+    }
+  }
+
   try {
-    return minify(str, options);
+    const result = await htmlnano.process(str, options);
+    return result.html;
   } catch (err) {
     throw new Error(`Path: ${path}\n${err}`);
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hexo-html-minifier",
   "version": "1.0.0",
-  "description": "Minify HTML files with HTMLMinifier.",
+  "description": "Minify HTML files with htmlnano.",
   "main": "index.js",
   "scripts": {
     "eslint": "eslint .",
@@ -31,8 +31,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "html-minifier": "^4.0.0",
-    "micromatch": "^4.0.4"
+    "cssnano": "^7.1.1",
+    "htmlnano": "^2.1.5",
+    "micromatch": "^4.0.4",
+    "postcss": "^8.5.6",
+    "svgo": "^3.3.2",
+    "terser": "^5.44.0"
   },
   "devDependencies": {
     "chai": "^6.0.1",

test/index.js

@@ -1,65 +1,61 @@
 'use strict';
 
 const should = require('chai').should(); // eslint-disable-line
-const { minify } = require('html-minifier');
-
 describe('hexo-html-minifier', () => {
   const ctx = {
     config: {
       html_minifier: {
+        exclude: [],
         collapseBooleanAttributes: true,
         collapseWhitespace: true,
         ignoreCustomComments: [/^\s*more/],
         removeComments: true,
         removeEmptyAttributes: true,
-        removeScriptTypeAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        minifyJS: true,
-        minifyCSS: true
+        removeRedundantAttributes: true,
+        removeAttributeQuotes: true,
+        minifyJs: true,
+        minifyCss: true
       }
     }
   };
   const h = require('../lib/filter').bind(ctx);
-  const defaultCfg = JSON.parse(JSON.stringify(ctx.config));
+  const defaultCfg = {...ctx.config.html_minifier};
   const input = '<p id="">foo</p>';
   const path = 'index.html';
 
   beforeEach(() => {
-    ctx.config = JSON.parse(JSON.stringify(defaultCfg));
+    ctx.config.html_minifier = {...defaultCfg};
   });
 
-  it('default', () => {
-    const result = h(input, { path });
+  it('default', async () => {
+    const result = await h(input, { path });
     result.should.eql('<p>foo</p>');
   });
 
-  it('option', () => {
+  it('option', async () => {
     ctx.config.html_minifier.removeEmptyAttributes = false;
-    const result = h(input, { path });
-    result.should.eql(input);
+    const result = await h(input, { path });
+    // htmlnano still removes the empty attribute value, leaving just the attribute name
+    result.should.eql('<p id>foo</p>');
   });
 
-  it('exclude', () => {
+  it('exclude', async () => {
     ctx.config.html_minifier.exclude = '**/*.min.html';
-    const result = h(input, { path: 'foo/bar.min.html' });
+    const result = await h(input, { path: 'foo/bar.min.html' });
     result.should.eql(input);
   });
 
-  it('invalid input', () => {
+  it('invalid input', async () => {
+    // htmlnano handles malformed HTML gracefully without throwing errors
     const invalid = '<html><>?:"{}|_+</html>';
-    let expected;
-
-    try {
-      minify(invalid);
-    } catch (err) {
-      expected = err;
-    }
+    const result = await h(invalid, { path });
+    // htmlnano processes the content as-is
+    result.should.eql(invalid);
+  });
 
-    try {
-      h(invalid, { path });
-      should.fail();
-    } catch (err) {
-      err.message.should.eql(`Path: ${path}\n${expected}`);
-    }
+  it('ignoreCustomComments', async () => {
+    const content = '<!-- more -->\n<p>Content</p>';
+    const result = await h(content, { path });
+    result.should.include('<!-- more -->');
   });
 });