htmlnano 0.2.7 → 0.2.8

package/lib/modules/mergeStyles.js

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = mergeStyles;
+exports.default = mergeStyles;
 
 var _helpers = require("../helpers");
 
 /* Merge multiple <style> into one */
 function mergeStyles(tree) {
-  var styleNodes = {};
+  const styleNodes = {};
   tree.match({
     tag: 'style'
-  }, function (node) {
-    var nodeAttrs = node.attrs || {}; // Skip <style scoped></style>
+  }, node => {
+    const nodeAttrs = node.attrs || {}; // Skip <style scoped></style>
     // https://developer.mozilla.org/en/docs/Web/HTML/Element/style
 
     if (nodeAttrs.scoped !== undefined) {
@@ -24,12 +24,12 @@ function mergeStyles(tree) {
       return node;
     }
 
-    var styleType = nodeAttrs.type || 'text/css';
-    var styleMedia = nodeAttrs.media || 'all';
-    var styleKey = styleType + '_' + styleMedia;
+    const styleType = nodeAttrs.type || 'text/css';
+    const styleMedia = nodeAttrs.media || 'all';
+    const styleKey = styleType + '_' + styleMedia;
 
     if (styleNodes[styleKey]) {
-      var styleContent = (node.content || []).join(' ');
+      const styleContent = (node.content || []).join(' ');
       styleNodes[styleKey].content.push(' ' + styleContent);
       return '';
     }

package/lib/modules/minifyConditionalComments.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = minifyConditionalComments;
+
+var _htmlnano = _interopRequireDefault(require("../htmlnano"));
+
+var _helpers = require("../helpers");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Spec: https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/compatibility/ms537512(v=vs.85)
+const CONDITIONAL_COMMENT_REGEXP = /(<!--\[if\s+?[^<>[\]]+?]>)([\s\S]+?)(<!\[endif\]-->)/gm;
+/** Minify content inside conditional comments */
+
+async function minifyConditionalComments(tree, htmlnanoOptions) {
+  // forEach, tree.walk, tree.match just don't support Promise.
+  for (let i = 0, len = tree.length; i < len; i++) {
+    const node = tree[i];
+
+    if (typeof node === 'string' && (0, _helpers.isConditionalComment)(node)) {
+      tree[i] = await minifycontentInsideConditionalComments(node, htmlnanoOptions);
+    }
+
+    if (node.content && node.content.length) {
+      tree[i].content = await minifyConditionalComments(node.content, htmlnanoOptions);
+    }
+  }
+
+  return tree;
+}
+
+async function minifycontentInsideConditionalComments(text, htmlnanoOptions) {
+  let match;
+  const matches = []; // FIXME!
+  // String#matchAll is supported since Node.js 12
+
+  while ((match = CONDITIONAL_COMMENT_REGEXP.exec(text)) !== null) {
+    matches.push([match[1], match[2], match[3]]);
+  }
+
+  if (!matches.length) {
+    return Promise.resolve(text);
+  }
+
+  return Promise.all(matches.map(async match => {
+    const result = await _htmlnano.default.process(match[1], htmlnanoOptions, {}, {});
+    return match[0] + result.html + match[2];
+  }));
+}

package/lib/modules/minifyCss.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = minifyCss;
+exports.default = minifyCss;
 
 var _helpers = require("../helpers");
 
 var _cssnano = _interopRequireDefault(require("cssnano"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var postcssOptions = {
+const postcssOptions = {
   // Prevent the following warning from being shown:
   // > Without `from` option PostCSS could generate wrong source map and will not find Browserslist config.
   // > Set it to CSS file path or to `undefined` to prevent this warning.
@@ -20,8 +20,8 @@ var postcssOptions = {
 /** Minify CSS with cssnano */
 
 function minifyCss(tree, options, cssnanoOptions) {
-  var promises = [];
-  tree.walk(function (node) {
+  let promises = [];
+  tree.walk(node => {
     if ((0, _helpers.isStyleNode)(node)) {
       promises.push(processStyleNode(node, cssnanoOptions));
     } else if (node.attrs && node.attrs.style) {
@@ -30,26 +30,22 @@ function minifyCss(tree, options, cssnanoOptions) {
 
     return node;
   });
-  return Promise.all(promises).then(function () {
-    return tree;
-  });
+  return Promise.all(promises).then(() => tree);
 }
 
 function processStyleNode(styleNode, cssnanoOptions) {
-  var css = (0, _helpers.extractCssFromStyleNode)(styleNode);
-  return _cssnano["default"].process(css, postcssOptions, cssnanoOptions).then(function (result) {
-    return styleNode.content = [result.css];
-  });
+  const css = (0, _helpers.extractCssFromStyleNode)(styleNode);
+  return _cssnano.default.process(css, postcssOptions, cssnanoOptions).then(result => styleNode.content = [result.css]);
 }
 
 function processStyleAttr(node, cssnanoOptions) {
   // CSS "color: red;" is invalid. Therefore it should be wrapped inside some selector:
   // a{color: red;}
-  var wrapperStart = 'a{';
-  var wrapperEnd = '}';
-  var wrappedStyle = wrapperStart + (node.attrs.style || '') + wrapperEnd;
-  return _cssnano["default"].process(wrappedStyle, postcssOptions, cssnanoOptions).then(function (result) {
-    var minifiedCss = result.css; // Remove wrapperStart at the start and wrapperEnd at the end of minifiedCss
+  const wrapperStart = 'a{';
+  const wrapperEnd = '}';
+  const wrappedStyle = wrapperStart + (node.attrs.style || '') + wrapperEnd;
+  return _cssnano.default.process(wrappedStyle, postcssOptions, cssnanoOptions).then(result => {
+    const minifiedCss = result.css; // Remove wrapperStart at the start and wrapperEnd at the end of minifiedCss
 
     node.attrs.style = minifiedCss.substring(wrapperStart.length, minifiedCss.length - wrapperEnd.length);
   });

package/lib/modules/minifyJs.js

@@ -3,19 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = minifyJs;
+exports.default = minifyJs;
 
 var _terser = _interopRequireDefault(require("terser"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /** Minify JS with Terser */
 function minifyJs(tree, options, terserOptions) {
   tree.match({
     tag: 'script'
-  }, function (node) {
-    var nodeAttrs = node.attrs || {};
-    var mimeType = nodeAttrs.type || 'text/javascript';
+  }, node => {
+    const nodeAttrs = node.attrs || {};
+    const mimeType = nodeAttrs.type || 'text/javascript';
 
     if (mimeType === 'text/javascript' || mimeType === 'application/javascript') {
       return processScriptNode(node, terserOptions);
@@ -25,35 +25,35 @@ function minifyJs(tree, options, terserOptions) {
   });
   tree.match({
     attrs: true
-  }, function (node) {
+  }, node => {
     return processNodeWithOnAttrs(node, terserOptions);
   });
   return tree;
 }
 
 function stripCdata(js) {
-  var leftStrippedJs = js.replace(/\/\/\s*<!\[CDATA\[/, '');
+  const leftStrippedJs = js.replace(/\/\/\s*<!\[CDATA\[/, '');
 
   if (leftStrippedJs === js) {
     return js;
   }
 
-  var strippedJs = leftStrippedJs.replace(/\/\/\s*\]\]>/, '');
+  const strippedJs = leftStrippedJs.replace(/\/\/\s*\]\]>/, '');
   return leftStrippedJs === strippedJs ? js : strippedJs;
 }
 
 function processScriptNode(scriptNode, terserOptions) {
-  var js = (scriptNode.content || []).join('').trim();
+  let js = (scriptNode.content || []).join('').trim();
 
   if (!js) {
     return scriptNode;
   }
 
-  var strippedJs = stripCdata(js);
-  var isCdataWrapped = js !== strippedJs;
+  const strippedJs = stripCdata(js);
+  const isCdataWrapped = js !== strippedJs;
   js = strippedJs;
 
-  var result = _terser["default"].minify(js, terserOptions);
+  const result = _terser.default.minify(js, terserOptions);
 
   if (result.error) {
     throw new Error(result.error);
@@ -63,7 +63,7 @@ function processScriptNode(scriptNode, terserOptions) {
     return scriptNode;
   }
 
-  var content = result.code;
+  let content = result.code;
 
   if (isCdataWrapped) {
     content = '//<![CDATA[' + content + '//]]>';
@@ -74,12 +74,10 @@ function processScriptNode(scriptNode, terserOptions) {
 }
 
 function processNodeWithOnAttrs(node, terserOptions) {
-  var jsWrapperStart = 'function _(){';
-  var jsWrapperEnd = '}';
-
-  for (var _i = 0, _Object$keys = Object.keys(node.attrs || {}); _i < _Object$keys.length; _i++) {
-    var attrName = _Object$keys[_i];
+  const jsWrapperStart = 'function _(){';
+  const jsWrapperEnd = '}';
 
+  for (const attrName of Object.keys(node.attrs || {})) {
     if (attrName.search('on') !== 0) {
       continue;
     } // For example onclick="return false" is valid,
@@ -88,11 +86,11 @@ function processNodeWithOnAttrs(node, terserOptions) {
     // "function _(){return false;}"
 
 
-    var wrappedJs = jsWrapperStart + node.attrs[attrName] + jsWrapperEnd;
+    let wrappedJs = jsWrapperStart + node.attrs[attrName] + jsWrapperEnd;
 
-    var wrappedMinifiedJs = _terser["default"].minify(wrappedJs, terserOptions).code;
+    let wrappedMinifiedJs = _terser.default.minify(wrappedJs, terserOptions).code;
 
-    var minifiedJs = wrappedMinifiedJs.substring(jsWrapperStart.length, wrappedMinifiedJs.length - jsWrapperEnd.length);
+    let minifiedJs = wrappedMinifiedJs.substring(jsWrapperStart.length, wrappedMinifiedJs.length - jsWrapperEnd.length);
     node.attrs[attrName] = minifiedJs;
   }
 

package/lib/modules/minifyJson.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = minifyJson;
+exports.default = minifyJson;
 
 /* Minify JSON inside <script> tags */
 function minifyJson(tree) {
@@ -13,8 +13,8 @@ function minifyJson(tree) {
     attrs: {
       type: /(\/|\+)json/
     }
-  }, function (node) {
-    var content = (node.content || []).join('');
+  }, node => {
+    let content = (node.content || []).join('');
 
     if (!content) {
       return node;

package/lib/modules/minifySvg.js

@@ -3,24 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = minifySvg;
+exports.default = minifySvg;
 
 var _svgo = _interopRequireDefault(require("svgo"));
 
 var _posthtmlRender = _interopRequireDefault(require("posthtml-render"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /** Minify SVG with SVGO */
-function minifySvg(tree, options) {
-  var svgoOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var promises = [];
-  var svgo = new _svgo["default"](svgoOptions);
+function minifySvg(tree, options, svgoOptions = {}) {
+  let promises = [];
+  let svgo = new _svgo.default(svgoOptions);
   tree.match({
     tag: 'svg'
-  }, function (node) {
-    var svgStr = (0, _posthtmlRender["default"])(node);
-    var promise = svgo.optimize(svgStr).then(function (result) {
+  }, node => {
+    let svgStr = (0, _posthtmlRender.default)(node);
+    let promise = svgo.optimize(svgStr).then(result => {
       node.tag = false;
       node.attrs = {};
       node.content = result.data;
@@ -28,7 +27,5 @@ function minifySvg(tree, options) {
     promises.push(promise);
     return node;
   });
-  return Promise.all(promises).then(function () {
-    return tree;
-  });
+  return Promise.all(promises).then(() => tree);
 }

package/lib/modules/minifyUrls.js

@@ -3,44 +3,37 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = minifyUrls;
+exports.default = minifyUrls;
 
 var _relateurl = _interopRequireDefault(require("relateurl"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _srcset = _interopRequireDefault(require("srcset"));
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Adopts from https://github.com/kangax/html-minifier/blob/51ce10f4daedb1de483ffbcccecc41be1c873da2/src/htmlminifier.js#L209-L221
-var tagsHaveUriValuesForAttributes = new Set(['a', 'area', 'link', 'base', 'img', 'object', 'q', 'blockquote', 'ins', 'form', 'input', 'head', 'script']);
-var REGEXP_TAGS_HAVE_URI_VSLUES_FOR_ATTRIBUTES = new RegExp('^(' + _toConsumableArray(tagsHaveUriValuesForAttributes).join('|') + ')$');
-var tagsHasHrefAttributes = new Set(['a', 'area', 'link', 'base']);
-var attributesOfImgTagHasUriValues = new Set(['src', 'longdesc', 'usemap']);
-var attributesOfObjectTagHasUriValues = new Set(['classid', 'codebase', 'data', 'usemap']);
-
-var isUriTypeAttribute = function isUriTypeAttribute(tag, attr) {
-  return tagsHasHrefAttributes.has(tag) && attr === 'href' || tag === 'img' && attributesOfImgTagHasUriValues.has(attr) || tag === 'object' && attributesOfObjectTagHasUriValues.has(attr) || tag === 'q' && attr === 'cite' || tag === 'blockquote' && attr === 'cite' || (tag === 'ins' || tag === 'del') && attr === 'cite' || tag === 'form' && attr === 'action' || tag === 'input' && (attr === 'src' || attr === 'usemap') || tag === 'head' && attr === 'profile' || tag === 'script' && (attr === 'src' || attr === 'for');
+const tagsHaveUriValuesForAttributes = new Set(['a', 'area', 'link', 'base', 'img', 'object', 'q', 'blockquote', 'ins', 'form', 'input', 'head', 'script']);
+const REGEXP_TAGS_HAVE_URI_VSLUES_FOR_ATTRIBUTES = new RegExp('^(' + [...tagsHaveUriValuesForAttributes].join('|') + ')$');
+const tagsHasHrefAttributes = new Set(['a', 'area', 'link', 'base']);
+const attributesOfImgTagHasUriValues = new Set(['src', 'longdesc', 'usemap']);
+const attributesOfObjectTagHasUriValues = new Set(['classid', 'codebase', 'data', 'usemap']);
+
+const isUriTypeAttribute = (tag, attr) => {
+  return tagsHasHrefAttributes.has(tag) && attr === 'href' || tag === 'img' && attributesOfImgTagHasUriValues.has(attr) || tag === 'object' && attributesOfObjectTagHasUriValues.has(attr) || tag === 'q' && attr === 'cite' || tag === 'blockquote' && attr === 'cite' || (tag === 'ins' || tag === 'del') && attr === 'cite' || tag === 'form' && attr === 'action' || tag === 'input' && (attr === 'src' || attr === 'usemap') || tag === 'head' && attr === 'profile' || tag === 'script' && (attr === 'src' || attr === 'for') ||
+  /**
+   * https://html.spec.whatwg.org/#attr-source-src
+   *
+   * Although most of browsers recommend not to use "src" in <source>,
+   * but technically it does comply with HTML Standard.
+   */
+  tag === 'source' && attr === 'src';
+};
+
+const isSrcsetAttribute = (tag, attr) => {
+  return tag === 'source' && attr === 'srcset' || tag === 'img' && attr === 'srcset' || tag === 'link' && attr === 'imagesrcset';
 };
 
-var processModuleOptions = function processModuleOptions(options) {
+const processModuleOptions = options => {
   // FIXME!
   // relateurl@1.0.0-alpha only supports URL while stable version (0.2.7) only supports string
   // should convert input into URL instance after relateurl@1 is stable
@@ -49,29 +42,26 @@ var processModuleOptions = function processModuleOptions(options) {
   return false;
 };
 
-var isLinkRelCanonical = function isLinkRelCanonical(_ref) {
-  var tag = _ref.tag,
-      attrs = _ref.attrs;
+const isLinkRelCanonical = ({
+  tag,
+  attrs
+}) => {
   // Return false early for non-"link" tag
   if (tag !== 'link') return false;
 
-  for (var _i = 0, _Object$entries = Object.entries(attrs); _i < _Object$entries.length; _i++) {
-    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-        attrName = _Object$entries$_i[0],
-        attrValue = _Object$entries$_i[1];
-
+  for (const [attrName, attrValue] of Object.entries(attrs)) {
     if (attrName.toLowerCase() === 'rel' && attrValue === 'canonical') return true;
   }
 
   return false;
 };
 
-var relateUrlInstance;
-var STORED_URL_BASE;
+let relateUrlInstance;
+let STORED_URL_BASE;
 /** Convert absolute url into relative url */
 
 function minifyUrls(tree, options, moduleOptions) {
-  var urlBase = processModuleOptions(moduleOptions); // Invalid configuration, return tree directly
+  const urlBase = processModuleOptions(moduleOptions); // Invalid configuration, return tree directly
 
   if (!urlBase) return tree;
   /** Bring up a reusable RelateUrl instances (only once)
@@ -82,30 +72,43 @@ function minifyUrls(tree, options, moduleOptions) {
    */
 
   if (!relateUrlInstance || STORED_URL_BASE !== urlBase) {
-    relateUrlInstance = new _relateurl["default"](urlBase);
+    relateUrlInstance = new _relateurl.default(urlBase);
     STORED_URL_BASE = urlBase;
   }
 
   tree.match({
     tag: REGEXP_TAGS_HAVE_URI_VSLUES_FOR_ATTRIBUTES
-  }, function (node) {
+  }, node => {
     if (!node.attrs) return node; // Prevent link[rel=canonical] being processed
     // Can't be excluded by isUriTypeAttribute()
 
     if (isLinkRelCanonical(node)) return node;
 
-    for (var _i2 = 0, _Object$entries2 = Object.entries(node.attrs); _i2 < _Object$entries2.length; _i2++) {
-      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
-          attrName = _Object$entries2$_i[0],
-          attrValue = _Object$entries2$_i[1];
-
-      var attrNameLower = attrName.toLowerCase();
-      if (!isUriTypeAttribute(node.tag, attrNameLower)) continue; // FIXME!
-      // relateurl@1.0.0-alpha only supports URL while stable version (0.2.7) only supports string
-      // the WHATWG URL API is very strict while attrValue might not be a valid URL
-      // new URL should be used, and relateUrl#relate should be wrapped in try...catch after relateurl@1 is stable
-
-      node.attrs[attrName] = relateUrlInstance.relate(attrValue);
+    for (const [attrName, attrValue] of Object.entries(node.attrs)) {
+      const attrNameLower = attrName.toLowerCase();
+
+      if (isUriTypeAttribute(node.tag, attrNameLower)) {
+        // FIXME!
+        // relateurl@1.0.0-alpha only supports URL while stable version (0.2.7) only supports string
+        // the WHATWG URL API is very strict while attrValue might not be a valid URL
+        // new URL should be used, and relateUrl#relate should be wrapped in try...catch after relateurl@1 is stable
+        node.attrs[attrName] = relateUrlInstance.relate(attrValue);
+        continue;
+      }
+
+      if (isSrcsetAttribute(node.tag, attrNameLower)) {
+        try {
+          const parsedSrcset = _srcset.default.parse(attrValue);
+
+          node.attrs[attrName] = _srcset.default.stringify(parsedSrcset.map(srcset => {
+            srcset.url = relateUrlInstance.relate(srcset.url);
+            return srcset;
+          }));
+        } catch (e) {// srcset will throw an Error for invalid srcset.
+        }
+
+        continue;
+      }
     }
 
     return node;

package/lib/modules/removeAttributeQuotes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = removeAttributeQuotes;
+exports.default = removeAttributeQuotes;
 
 // Specification: https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // See also: https://github.com/posthtml/posthtml-render/pull/30

package/lib/modules/removeComments.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = removeComments;
+exports.default = removeComments;
 
 var _helpers = require("../helpers");
 
-var MATCH_EXCERPT_REGEXP = /<!-- ?more ?-->/i;
+const MATCH_EXCERPT_REGEXP = /<!-- ?more ?-->/i;
 /** Removes HTML comments */
 
 function removeComments(tree, options, removeType) {
@@ -15,11 +15,9 @@ function removeComments(tree, options, removeType) {
     removeType = 'safe';
   }
 
-  tree.walk(function (node) {
+  tree.walk(node => {
     if (node.contents && node.contents.length) {
-      node.contents = node.contents.filter(function (content) {
-        return !isCommentToRemove(content, removeType);
-      });
+      node.contents = node.contents.filter(content => !isCommentToRemove(content, removeType));
     } else if (isCommentToRemove(node, removeType)) {
       node = '';
     }
@@ -40,14 +38,14 @@ function isCommentToRemove(text, removeType) {
   }
 
   if (removeType === 'safe') {
-    var isNoindex = text === '<!--noindex-->' || text === '<!--/noindex-->'; // Don't remove noindex comments.
+    const isNoindex = text === '<!--noindex-->' || text === '<!--/noindex-->'; // Don't remove noindex comments.
     // See: https://yandex.com/support/webmaster/controlling-robot/html.xml
 
     if (isNoindex) {
       return false;
     }
 
-    var isServerSideExclude = text === '<!--sse-->' || text === '<!--/sse-->'; // Don't remove sse comments.
+    const isServerSideExclude = text === '<!--sse-->' || text === '<!--/sse-->'; // Don't remove sse comments.
     // See: https://support.cloudflare.com/hc/en-us/articles/200170036-What-does-Server-Side-Excludes-SSE-do-
 
     if (isServerSideExclude) {
@@ -63,7 +61,7 @@ function isCommentToRemove(text, removeType) {
     // Jekyll: https://jekyllrb.com/docs/posts/#post-excerpts
 
 
-    var isCMSExcerptComment = MATCH_EXCERPT_REGEXP.test(text);
+    const isCMSExcerptComment = MATCH_EXCERPT_REGEXP.test(text);
 
     if (isCMSExcerptComment) {
       return false;

package/lib/modules/removeEmptyAttributes.js

@@ -3,36 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = removeEmptyAttributes;
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
+exports.default = removeEmptyAttributes;
 // Source: https://www.w3.org/TR/html4/sgml/dtd.html#events (Generic Attributes)
-var safeToRemoveAttrs = new Set(['id', 'class', 'style', 'title', 'lang', 'dir', 'onclick', 'ondblclick', 'onmousedown', 'onmouseup', 'onmouseover', 'onmousemove', 'onmouseout', 'onkeypress', 'onkeydown', 'onkeyup']);
+const safeToRemoveAttrs = new Set(['id', 'class', 'style', 'title', 'lang', 'dir', 'onclick', 'ondblclick', 'onmousedown', 'onmouseup', 'onmouseover', 'onmousemove', 'onmouseout', 'onkeypress', 'onkeydown', 'onkeyup']);
 /** Removes empty attributes */
 
 function removeEmptyAttributes(tree) {
-  tree.walk(function (node) {
+  tree.walk(node => {
     if (!node.attrs) {
       return node;
     }
 
-    Object.entries(node.attrs).forEach(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          attrName = _ref2[0],
-          attrValue = _ref2[1];
-
-      var attrNameLower = attrName.toLowerCase();
+    Object.entries(node.attrs).forEach(([attrName, attrValue]) => {
+      const attrNameLower = attrName.toLowerCase();
 
       if (!safeToRemoveAttrs.has(attrNameLower)) {
         return;