diff options
Diffstat (limited to 'node_modules/html-minifier/src')
| -rw-r--r-- | node_modules/html-minifier/src/htmlminifier.js | 425 | ||||
| -rw-r--r-- | node_modules/html-minifier/src/htmlparser.js | 63 |
2 files changed, 274 insertions, 214 deletions
diff --git a/node_modules/html-minifier/src/htmlminifier.js b/node_modules/html-minifier/src/htmlminifier.js index 6910e15dd..ecf06eba1 100644 --- a/node_modules/html-minifier/src/htmlminifier.js +++ b/node_modules/html-minifier/src/htmlminifier.js @@ -8,20 +8,13 @@ var TokenChain = require('./tokenchain'); var UglifyJS = require('uglify-js'); var utils = require('./utils'); -var trimWhitespace = String.prototype.trim ? function(str) { - if (typeof str !== 'string') { - return str; - } - return str.trim(); -} : function(str) { - if (typeof str !== 'string') { - return str; - } - return str.replace(/^\s+/, '').replace(/\s+$/, ''); -}; +function trimWhitespace(str) { + return str && str.replace(/^[ \n\r\t\f]+/, '').replace(/[ \n\r\t\f]+$/, ''); +} function collapseWhitespaceAll(str) { - return str && str.replace(/\s+/g, function(spaces) { + // Non-breaking space is specifically handled inside the replacer function here: + return str && str.replace(/[ \n\r\t\f\xA0]+/g, function(spaces) { return spaces === '\t' ? '\t' : spaces.replace(/(^|\xA0+)[^\xA0]+/g, '$1 '); }); } @@ -30,17 +23,18 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) { var lineBreakBefore = '', lineBreakAfter = ''; if (options.preserveLineBreaks) { - str = str.replace(/^\s*?[\n\r]\s*/, function() { + str = str.replace(/^[ \n\r\t\f]*?[\n\r][ \n\r\t\f]*/, function() { lineBreakBefore = '\n'; return ''; - }).replace(/\s*?[\n\r]\s*$/, function() { + }).replace(/[ \n\r\t\f]*?[\n\r][ \n\r\t\f]*$/, function() { lineBreakAfter = '\n'; return ''; }); } if (trimLeft) { - str = str.replace(/^\s+/, function(spaces) { + // Non-breaking space is specifically handled inside the replacer function here: + str = str.replace(/^[ \n\r\t\f\xA0]+/, function(spaces) { var conservative = !lineBreakBefore && options.conservativeCollapse; if (conservative && spaces === '\t') { return '\t'; @@ -50,7 +44,8 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) { } if (trimRight) { - str = str.replace(/\s+$/, function(spaces) { + // Non-breaking space is specifically handled inside the replacer function here: + str = str.replace(/[ \n\r\t\f\xA0]+$/, function(spaces) { var conservative = !lineBreakAfter && options.conservativeCollapse; if (conservative && spaces === '\t') { return '\t'; @@ -69,9 +64,9 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) { var createMapFromString = utils.createMapFromString; // non-empty tags that will maintain whitespace around them -var inlineTags = createMapFromString('a,abbr,acronym,b,bdi,bdo,big,button,cite,code,del,dfn,em,font,i,ins,kbd,mark,math,nobr,q,rt,rp,s,samp,small,span,strike,strong,sub,sup,svg,time,tt,u,var'); +var inlineTags = createMapFromString('a,abbr,acronym,b,bdi,bdo,big,button,cite,code,del,dfn,em,font,i,ins,kbd,label,mark,math,nobr,object,q,rp,rt,rtc,ruby,s,samp,select,small,span,strike,strong,sub,sup,svg,textarea,time,tt,u,var'); // non-empty tags that will maintain whitespace within them -var inlineTextTags = createMapFromString('a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,nobr,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var'); +var inlineTextTags = createMapFromString('a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,nobr,rp,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var'); // self-closing tags that will maintain whitespace around them var selfClosingInlineTags = createMapFromString('comment,img,input,wbr'); @@ -114,7 +109,7 @@ function isEventAttribute(attrName, options) { } function canRemoveAttributeQuotes(value) { - // http://mathiasbynens.be/notes/unquoted-attribute-values + // https://mathiasbynens.be/notes/unquoted-attribute-values return /^[^ \t\n\f\r"'`=<>]+$/.test(value); } @@ -260,7 +255,7 @@ function isSrcset(attrName, tag) { } function cleanAttributeValue(tag, attrName, attrValue, options, attrs) { - if (attrValue && isEventAttribute(attrName, options)) { + if (isEventAttribute(attrName, options)) { attrValue = trimWhitespace(attrValue).replace(/^javascript:\s*/i, ''); return options.minifyJS(attrValue, true); } @@ -285,9 +280,9 @@ function cleanAttributeValue(tag, attrName, attrValue, options, attrs) { attrValue = trimWhitespace(attrValue); if (attrValue) { if (/;$/.test(attrValue) && !/&#?[0-9a-zA-Z]+;$/.test(attrValue)) { - attrValue = attrValue.replace(/\s*;$/, ''); + attrValue = attrValue.replace(/\s*;$/, ';'); } - attrValue = unwrapInlineCSS(options.minifyCSS(wrapInlineCSS(attrValue))); + attrValue = options.minifyCSS(attrValue, 'inline'); } return attrValue; } @@ -316,7 +311,7 @@ function cleanAttributeValue(tag, attrName, attrValue, options, attrs) { return (+numString).toString(); }); } - else if (attrValue && options.customAttrCollapse && options.customAttrCollapse.test(attrName)) { + else if (options.customAttrCollapse && options.customAttrCollapse.test(attrName)) { attrValue = attrValue.replace(/\n+|\r+|\s{2,}/g, ''); } else if (tag === 'script' && attrName === 'type') { @@ -324,7 +319,7 @@ function cleanAttributeValue(tag, attrName, attrValue, options, attrs) { } else if (isMediaQuery(tag, attrs, attrName)) { attrValue = trimWhitespace(attrValue); - return unwrapMediaQuery(options.minifyCSS(wrapMediaQuery(attrValue))); + return options.minifyCSS(attrValue, 'media'); } return attrValue; } @@ -340,23 +335,33 @@ function isMetaViewport(tag, attrs) { } } -// Wrap CSS declarations for CleanCSS > 3.x -// See https://github.com/jakubpawlowicz/clean-css/issues/418 -function wrapInlineCSS(text) { - return '*{' + text + '}'; -} - -function unwrapInlineCSS(text) { - var matches = text.match(/^\*\{([\s\S]*)\}$/); - return matches ? matches[1] : text; +function ignoreCSS(id) { + return '/* clean-css ignore:start */' + id + '/* clean-css ignore:end */'; } -function wrapMediaQuery(text) { - return '@media ' + text + '{a{top:0}}'; +// Wrap CSS declarations for CleanCSS > 3.x +// See https://github.com/jakubpawlowicz/clean-css/issues/418 +function wrapCSS(text, type) { + switch (type) { + case 'inline': + return '*{' + text + '}'; + case 'media': + return '@media ' + text + '{a{top:0}}'; + default: + return text; + } } -function unwrapMediaQuery(text) { - var matches = text.match(/^@media ([\s\S]*?)\s*{[\s\S]*}$/); +function unwrapCSS(text, type) { + var matches; + switch (type) { + case 'inline': + matches = text.match(/^\*\{([\s\S]*)\}$/); + break; + case 'media': + matches = text.match(/^@media ([\s\S]*?)\s*{[\s\S]*}$/); + break; + } return matches ? matches[1] : text; } @@ -379,7 +384,7 @@ function processScript(text, options, currentAttrs) { // Tag omission rules from https://html.spec.whatwg.org/multipage/syntax.html#optional-tags // with the following deviations: // - retain <body> if followed by <noscript> -// - </rb>, </rt>, </rtc>, </rp> & </tfoot> follow http://www.w3.org/TR/html5/syntax.html#optional-tags +// - </rb>, </rt>, </rtc>, </rp> & </tfoot> follow https://www.w3.org/TR/html5/syntax.html#optional-tags // - retain all tags which are adjacent to non-standard HTML tags var optionalStartTags = createMapFromString('html,head,body,colgroup,tbody'); var optionalEndTags = createMapFromString('html,head,body,li,dt,dd,p,rb,rt,rtc,rp,optgroup,option,colgroup,caption,thead,tbody,tfoot,tr,td,th'); @@ -397,7 +402,7 @@ var topLevelTags = createMapFromString('html,head,body'); var compactTags = createMapFromString('html,body'); var looseTags = createMapFromString('head,colgroup,caption'); var trailingTags = createMapFromString('dt,thead'); -var htmlTags = createMapFromString('a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,element,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,menu,menuitem,meta,meter,multicol,nav,nobr,noembed,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,pre,progress,q,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,spacer,span,strike,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,xmp'); +var htmlTags = createMapFromString('a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,element,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,menu,menuitem,meta,meter,multicol,nav,nobr,noembed,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,pre,progress,q,rb,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,spacer,span,strike,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,xmp'); function canRemoveParentTag(optionalStartTag, tag) { switch (optionalStartTag) { @@ -524,7 +529,7 @@ function canTrimWhitespace(tag) { } function normalizeAttr(attr, attrs, tag, options) { - var attrName = options.caseSensitive ? attr.name : attr.name.toLowerCase(), + var attrName = options.name(attr.name), attrValue = attr.value; if (options.decodeEntities && attrValue) { @@ -540,7 +545,9 @@ function normalizeAttr(attr, attrs, tag, options) { return; } - attrValue = cleanAttributeValue(tag, attrName, attrValue, options, attrs); + if (attrValue) { + attrValue = cleanAttributeValue(tag, attrName, attrValue, options, attrs); + } if (options.removeEmptyAttributes && canDeleteEmptyAttribute(tag, attrName, attrValue, options)) { @@ -615,100 +622,102 @@ function identity(value) { return value; } -function processOptions(options) { - ['html5', 'includeAutoGeneratedTags'].forEach(function(key) { - if (!(key in options)) { - options[key] = true; - } - }); - - if (typeof options.log !== 'function') { - options.log = identity; - } - - if (!options.canCollapseWhitespace) { - options.canCollapseWhitespace = canCollapseWhitespace; - } - if (!options.canTrimWhitespace) { - options.canTrimWhitespace = canTrimWhitespace; - } - - if (!('ignoreCustomComments' in options)) { - options.ignoreCustomComments = [/^!/]; - } - - if (!('ignoreCustomFragments' in options)) { - options.ignoreCustomFragments = [ +function processOptions(values) { + var options = { + name: function(name) { + return name.toLowerCase(); + }, + canCollapseWhitespace: canCollapseWhitespace, + canTrimWhitespace: canTrimWhitespace, + html5: true, + ignoreCustomComments: [/^!/], + ignoreCustomFragments: [ /<%[\s\S]*?%>/, /<\?[\s\S]*?\?>/ - ]; - } - - if (!options.minifyURLs) { - options.minifyURLs = identity; - } - if (typeof options.minifyURLs !== 'function') { - var minifyURLs = options.minifyURLs; - if (typeof minifyURLs === 'string') { - minifyURLs = { site: minifyURLs }; + ], + includeAutoGeneratedTags: true, + log: identity, + minifyCSS: identity, + minifyJS: identity, + minifyURLs: identity + }; + Object.keys(values).forEach(function(key) { + var value = values[key]; + if (key === 'caseSensitive') { + if (value) { + options.name = identity; + } } - else if (typeof minifyURLs !== 'object') { - minifyURLs = {}; + else if (key === 'log') { + if (typeof value === 'function') { + options.log = value; + } } - options.minifyURLs = function(text) { - try { - return RelateUrl.relate(text, minifyURLs); + else if (key === 'minifyCSS' && typeof value !== 'function') { + if (!value) { + return; } - catch (err) { - options.log(err); - return text; + if (typeof value !== 'object') { + value = {}; } - }; - } - - if (!options.minifyJS) { - options.minifyJS = identity; - } - if (typeof options.minifyJS !== 'function') { - var minifyJS = options.minifyJS; - if (typeof minifyJS !== 'object') { - minifyJS = {}; + options.minifyCSS = function(text, type) { + 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); + return text; + } + }; } - (minifyJS.parse || (minifyJS.parse = {})).bare_returns = false; - options.minifyJS = function(text, inline) { - var start = text.match(/^\s*<!--.*/); - var code = start ? text.slice(start[0].length).replace(/\n\s*-->\s*$/, '') : text; - minifyJS.parse.bare_returns = inline; - var result = UglifyJS.minify(code, minifyJS); - if (result.error) { - options.log(result.error); - return text; + else if (key === 'minifyJS' && typeof value !== 'function') { + if (!value) { + return; } - return result.code.replace(/;$/, ''); - }; - } - - if (!options.minifyCSS) { - options.minifyCSS = identity; - } - if (typeof options.minifyCSS !== 'function') { - var minifyCSS = options.minifyCSS; - if (typeof minifyCSS !== 'object') { - minifyCSS = {}; + if (typeof value !== 'object') { + value = {}; + } + (value.parse || (value.parse = {})).bare_returns = false; + options.minifyJS = function(text, inline) { + var start = text.match(/^\s*<!--.*/); + var code = start ? text.slice(start[0].length).replace(/\n\s*-->\s*$/, '') : text; + value.parse.bare_returns = inline; + var result = UglifyJS.minify(code, value); + if (result.error) { + options.log(result.error); + return text; + } + return result.code.replace(/;$/, ''); + }; } - options.minifyCSS = function(text) { - 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 new CleanCSS(minifyCSS).minify(text).styles; + else if (key === 'minifyURLs' && typeof value !== 'function') { + if (!value) { + return; } - catch (err) { - options.log(err); - return text; + if (typeof value === 'string') { + value = { site: value }; } - }; - } + else if (typeof value !== 'object') { + value = {}; + } + options.minifyURLs = function(text) { + try { + return RelateUrl.relate(text, value); + } + catch (err) { + options.log(err); + return text; + } + }; + } + else { + options[key] = value; + } + }); + return options; } function uniqueId(value) { @@ -727,7 +736,7 @@ function createSortFns(value, options, uidIgnore, uidAttr) { function attrNames(attrs) { return attrs.map(function(attr) { - return options.caseSensitive ? attr.name : attr.name.toLowerCase(); + return options.name(attr.name); }); } @@ -751,7 +760,7 @@ function createSortFns(value, options, uidIgnore, uidAttr) { } for (var i = 0, len = attrs.length; i < len; i++) { var attr = attrs[i]; - if (classChain && (options.caseSensitive ? attr.name : attr.name.toLowerCase()) === 'class') { + if (classChain && attr.value && options.name(attr.name) === 'class') { classChain.add(trimWhitespace(attr.value).split(/[ \t\n\f\r]+/).filter(shouldSkipUIDs)); } else if (options.processScripts && attr.name.toLowerCase() === 'type') { @@ -773,7 +782,7 @@ function createSortFns(value, options, uidIgnore, uidAttr) { } var log = options.log; - options.log = null; + options.log = identity; options.sortAttributes = false; options.sortClassName = false; scan(minify(value, options)); @@ -806,9 +815,6 @@ function createSortFns(value, options, uidIgnore, uidAttr) { } function minify(value, options, partialMarkup) { - options = options || {}; - var optionsStack = []; - processOptions(options); if (options.collapseWhitespace) { value = collapseWhitespace(value, options, true, true); } @@ -823,7 +829,6 @@ function minify(value, options, partialMarkup) { stackNoCollapseWhitespace = [], optionalStartTag = '', optionalEndTag = '', - t = Date.now(), ignoredMarkupChunks = [], ignoredCustomMarkupChunks = [], uidIgnore, @@ -839,24 +844,18 @@ function minify(value, options, partialMarkup) { uidIgnore = uniqueId(value); var pattern = new RegExp('^' + uidIgnore + '([0-9]+)$'); if (options.ignoreCustomComments) { - options.ignoreCustomComments.push(pattern); + options.ignoreCustomComments = options.ignoreCustomComments.slice(); } else { - options.ignoreCustomComments = [pattern]; + options.ignoreCustomComments = []; } + options.ignoreCustomComments.push(pattern); } var token = '<!--' + uidIgnore + ignoredMarkupChunks.length + '-->'; ignoredMarkupChunks.push(group1); return token; }); - function escapeFragments(text) { - return text.replace(uidPattern, function(match, prefix, index) { - var chunks = ignoredCustomMarkupChunks[+index]; - return chunks[1] + uidAttr + index + chunks[2]; - }); - } - var customFragments = options.ignoreCustomFragments.map(function(re) { return re.source; }); @@ -867,17 +866,39 @@ function minify(value, options, partialMarkup) { if (!uidAttr) { uidAttr = uniqueId(value); uidPattern = new RegExp('(\\s*)' + uidAttr + '([0-9]+)(\\s*)', 'g'); - var minifyCSS = options.minifyCSS; - if (minifyCSS) { - options.minifyCSS = function(text) { - return minifyCSS(escapeFragments(text)); - }; + 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]; + }); + var ids = []; + new CleanCSS().minify(wrapCSS(text, type)).warnings.forEach(function(warning) { + var match = uidPattern.exec(warning); + if (match) { + var id = uidAttr + match[2]; + text = text.replace(id, ignoreCSS(id)); + ids.push(id); + } + }); + text = fn(text, type); + ids.forEach(function(id) { + text = text.replace(ignoreCSS(id), id); + }); + return text; + }; + })(options.minifyCSS); } - var minifyJS = options.minifyJS; - if (minifyJS) { - options.minifyJS = function(text, inline) { - return minifyJS(escapeFragments(text), inline); - }; + if (options.minifyJS) { + options.minifyJS = (function(fn) { + return function(text, type) { + return fn(text.replace(uidPattern, function(match, prefix, index) { + var chunks = ignoredCustomMarkupChunks[+index]; + return chunks[1] + uidAttr + index + chunks[2]; + }), type); + }; + })(options.minifyJS); } } var token = uidAttr + ignoredCustomMarkupChunks.length; @@ -948,21 +969,13 @@ function minify(value, options, partialMarkup) { html5: options.html5, start: function(tag, attrs, unary, unarySlash, autoGenerated) { - var lowerTag = tag.toLowerCase(); - - if (lowerTag === 'svg') { - optionsStack.push(options); - var nextOptions = {}; - for (var key in options) { - nextOptions[key] = options[key]; - } - nextOptions.keepClosingSlash = true; - nextOptions.caseSensitive = true; - options = nextOptions; + if (tag.toLowerCase() === 'svg') { + options = Object.create(options); + options.caseSensitive = true; + options.keepClosingSlash = true; + options.name = identity; } - - tag = options.caseSensitive ? tag : lowerTag; - + tag = options.name(tag); currentTag = tag; charsPrevTag = tag; if (!inlineTextTags(tag)) { @@ -998,11 +1011,13 @@ function minify(value, options, partialMarkup) { if (!stackNoTrimWhitespace.length) { squashTrailingWhitespace(tag); } - if (!_canTrimWhitespace(tag, attrs) || stackNoTrimWhitespace.length) { - stackNoTrimWhitespace.push(tag); - } - if (!_canCollapseWhitespace(tag, attrs) || stackNoCollapseWhitespace.length) { - stackNoCollapseWhitespace.push(tag); + if (!unary) { + if (!_canTrimWhitespace(tag, attrs) || stackNoTrimWhitespace.length) { + stackNoTrimWhitespace.push(tag); + } + if (!_canCollapseWhitespace(tag, attrs) || stackNoCollapseWhitespace.length) { + stackNoCollapseWhitespace.push(tag); + } } } @@ -1040,11 +1055,10 @@ function minify(value, options, partialMarkup) { } }, end: function(tag, attrs, autoGenerated) { - var lowerTag = tag.toLowerCase(); - if (lowerTag === 'svg') { - options = optionsStack.pop(); + if (tag.toLowerCase() === 'svg') { + options = Object.getPrototypeOf(options); } - tag = options.caseSensitive ? tag : lowerTag; + tag = options.name(tag); // check if current tag is in a whitespace stack if (options.collapseWhitespace) { @@ -1186,6 +1200,11 @@ function minify(value, options, partialMarkup) { // https://mathiasbynens.be/notes/ambiguous-ampersands text = text.replace(/&(#?[0-9a-zA-Z]+;)/g, '&$1').replace(/</g, '<'); } + if (uidPattern && options.collapseWhitespace && stackNoTrimWhitespace.length) { + text = text.replace(uidPattern, function(match, prefix, index) { + return ignoredCustomMarkupChunks[+index][0]; + }); + } currentChars += text; if (text) { hasChars = true; @@ -1217,7 +1236,7 @@ function minify(value, options, partialMarkup) { buffer.push(text); }, doctype: function(doctype) { - buffer.push(options.useShortDoctype ? '<!DOCTYPE html>' : collapseWhitespaceAll(doctype)); + buffer.push(options.useShortDoctype ? '<!doctype html>' : collapseWhitespaceAll(doctype)); }, customAttrAssign: options.customAttrAssign, customAttrSurround: options.customAttrSurround @@ -1238,10 +1257,8 @@ function minify(value, options, partialMarkup) { squashTrailingWhitespace('br'); } - var str = joinResultSegments(buffer, options); - - if (uidPattern) { - str = str.replace(uidPattern, function(match, prefix, index, suffix) { + return joinResultSegments(buffer, options, uidPattern ? function(str) { + return str.replace(uidPattern, function(match, prefix, index, suffix) { var chunk = ignoredCustomMarkupChunks[+index][0]; if (options.collapseWhitespace) { if (prefix !== '\t') { @@ -1253,48 +1270,56 @@ function minify(value, options, partialMarkup) { return collapseWhitespace(chunk, { preserveLineBreaks: options.preserveLineBreaks, conservativeCollapse: !options.trimCustomFragments - }, /^\s/.test(chunk), /\s$/.test(chunk)); + }, /^[ \n\r\t\f]/.test(chunk), /[ \n\r\t\f]$/.test(chunk)); } return chunk; }); - } - if (uidIgnore) { - str = str.replace(new RegExp('<!--' + uidIgnore + '([0-9]+)-->', 'g'), function(match, index) { + } : identity, uidIgnore ? function(str) { + return str.replace(new RegExp('<!--' + uidIgnore + '([0-9]+)-->', 'g'), function(match, index) { return ignoredMarkupChunks[+index]; }); - } - - options.log('minified in: ' + (Date.now() - t) + 'ms'); - return str; + } : identity); } -function joinResultSegments(results, options) { +function joinResultSegments(results, options, restoreCustom, restoreIgnore) { var str; var maxLineLength = options.maxLineLength; if (maxLineLength) { - var token; - var lines = []; - var line = ''; - for (var i = 0, len = results.length; i < len; i++) { - token = results[i]; - if (line.length + token.length < maxLineLength) { - line += token; + var line = '', lines = []; + while (results.length) { + var len = line.length; + var end = results[0].indexOf('\n'); + if (end < 0) { + line += restoreIgnore(restoreCustom(results.shift())); } else { - lines.push(line.replace(/^\n/, '')); - line = token; + line += restoreIgnore(restoreCustom(results[0].slice(0, end))); + results[0] = results[0].slice(end + 1); + } + if (len > 0 && line.length > maxLineLength) { + lines.push(line.slice(0, len)); + line = line.slice(len); + } + else if (end >= 0) { + lines.push(line); + line = ''; } } - lines.push(line); - + if (line) { + lines.push(line); + } str = lines.join('\n'); } else { - str = results.join(''); + str = restoreIgnore(restoreCustom(results.join(''))); } return options.collapseWhitespace ? collapseWhitespace(str, options, true, true) : str; } exports.minify = function(value, options) { - return minify(value, options); + var start = Date.now(); + options = processOptions(options || {}); + var result = minify(value, options); + options.log('minified in: ' + (Date.now() - start) + 'ms'); + return result; }; diff --git a/node_modules/html-minifier/src/htmlparser.js b/node_modules/html-minifier/src/htmlparser.js index 74695a01d..8872d2fa1 100644 --- a/node_modules/html-minifier/src/htmlparser.js +++ b/node_modules/html-minifier/src/htmlparser.js @@ -49,13 +49,18 @@ var singleAttrIdentifier = /([^\s"'<>/=]+)/, ], // https://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-QName qnameCapture = (function() { - var ncname = require('ncname').source.slice(1, -1); + // based on https://www.npmjs.com/package/ncname + var combiningChar = '\\u0300-\\u0345\\u0360\\u0361\\u0483-\\u0486\\u0591-\\u05A1\\u05A3-\\u05B9\\u05BB-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u064B-\\u0652\\u0670\\u06D6-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0901-\\u0903\\u093C\\u093E-\\u094D\\u0951-\\u0954\\u0962\\u0963\\u0981-\\u0983\\u09BC\\u09BE-\\u09C4\\u09C7\\u09C8\\u09CB-\\u09CD\\u09D7\\u09E2\\u09E3\\u0A02\\u0A3C\\u0A3E-\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A70\\u0A71\\u0A81-\\u0A83\\u0ABC\\u0ABE-\\u0AC5\\u0AC7-\\u0AC9\\u0ACB-\\u0ACD\\u0B01-\\u0B03\\u0B3C\\u0B3E-\\u0B43\\u0B47\\u0B48\\u0B4B-\\u0B4D\\u0B56\\u0B57\\u0B82\\u0B83\\u0BBE-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCD\\u0BD7\\u0C01-\\u0C03\\u0C3E-\\u0C44\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C82\\u0C83\\u0CBE-\\u0CC4\\u0CC6-\\u0CC8\\u0CCA-\\u0CCD\\u0CD5\\u0CD6\\u0D02\\u0D03\\u0D3E-\\u0D43\\u0D46-\\u0D48\\u0D4A-\\u0D4D\\u0D57\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F3E\\u0F3F\\u0F71-\\u0F84\\u0F86-\\u0F8B\\u0F90-\\u0F95\\u0F97\\u0F99-\\u0FAD\\u0FB1-\\u0FB7\\u0FB9\\u20D0-\\u20DC\\u20E1\\u302A-\\u302F\\u3099\\u309A'; + var digit = '0-9\\u0660-\\u0669\\u06F0-\\u06F9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE7-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29'; + var extender = '\\xB7\\u02D0\\u02D1\\u0387\\u0640\\u0E46\\u0EC6\\u3005\\u3031-\\u3035\\u309D\\u309E\\u30FC-\\u30FE'; + var letter = 'A-Za-z\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u0131\\u0134-\\u013E\\u0141-\\u0148\\u014A-\\u017E\\u0180-\\u01C3\\u01CD-\\u01F0\\u01F4\\u01F5\\u01FA-\\u0217\\u0250-\\u02A8\\u02BB-\\u02C1\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03CE\\u03D0-\\u03D6\\u03DA\\u03DC\\u03DE\\u03E0\\u03E2-\\u03F3\\u0401-\\u040C\\u040E-\\u044F\\u0451-\\u045C\\u045E-\\u0481\\u0490-\\u04C4\\u04C7\\u04C8\\u04CB\\u04CC\\u04D0-\\u04EB\\u04EE-\\u04F5\\u04F8\\u04F9\\u0531-\\u0556\\u0559\\u0561-\\u0586\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0621-\\u063A\\u0641-\\u064A\\u0671-\\u06B7\\u06BA-\\u06BE\\u06C0-\\u06CE\\u06D0-\\u06D3\\u06D5\\u06E5\\u06E6\\u0905-\\u0939\\u093D\\u0958-\\u0961\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8B\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AE0\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B36-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB5\\u0BB7-\\u0BB9\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CDE\\u0CE0\\u0CE1\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D28\\u0D2A-\\u0D39\\u0D60\\u0D61\\u0E01-\\u0E2E\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E45\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD\\u0EAE\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0F40-\\u0F47\\u0F49-\\u0F69\\u10A0-\\u10C5\\u10D0-\\u10F6\\u1100\\u1102\\u1103\\u1105-\\u1107\\u1109\\u110B\\u110C\\u110E-\\u1112\\u113C\\u113E\\u1140\\u114C\\u114E\\u1150\\u1154\\u1155\\u1159\\u115F-\\u1161\\u1163\\u1165\\u1167\\u1169\\u116D\\u116E\\u1172\\u1173\\u1175\\u119E\\u11A8\\u11AB\\u11AE\\u11AF\\u11B7\\u11B8\\u11BA\\u11BC-\\u11C2\\u11EB\\u11F0\\u11F9\\u1E00-\\u1E9B\\u1EA0-\\u1EF9\\u1F00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2126\\u212A\\u212B\\u212E\\u2180-\\u2182\\u3007\\u3021-\\u3029\\u3041-\\u3094\\u30A1-\\u30FA\\u3105-\\u312C\\u4E00-\\u9FA5\\uAC00-\\uD7A3'; + var ncname = '[' + letter + '_][' + letter + digit + '\\.\\-_' + combiningChar + extender + ']*'; return '((?:' + ncname + '\\:)?' + ncname + ')'; })(), startTagOpen = new RegExp('^<' + qnameCapture), startTagClose = /^\s*(\/?)>/, endTag = new RegExp('^<\\/' + qnameCapture + '[^>]*>'), - doctype = /^<!DOCTYPE [^>]+>/i; + doctype = /^<!DOCTYPE\s[^>]+>/i; var IS_REGEX_CAPTURING_BROKEN = false; 'x'.replace(/x(.)?/g, function(m, g) { @@ -70,7 +75,7 @@ var inline = makeMap('a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,co // Elements that you can, intentionally, leave open // (and which close themselves) -var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source'); +var closeSelf = makeMap('colgroup,dd,dt,li,option,p,td,tfoot,th,thead,tr,source'); // Attributes that have their values filled in disabled='disabled' var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); @@ -80,7 +85,7 @@ var special = makeMap('script,style'); // HTML5 tags https://html.spec.whatwg.org/multipage/indices.html#elements-3 // Phrasing Content https://html.spec.whatwg.org/multipage/dom.html#phrasing-content -var nonPhrasing = makeMap('address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track'); +var nonPhrasing = makeMap('address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,ol,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track,ul'); var reCache = {}; @@ -135,7 +140,7 @@ function HTMLParser(html, handler) { } } - // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment + // https://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment if (/^<!\[/.test(html)) { var conditionalEnd = html.indexOf(']>'); @@ -262,15 +267,39 @@ function HTMLParser(html, handler) { } } + function closeIfFound(tagName) { + if (findTag(tagName) >= 0) { + parseEndTag('', tagName); + return true; + } + } + function handleStartTag(match) { var tagName = match.tagName; var unarySlash = match.unarySlash; - if (handler.html5 && lastTag === 'p' && nonPhrasing(tagName)) { - parseEndTag('', lastTag); + if (handler.html5) { + if (lastTag === 'p' && nonPhrasing(tagName)) { + parseEndTag('', lastTag); + } + else if (tagName === 'tbody') { + closeIfFound('thead'); + } + else if (tagName === 'tfoot') { + if (!closeIfFound('tbody')) { + closeIfFound('thead'); + } + } + if (tagName === 'col' && findTag('colgroup') < 0) { + lastTag = 'colgroup'; + stack.push({ tag: lastTag, attrs: [] }); + if (handler.start) { + handler.start(lastTag, [], false, ''); + } + } } - if (!handler.html5) { + if (!handler.html5 && !inline(tagName)) { while (lastTag && inline(lastTag)) { parseEndTag('', lastTag); } @@ -348,17 +377,23 @@ function HTMLParser(html, handler) { } } + function findTag(tagName) { + var pos; + var needle = tagName.toLowerCase(); + for (pos = stack.length - 1; pos >= 0; pos--) { + if (stack[pos].tag.toLowerCase() === needle) { + break; + } + } + return pos; + } + function parseEndTag(tag, tagName) { var pos; // Find the closest opened tag of the same type if (tagName) { - var needle = tagName.toLowerCase(); - for (pos = stack.length - 1; pos >= 0; pos--) { - if (stack[pos].tag.toLowerCase() === needle) { - break; - } - } + pos = findTag(tagName); } // If no tag name is provided, clean shop else { |