htmlnano 1.1.0 → 2.0.1

package/lib/modules/removeComments.js

@@ -3,28 +3,36 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = removeComments;
+exports.onContent = onContent;
+exports.onNode = onNode;
 
 var _helpers = require("../helpers");
 
 const MATCH_EXCERPT_REGEXP = /<!-- ?more ?-->/i;
 /** Removes HTML comments */
 
-function removeComments(tree, options, removeType) {
+function onNode(options, removeType) {
   if (removeType !== 'all' && removeType !== 'safe' && !isMatcher(removeType)) {
     removeType = 'safe';
   }
 
-  tree.walk(node => {
-    if (node.contents && node.contents.length) {
-      node.contents = node.contents.filter(content => !isCommentToRemove(content, removeType));
-    } else if (isCommentToRemove(node, removeType)) {
-      node = '';
+  return node => {
+    if (isCommentToRemove(node, removeType)) {
+      return '';
     }
 
     return node;
-  });
-  return tree;
+  };
+}
+
+function onContent(options, removeType) {
+  if (removeType !== 'all' && removeType !== 'safe' && !isMatcher(removeType)) {
+    removeType = 'safe';
+  }
+
+  return contents => {
+    return contents.filter(content => !isCommentToRemove(content, removeType));
+  };
 }
 
 function isCommentToRemove(text, removeType) {

package/lib/modules/removeEmptyAttributes.js

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = removeEmptyAttributes;
+exports.onAttrs = onAttrs;
+
+var _helpers = require("../helpers");
+
 const safeToRemoveAttrs = {
   id: null,
   class: null,
@@ -52,24 +55,18 @@ const safeToRemoveAttrs = {
   value: ['button', 'input', 'li'],
   width: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video']
 };
-/** Removes empty attributes */
-
-function removeEmptyAttributes(tree) {
-  tree.walk(node => {
-    if (!node.attrs) {
-      return node;
-    }
-
-    Object.entries(node.attrs).forEach(([attrName, attrValue]) => {
-      const attrNameLower = attrName.toLowerCase();
 
-      if (attrNameLower.slice(0, 2).toLowerCase() === 'on' && attrName.length >= 5 || Object.hasOwnProperty.call(safeToRemoveAttrs, attrNameLower) && (safeToRemoveAttrs[attrNameLower] === null || safeToRemoveAttrs[attrNameLower].includes(node.tag))) {
+function onAttrs() {
+  return (attrs, node) => {
+    const newAttrs = { ...attrs
+    };
+    Object.entries(attrs).forEach(([attrName, attrValue]) => {
+      if ((0, _helpers.isEventHandler)(attrName) || Object.hasOwnProperty.call(safeToRemoveAttrs, attrName) && (safeToRemoveAttrs[attrName] === null || safeToRemoveAttrs[attrName].includes(node.tag))) {
         if (attrValue === '' || (attrValue || '').match(/^\s+$/)) {
-          delete node.attrs[attrName];
+          delete newAttrs[attrName];
         }
       }
     });
-    return node;
-  });
-  return tree;
+    return newAttrs;
+  };
 }

package/lib/modules/removeRedundantAttributes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = removeRedundantAttributes;
+exports.onAttrs = onAttrs;
 exports.redundantScriptTypes = void 0;
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#JavaScript_types
 const redundantScriptTypes = new Set(['application/javascript', 'application/ecmascript', 'application/x-ecmascript', 'application/x-javascript', 'text/javascript', 'text/ecmascript', 'text/javascript1.0', 'text/javascript1.1', 'text/javascript1.2', 'text/javascript1.3', 'text/javascript1.4', 'text/javascript1.5', 'text/jscript', 'text/livescript', 'text/x-ecmascript', 'text/x-javascript']);
@@ -20,8 +20,8 @@ const redundantAttributes = {
   },
   'script': {
     'language': 'javascript',
-    'type': node => {
-      for (const [attrName, attrValue] of Object.entries(node.attrs)) {
+    'type': attrs => {
+      for (const [attrName, attrValue] of Object.entries(attrs)) {
         if (attrName.toLowerCase() !== 'type') {
           continue;
         }
@@ -32,10 +32,10 @@ const redundantAttributes = {
       return false;
     },
     // Remove attribute if the function returns false
-    'charset': node => {
+    'charset': attrs => {
       // The charset attribute only really makes sense on “external” SCRIPT elements:
       // http://perfectionkills.com/optimizing-html/#8_script_charset
-      return node.attrs && !node.attrs.src;
+      return !attrs.src;
     }
   },
   'style': {
@@ -44,13 +44,13 @@ const redundantAttributes = {
   },
   'link': {
     'media': 'all',
-    'type': node => {
+    'type': attrs => {
       // https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet
       let isRelStyleSheet = false;
       let isTypeTextCSS = false;
 
-      if (node.attrs) {
-        for (const [attrName, attrValue] of Object.entries(node.attrs)) {
+      if (attrs) {
+        for (const [attrName, attrValue] of Object.entries(attrs)) {
           if (attrName.toLowerCase() === 'rel' && attrValue === 'stylesheet') {
             isRelStyleSheet = true;
           }
@@ -115,13 +115,10 @@ const tagsHaveRedundantAttributes = new Set(Object.keys(redundantAttributes));
 const tagsHaveMissingValueDefaultAttributes = new Set(Object.keys(canBeReplacedWithEmptyStringAttributes));
 /** Removes redundant attributes */
 
-function removeRedundantAttributes(tree) {
-  tree.walk(node => {
-    if (!node.tag) {
-      return node;
-    }
-
-    node.attrs = node.attrs || {};
+function onAttrs() {
+  return (attrs, node) => {
+    if (!node.tag) return attrs;
+    const newAttrs = attrs;
 
     if (tagsHaveRedundantAttributes.has(node.tag)) {
       const tagRedundantAttributes = redundantAttributes[node.tag];
@@ -131,13 +128,13 @@ function removeRedundantAttributes(tree) {
         let isRemove = false;
 
         if (typeof tagRedundantAttributeValue === 'function') {
-          isRemove = tagRedundantAttributeValue(node);
-        } else if (node.attrs[redundantAttributeName] === tagRedundantAttributeValue) {
+          isRemove = tagRedundantAttributeValue(attrs);
+        } else if (attrs[redundantAttributeName] === tagRedundantAttributeValue) {
           isRemove = true;
         }
 
         if (isRemove) {
-          delete node.attrs[redundantAttributeName];
+          delete newAttrs[redundantAttributeName];
         }
       }
     }
@@ -149,17 +146,16 @@ function removeRedundantAttributes(tree) {
         let tagMissingValueDefaultAttribute = tagMissingValueDefaultAttributes[canBeReplacedWithEmptyStringAttributeName];
         let isReplace = false;
 
-        if (node.attrs[canBeReplacedWithEmptyStringAttributeName] === tagMissingValueDefaultAttribute) {
+        if (attrs[canBeReplacedWithEmptyStringAttributeName] === tagMissingValueDefaultAttribute) {
           isReplace = true;
         }
 
         if (isReplace) {
-          node.attrs[canBeReplacedWithEmptyStringAttributeName] = '';
+          newAttrs[canBeReplacedWithEmptyStringAttributeName] = '';
         }
       }
     }
 
-    return node;
-  });
-  return tree;
+    return newAttrs;
+  };
 }

package/lib/modules/removeUnusedCss.js

@@ -7,13 +7,9 @@ exports.default = removeUnusedCss;
 
 var _helpers = require("../helpers");
 
-var _uncss = _interopRequireDefault(require("uncss"));
+const uncss = (0, _helpers.optionalRequire)('uncss');
+const purgecss = (0, _helpers.optionalRequire)('purgecss'); // These options must be set and shouldn't be overriden to ensure uncss doesn't look at linked stylesheets.
 
-var _purgecss = _interopRequireDefault(require("purgecss"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// These options must be set and shouldn't be overriden to ensure uncss doesn't look at linked stylesheets.
 const uncssOptions = {
   ignoreSheets: [/\s*/],
   stylesheets: []
@@ -43,7 +39,7 @@ function runUncss(html, css, userOptions) {
   };
   return new Promise((resolve, reject) => {
     options.raw = css;
-    (0, _uncss.default)(html, options, (error, output) => {
+    uncss(html, options, (error, output) => {
       if (error) {
         reject(error);
         return;
@@ -100,7 +96,7 @@ function runPurgecss(tree, css, userOptions) {
       extensions: ['html']
     }]
   };
-  return new _purgecss.default().purge(options).then(result => {
+  return new purgecss.PurgeCSS().purge(options).then(result => {
     return result[0].css;
   });
 }
@@ -113,9 +109,13 @@ function removeUnusedCss(tree, options, userOptions) {
   tree.walk(node => {
     if ((0, _helpers.isStyleNode)(node)) {
       if (userOptions.tool === 'purgeCSS') {
-        promises.push(processStyleNodePurgeCSS(tree, node, userOptions));
+        if (purgecss) {
+          promises.push(processStyleNodePurgeCSS(tree, node, userOptions));
+        }
       } else {
-        promises.push(processStyleNodeUnCSS(html, node, userOptions));
+        if (uncss) {
+          promises.push(processStyleNodeUnCSS(html, node, userOptions));
+        }
       }
     }
 

package/lib/presets/max.js

@@ -22,6 +22,8 @@ var _default = { ..._safe.default,
   removeComments: 'all',
   removeAttributeQuotes: true,
   removeRedundantAttributes: true,
+  mergeScripts: true,
+  mergeStyles: true,
   removeUnusedCss: {},
   minifyCss: {
     preset: 'default'

package/lib/presets/safe.js

@@ -17,8 +17,8 @@ var _default = {
   collapseWhitespace: 'conservative',
   custom: [],
   deduplicateAttributeValues: true,
-  mergeScripts: true,
-  mergeStyles: true,
+  mergeScripts: false,
+  mergeStyles: false,
   removeUnusedCss: false,
   minifyCss: {
     preset: 'default'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlnano",
-  "version": "1.1.0",
+  "version": "2.0.1",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "main": "index.js",
   "author": "Kirill Maltsev <maltsevkirill@gmail.com>",
@@ -40,28 +40,64 @@
   },
   "dependencies": {
     "cosmiconfig": "^7.0.1",
-    "cssnano": "^5.0.8",
-    "postcss": "^8.3.6",
     "posthtml": "^0.16.5",
-    "purgecss": "^4.0.0",
-    "relateurl": "^0.2.7",
-    "srcset": "^4.0.0",
-    "svgo": "^2.6.1",
-    "terser": "^5.8.0",
-    "timsort": "^0.3.0",
-    "uncss": "^0.17.3"
+    "timsort": "^0.3.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.7",
     "@babel/core": "^7.15.5",
+    "@babel/eslint-parser": "^7.17.0",
     "@babel/preset-env": "^7.15.6",
     "@babel/register": "^7.15.3",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.32.0",
+    "cssnano": "^5.0.11",
+    "eslint": "^8.12.0",
     "expect": "^27.2.0",
     "mocha": "^9.1.0",
+    "postcss": "^8.3.11",
+    "purgecss": "^4.0.3",
+    "relateurl": "^0.2.7",
     "release-it": "^14.11.5",
-    "rimraf": "^3.0.2"
+    "rimraf": "^3.0.2",
+    "srcset": "^5.0.0",
+    "svgo": "^2.8.0",
+    "terser": "^5.10.0",
+    "uncss": "^0.17.3"
+  },
+  "peerDependencies": {
+    "cssnano": "^5.0.11",
+    "postcss": "^8.3.11",
+    "purgecss": "^4.0.3",
+    "relateurl": "^0.2.7",
+    "srcset": "^5.0.0",
+    "svgo": "^2.8.0",
+    "terser": "^5.10.0",
+    "uncss": "^0.17.3"
+  },
+  "peerDependenciesMeta": {
+    "cssnano": {
+      "optional": true
+    },
+    "postcss": {
+      "optional": true
+    },
+    "purgecss": {
+      "optional": true
+    },
+    "relateurl": {
+      "optional": true
+    },
+    "srcset": {
+      "optional": true
+    },
+    "svgo": {
+      "optional": true
+    },
+    "terser": {
+      "optional": true
+    },
+    "uncss": {
+      "optional": true
+    }
   },
   "repository": {
     "type": "git",

package/uncss-fork.patch

@@ -1,13 +0,0 @@
-diff --git a/package.json b/package.json
-index a127c0f..66455bb 100644
---- a/package.json
-+++ b/package.json
-@@ -49,7 +49,7 @@
-     "svgo": "^2.4.0",
-     "terser": "^5.7.0",
-     "timsort": "^0.3.0",
--    "uncss": "^0.17.3"
-+    "@novaatwarren/uncss": "^0.17.4"
-   },
-   "devDependencies": {
-     "@babel/cli": "^7.14.3",