html-minifier 0.7.1 → 0.7.2

package/cli.js

@@ -4,7 +4,7 @@
  *
  * The MIT License (MIT)
  *
- *  Copyright (c) 2014 Zoltan Frombach
+ *  Copyright (c) 2014-2015 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
@@ -69,7 +69,10 @@ var mainOptions = {
   preventAttributesEscaping: [[false, 'Prevents the escaping of the values of attributes.']],
   useShortDoctype: [[false, 'Replaces the doctype with the short (HTML5) doctype']],
   removeEmptyAttributes: [[false, 'Remove all attributes with whitespace-only values']],
+  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']],
+  removeIgnored: [[false, 'Remove all tags starting and ending with <%, %>, <?, ?>']],
   removeEmptyElements: [[false, 'Remove all elements with empty contents']],
   lint: [[false, 'Toggle linting']],
   keepClosingSlash: [[false, 'Keep the trailing slash on singleton elements']],
@@ -79,7 +82,10 @@ var mainOptions = {
   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'],
   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'],
-  maxLineLength: [[false, 'Max line length', 'number'], true]
+  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'],
+  customAttrSurround: [[false, 'Arrays of regex\'es that allow to support custom attribute surround expressions (e.g. <input {{#if value}}checked="checked"{{/if}}>)', 'string'], 'json'],
+  customAttrCollapse: [[false, 'Regex that specifies custom attribute to strip newlines from (e.g. /ng\-class/)', 'string'], true]
 };
 
 var cliOptions = {
@@ -97,6 +103,56 @@ cli.parse(cliOptions);
 
 cli.main(function(args, options) {
 
+  function parseJSONOption(value) {
+    if (value !== null) {
+      var jsonArray;
+      try {
+        jsonArray = JSON.parse(value);
+      }
+      catch (e) {}
+      if (jsonArray instanceof Array) {
+        return jsonArray;
+      }
+      else {
+        return [value];
+      }
+    }
+  }
+
+  function runMinify(original) {
+    var status = 0;
+    var minified = null;
+    try {
+      minified = minify(original, minifyOptions);
+    }
+    catch (e) {
+      status = 3;
+      process.stderr.write('Error: Minification error');
+    }
+
+    if (minifyOptions.lint) {
+      minifyOptions.lint.populate();
+    }
+
+    if (minified !== null) {
+      // Write the output
+      try {
+        if (output !== null) {
+          fs.writeFileSync(path.resolve(output), minified);
+        }
+        else {
+          process.stdout.write(minified);
+        }
+      }
+      catch (e) {
+        status = 4;
+        process.stderr.write('Error: Cannot write to output');
+      }
+    }
+
+    cli.exit(status);
+  }
+
   if (options.version) {
     process.stderr.write(appName + ' v' + appVersion);
     cli.exit(0);
@@ -165,53 +221,4 @@ cli.main(function(args, options) {
     process.stdin.pipe(concat({ encoding: 'string' }, runMinify));
   }
 
-  function parseJSONOption(value) {
-    if (value !== null) {
-      var jsonArray;
-      try {
-        jsonArray = JSON.parse(value);
-      }
-      catch (e) {}
-      if (jsonArray instanceof Array) {
-        return jsonArray;
-      }
-      else {
-        return [value];
-      }
-    }
-  }
-
-  function runMinify(original) {
-    var status = 0;
-    var minified = null;
-    try {
-      minified = minify(original, minifyOptions);
-    }
-    catch (e) {
-      status = 3;
-      process.stderr.write('Error: Minification error');
-    }
-
-    if (minifyOptions.lint) {
-      minifyOptions.lint.populate();
-    }
-
-    if (minified !== null) {
-      // Write the output
-      try {
-        if (output !== null) {
-          fs.writeFileSync(path.resolve(output), minified);
-        }
-        else {
-          process.stdout.write(minified);
-        }
-      }
-      catch (e) {
-        status = 4;
-        process.stderr.write('Error: Cannot write to output');
-      }
-    }
-
-    cli.exit(status);
-  }
 });

package/dist/htmlminifier.js

@@ -1,5 +1,5 @@
 /*!
- * HTMLMinifier v0.7.1 (http://kangax.github.io/html-minifier/)
+ * HTMLMinifier v0.7.2 (http://kangax.github.io/html-minifier/)
  * Copyright 2010-2015 Juriy "kangax" Zaytsev
  * Licensed under MIT (https://github.com/kangax/html-minifier/blob/gh-pages/LICENSE)
  */

package/dist/htmlminifier.min.js

@@ -1,5 +1,5 @@
 /*!
- * HTMLMinifier v0.7.1 (http://kangax.github.io/html-minifier/)
+ * HTMLMinifier v0.7.2 (http://kangax.github.io/html-minifier/)
  * Copyright 2010-2015 Juriy "kangax" Zaytsev
  * Licensed under MIT (https://github.com/kangax/html-minifier/blob/gh-pages/LICENSE)
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "html-minifier",
   "description": "HTML minifier with lint-like capabilities.",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "keywords": [
     "html",
     "minifier",