html-minifier 1.1.1 → 1.4.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Juriy "kangax" Zaytsev
+Copyright (c) 2010-2016 Juriy "kangax" Zaytsev
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

package/README.md

@@ -1,9 +1,12 @@
+# HTMLMinifier
+
 [![NPM version](https://img.shields.io/npm/v/html-minifier.svg)](https://www.npmjs.com/package/html-minifier)
 [![Build Status](https://img.shields.io/travis/kangax/html-minifier.svg)](https://travis-ci.org/kangax/html-minifier)
 [![Dependency Status](https://img.shields.io/david/kangax/html-minifier.svg)](https://david-dm.org/kangax/html-minifier)
 [![devDependency Status](https://img.shields.io/david/dev/kangax/html-minifier.svg)](https://david-dm.org/kangax/html-minifier#info=devDependencies)
+[![Gitter](https://img.shields.io/gitter/room/kangax/html-minifier.svg)](https://gitter.im/kangax/html-minifier)
 
-[HTMLMinifier](http://kangax.github.io/html-minifier/) is a highly **configurable**, **well-tested**, Javascript-based HTML minifier, with lint-like capabilities.
+[HTMLMinifier](http://kangax.github.io/html-minifier/) is a highly **configurable**, **well-tested**, JavaScript-based HTML minifier, with lint-like capabilities.
 
 See [corresponding blog post](http://perfectionkills.com/experimenting-with-html-minifier/) for all the gory details of [how it works](http://perfectionkills.com/experimenting-with-html-minifier/#how_it_works), [description of each option](http://perfectionkills.com/experimenting-with-html-minifier/#options), [testing results](http://perfectionkills.com/experimenting-with-html-minifier/#field_testing) and [conclusions](http://perfectionkills.com/experimenting-with-html-minifier/#cost_and_benefits).
 
@@ -13,58 +16,64 @@ Also see corresponding [Ruby wrapper](https://github.com/stereobooster/html_mini
 
 ## Minification comparison
 
-How does HTMLMinifier compare to other solutions — [HTML Minifier from Will Peavy](http://www.willpeavy.com/minifier/) (1st result in [google search for "html minifier"](https://www.google.com/#q=html+minifier)) as well as [htmlcompressor.com](http://htmlcompressor.com) and [minimize](https://github.com/Swaagie/minimize)?
-
-| Site | Original size _(KB)_ | HTMLMinifier | minimize | Will Peavy | htmlcompressor.com |
-| --------------------------------------------------------------------------- |:-----------:| ----------------:| ----------------:| ------------:| ----------------:|
-| [HTMLMinifier page](https://github.com/kangax/html-minifier)                | 48.8        | <b>37.3</b>      | 41.8      |   43.3       | 41.9 |
-| [ES6 table](http://kangax.github.io/es5-compat-table/es6/)                  | 117.9       | <b>79.9</b>      | 94.1      |   92         | 91.9 |
-| [MSN](http://msn.com)                                                       | 156.6       | <b>133</b>       | 137.7     |   145        | 138.3 |
-| [Stackoverflow](http://stackoverflow.com)                                   | 200.4       | <b>159.5</b>     | 165.1     |   168.3      | 163.3 |
-| [Amazon](http://amazon.com)                                                 | 245.9       | <b>206.3</b>     | 234.1     |   225        | 218.5 |
-| [Wikipedia](http://en.wikipedia.org/wiki/President_of_the_United_States)    | 401.4       | <b>380.6</b>     | 386.6     |   396.3      | n/a |
-| [Eloquent Javascript](http://eloquentjavascript.net/print.html)             | 869.5       | <b>830</b>       | 838       |   872        | n/a |
-
-
+How does HTMLMinifier compare to other solutions — [HTML Minifier from Will Peavy](http://www.willpeavy.com/minifier/) (1st result in [Google search for "html minifier"](https://www.google.com/#q=html+minifier)) as well as [htmlcompressor.com](http://htmlcompressor.com) and [minimize](https://github.com/Swaagie/minimize)?
+
+| Site                                                                        | Original size *(KB)* | HTMLMinifier | minimize | Will Peavy | htmlcompressor.com |
+| --------------------------------------------------------------------------- |:--------------------:| ------------:| --------:| ----------:| ------------------:|
+| [HTMLMinifier page](https://github.com/kangax/html-minifier)                | 49                   | **37**       | 42       | 44         | 43                 |
+| [NBC](http://www.nbc.com/)                                                  | 91                   | **74**       | 84       | 85         | 85                 |
+| [ES6 table](http://kangax.github.io/es5-compat-table/es6/)                  | 118                  | **80**       | 93       | 93         | 94                 |
+| [New York Times](http://www.nytimes.com/)                                   | 131                  | **101**      | 122      | 125        | 120                |
+| [Google](https://www.google.com/)                                           | 133                  | **128**      | 132      | 135        | 131                |
+| [MSN](http://www.msn.com/)                                                  | 157                  | **130**      | 138      | 145        | 138                |
+| [Stackoverflow](http://stackoverflow.com/)                                  | 200                  | **159**      | 165      | 173        | 166                |
+| [Amazon](http://www.amazon.com/)                                            | 246                  | **203**      | 234      | 230        | 219                |
+| [Bootstrap CSS](http://getbootstrap.com/css/)                               | 277                  | **268**      | 274      | 232        | 277                |
+| [Wikipedia](https://en.wikipedia.org/wiki/President_of_the_United_States)   | 401                  | **367**      | 388      | 400        | n/a                |
+| [Eloquent Javascript](http://eloquentjavascript.net/1st_edition/print.html) | 870                  | **827**      | 840      | 864        | n/a                |
+| [ES6 draft](https://tc39.github.io/ecma262/)                                | 3678                 | **2991**     | 3079     | 3183       | n/a                |
 
 ## Options Quick Reference
 
 | Option                         | Description     | Default |
 |--------------------------------|-----------------|---------|
 | `removeComments`               | [Strip HTML comments](http://perfectionkills.com/experimenting-with-html-minifier/#remove_comments) | `false` |
-| `removeCommentsFromCDATA`      | [Strip HTML comments from scripts and styles](http://perfectionkills.com/experimenting-with-html-minifier/#remove_comments_from_scripts_and_styles) | `false` |
-| `removeCDATASectionsFromCDATA` | [Remove CDATA sections from script and style elements](http://perfectionkills.com/experimenting-with-html-minifier/#remove_cdata_sections) | `false` |
 | `collapseWhitespace`           | [Collapse white space that contributes to text nodes in a document tree.](http://perfectionkills.com/experimenting-with-html-minifier/#collapse_whitespace) | `false` |
 | `conservativeCollapse`         | Always collapse to 1 space (never remove it entirely). Must be used in conjunction with `collapseWhitespace=true` | `false` |
+| `collapseInlineTagWhitespace`  | Don't leave any spaces between `display:inline;` elements when collapsing. Must be used in conjunction with `collapseWhitespace=true` | `false` |
 | `preserveLineBreaks`           | Always collapse to 1 line break (never remove it entirely) when whitespace between tags include a line break. Must be used in conjunction with `collapseWhitespace=true` | `false` |
 | `collapseBooleanAttributes`    | [Omit attribute values from boolean attributes](http://perfectionkills.com/experimenting-with-html-minifier/#collapse_boolean_attributes) | `false` |
+| `removeTagWhitespace`          | Remove space between attributes whenever possible. **Note that this will result in invalid HTML!** | `false` |
 | `removeAttributeQuotes`        | [Remove quotes around attributes when possible.](http://perfectionkills.com/experimenting-with-html-minifier/#remove_attribute_quotes) | `false` |
 | `removeRedundantAttributes`    | [Remove attributes when value matches default.](http://perfectionkills.com/experimenting-with-html-minifier/#remove_redundant_attributes) | `false` |
 | `preventAttributesEscaping`    | Prevents the escaping of the values of attributes. | `false` |
-| `useShortDoctype`              | [Replaces the doctype with the short (HTML5) doctype](http://perfectionkills.com/experimenting-with-html-minifier/#use_short_doctype) | `false` |
+| `useShortDoctype`              | [Replaces the `doctype` with the short (HTML5) doctype](http://perfectionkills.com/experimenting-with-html-minifier/#use_short_doctype) | `false` |
 | `removeEmptyAttributes`        | [Remove all attributes with whitespace-only values](http://perfectionkills.com/experimenting-with-html-minifier/#remove_empty_or_blank_attributes) | `false` |
 | `removeScriptTypeAttributes`   | Remove `type="text/javascript"` from `script` tags. Other `type` attribute values are left intact. | `false` |
 | `removeStyleLinkTypeAttributes`| Remove `type="text/css"` from `style` and `link` tags. Other `type` attribute values are left intact. | `false` |
-| `removeOptionalTags`           | [Remove unrequired tags](http://perfectionkills.com/experimenting-with-html-minifier/#remove_optional_tags) | `false` |
+| `removeOptionalTags`           | [Remove optional tags](http://perfectionkills.com/experimenting-with-html-minifier/#remove_optional_tags) | `false` |
 | `removeEmptyElements`          | [Remove all elements with empty contents](http://perfectionkills.com/experimenting-with-html-minifier/#remove_empty_elements) | `false` |
 | `lint`                         | [Toggle linting](http://perfectionkills.com/experimenting-with-html-minifier/#validate_input_through_html_lint) | `false` |
 | `keepClosingSlash`             | Keep the trailing slash on singleton elements                            | `false` |
 | `caseSensitive`                | Treat attributes in case sensitive manner (useful for custom HTML tags.) | `false` |
-| `minifyJS`                     | Minify Javascript in script elements and on* attributes (uses [UglifyJS](https://github.com/mishoo/UglifyJS2)) | `false` (could be `true`, `false`, `Object` (options)) |
-| `minifyCSS`                    | Minify CSS in style elements and style attributes (uses [clean-css](https://github.com/GoalSmashers/clean-css)) | `false` (could be `true`, `false`, `Object` (options)) |
+| `minifyJS`                     | Minify JavaScript in script elements and event attributes (uses [UglifyJS](https://github.com/mishoo/UglifyJS2)) | `false` (could be `true`, `false`, `Object` (options)) |
+| `minifyCSS`                    | Minify CSS in style elements and style attributes (uses [clean-css](https://github.com/jakubpawlowicz/clean-css)) | `false` (could be `true`, `false`, `Object` (options)) |
 | `minifyURLs`                   | Minify URLs in various attributes (uses [relateurl](https://github.com/stevenvachon/relateurl)) | `false` (could be `Object` (options)) |
+| `includeAutoGeneratedTags`     | Insert tags generated by HTML parser | `true` |
 | `ignoreCustomComments`         | Array of regex'es that allow to ignore certain comments, when matched  | `[ ]` |
-| `ignoreCustomFragments`         | Array of regex'es that allow to ignore certain fragments, when matched (e.g. `<?php ... ?>`, `{{ ... }}`, etc.)  | `[ ]` |
+| `ignoreCustomFragments`        | Array of regex'es that allow to ignore certain fragments, when matched (e.g. `<?php ... ?>`, `{{ ... }}`, etc.)  | `[ /<%[\s\S]*?%>/, /<\?[\s\S]*?\?>/ ]` |
 | `processScripts`               | Array of strings corresponding to types of script elements to process through minifier (e.g. `text/ng-template`, `text/x-handlebars-template`, etc.) | `[ ]` |
+| `processConditionalComments`   | Process contents of conditional comments through minifier | `false` |
 | `maxLineLength`                | Specify a maximum line length. Compressed output will be split by newlines at valid HTML split-points. |
+| `customEventAttributes`        | Arrays of regex'es that allow to support custom event attributes for `minifyJS` (e.g. `ng-click`) | `[ /^on[a-z]{3,}$/ ]` |
 | `customAttrAssign`             | Arrays of regex'es that allow to support custom attribute assign expressions (e.g. `'<div flex?="{{mode != cover}}"></div>'`) | `[ ]` |
 | `customAttrSurround`           | Arrays of regex'es that allow to support custom attribute surround expressions (e.g. `<input {{#if value}}checked="checked"{{/if}}>`) | `[ ]` |
 | `customAttrCollapse`           | Regex that specifies custom attribute to strip newlines from (e.g. `/ng\-class/`) | |
-| `quoteCharacter`               | Type of quote to use for attribute values (' or ") | " |
+| `quoteCharacter`               | Type of quote to use for attribute values (' or ") | |
 
 ## Special cases
 
-### Ignoring chunks of markup.
+### Ignoring chunks of markup
 
 If you have chunks of markup you would like preserved, you can wrap them `<!-- htmlmin:ignore -->`.
 
@@ -74,17 +83,17 @@ SVG tags are automatically recognized, and when they are minified, both case-sen
 
 ### Working with invalid markup
 
-HTMLMinifier **can't work with invalid or partial chunks of markup**. This is because it parses markup into a tree structure, then modifies it (removing anything that was specified for removal, ignoring anything that was specified to be ingored, etc.), then it creates a markup out of that tree and returns it.
+HTMLMinifier **can't work with invalid or partial chunks of markup**. This is because it parses markup into a tree structure, then modifies it (removing anything that was specified for removal, ignoring anything that was specified to be ignored, etc.), then it creates a markup out of that tree and returns it.
 
 Input markup (e.g. `<p id="">foo`)
 
 ↓
 
-Internal representation of markup in a form of tree (e.g. `{tag: "p", attr: "id", children: ["foo"] }`)
+Internal representation of markup in a form of tree (e.g. `{ tag: "p", attr: "id", children: ["foo"] }`)
 
 ↓
 
-Transformation of internal representation (e.g. removal of "id" attribute)
+Transformation of internal representation (e.g. removal of `id` attribute)
 
 ↓
 
@@ -95,17 +104,20 @@ HTMLMinifier can't know that original markup was only half of the tree; it does
 ## Installation Instructions
 
 From NPM for use as a command line app:
-```bash
+
+```shell
 npm install html-minifier -g
 ```
 
 From NPM for programmatic use:
-```bash
+
+```shell
 npm install html-minifier
 ```
 
 From Git:
-```bash
+
+```shell
 git clone git://github.com/kangax/html-minifier.git
 cd html-minifier
 npm link .
@@ -128,6 +140,7 @@ result; // '<p title=blah id=moo>foo</p>'
 ## Running benchmarks
 
 Benchmarks for minified HTML:
-```
+
+```shell
 node benchmark.js
 ```

package/cli.js

@@ -4,7 +4,7 @@
  *
  * The MIT License (MIT)
  *
- *  Copyright (c) 2014-2015 Zoltan Frombach
+ *  Copyright (c) 2014-2016 Zoltan Frombach
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy of
  *  this software and associated documentation files (the "Software"), to deal in
@@ -25,8 +25,6 @@
  *
  */
 
-/* globals JSON:true */
-
 'use strict';
 
 var cli = require('cli');
@@ -36,19 +34,18 @@ var path = require('path');
 var fs = require('fs');
 var appName = require('./package.json').name;
 var appVersion = require('./package.json').version;
-var minify = require('./dist/htmlminifier.min.js').minify;
-var HTMLLint = require('./dist/htmlminifier.min.js').HTMLLint;
+var minify = require('.').minify;
+var HTMLLint = require('./src/htmllint').HTMLLint;
 var minifyOptions = {};
-var input = null;
-var output = null;
+var output;
 
 cli.width = 100;
 cli.option_width = 40;
 cli.setApp(appName, appVersion);
 
 var usage = appName + ' [OPTIONS] [FILE(s)]\n\n';
-usage += '  If no input file(s) specified then STDIN will be used for input.\n';
-usage += '  If more than one input file specified those will be concatenated and minified together.\n\n';
+usage += '  If no input files are specified then STDIN will be used for input.\n';
+usage += '  If more than one input file is specified then those will be concatenated and minified together.\n\n';
 usage += '  When you specify a config file with the --config-file option (see sample-cli-config-file.conf for format)\n';
 usage += '    you can still override some of its contents by providing individual command line options, too.\n\n';
 usage += '  When you want to provide an array of strings for --ignore-custom-comments or --process-scripts options\n';
@@ -57,35 +54,40 @@ usage += '    on the command line you must escape those such as --ignore-custom-
 cli.setUsage(usage);
 
 var mainOptions = {
-  removeComments: [[false, 'Strip HTML comments']],
-  removeCommentsFromCDATA: [[false, 'Strip HTML comments from scripts and styles']],
-  removeCDATASectionsFromCDATA: [[false, 'Remove CDATA sections from script and style elements']],
+  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.']],
-  collapseInlineTagWhitespace: [[false, 'Collapse white space around inline tag']],
-  collapseBooleanAttributes: [[false, 'Omit attribute values from boolean attributes']],
-  removeAttributeQuotes: [[false, 'Remove quotes around attributes when possible.']],
-  removeRedundantAttributes: [[false, 'Remove attributes when value matches default.']],
   preventAttributesEscaping: [[false, 'Prevents the escaping of the values of attributes.']],
-  useShortDoctype: [[false, 'Replaces the doctype with the short (HTML5) doctype']],
+  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.']],
-  removeOptionalTags: [[false, 'Remove unrequired tags']],
-  removeEmptyElements: [[false, 'Remove all elements with empty contents']],
-  lint: [[false, 'Toggle linting']],
-  keepClosingSlash: [[false, 'Keep the trailing slash on singleton elements']],
-  caseSensitive: [[false, 'Treat attributes in case sensitive manner (useful for SVG; e.g. viewBox)']],
-  minifyJS: [[false, 'Minify Javascript in script elements and on* attributes (uses UglifyJS)']],
-  minifyCSS: [[false, 'Minify CSS in style elements and style attributes (uses clean-css)']],
-  minifyURLs: [[false, 'Minify URLs in various attributes (uses relateurl)']],
-  ignoreCustomComments: [[false, 'Array of regex\'es that allow to ignore certain comments, when matched', 'string'], 'json-regex'],
-  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-regex'],
-  maxLineLength: [[false, 'Max line length', 'number'], true],
-  customAttrAssign: [[false, 'Arrays of regex\'es that allow to support custom attribute assign expressions (e.g. \'<div flex?="{{mode != cover}}"></div>\')', 'string'], 'json-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'],
-  customAttrCollapse: [[false, 'Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)', 'string'], 'string-regex']
+  removeTagWhitespace: [[false, 'Remove space between attributes whenever possible.']],
+  useShortDoctype: [[false, 'Replaces the doctype with the short (HTML5) doctype']]
 };
 
 var cliOptions = {
@@ -132,27 +134,19 @@ cli.main(function(args, options) {
     }
   }
 
-  function parseJSONOption(value, options) {
-    var opts = options || {};
+  function parseJSONOption(value, regexArray) {
     if (value !== null) {
       var jsonArray;
       try {
         jsonArray = JSON.parse(value);
-        if (opts.regexArray) {
-          jsonArray = jsonArray.map(function (regexString) {
-            return stringToRegExp(regexString);
-          });
+        if (regexArray) {
+          jsonArray = jsonArray.map(stringToRegExp);
         }
       }
       catch (e) {
         cli.fatal('Could not parse JSON value \'' + value + '\'');
       }
-      if (jsonArray instanceof Array) {
-        return jsonArray;
-      }
-      else {
-        return [value];
-      }
+      return Array.isArray(jsonArray) ? jsonArray : [value];
     }
   }
 
@@ -165,7 +159,7 @@ cli.main(function(args, options) {
     catch (e) {
       status = 3;
       cli.error('Minification error');
-      process.stderr.write(e);
+      process.stderr.write((e.stack || e).toString());
     }
 
     if (minifyOptions.lint) {
@@ -174,22 +168,21 @@ cli.main(function(args, options) {
 
     if (minified !== null) {
       // Write the output
-      try {
-        if (output !== null) {
+      if (output) {
+        try {
           fs.writeFileSync(path.resolve(output), minified);
         }
-        else {
-          process.stdout.write(minified);
+        catch (e) {
+          status = 4;
+          cli.error('Cannot write to ' + output);
         }
       }
-      catch (e) {
-        status = 4;
-        console.log(output);
-        cli.error('Cannot write to output');
+      else {
+        process.stdout.write(minified);
       }
     }
 
-    cli.exit(status);
+    return status;
   }
 
   function createDirectory(path) {
@@ -197,31 +190,34 @@ cli.main(function(args, options) {
       fs.mkdirSync(path);
     }
     catch (e) {
-      if (e.code === 'EEXIST') {
-        return;
+      if (e.code !== 'EEXIST') {
+        cli.fatal('Can not create directory ' + path);
+        return 3;
       }
-      cli.fatal('Can not create directory ' + path);
-      cli.exit(3);
     }
+    return 0;
   }
 
   function processDirectory(inputDir, outputDir) {
-    createDirectory(outputDir);
     var fileList = fs.readdirSync(inputDir);
+    var status = createDirectory(outputDir);
 
-    fileList.forEach(function(fileName) {
+    for (var i = 0; status === 0 && i < fileList.length; i++) {
+      var fileName = fileList[i];
       var inputFilePath = inputDir + '/' + fileName;
       var outputFilePath = outputDir + '/' + fileName;
 
       var stat = fs.statSync(inputFilePath);
       if (stat.isDirectory()) {
-        processDirectory(inputFilePath, outputFilePath);
-        return;
+        status = processDirectory(inputFilePath, outputFilePath);
       }
+      else {
+        var originalContent = fs.readFileSync(inputFilePath, 'utf8');
+        status = runMinify(originalContent, outputFilePath);
+      }
+    }
 
-      var originalContent = fs.readFileSync(inputFilePath, 'utf8');
-      runMinify(originalContent, outputFilePath);
-    });
+    return status;
   }
 
   if (options.version) {
@@ -230,44 +226,58 @@ cli.main(function(args, options) {
   }
 
   if (options['config-file']) {
-    var fileOptions;
-    var fileOptionsPath = path.resolve(options['config-file']);
-    try {
-      fs.accessSync(fileOptionsPath, fs.R_OK);
-    }
-    catch (e) {
-      cli.fatal('The specified config file doesn’t exist or is unreadable:\n' + fileOptionsPath);
-    }
+    var configPath = path.resolve(options['config-file']);
     try {
-      fileOptions = JSON.parse(fs.readFileSync(fileOptionsPath), 'utf8');
+      var configData;
+      try {
+        configData = fs.readFileSync(configPath, { encoding: 'utf8' });
+      }
+      catch (e) {
+        cli.fatal('The specified config file doesn’t exist or is unreadable:\n' + configPath);
+      }
+      configData = JSON.parse(configData);
+      mainOptionKeys.forEach(function(key) {
+        var value = configData[key];
+        if (value !== undefined) {
+          switch (mainOptions[key][1]) {
+            case 'json-regex':
+              minifyOptions[key] = value.map(stringToRegExp);
+              break;
+            case 'string-regex':
+              minifyOptions[key] = stringToRegExp(value);
+              break;
+            default:
+              minifyOptions[key] = value;
+          }
+        }
+      });
     }
     catch (je) {
       try {
-        fileOptions = require(fileOptionsPath);
+        minifyOptions = require(configPath);
       }
       catch (ne) {
-        cli.fatal('Cannot read the specified config file. \nAs JSON: ' + je.message + '\nAs module: ' + ne.message);
+        cli.fatal('Cannot read the specified config file.\nAs JSON: ' + je.message + '\nAs module: ' + ne.message);
       }
     }
-
-    if (fileOptions && typeof fileOptions === 'object') {
-      minifyOptions = fileOptions;
-    }
   }
   mainOptionKeys.forEach(function(key) {
     var paramKey = changeCase.paramCase(key);
     var value = options[paramKey];
-    if (options[paramKey] !== null) {
+    if (value !== null) {
       switch (mainOptions[key][1]) {
         case 'json':
           minifyOptions[key] = parseJSONOption(value);
           break;
         case 'json-regex':
-          minifyOptions[key] = parseJSONOption(value, { regexArray: true });
+          minifyOptions[key] = parseJSONOption(value, true);
           break;
         case 'string-regex':
           minifyOptions[key] = stringToRegExp(value);
           break;
+        case 'site-url':
+          minifyOptions[key] = { site: value };
+          break;
         case true:
           minifyOptions[key] = value;
           break;
@@ -281,16 +291,12 @@ cli.main(function(args, options) {
     minifyOptions.lint = new HTMLLint();
   }
 
-  if (args.length) {
-    input = args;
-  }
-
   if (options['input-dir'] || options['output-dir']) {
     var inputDir = options['input-dir'];
     var outputDir = options['output-dir'];
 
     if (!inputDir) {
-      cli.error('The option output-dir need to be use with the option include-dir. If you are working with only 1 file, use -o.');
+      cli.error('The option output-dir needs to be used with the option input-dir. If you are working with a single file, use -o.');
       cli.exit(2);
     }
 
@@ -298,7 +304,7 @@ cli.main(function(args, options) {
       fs.statSync(inputDir);
     }
     catch (e) {
-      cli.error('The input directory does not exits');
+      cli.error('The input directory does not exist');
       cli.exit(2);
     }
 
@@ -309,27 +315,23 @@ cli.main(function(args, options) {
     }
 
     try {
-      processDirectory(inputDir, outputDir);
+      cli.exit(processDirectory(inputDir, outputDir));
     }
     catch (e) {
-      cli.error('Something wrong happened');
+      cli.error('Error while processing input files');
       cli.error(e);
       cli.exit(3);
     }
-
-    cli.exit(0);
-    return;
   }
 
   if (options.output) {
     output = options.output;
   }
 
-  if (input !== null) { // Minifying one or more files specified on the CMD line
-
+  if (args.length) { // Minifying one or more files specified on the CMD line
     var original = '';
 
-    input.forEach(function(afile) {
+    args.forEach(function(afile) {
       try {
         original += fs.readFileSync(afile, 'utf8');
       }
@@ -339,10 +341,11 @@ cli.main(function(args, options) {
       }
     });
 
-    runMinify(original, output);
-
+    cli.exit(runMinify(original, output));
   }
   else { // Minifying input coming from STDIN
-    process.stdin.pipe(concat({ encoding: 'string' }, runMinify));
+    process.stdin.pipe(concat({ encoding: 'string' }, function(content) {
+      cli.exit(runMinify(content, output));
+    }));
   }
 });