htmlnano 2.1.1 → 2.1.3

package/lib/modules/minifyUrls.mjs

@@ -1,229 +0,0 @@
-import { optionalImport } from '../helpers.mjs';
-
-// Adopts from https://github.com/kangax/html-minifier/blob/51ce10f4daedb1de483ffbcccecc41be1c873da2/src/htmlminifier.js#L209-L221
-const tagsHaveUriValuesForAttributes = new Set([
-    'a',
-    'area',
-    'link',
-    'base',
-    'object',
-    'blockquote',
-    'q',
-    'del',
-    'ins',
-    'form',
-    'input',
-    'head',
-    'audio',
-    'embed',
-    'iframe',
-    'img',
-    'script',
-    'track',
-    'video',
-]);
-
-const tagsHasHrefAttributes = new Set([
-    'a',
-    'area',
-    'link',
-    'base'
-]);
-
-const attributesOfImgTagHasUriValues = new Set([
-    'src',
-    'longdesc',
-    'usemap'
-]);
-
-const attributesOfObjectTagHasUriValues = new Set([
-    'classid',
-    'codebase',
-    'data',
-    'usemap'
-]);
-
-const tagsHasCiteAttributes = new Set([
-    'blockquote',
-    'q',
-    'ins',
-    'del'
-]);
-
-const tagsHasSrcAttributes = new Set([
-    'audio',
-    'embed',
-    'iframe',
-    'img',
-    'input',
-    'script',
-    'track',
-    'video',
-    /**
-     * 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.
-     */
-    'source'
-]);
-
-const isUriTypeAttribute = (tag, attr) => {
-    return (
-        tagsHasHrefAttributes.has(tag) && attr === 'href' ||
-        tag === 'img' && attributesOfImgTagHasUriValues.has(attr) ||
-        tag === 'object' && attributesOfObjectTagHasUriValues.has(attr) ||
-        tagsHasCiteAttributes.has(tag) && attr === 'cite' ||
-        tag === 'form' && attr === 'action' ||
-        tag === 'input' && attr === 'usemap' ||
-        tag === 'head' && attr === 'profile' ||
-        tag === 'script' && attr === 'for' ||
-        tagsHasSrcAttributes.has(tag) && attr === 'src'
-    );
-};
-
-const isSrcsetAttribute = (tag, attr) => {
-    return (
-        tag === 'source' && attr === 'srcset' ||
-        tag === 'img' && attr === 'srcset' ||
-        tag === 'link' && attr === 'imagesrcset'
-    );
-};
-
-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
-    if (typeof options === 'string') return options;
-    if (options instanceof URL) return options.toString();
-
-    return false;
-};
-
-const isLinkRelCanonical = ({ tag, attrs }) => {
-    // Return false early for non-"link" tag
-    if (tag !== 'link') return false;
-
-    for (const [attrName, attrValue] of Object.entries(attrs)) {
-        if (attrName.toLowerCase() === 'rel' && attrValue === 'canonical') return true;
-    }
-
-    return false;
-};
-
-const JAVASCRIPT_URL_PROTOCOL = 'javascript:';
-
-let relateUrlInstance;
-let STORED_URL_BASE;
-
-/** Convert absolute url into relative url */
-export default async function minifyUrls(tree, options, moduleOptions) {
-    const RelateUrl = await optionalImport('relateurl');
-    const srcset = await optionalImport('srcset');
-    const terser = await optionalImport('terser');
-
-    let promises = [];
-
-    const urlBase = processModuleOptions(moduleOptions);
-
-    // Invalid configuration, return tree directly
-    if (!urlBase) return tree;
-
-    /** Bring up a reusable RelateUrl instances (only once)
-     *
-     * STORED_URL_BASE is used to invalidate RelateUrl instances,
-     * avoiding require.cache acrossing multiple htmlnano instance with different configuration,
-     * e.g. unit tests cases.
-     */
-    if (!relateUrlInstance || STORED_URL_BASE !== urlBase) {
-        if (RelateUrl) {
-            relateUrlInstance = new RelateUrl(urlBase);
-        }
-        STORED_URL_BASE = urlBase;
-    }
-
-    tree.walk(node => {
-        if (!node.attrs) return node;
-
-        if (!node.tag) return node;
-
-        if (!tagsHaveUriValuesForAttributes.has(node.tag)) return node;
-
-        // Prevent link[rel=canonical] being processed
-        // Can't be excluded by isUriTypeAttribute()
-        if (isLinkRelCanonical(node)) return node;
-
-        for (const [attrName, attrValue] of Object.entries(node.attrs)) {
-            const attrNameLower = attrName.toLowerCase();
-
-            if (isUriTypeAttribute(node.tag, attrNameLower)) {
-                if (isJavaScriptUrl(attrValue)) {
-                    promises.push(minifyJavaScriptUrl(node, attrName, terser));
-                } else {
-                    if (relateUrlInstance) {
-                        // 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)) {
-                if (srcset) {
-                    try {
-                        const parsedSrcset = srcset.parseSrcset(attrValue, { strict: true });
-
-                        node.attrs[attrName] = srcset.stringifySrcset(parsedSrcset.map(item => {
-                            if (relateUrlInstance) {
-                                item.url = relateUrlInstance.relate(item.url);
-                            }
-
-                            return item;
-                        }));
-                    } catch (e) {
-                        // srcset will throw an Error for invalid srcset.
-                    }
-                }
-
-                continue;
-            }
-        }
-
-        return node;
-    });
-
-    if (promises.length > 0) return Promise.all(promises).then(() => tree);
-    return Promise.resolve(tree);
-}
-
-function isJavaScriptUrl(url) {
-    return typeof url === 'string' && url.toLowerCase().startsWith(JAVASCRIPT_URL_PROTOCOL);
-}
-
-const jsWrapperStart = 'function a(){';
-const jsWrapperEnd = '}a();';
-
-function minifyJavaScriptUrl(node, attrName, terser) {
-    if (!terser) return Promise.resolve();
-
-    let result = node.attrs[attrName];
-    if (result) {
-        result = jsWrapperStart + result.slice(JAVASCRIPT_URL_PROTOCOL.length) + jsWrapperEnd;
-
-        return terser
-            .minify(result, {}) // Default Option is good enough
-            .then(({ code }) => {
-                const minifiedJs = code.substring(
-                    jsWrapperStart.length,
-                    code.length - jsWrapperEnd.length
-                );
-                node.attrs[attrName] = JAVASCRIPT_URL_PROTOCOL + minifiedJs;
-            });
-    }
-
-    return Promise.resolve();
-}

package/lib/modules/normalizeAttributeValues.cjs

@@ -1,120 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.onAttrs = onAttrs;
-const caseInsensitiveAttributes = {
-  autocomplete: ['form'],
-  charset: ['meta', 'script'],
-  contenteditable: null,
-  crossorigin: ['audio', 'img', 'link', 'script', 'video'],
-  dir: null,
-  draggable: null,
-  dropzone: null,
-  formmethod: ['button', 'input'],
-  inputmode: ['input', 'textarea'],
-  kind: ['track'],
-  method: ['form'],
-  preload: ['audio', 'video'],
-  referrerpolicy: null,
-  sandbox: ['iframe'],
-  spellcheck: null,
-  scope: ['th'],
-  shape: ['area'],
-  sizes: ['link'],
-  step: ['input'],
-  translate: null,
-  type: ['a', 'link', 'button', 'embed', 'object', 'script', 'source', 'style', 'input', 'menu', 'menuitem'],
-  wrap: ['textarea']
-};
-
-// https://html.spec.whatwg.org/#invalid-value-default
-/** @typedef { [key: string]: { tag: null | string[], default: string, valid: string[] } } */
-const invalidValueDefault = {
-  crossorigin: {
-    tag: null,
-    default: 'anonymous',
-    valid: ['', 'anonymous', 'use-credentials']
-  },
-  // https://html.spec.whatwg.org/#referrer-policy-attributes
-  // The attribute's invalid value default and missing value default are both the empty string state.
-  referrerpolicy: {
-    tag: null,
-    default: '',
-    valid: ['', 'url', 'origin', 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin', 'unsafe-url']
-  },
-  // https://html.spec.whatwg.org/#lazy-loading-attributes
-  loading: {
-    tag: ['img', 'iframe'],
-    default: 'eager',
-    valid: ['lazy', 'eager']
-  },
-  // https://html.spec.whatwg.org/#the-img-element
-  // https://html.spec.whatwg.org/#image-decoding-hint
-  decoding: {
-    tag: ['img'],
-    default: 'auto',
-    valid: ['auto', 'sync', 'async']
-  },
-  // https://html.spec.whatwg.org/#the-track-element
-  kind: {
-    tag: ['track'],
-    default: 'metadata',
-    valid: ['subtitles', 'captions', 'descriptions', 'chapters', 'metadata']
-  },
-  type: {
-    tag: ['button'],
-    default: 'submit',
-    valid: ['submit', 'reset', 'button']
-  },
-  wrap: {
-    tag: ['textarea'],
-    default: 'soft',
-    valid: ['soft', 'hard']
-  },
-  // https://html.spec.whatwg.org/#the-hidden-attribute
-  hidden: {
-    tag: null,
-    default: 'hidden',
-    valid: ['hidden', 'until-found']
-  },
-  // https://html.spec.whatwg.org/#autocapitalization
-  autocapitalize: {
-    tag: null,
-    default: 'sentences',
-    valid: ['none', 'off', 'on', 'sentences', 'words', 'characters']
-  },
-  // https://html.spec.whatwg.org/#the-marquee-element
-  behavior: {
-    tag: ['marquee'],
-    default: 'scroll',
-    valid: ['scroll', 'slide', 'alternate']
-  },
-  direction: {
-    tag: ['marquee'],
-    default: 'left',
-    valid: ['left', 'right', 'up', 'down']
-  }
-};
-function onAttrs() {
-  return (attrs, node) => {
-    const newAttrs = attrs;
-    Object.entries(attrs).forEach(([attrName, attrValue]) => {
-      let newAttrValue = attrValue;
-      if (Object.hasOwnProperty.call(caseInsensitiveAttributes, attrName) && (caseInsensitiveAttributes[attrName] === null || caseInsensitiveAttributes[attrName].includes(node.tag))) {
-        newAttrValue = typeof attrValue.toLowerCase === 'function' ? attrValue.toLowerCase() : attrValue;
-      }
-      if (Object.hasOwnProperty.call(invalidValueDefault, attrName)) {
-        const meta = invalidValueDefault[attrName];
-        if (meta.tag === null || node && node.tag && meta.tag.includes(node.tag)) {
-          if (!meta.valid.includes(newAttrValue)) {
-            newAttrValue = meta.default;
-          }
-        }
-      }
-      newAttrs[attrName] = newAttrValue;
-    });
-    return newAttrs;
-  };
-}

package/lib/modules/normalizeAttributeValues.mjs

@@ -1,140 +0,0 @@
-const caseInsensitiveAttributes = {
-    autocomplete: ['form'],
-    charset: ['meta', 'script'],
-    contenteditable: null,
-    crossorigin: ['audio', 'img', 'link', 'script', 'video'],
-    dir: null,
-    draggable: null,
-    dropzone: null,
-    formmethod: ['button', 'input'],
-    inputmode: ['input', 'textarea'],
-    kind: ['track'],
-    method: ['form'],
-    preload: ['audio', 'video'],
-    referrerpolicy: null,
-    sandbox: ['iframe'],
-    spellcheck: null,
-    scope: ['th'],
-    shape: ['area'],
-    sizes: ['link'],
-    step: ['input'],
-    translate: null,
-    type: [
-        'a',
-        'link',
-        'button',
-        'embed',
-        'object',
-        'script',
-        'source',
-        'style',
-        'input',
-        'menu',
-        'menuitem'
-    ],
-    wrap: ['textarea']
-};
-
-// https://html.spec.whatwg.org/#invalid-value-default
-/** @typedef { [key: string]: { tag: null | string[], default: string, valid: string[] } } */
-const invalidValueDefault = {
-    crossorigin: {
-        tag: null,
-        default: 'anonymous',
-        valid: ['', 'anonymous', 'use-credentials']
-    },
-    // https://html.spec.whatwg.org/#referrer-policy-attributes
-    // The attribute's invalid value default and missing value default are both the empty string state.
-    referrerpolicy: {
-        tag: null,
-        default: '',
-        valid: ['', 'url', 'origin', 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin', 'unsafe-url']
-    },
-    // https://html.spec.whatwg.org/#lazy-loading-attributes
-    loading: {
-        tag: ['img', 'iframe'],
-        default: 'eager',
-        valid: ['lazy', 'eager']
-    },
-    // https://html.spec.whatwg.org/#the-img-element
-    // https://html.spec.whatwg.org/#image-decoding-hint
-    decoding: {
-        tag: ['img'],
-        default: 'auto',
-        valid: ['auto', 'sync', 'async']
-    },
-    // https://html.spec.whatwg.org/#the-track-element
-    kind: {
-        tag: ['track'],
-        default: 'metadata',
-        valid: ['subtitles', 'captions', 'descriptions', 'chapters', 'metadata']
-    },
-    type: {
-        tag: ['button'],
-        default: 'submit',
-        valid: ['submit', 'reset', 'button']
-    },
-    wrap: {
-        tag: ['textarea'],
-        default: 'soft',
-        valid: ['soft', 'hard']
-    },
-    // https://html.spec.whatwg.org/#the-hidden-attribute
-    hidden: {
-        tag: null,
-        default: 'hidden',
-        valid: ['hidden', 'until-found']
-    },
-    // https://html.spec.whatwg.org/#autocapitalization
-    autocapitalize: {
-        tag: null,
-        default: 'sentences',
-        valid: ['none', 'off', 'on', 'sentences', 'words', 'characters']
-    },
-    // https://html.spec.whatwg.org/#the-marquee-element
-    behavior: {
-        tag: ['marquee'],
-        default: 'scroll',
-        valid: ['scroll', 'slide', 'alternate']
-    },
-    direction: {
-        tag: ['marquee'],
-        default: 'left',
-        valid: ['left', 'right', 'up', 'down']
-    }
-};
-
-export function onAttrs() {
-    return (attrs, node) => {
-        const newAttrs = attrs;
-
-        Object.entries(attrs).forEach(([attrName, attrValue]) => {
-            let newAttrValue = attrValue;
-
-            if (
-                Object.hasOwnProperty.call(caseInsensitiveAttributes, attrName)
-                && (
-                    caseInsensitiveAttributes[attrName] === null
-                    || caseInsensitiveAttributes[attrName].includes(node.tag)
-                )
-            ) {
-                newAttrValue = typeof attrValue.toLowerCase === 'function' ? attrValue.toLowerCase() : attrValue;
-            }
-
-            if (
-                Object.hasOwnProperty.call(invalidValueDefault, attrName)
-            ) {
-                const meta = invalidValueDefault[attrName];
-                if (meta.tag === null || (node && node.tag && meta.tag.includes(node.tag))) {
-                    if (!meta.valid.includes(newAttrValue)) {
-                        newAttrValue = meta.default;
-                    }
-                }
-            }
-
-            newAttrs[attrName] = newAttrValue;
-        });
-
-        return newAttrs;
-    };
-}

package/lib/modules/removeAttributeQuotes.cjs

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = removeAttributeQuotes;
-// Specification: https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-// See also: https://github.com/posthtml/posthtml-render/pull/30
-// See also: https://github.com/posthtml/htmlnano/issues/6#issuecomment-707105334
-
-/** Disable quoteAllAttributes while not overriding the configuration */
-function removeAttributeQuotes(tree) {
-  if (tree.options && typeof tree.options.quoteAllAttributes === 'undefined') {
-    tree.options.quoteAllAttributes = false;
-  }
-  return tree;
-}

package/lib/modules/removeAttributeQuotes.mjs

@@ -1,12 +0,0 @@
-// Specification: https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
-// See also: https://github.com/posthtml/posthtml-render/pull/30
-// See also: https://github.com/posthtml/htmlnano/issues/6#issuecomment-707105334
-
-/** Disable quoteAllAttributes while not overriding the configuration */
-export default function removeAttributeQuotes(tree) {
-    if (tree.options && typeof tree.options.quoteAllAttributes === 'undefined') {
-        tree.options.quoteAllAttributes = false;
-    }
-
-    return tree;
-}

package/lib/modules/removeComments.cjs

@@ -1,86 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.onContent = onContent;
-exports.onNode = onNode;
-var _helpers = require("../helpers.cjs");
-const MATCH_EXCERPT_REGEXP = /<!-- ?more ?-->/i;
-
-/** Removes HTML comments */
-function onNode(options, removeType) {
-  if (removeType !== 'all' && removeType !== 'safe' && !isMatcher(removeType)) {
-    removeType = 'safe';
-  }
-  return node => {
-    if (isCommentToRemove(node, removeType)) {
-      return '';
-    }
-    return node;
-  };
-}
-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) {
-  if (typeof text !== 'string') {
-    return false;
-  }
-  if (!(0, _helpers.isComment)(text)) {
-    // Not HTML comment
-    return false;
-  }
-  if (removeType === 'safe') {
-    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;
-    }
-    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) {
-      return false;
-    }
-
-    // https://en.wikipedia.org/wiki/Conditional_comment
-    if ((0, _helpers.isConditionalComment)(text)) {
-      return false;
-    }
-
-    // Hexo: https://hexo.io/docs/tag-plugins#Post-Excerpt
-    // Hugo: https://gohugo.io/content-management/summaries/#manual-summary-splitting
-    // WordPress: https://wordpress.com/support/wordpress-editor/blocks/more-block/2/
-    // Jekyll: https://jekyllrb.com/docs/posts/#post-excerpts
-    const isCMSExcerptComment = MATCH_EXCERPT_REGEXP.test(text);
-    if (isCMSExcerptComment) {
-      return false;
-    }
-  }
-  if (isMatcher(removeType)) {
-    return isMatch(text, removeType);
-  }
-  return true;
-}
-function isMatch(input, matcher) {
-  if (matcher instanceof RegExp) {
-    return matcher.test(input);
-  }
-  if (typeof matcher === 'function') {
-    return Boolean(matcher(input));
-  }
-  return false;
-}
-function isMatcher(matcher) {
-  if (matcher instanceof RegExp || typeof matcher === 'function') {
-    return true;
-  }
-  return false;
-}

package/lib/modules/removeEmptyAttributes.cjs

@@ -1,72 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.onAttrs = onAttrs;
-var _helpers = require("../helpers.cjs");
-const safeToRemoveAttrs = {
-  id: null,
-  class: null,
-  style: null,
-  title: null,
-  lang: null,
-  dir: null,
-  abbr: ['th'],
-  accept: ['input'],
-  'accept-charset': ['form'],
-  charset: ['meta', 'script'],
-  action: ['form'],
-  cols: ['textarea'],
-  colspan: ['td', 'th'],
-  coords: ['area'],
-  dirname: ['input', 'textarea'],
-  dropzone: null,
-  headers: ['td', 'th'],
-  form: ['button', 'fieldset', 'input', 'keygen', 'object', 'output', 'select', 'textarea'],
-  formaction: ['button', 'input'],
-  height: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video'],
-  high: 'meter',
-  href: 'link',
-  list: 'input',
-  low: 'meter',
-  manifest: 'html',
-  max: ['meter', 'progress'],
-  maxLength: ['input', 'textarea'],
-  menu: 'button',
-  min: 'meter',
-  minLength: ['input', 'textarea'],
-  name: ['button', 'fieldset', 'input', 'keygen', 'output', 'select', 'textarea', 'form', 'map', 'meta', 'param', 'slot'],
-  pattern: ['input'],
-  ping: ['a', 'area'],
-  placeholder: ['input', 'textarea'],
-  poster: ['video'],
-  rel: ['a', 'area', 'link'],
-  rows: 'textarea',
-  rowspan: ['td', 'th'],
-  size: ['input', 'select'],
-  span: ['col', 'colgroup'],
-  src: ['audio', 'embed', 'iframe', 'img', 'input', 'script', 'source', 'track', 'video'],
-  start: 'ol',
-  tabindex: null,
-  type: ['a', 'link', 'button', 'embed', 'object', 'script', 'source', 'style', 'input', 'menu', 'menuitem', 'ol'],
-  value: ['button', 'input', 'li'],
-  width: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video']
-};
-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 (typeof attrValue === 'string') {
-          if (attrValue === '' || attrValue.trim() === '') {
-            delete newAttrs[attrName];
-          }
-        }
-      }
-    });
-    return newAttrs;
-  };
-}