htmlnano 2.1.0 → 2.1.2

package/index.d.ts

@@ -5,6 +5,7 @@ import type { Config as SvgoOptimizeOptions } from "svgo";
 
 export interface HtmlnanoOptions {
   skipConfigLoading?: boolean;
+  skipInternalWarnings?: boolean;
   collapseAttributeWhitespace?: boolean;
   collapseBooleanAttributes?: {
     amphtml?: boolean;
@@ -22,7 +23,7 @@ export interface HtmlnanoOptions {
   minifySvg?: SvgoOptimizeOptions | boolean;
   normalizeAttributeValues?: boolean;
   removeAttributeQuotes?: boolean;
-  removeComments?: boolean | "safe" | "all" | RegExp | (() => boolean);
+  removeComments?: boolean | "safe" | "all" | RegExp | ((comment: string) => boolean);
   removeEmptyAttributes?: boolean;
   removeRedundantAttributes?: boolean;
   removeOptionalTags?: boolean;

package/lib/helpers.cjs

@@ -11,7 +11,7 @@ exports.isEventHandler = isEventHandler;
 exports.isStyleNode = isStyleNode;
 exports.optionalImport = optionalImport;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function __transformExtension(filepath, extMapping) {
   if (!filepath.startsWith('./') && !filepath.startsWith('../')) {
     // Package import
@@ -52,7 +52,8 @@ function isComment(content) {
   return false;
 }
 function isConditionalComment(content) {
-  return (content || '').trim().startsWith('<!--[if');
+  const clean = (content || '').trim();
+  return clean.startsWith('<!--[if') || clean === '<!--<![endif]-->';
 }
 function isStyleNode(node) {
   return node.tag === 'style' && !isAmpBoilerplate(node) && 'content' in node && node.content.length > 0;

package/lib/helpers.mjs

@@ -24,7 +24,8 @@ export function isComment(content) {
 }
 
 export function isConditionalComment(content) {
-    return (content || '').trim().startsWith('<!--[if');
+    const clean = (content || '').trim();
+    return clean.startsWith('<!--[if') || clean === '<!--<![endif]-->';
 }
 
 export function isStyleNode(node) {

package/lib/htmlnano.cjs

@@ -10,7 +10,7 @@ var _cosmiconfig = require("cosmiconfig");
 var _safe = _interopRequireDefault(require("./presets/safe.cjs"));
 var _ampSafe = _interopRequireDefault(require("./presets/ampSafe.cjs"));
 var _max = _interopRequireDefault(require("./presets/max.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function __transformExtension(filepath, extMapping) {
   if (!filepath.startsWith('./') && !filepath.startsWith('../')) {
     // Package import
@@ -33,7 +33,7 @@ function __transformExtension(filepath, extMapping) {
   return filepath;
 }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const presets = {
   safe: _safe.default,
   ampSafe: _ampSafe.default,
@@ -121,7 +121,9 @@ function htmlnano(optionsRun, presetRun) {
           }));
         } catch (e) {
           if (e.code === 'MODULE_NOT_FOUND' || e.code === 'ERR_MODULE_NOT_FOUND') {
-            console.warn(`You have to install "${dependency}" in order to use htmlnano's "${moduleName}" module`);
+            if (!options.skipInternalWarnings) {
+              console.warn(`You have to install "${dependency}" in order to use htmlnano's "${moduleName}" module`);
+            }
           } else {
             throw e;
           }

package/lib/htmlnano.mjs

@@ -98,7 +98,9 @@ function htmlnano(optionsRun, presetRun) {
                     await import(dependency);
                 } catch (e) {
                     if (e.code === 'MODULE_NOT_FOUND' || e.code === 'ERR_MODULE_NOT_FOUND') {
-                        console.warn(`You have to install "${dependency}" in order to use htmlnano's "${moduleName}" module`);
+                        if (!options.skipInternalWarnings){
+                            console.warn(`You have to install "${dependency}" in order to use htmlnano's "${moduleName}" module`);
+                        }
                     } else {
                         throw e;
                     }

package/lib/modules/minifyConditionalComments.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = minifyConditionalComments;
 var _htmlnano = _interopRequireDefault(require("../htmlnano.cjs"));
 var _helpers = require("../helpers.cjs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 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;
 

package/lib/modules/minifyUrls.cjs

@@ -98,14 +98,14 @@ async function minifyUrls(tree, options, moduleOptions) {
       if (isSrcsetAttribute(node.tag, attrNameLower)) {
         if (srcset) {
           try {
-            const parsedSrcset = srcset.parse(attrValue, {
+            const parsedSrcset = srcset.parseSrcset(attrValue, {
               strict: true
             });
-            node.attrs[attrName] = srcset.stringify(parsedSrcset.map(srcset => {
+            node.attrs[attrName] = srcset.stringifySrcset(parsedSrcset.map(item => {
               if (relateUrlInstance) {
-                srcset.url = relateUrlInstance.relate(srcset.url);
+                item.url = relateUrlInstance.relate(item.url);
               }
-              return srcset;
+              return item;
             }));
           } catch (e) {
             // srcset will throw an Error for invalid srcset.

package/lib/modules/minifyUrls.mjs

@@ -175,14 +175,14 @@ export default async function minifyUrls(tree, options, moduleOptions) {
             if (isSrcsetAttribute(node.tag, attrNameLower)) {
                 if (srcset) {
                     try {
-                        const parsedSrcset = srcset.parse(attrValue, { strict: true });
+                        const parsedSrcset = srcset.parseSrcset(attrValue, { strict: true });
 
-                        node.attrs[attrName] = srcset.stringify(parsedSrcset.map(srcset => {
+                        node.attrs[attrName] = srcset.stringifySrcset(parsedSrcset.map(item => {
                             if (relateUrlInstance) {
-                                srcset.url = relateUrlInstance.relate(srcset.url);
+                                item.url = relateUrlInstance.relate(item.url);
                             }
 
-                            return srcset;
+                            return item;
                         }));
                     } catch (e) {
                         // srcset will throw an Error for invalid srcset.

package/lib/modules/sortAttributes.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = sortAttributes;
-var _timsort = require("timsort");
 const validOptions = new Set(['frequency', 'alphabetical']);
 const processModuleOptions = options => {
   if (options === true) return 'alphabetical';
@@ -14,7 +13,6 @@ class AttributeTokenChain {
   constructor() {
     this.freqData = new Map(); // <attr, frequency>[]
   }
-
   addFromNodeAttrs(nodeAttrs) {
     Object.keys(nodeAttrs).forEach(attrName => {
       const attrNameLower = attrName.toLowerCase();
@@ -27,7 +25,7 @@ class AttributeTokenChain {
   }
   createSortOrder() {
     let _sortOrder = [...this.freqData.entries()];
-    (0, _timsort.sort)(_sortOrder, (a, b) => b[1] - a[1]);
+    _sortOrder.sort((a, b) => b[1] - a[1]);
     this.sortOrder = _sortOrder.map(i => i[0]);
   }
   sortFromNodeAttrs(nodeAttrs) {

package/lib/modules/sortAttributes.mjs

@@ -1,5 +1,3 @@
-import { sort as timSort } from 'timsort';
-
 const validOptions = new Set(['frequency', 'alphabetical']);
 
 const processModuleOptions = options => {
@@ -27,7 +25,7 @@ class AttributeTokenChain {
 
     createSortOrder() {
         let _sortOrder = [...this.freqData.entries()];
-        timSort(_sortOrder, (a, b) => b[1] - a[1]);
+        _sortOrder.sort((a, b) => b[1] - a[1]);
 
         this.sortOrder = _sortOrder.map(i => i[0]);
     }

package/lib/modules/sortAttributesWithLists.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = collapseAttributeWhitespace;
-var _timsort = require("timsort");
 var _collapseAttributeWhitespace = require("./collapseAttributeWhitespace.cjs");
 // class, rel, ping
 
@@ -17,7 +16,6 @@ class AttributeTokenChain {
   constructor() {
     this.freqData = new Map(); // <attrValue, frequency>[]
   }
-
   addFromNodeAttrsArray(attrValuesArray) {
     attrValuesArray.forEach(attrValue => {
       if (this.freqData.has(attrValue)) {
@@ -29,7 +27,7 @@ class AttributeTokenChain {
   }
   createSortOrder() {
     let _sortOrder = [...this.freqData.entries()];
-    (0, _timsort.sort)(_sortOrder, (a, b) => b[1] - a[1]);
+    _sortOrder.sort((a, b) => b[1] - a[1]);
     this.sortOrder = _sortOrder.map(i => i[0]);
   }
   sortFromNodeAttrsArray(attrValuesArray) {

package/lib/modules/sortAttributesWithLists.mjs

@@ -1,5 +1,4 @@
 // class, rel, ping
-import { sort as timSort } from 'timsort';
 import { attributesWithLists } from './collapseAttributeWhitespace.mjs';
 
 const validOptions = new Set(['frequency', 'alphabetical']);
@@ -26,7 +25,7 @@ class AttributeTokenChain {
 
     createSortOrder() {
         let _sortOrder = [...this.freqData.entries()];
-        timSort(_sortOrder, (a, b) => b[1] - a[1]);
+        _sortOrder.sort((a, b) => b[1] - a[1]);
 
         this.sortOrder = _sortOrder.map(i => i[0]);
     }

package/lib/presets/ampSafe.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _safe = _interopRequireDefault(require("./safe.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * A safe preset for AMP pages (https://www.ampproject.org)
  */

package/lib/presets/max.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _safe = _interopRequireDefault(require("./safe.cjs"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Maximal minification (might break some pages)
  */

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "htmlnano",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "main": "index.cjs",
   "module": "index.mjs",
   "source": "index.mjs",
   "exports": {
     ".": {
+      "types": "./index.d.ts",
       "require": "./index.cjs",
       "import": "./index.mjs"
     },
     "./index.mjs": {
+      "types": "./index.d.mts",
       "import": "./index.mjs"
     },
     "./index.cjs": {
+      "types": "./index.d.cts",
       "require": "./index.cjs"
     }
   },
@@ -59,38 +62,37 @@
     ]
   },
   "dependencies": {
-    "cosmiconfig": "^8.0.0",
-    "posthtml": "^0.16.5",
-    "timsort": "^0.3.0"
+    "cosmiconfig": "^9.0.0",
+    "posthtml": "^0.16.5"
   },
   "devDependencies": {
+    "@aminya/babel-plugin-replace-import-extension": "1.2.0",
     "@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",
-    "@aminya/babel-plugin-replace-import-extension": "1.2.0",
-    "cssnano": "^6.0.0",
+    "cssnano": "^7.0.0",
     "eslint": "^8.12.0",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-path-import-extension": "^0.9.0",
     "expect": "^29.0.0",
-    "mocha": "^10.1.0",
+    "mocha": "^11.0.1",
     "postcss": "^8.3.11",
-    "purgecss": "^5.0.0",
+    "purgecss": "^7.0.2",
     "relateurl": "^0.2.7",
-    "rimraf": "^5.0.0",
-    "srcset": "4.0.0",
+    "rimraf": "^6.0.0",
+    "srcset": "5.0.1",
     "svgo": "^3.0.2",
     "terser": "^5.21.0",
     "uncss": "^0.17.3"
   },
   "peerDependencies": {
-    "cssnano": "^6.0.0",
+    "cssnano": "^7.0.0",
     "postcss": "^8.3.11",
-    "purgecss": "^5.0.0",
+    "purgecss": "^7.0.2",
     "relateurl": "^0.2.7",
-    "srcset": "4.0.0",
+    "srcset": "5.0.1",
     "svgo": "^3.0.2",
     "terser": "^5.10.0",
     "uncss": "^0.17.3"

package/test.js

@@ -1,39 +1,13 @@
+const fs = require('fs');
+
 const htmlnano = require('.');
 // const posthtml = require('posthtml');
-const safePreset = require('./lib/presets/safe');
-// const options = {
-    // minifySvg: false,
-    // minifyJs: false,
-// };
-// // posthtml, posthtml-render, and posthtml-parse options
-// const postHtmlOptions = {
-//     sync: true, // https://github.com/posthtml/posthtml#usage
-//     lowerCaseTags: true, // https://github.com/posthtml/posthtml-parser#options
-//     quoteAllAttributes: false, // https://github.com/posthtml/posthtml-render#options
-// };
+const preset = require('./lib/presets/max.cjs');
+
 
-// const html = `
-// <!doctype html>
-// <html lang="en">
-// <head>
-//   <meta charset="utf-8">
-//   <title></title>
-//   <script class="fob">alert(1)</script>
-//   <script>alert(2)</script>
-// </head>
-// <body>
-//     <script>alert(3)</script>
-//     <script>alert(4)</script>
-// </body>
-// </html>
-// `;
+const html = fs.readFileSync('./test.html', 'utf8');
 
-const options = {
-    minifySvg: safePreset.minifySvg,
-};
-const html = `
-<input type="text" class="form-control" name="testInput" autofocus="" autocomplete="off" id="testId"><a id="testId" href="#" class="testClass"></a><img width="20" src="../images/image.png" height="40" alt="image" class="cls" id="id2">
-`;
+const startTime = Date.now();
 
 htmlnano
     // "preset" arg might be skipped (see "Presets" section below for more info)
@@ -41,7 +15,8 @@ htmlnano
     .process(html)
     .then(function (result) {
         // result.html is minified
-        console.log(result.html);
+        // console.log(result.html);
+        console.log(`Time taken: ${Date.now() - startTime}ms`);
     })
     .catch(function (err) {
         console.error(err);