Replace he with entities (#98)

package.json

@@ -76,14 +76,15 @@
     "camel-case": "^4.1.2",
     "clean-css": "^5.2.2",
     "commander": "^8.3.0",
-    "he": "^1.2.0",
+    "entities": "^3.0.1",
     "param-case": "^3.0.4",
     "relateurl": "^0.2.7",
     "terser": "^5.10.0"
   },
   "devDependencies": {
     "@jest/globals": "^27.3.1",
     "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "alpinejs": "^3.5.2",
     "eslint": "^7.32.0",

rollup.config.js

@@ -2,8 +2,18 @@ import { defineConfig } from 'rollup';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
+import json from '@rollup/plugin-json';
 import { terser } from 'rollup-plugin-terser';
 
+const bunldePlugins = [
+  commonjs(),
+  nodePolyfills(),
+  nodeResolve({
+    preferBuiltins: false
+  }),
+  json()
+];
+
 const config = defineConfig([
   {
     input: 'src/htmlminifier.js',
@@ -13,13 +23,7 @@ const config = defineConfig([
       exports: 'named',
       name: 'HTMLMinifier'
     }],
-    plugins: [
-      commonjs(),
-      nodePolyfills(),
-      nodeResolve({
-        preferBuiltins: false
-      })
-    ]
+    plugins: bunldePlugins
   },
   {
     input: 'src/htmlminifier.js',
@@ -30,11 +34,7 @@ const config = defineConfig([
       name: 'HTMLMinifier'
     }],
     plugins: [
-      commonjs(),
-      nodePolyfills(),
-      nodeResolve({
-        preferBuiltins: false
-      }),
+      ...bunldePlugins,
       terser()
     ]
   },
@@ -44,13 +44,7 @@ const config = defineConfig([
       file: 'dist/htmlminifier.esm.bundle.js',
       format: 'es'
     },
-    plugins: [
-      commonjs(),
-      nodePolyfills(),
-      nodeResolve({
-        preferBuiltins: false
-      })
-    ]
+    plugins: bunldePlugins
   },
   {
     input: 'src/htmlminifier.js',
@@ -61,7 +55,7 @@ const config = defineConfig([
     plugins: [
       commonjs()
     ],
-    external: ['clean-css', 'terser', 'he', 'relateurl']
+    external: ['clean-css', 'terser', 'entities', 'relateurl']
   }
 ]);
 

src/htmlminifier.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const CleanCSS = require('clean-css');
-const { decode } = require('he');
+const { decodeHTMLStrict, decodeHTML } = require('entities');
 const RelateUrl = require('relateurl');
 const Terser = require('terser');
 
@@ -549,7 +549,7 @@ async function normalizeAttr(attr, attrs, tag, options) {
   let attrValue = attr.value;
 
   if (options.decodeEntities && attrValue) {
-    attrValue = decode(attrValue, { isAttributeValue: true });
+    attrValue = decodeHTMLStrict(attrValue);
   }
 
   if ((options.removeRedundantAttributes &&
@@ -1128,7 +1128,7 @@ async function minify(value, options, partialMarkup) {
       prevTag = prevTag === '' ? 'comment' : prevTag;
       nextTag = nextTag === '' ? 'comment' : nextTag;
       if (options.decodeEntities && text && !specialContentTags(currentTag)) {
-        text = decode(text);
+        text = decodeHTML(text);
       }
       if (options.collapseWhitespace) {
         if (!stackNoTrimWhitespace.length) {