},
"extends": "eslint:recommended",
"rules": {
+ "array-bracket-spacing": [
+ "error",
+ "always"
+ ],
"block-scoped-var": "error",
"block-spacing": "error",
"brace-style": [
src: 'Gruntfile.js'
},
src: {
- src: ['cli.js', 'src/**/*.js']
+ src: [ 'cli.js', 'src/**/*.js' ]
},
tests: {
- src: ['tests/*.js', 'test.js']
+ src: [ 'tests/*.js', 'test.js' ]
},
web: {
src: 'assets/master.js'
},
other: {
- src: ['backtest.js', 'benchmark.js']
+ src: [ 'backtest.js', 'benchmark.js' ]
}
},
}
else {
process.on('message', function(hash) {
- var paths = ['src', 'benchmark.conf', 'sample-cli-config-file.conf'];
+ var paths = [ 'src', 'benchmark.conf', 'sample-cli-config-file.conf' ];
git('reset', 'HEAD', '--', paths, function() {
var conf = 'sample-cli-config-file.conf';
});
var table = new Table({
- head: ['File', 'Before', 'After', 'Minimize', 'Will Peavy', 'htmlcompressor.com', 'Savings', 'Time'],
- colWidths: [20, 25, 25, 25, 25, 25, 20, 10]
+ head: [ 'File', 'Before', 'After', 'Minimize', 'Will Peavy', 'htmlcompressor.com', 'Savings', 'Time' ],
+ colWidths: [ 20, 25, 25, 25, 25, 25, 20, 10 ]
});
function toKb(size) {
brFilePath: path.join('benchmarks/generated/', fileName + '.html.br')
};
var infos = {};
- ['minifier', 'minimize', 'willpeavy', 'compressor'].forEach(function (name) {
+ [ 'minifier', 'minimize', 'willpeavy', 'compressor' ].forEach(function (name) {
infos[name] = {
filePath: path.join('benchmarks/generated/', fileName + '.' + name + '.html'),
gzFilePath: path.join('benchmarks/generated/', fileName + '.' + name + '.html.gz'),
function testHTMLMinifier(done) {
var info = infos.minifier;
info.startTime = Date.now();
- var args = [filePath, '-c', 'sample-cli-config-file.conf', '--minify-urls', urls[fileName], '-o', info.filePath];
+ var args = [ filePath, '-c', 'sample-cli-config-file.conf', '--minify-urls', urls[fileName], '-o', info.filePath ];
fork('./cli', args).on('exit', function () {
readSizes(info, done);
});
testHTMLCompressor
], function () {
var row = [
- [fileName, '+ gzip', '+ lzma', '+ brotli'].join('\n'),
- [redSize(original.size), redSize(original.gzSize), redSize(original.lzSize), redSize(original.brSize)].join('\n')
+ [ fileName, '+ gzip', '+ lzma', '+ brotli' ].join('\n'),
+ [ redSize(original.size), redSize(original.gzSize), redSize(original.lzSize), redSize(original.brSize) ].join('\n')
];
for (var name in infos) {
var info = infos[name];
- row.push([greenSize(info.size), greenSize(info.gzSize), greenSize(info.lzSize), greenSize(info.brSize)].join('\n'));
+ row.push([ greenSize(info.size), greenSize(info.gzSize), greenSize(info.lzSize), greenSize(info.brSize) ].join('\n'));
}
row.push(
[
cli.setUsage(usage);
var mainOptions = {
- caseSensitive: [[false, 'Treat attributes in case sensitive manner (useful for SVG; e.g. viewBox)']],
- collapseBooleanAttributes: [[false, 'Omit attribute values from boolean attributes']],
- collapseInlineTagWhitespace: [[false, 'Collapse white space around inline tag']],
- collapseWhitespace: [[false, 'Collapse white space that contributes to text nodes in a document tree.']],
- conservativeCollapse: [[false, 'Always collapse to 1 space (never remove it entirely)']],
- customAttrAssign: [[false, 'Arrays of regex\'es that allow to support custom attribute assign expressions (e.g. \'<div flex?="{{mode != cover}}"></div>\')', 'string'], 'json-regex'],
- customAttrCollapse: [[false, 'Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)', 'string'], 'string-regex'],
- customAttrSurround: [[false, 'Arrays of regex\'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)', 'string'], 'json-regex'],
- customEventAttributes: [[false, 'Arrays of regex\'es that allow to support custom event attributes for minifyJS (e.g. ng-click)', 'string'], 'json-regex'],
- html5: [[false, 'Parse input according to HTML5 specifications']],
- ignoreCustomComments: [[false, 'Array of regex\'es that allow to ignore certain comments, when matched', 'string'], 'json-regex'],
- ignoreCustomFragments: [[false, 'Array of regex\'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }})', 'string'], 'json-regex'],
- includeAutoGeneratedTags: [[false, 'Insert tags generated by HTML parser'], true],
- keepClosingSlash: [[false, 'Keep the trailing slash on singleton elements']],
- lint: [[false, 'Toggle linting']],
- maxLineLength: [[false, 'Max line length', 'number'], true],
- minifyCSS: [[false, 'Minify CSS in style elements and style attributes (uses clean-css)']],
- minifyJS: [[false, 'Minify Javascript in script elements and on* attributes (uses UglifyJS)']],
- minifyURLs: [[false, 'Minify URLs in various attributes (uses relateurl)', 'string'], 'site-url'],
- preserveLineBreaks: [[false, 'Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break.']],
- preventAttributesEscaping: [[false, 'Prevents the escaping of the values of attributes.']],
- processConditionalComments: [[false, 'Process contents of conditional comments through minifier']],
- processScripts: [[false, 'Array of strings corresponding to types of script elements to process through minifier (e.g. "text/ng-template", "text/x-handlebars-template", etc.)', 'string'], 'json'],
- quoteCharacter: [[false, 'Type of quote to use for attribute values (\' or ")', 'string'], true],
- removeAttributeQuotes: [[false, 'Remove quotes around attributes when possible.']],
- removeComments: [[false, 'Strip HTML comments']],
- removeEmptyAttributes: [[false, 'Remove all attributes with whitespace-only values']],
- removeEmptyElements: [[false, 'Remove all elements with empty contents']],
- removeOptionalTags: [[false, 'Remove unrequired tags']],
- removeRedundantAttributes: [[false, 'Remove attributes when value matches default.']],
- removeScriptTypeAttributes: [[false, 'Remove type="text/javascript" from script tags. Other type attribute values are left intact.']],
- removeStyleLinkTypeAttributes: [[false, 'Remove type="text/css" from style and link tags. Other type attribute values are left intact.']],
- removeTagWhitespace: [[false, 'Remove space between attributes whenever possible.']],
- useShortDoctype: [[false, 'Replaces the doctype with the short (HTML5) doctype']]
+ caseSensitive: [ [ false, 'Treat attributes in case sensitive manner (useful for SVG; e.g. viewBox)' ] ],
+ collapseBooleanAttributes: [ [ false, 'Omit attribute values from boolean attributes' ] ],
+ collapseInlineTagWhitespace: [ [ false, 'Collapse white space around inline tag' ] ],
+ collapseWhitespace: [ [ false, 'Collapse white space that contributes to text nodes in a document tree.' ] ],
+ conservativeCollapse: [ [ false, 'Always collapse to 1 space (never remove it entirely)' ] ],
+ customAttrAssign: [ [ false, 'Arrays of regex\'es that allow to support custom attribute assign expressions (e.g. \'<div flex?="{{mode != cover}}"></div>\')', 'string' ], 'json-regex' ],
+ customAttrCollapse: [ [ false, 'Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)', 'string' ], 'string-regex' ],
+ customAttrSurround: [ [ false, 'Arrays of regex\'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)', 'string' ], 'json-regex' ],
+ customEventAttributes: [ [ false, 'Arrays of regex\'es that allow to support custom event attributes for minifyJS (e.g. ng-click)', 'string' ], 'json-regex' ],
+ html5: [ [ false, 'Parse input according to HTML5 specifications' ] ],
+ ignoreCustomComments: [ [ false, 'Array of regex\'es that allow to ignore certain comments, when matched', 'string' ], 'json-regex' ],
+ ignoreCustomFragments: [ [ false, 'Array of regex\'es that allow to ignore certain fragments, when matched (e.g. <?php ... ?>, {{ ... }})', 'string' ], 'json-regex' ],
+ includeAutoGeneratedTags: [ [ false, 'Insert tags generated by HTML parser' ], true ],
+ keepClosingSlash: [ [ false, 'Keep the trailing slash on singleton elements' ] ],
+ lint: [ [ false, 'Toggle linting' ] ],
+ maxLineLength: [ [ false, 'Max line length', 'number' ], true ],
+ minifyCSS: [ [ false, 'Minify CSS in style elements and style attributes (uses clean-css)' ] ],
+ minifyJS: [ [ false, 'Minify Javascript in script elements and on* attributes (uses UglifyJS)' ] ],
+ minifyURLs: [ [ false, 'Minify URLs in various attributes (uses relateurl)', 'string' ], 'site-url' ],
+ preserveLineBreaks: [ [ false, 'Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break.' ] ],
+ preventAttributesEscaping: [ [ false, 'Prevents the escaping of the values of attributes.' ] ],
+ processConditionalComments: [ [ false, 'Process contents of conditional comments through minifier' ] ],
+ processScripts: [ [ false, 'Array of strings corresponding to types of script elements to process through minifier (e.g. "text/ng-template", "text/x-handlebars-template", etc.)', 'string' ], 'json' ],
+ quoteCharacter: [ [ false, 'Type of quote to use for attribute values (\' or ")', 'string' ], true ],
+ removeAttributeQuotes: [ [ false, 'Remove quotes around attributes when possible.' ] ],
+ removeComments: [ [ false, 'Strip HTML comments' ] ],
+ removeEmptyAttributes: [ [ false, 'Remove all attributes with whitespace-only values' ] ],
+ removeEmptyElements: [ [ false, 'Remove all elements with empty contents' ] ],
+ removeOptionalTags: [ [ false, 'Remove unrequired tags' ] ],
+ removeRedundantAttributes: [ [ false, 'Remove attributes when value matches default.' ] ],
+ removeScriptTypeAttributes: [ [ false, 'Remove type="text/javascript" from script tags. Other type attribute values are left intact.' ] ],
+ removeStyleLinkTypeAttributes: [ [ false, 'Remove type="text/css" from style and link tags. Other type attribute values are left intact.' ] ],
+ removeTagWhitespace: [ [ false, 'Remove space between attributes whenever possible.' ] ],
+ useShortDoctype: [ [ false, 'Replaces the doctype with the short (HTML5) doctype' ] ]
};
var cliOptions = {
- version: ['v', 'Version information'],
- output: ['o', 'Specify output file (if not specified STDOUT will be used for output)', 'file'],
- 'config-file': ['c', 'Use config file', 'file'],
- 'input-dir': [false, 'Specify an input directory', 'dir'],
- 'output-dir': [false, 'Specify an output directory', 'dir']
+ version: [ 'v', 'Version information' ],
+ output: [ 'o', 'Specify output file (if not specified STDOUT will be used for output)', 'file' ],
+ 'config-file': [ 'c', 'Use config file', 'file' ],
+ 'input-dir': [ false, 'Specify an input directory', 'dir' ],
+ 'output-dir': [ false, 'Specify an output directory', 'dir' ]
};
var mainOptionKeys = Object.keys(mainOptions);
catch (e) {
cli.fatal('Could not parse JSON value \'' + value + '\'');
}
- return Array.isArray(jsonArray) ? jsonArray : [value];
+ return Array.isArray(jsonArray) ? jsonArray : [ value ];
}
}
options.includeAutoGeneratedTags = true;
}
- var defaultTesters = ['canCollapseWhitespace', 'canTrimWhitespace'];
+ var defaultTesters = [ 'canCollapseWhitespace', 'canTrimWhitespace' ];
for (var i = 0, len = defaultTesters.length; i < len; i++) {
if (!options[defaultTesters[i]]) {
options[defaultTesters[i]] = function() {
options.includeAutoGeneratedTags = true;
}
- var defaultTesters = ['canCollapseWhitespace', 'canTrimWhitespace'];
+ var defaultTesters = [ 'canCollapseWhitespace', 'canTrimWhitespace' ];
for (var i = 0, len = defaultTesters.length; i < len; i++) {
if (!options[defaultTesters[i]]) {
options[defaultTesters[i]] = function() {
testrunner.options.log.assertions = false;
testrunner.run({
- deps: ['./src/htmlparser.js', './src/htmllint.js'],
+ deps: [ './src/htmlparser.js', './src/htmllint.js' ],
code: './src/htmlminifier.js',
tests: [
'./tests/lint.js',
'use strict';
QUnit.done(function(details) {
- alert(JSON.stringify(['qunit.done', details]));
+ alert(JSON.stringify([ 'qunit.done', details ]));
});
test('tests from PHPTAL', function() {
[
// trailing </p> removed by minifier, but not by PHPTAL
- ['<p>foo bar baz', '<p>foo \t bar\n\n\n baz</p>'],
- ['<p>foo bar<pre> \tfoo\t \nbar </pre>', '<p>foo \t\n bar</p><pre> \tfoo\t \nbar </pre>'],
- ['<p>foo <a href="">bar </a>baz', '<p>foo <a href=""> bar </a> baz </p>'],
- ['<p>foo <a href="">bar </a>baz', ' <p>foo <a href=""> bar </a>baz </p>'],
- ['<p>foo<a href=""> bar </a>baz', ' <p> foo<a href=""> bar </a>baz </p> '],
- ['<p>foo <a href="">bar</a> baz', ' <p> foo <a href="">bar</a> baz</p>'],
- ['<p>foo<br>', '<p>foo <br/></p>'],
+ [ '<p>foo bar baz', '<p>foo \t bar\n\n\n baz</p>' ],
+ [ '<p>foo bar<pre> \tfoo\t \nbar </pre>', '<p>foo \t\n bar</p><pre> \tfoo\t \nbar </pre>' ],
+ [ '<p>foo <a href="">bar </a>baz', '<p>foo <a href=""> bar </a> baz </p>' ],
+ [ '<p>foo <a href="">bar </a>baz', ' <p>foo <a href=""> bar </a>baz </p>' ],
+ [ '<p>foo<a href=""> bar </a>baz', ' <p> foo<a href=""> bar </a>baz </p> ' ],
+ [ '<p>foo <a href="">bar</a> baz', ' <p> foo <a href="">bar</a> baz</p>' ],
+ [ '<p>foo<br>', '<p>foo <br/></p>' ],
// PHPTAL remove whitespace after 'foo' - problematic if <span> is used as icon font
- ['<p>foo <span></span>', '<p>foo <span></span></p>'],
- ['<p>foo <span></span>', '<p>foo <span></span> </p>'],
+ [ '<p>foo <span></span>', '<p>foo <span></span></p>' ],
+ [ '<p>foo <span></span>', '<p>foo <span></span> </p>' ],
// comments removed by minifier, but not by PHPTAL
- ['<p>foo', '<p>foo <!-- --> </p>'],
- ['<div>a<div>b</div>c<div>d</div>e</div>', '<div>a <div>b</div> c <div> d </div> e </div>'],
+ [ '<p>foo', '<p>foo <!-- --> </p>' ],
+ [ '<div>a<div>b</div>c<div>d</div>e</div>', '<div>a <div>b</div> c <div> d </div> e </div>' ],
// unary slashes removed by minifier, but not by PHPTAL
- ['<div><img></div>', '<div> <img/> </div>'],
- ['<div>x <img></div>', '<div> x <img/> </div>'],
- ['<div>x <img> y</div>', '<div> x <img/> y </div>'],
- ['<div><img> y</div>', '<div><img/> y </div>'],
- ['<div><button>Z</button></div>', '<div> <button>Z</button> </div>'],
- ['<div>x <button>Z</button></div>', '<div> x <button>Z</button> </div>'],
- ['<div>x <button>Z</button> y</div>', '<div> x <button>Z</button> y </div>'],
- ['<div><button>Z</button> y</div>', '<div><button>Z</button> y </div>'],
- ['<div><button>Z</button></div>', '<div> <button> Z </button> </div>'],
- ['<div>x <button>Z</button></div>', '<div> x <button> Z </button> </div>'],
- ['<div>x <button>Z</button> y</div>', '<div> x <button> Z </button> y </div>'],
- ['<div><button>Z</button> y</div>', '<div><button> Z </button> y </div>'],
- ['<script>//foo\nbar()</script>', '<script>//foo\nbar()</script>'],
+ [ '<div><img></div>', '<div> <img/> </div>' ],
+ [ '<div>x <img></div>', '<div> x <img/> </div>' ],
+ [ '<div>x <img> y</div>', '<div> x <img/> y </div>' ],
+ [ '<div><img> y</div>', '<div><img/> y </div>' ],
+ [ '<div><button>Z</button></div>', '<div> <button>Z</button> </div>' ],
+ [ '<div>x <button>Z</button></div>', '<div> x <button>Z</button> </div>' ],
+ [ '<div>x <button>Z</button> y</div>', '<div> x <button>Z</button> y </div>' ],
+ [ '<div><button>Z</button> y</div>', '<div><button>Z</button> y </div>' ],
+ [ '<div><button>Z</button></div>', '<div> <button> Z </button> </div>' ],
+ [ '<div>x <button>Z</button></div>', '<div> x <button> Z </button> </div>' ],
+ [ '<div>x <button>Z</button> y</div>', '<div> x <button> Z </button> y </div>' ],
+ [ '<div><button>Z</button> y</div>', '<div><button> Z </button> y </div>' ],
+ [ '<script>//foo\nbar()</script>', '<script>//foo\nbar()</script>' ],
// optional tags removed by minifier, but not by PHPTAL
// parser cannot handle <script/>
[
' > </style >\n' +
' </head > </html>'
],
- ['<div><p>test 123<p>456<ul><li>x</ul></div>', '<div> <p> test 123 </p> <p> 456 </p> <ul> <li>x</li> </ul> </div>'],
- ['<div><p>test 123<pre> 456 </pre><p>x</div>', '<div> <p> test 123 </p> <pre> 456 </pre> <p> x </p> </div>'],
+ [ '<div><p>test 123<p>456<ul><li>x</ul></div>', '<div> <p> test 123 </p> <p> 456 </p> <ul> <li>x</li> </ul> </div>' ],
+ [ '<div><p>test 123<pre> 456 </pre><p>x</div>', '<div> <p> test 123 </p> <pre> 456 </pre> <p> x </p> </div>' ],
/* minifier does not assume <li> as "display: inline"
['<div><ul><li><a>a </a></li><li>b </li><li>c</li></ul></div>', '<div> <ul> <li> <a> a </a> </li> <li> b </li> <li> c </li> </ul> </div>'],
*/
- ['<table>x<tr>x<td>foo</td>x</tr>x</table>', '<table> x <tr> x <td> foo </td> x </tr> x </table>'],
- ['<select>x<option></option>x<optgroup>x<option></option>x</optgroup>x</select>', '<select> x <option> </option> x <optgroup> x <option> </option> x </optgroup> x </select> '],
+ [ '<table>x<tr>x<td>foo</td>x</tr>x</table>', '<table> x <tr> x <td> foo </td> x </tr> x </table>' ],
+ [ '<select>x<option></option>x<optgroup>x<option></option>x</optgroup>x</select>', '<select> x <option> </option> x <optgroup> x <option> </option> x </optgroup> x </select> ' ],
/* minifier does not reorder attributes
['<img src="foo" width="10" height="5" alt="x"/>', '<img width="10" height="5" src="foo" alt="x" />'],
['<img alpha="1" beta="2" gamma="3"/>', '<img gamma="3" alpha="1" beta="2" />'],
*/
- ['<pre>\n\n\ntest</pre>', '<pre>\n\n\ntest</pre>'],
+ [ '<pre>\n\n\ntest</pre>', '<pre>\n\n\ntest</pre>' ],
/* single line-break preceding <pre> is redundant, assuming <pre> is block element
['<pre>test</pre>', '<pre>\ntest</pre>'],
*/
// optional attribute quotes removed by minifier, but not by PHPTAL
- ['<meta http-equiv=Content-Type content="text/plain;charset=UTF-8">', '<meta http-equiv=\'Content-Type\' content=\'text/plain;charset=UTF-8\'/>'],
+ [ '<meta http-equiv=Content-Type content="text/plain;charset=UTF-8">', '<meta http-equiv=\'Content-Type\' content=\'text/plain;charset=UTF-8\'/>' ],
/* minifier does not optimise <meta/> in HTML5 mode
['<meta charset=utf-8>', '<meta http-equiv=\'Content-Type\' content=\'text/plain;charset=UTF-8\'/>'],
*/
'language=\'javascript\'></script><style type=\'text/css\'></style>'
],
*/
- ['<script type="text/javascript;e4x=1"></script><script type=text/hack></script>', '<script type="text/javascript;e4x=1"></script><script type="text/hack"></script>']
+ [ '<script type="text/javascript;e4x=1"></script><script type=text/hack></script>', '<script type="text/javascript;e4x=1"></script><script type="text/hack"></script>' ]
/* trim "title" attribute value in <a>
[
'<title>Foo</title><p><a title=\"x\"href=test>x </a>xu</p><br>foo',
public / html-minifier.git / commitdiff