html-minifier 3.5.20 → 3.5.21

package/README.md

@@ -20,19 +20,19 @@ How does HTMLMinifier compare to other solutions — [HTML Minifier from Will Pe
 
 | Site                                                                         | Original size *(KB)* | HTMLMinifier | minimize | Will Peavy | htmlcompressor.com |
 | ---------------------------------------------------------------------------- |:--------------------:| ------------:| --------:| ----------:| ------------------:|
-| [Google](https://www.google.com/)                                            | 47                   | **43**       | 47       | 49         | 47                 |
-| [Twitter](https://twitter.com/)                                              | 146                  | **115**      | 138      | 155        | 138                |
-| [HTMLMinifier](https://github.com/kangax/html-minifier)                      | 171                  | **128**      | 143      | 148        | 142                |
-| [New York Times](https://www.nytimes.com/)                                   | 207                  | **139**      | 158      | 155        | 144                |
-| [Stack Overflow](https://stackoverflow.com/)                                 | 256                  | **199**      | 209      | 217        | 206                |
+| [Google](https://www.google.com/)                                            | 48                   | **44**       | 48       | 49         | 48                 |
+| [HTMLMinifier](https://github.com/kangax/html-minifier)                      | 154                  | **117**      | 128      | 133        | 128                |
+| [Twitter](https://twitter.com/)                                              | 203                  | **162**      | 195      | 219        | 195                |
+| [Stack Overflow](https://stackoverflow.com/)                                 | 254                  | **196**      | 208      | 216        | 205                |
 | [Bootstrap CSS](https://getbootstrap.com/docs/3.3/css/)                      | 271                  | **260**      | 269      | 229        | 269                |
-| [BBC](https://www.bbc.co.uk/)                                                | 294                  | **238**      | 285      | 289        | 278                |
-| [Amazon](https://www.amazon.co.uk/)                                          | 377                  | **328**      | 368      | 379        | n/a                |
-| [Wikipedia](https://en.wikipedia.org/wiki/President_of_the_United_States)    | 520                  | **484**      | 504      | 523        | 503                |
-| [NBC](https://www.nbc.com/)                                                  | 669                  | **633**      | 668      | 669        | n/a                |
+| [BBC](https://www.bbc.co.uk/)                                                | 288                  | **230**      | 280      | 281        | 272                |
+| [Amazon](https://www.amazon.co.uk/)                                          | 508                  | **439**      | 495      | 501        | n/a                |
+| [Wikipedia](https://en.wikipedia.org/wiki/President_of_the_United_States)    | 533                  | **434**      | 517      | 536        | 517                |
+| [New York Times](https://mathiasbynens.be/_tmp/nyt.html)                     | 699                  | **619**      | 693      | 683        | n/a                |
+| [NBC](https://www.nbc.com/)                                                  | 700                  | **657**      | 698      | 699        | n/a                |
 | [Eloquent Javascript](https://eloquentjavascript.net/1st_edition/print.html) | 870                  | **815**      | 840      | 864        | n/a                |
-| [ES6 table](https://kangax.github.io/compat-table/es6/)                      | 5243                 | **4472**     | 4963     | n/a        | n/a                |
-| [ES6 draft](https://tc39.github.io/ecma262/)                                 | 6072                 | **5449**     | 5615     | n/a        | n/a                |
+| [ES6 table](https://kangax.github.io/compat-table/es6/)                      | 5308                 | **4529**     | 5025     | n/a        | n/a                |
+| [ES draft](https://tc39.github.io/ecma262/)                                  | 6082                 | **5456**     | 5624     | n/a        | n/a                |
 
 ## Options Quick Reference
 
@@ -136,7 +136,9 @@ npm link .
 
 ## Usage
 
-For command line usage please see `html-minifier --help`
+Note that almost all options are disabled by default. For command line usage please see `html-minifier --help` for a list of available options. Experiment and find what works best for you and your project.
+
+* **Sample command line:** ``html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true``
 
 ### Node.js
 

package/cli.js

@@ -197,7 +197,7 @@ program.arguments('[files...]').action(function(files) {
 function createOptions() {
   var options = {};
   mainOptionKeys.forEach(function(key) {
-    var param = program[camelCase(key)];
+    var param = program[key === 'minifyURLs' ? 'minifyUrls' : camelCase(key)];
     if (typeof param !== 'undefined') {
       options[key] = param;
     }
@@ -297,7 +297,7 @@ if (inputDir || outputDir) {
   processDirectory(inputDir, outputDir, fileExt);
 }
 // Minifying one or more files specified on the CMD line
-else if (typeof content === 'string') {
+else if (content) {
   writeMinify();
 }
 // Minifying input coming from STDIN

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "html-minifier",
   "description": "Highly configurable, well-tested, JavaScript-based HTML minifier.",
-  "version": "3.5.20",
+  "version": "3.5.21",
   "keywords": [
     "cli",
     "compress",
@@ -57,7 +57,7 @@
     "camel-case": "3.0.x",
     "clean-css": "4.2.x",
     "commander": "2.17.x",
-    "he": "1.1.x",
+    "he": "1.2.x",
     "param-case": "2.1.x",
     "relateurl": "0.2.x",
     "uglify-js": "3.4.x"

package/src/htmlminifier.js

@@ -664,13 +664,12 @@ function processOptions(values) {
         text = text.replace(/(url\s*\(\s*)("|'|)(.*?)\2(\s*\))/ig, function(match, prefix, quote, url, suffix) {
           return prefix + quote + options.minifyURLs(url) + quote + suffix;
         });
-        try {
-          return unwrapCSS(new CleanCSS(value).minify(wrapCSS(text, type)).styles, type);
-        }
-        catch (err) {
-          options.log(err);
+        var cleanCssOutput = new CleanCSS(value).minify(wrapCSS(text, type));
+        if (cleanCssOutput.errors.length > 0) {
+          cleanCssOutput.errors.forEach(options.log);
           return text;
         }
+        return unwrapCSS(cleanCssOutput.styles, type);
       };
     }
     else if (key === 'minifyJS' && typeof value !== 'function') {
@@ -1196,9 +1195,12 @@ function minify(value, options, partialMarkup) {
       }
       charsPrevTag = /^\s*$/.test(text) ? prevTag : 'comment';
       if (options.decodeEntities && text && !specialContentTags(currentTag)) {
-        // semi-colon can be omitted
+        // Escape any `&` symbols that start either:
+        // 1) a legacy named character reference (i.e. one that doesn't end with `;`)
+        // 2) or any other character reference (i.e. one that does end with `;`)
+        // Note that `&` can be escaped as `&amp`, without the semi-colon.
         // https://mathiasbynens.be/notes/ambiguous-ampersands
-        text = text.replace(/&(#?[0-9a-zA-Z]+;)/g, '&amp$1').replace(/</g, '&lt;');
+        text = text.replace(/&((?:Iacute|aacute|uacute|plusmn|Otilde|otilde|agrave|Agrave|Yacute|yacute|Oslash|oslash|atilde|Atilde|brvbar|ccedil|Ccedil|Ograve|curren|divide|eacute|Eacute|ograve|Oacute|egrave|Egrave|Ugrave|frac12|frac14|frac34|ugrave|oacute|iacute|Ntilde|ntilde|Uacute|middot|igrave|Igrave|iquest|Aacute|cedil|laquo|micro|iexcl|Icirc|icirc|acirc|Ucirc|Ecirc|ocirc|Ocirc|ecirc|ucirc|Aring|aring|AElig|aelig|acute|pound|raquo|Acirc|times|THORN|szlig|thorn|COPY|auml|ordf|ordm|Uuml|macr|uuml|Auml|ouml|Ouml|para|nbsp|euml|quot|QUOT|Euml|yuml|cent|sect|copy|sup1|sup2|sup3|iuml|Iuml|ETH|shy|reg|not|yen|amp|AMP|REG|uml|eth|deg|gt|GT|LT|lt)(?!;)|(?:#?[0-9a-zA-Z]+;))/g, '&amp$1').replace(/</g, '&lt;');
       }
       if (uidPattern && options.collapseWhitespace && stackNoTrimWhitespace.length) {
         text = text.replace(uidPattern, function(match, prefix, index) {
@@ -1236,7 +1238,9 @@ function minify(value, options, partialMarkup) {
       buffer.push(text);
     },
     doctype: function(doctype) {
-      buffer.push(options.useShortDoctype ? '<!doctype html>' : collapseWhitespaceAll(doctype));
+      buffer.push(options.useShortDoctype ? '<!doctype' +
+        (options.removeTagWhitespace ? '' : ' ') + 'html>' :
+        collapseWhitespaceAll(doctype));
     },
     customAttrAssign: options.customAttrAssign,
     customAttrSurround: options.customAttrSurround

package/src/htmlparser.js

@@ -60,7 +60,7 @@ var singleAttrIdentifier = /([^\s"'<>/=]+)/,
     startTagOpen = new RegExp('^<' + qnameCapture),
     startTagClose = /^\s*(\/?)>/,
     endTag = new RegExp('^<\\/' + qnameCapture + '[^>]*>'),
-    doctype = /^<!DOCTYPE\s[^>]+>/i;
+    doctype = /^<!DOCTYPE\s?[^>]+>/i;
 
 var IS_REGEX_CAPTURING_BROKEN = false;
 'x'.replace(/x(.)?/g, function(m, g) {