update deps

node_modules/html-minifier/src/htmlminifier.js

@@ -311,6 +311,9 @@ function cleanAttributeValue(tag, attrName, attrValue, options, attrs) {
       return (+numString).toString();
     });
   }
+  else if (isContentSecurityPolicy(tag, attrs) && attrName.toLowerCase() === 'content') {
+    return collapseWhitespaceAll(attrValue);
+  }
   else if (options.customAttrCollapse && options.customAttrCollapse.test(attrName)) {
     attrValue = attrValue.replace(/\n+|\r+|\s{2,}/g, '');
   }
@@ -335,6 +338,17 @@ function isMetaViewport(tag, attrs) {
   }
 }
 
+function isContentSecurityPolicy(tag, attrs) {
+  if (tag !== 'meta') {
+    return false;
+  }
+  for (var i = 0, len = attrs.length; i < len; i++) {
+    if (attrs[i].name.toLowerCase() === 'http-equiv' && attrs[i].value.toLowerCase() === 'content-security-policy') {
+      return true;
+    }
+  }
+}
+
 function ignoreCSS(id) {
   return '/* clean-css ignore:start */' + id + '/* clean-css ignore:end */';
 }
@@ -864,19 +878,19 @@ function minify(value, options, partialMarkup) {
     value = value.replace(reCustomIgnore, function(match) {
       if (!uidAttr) {
         uidAttr = uniqueId(value);
-        uidPattern = new RegExp('(\\s*)' + uidAttr + '([0-9]+)(\\s*)', 'g');
+        uidPattern = new RegExp('(\\s*)' + uidAttr + '([0-9]+)' + uidAttr + '(\\s*)', 'g');
         if (options.minifyCSS) {
           options.minifyCSS = (function(fn) {
             return function(text, type) {
               text = text.replace(uidPattern, function(match, prefix, index) {
                 var chunks = ignoredCustomMarkupChunks[+index];
-                return chunks[1] + uidAttr + index + chunks[2];
+                return chunks[1] + uidAttr + index + uidAttr + chunks[2];
               });
               var ids = [];
               new CleanCSS().minify(wrapCSS(text, type)).warnings.forEach(function(warning) {
                 var match = uidPattern.exec(warning);
                 if (match) {
-                  var id = uidAttr + match[2];
+                  var id = uidAttr + match[2] + uidAttr;
                   text = text.replace(id, ignoreCSS(id));
                   ids.push(id);
                 }
@@ -894,13 +908,13 @@ function minify(value, options, partialMarkup) {
             return function(text, type) {
               return fn(text.replace(uidPattern, function(match, prefix, index) {
                 var chunks = ignoredCustomMarkupChunks[+index];
-                return chunks[1] + uidAttr + index + chunks[2];
+                return chunks[1] + uidAttr + index + uidAttr + chunks[2];
               }), type);
             };
           })(options.minifyJS);
         }
       }
-      var token = uidAttr + ignoredCustomMarkupChunks.length;
+      var token = uidAttr + ignoredCustomMarkupChunks.length + uidAttr;
       ignoredCustomMarkupChunks.push(/^(\s*)[\s\S]*?(\s*)$/.exec(match));
       return '\t' + token + '\t';
     });
@@ -965,6 +979,9 @@ function minify(value, options, partialMarkup) {
 
   new HTMLParser(value, {
     partialMarkup: partialMarkup,
+    continueOnParseError: options.continueOnParseError,
+    customAttrAssign: options.customAttrAssign,
+    customAttrSurround: options.customAttrSurround,
     html5: options.html5,
 
     start: function(tag, attrs, unary, unarySlash, autoGenerated) {
@@ -1241,9 +1258,7 @@ function minify(value, options, partialMarkup) {
       buffer.push(options.useShortDoctype ? '<!doctype' +
         (options.removeTagWhitespace ? '' : ' ') + 'html>' :
         collapseWhitespaceAll(doctype));
-    },
-    customAttrAssign: options.customAttrAssign,
-    customAttrSurround: options.customAttrSurround
+    }
   });
 
   if (options.removeOptionalTags) {

node_modules/html-minifier/src/htmlparser.js

@@ -182,6 +182,11 @@ function HTMLParser(html, handler) {
           prevTag = startTagMatch.tagName.toLowerCase();
           continue;
         }
+
+        // Treat `<` as text
+        if (handler.continueOnParseError) {
+          textEnd = html.indexOf('<', 1);
+        }
       }
 
       var text;
@@ -213,7 +218,6 @@ function HTMLParser(html, handler) {
         handler.chars(text, prevTag, nextTag);
       }
       prevTag = '';
-
     }
     else {
       var stackedTag = lastTag.toLowerCase();