htmlminify, fixes bazilio91#9

Author: bazilio91

.editorconfig

@@ -0,0 +1,6 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+indent_style = space
+indent_size = 2

README.md

@@ -24,6 +24,34 @@ template(data) // Pass object with data
 <%- include templates/child -%>
 ```
 
+## Options
+
+Following options can be specified in query:
+
+`beatify` — enable or disable uglify-js beautify of teamplate ast
+
+`compileDebug` — see ejs compileDebug option
+
+`htmlmin` — see [htmlminify section](#htmlminify)
+
+## htmlminify
+
+```javascript
+module: {
+  loaders: [
+    {test: /\.ejs$/, loader: 'ejs-compiled?htmlmin'} // enable here
+  ]
+},
+'ejs-compiled-loader': {
+  'htmlmin': true, // or enable here  
+  'htmlminOptions': {
+    removeComments: true
+  }
+}
+```
+
+See [all options reference](https://github.com/kangax/html-minifier#options-quick-reference)
+
 ## License
 
 MIT (http://www.opensource.org/licenses/mit-license.php)

index.js

@@ -1,12 +1,14 @@
 var ejs = require('ejs'),
   UglifyJS = require('uglify-js'),
   utils = require('loader-utils'),
-  path = require('path');
+  path = require('path'),
+  htmlmin = require('html-minifier'),
+  merge = require('merge');
 
 
 module.exports = function (source) {
   this.cacheable && this.cacheable();
-  var opts = utils.parseQuery(this.query);
+  var opts = merge(this.options['ejs-compiled-loader'] || {}, utils.parseQuery(this.query));
   opts.client = true;
 
   // Skip compile debug for production when running with
@@ -18,6 +20,10 @@ module.exports = function (source) {
   // Use filenames relative to working dir, which should be project root
   opts.filename = path.relative(process.cwd(), this.resourcePath);
 
+  if (opts.htmlmin) {
+    source = htmlmin.minify(source, opts['htmlminOptions'] || {});
+  }
+
   var template = ejs.compile(source, opts);
 
   // Beautify javascript code

test/app.js

@@ -3,8 +3,11 @@ const assert = require('assert');
 var tpl = require("./template.ejs");
 assert.equal(tpl({noun: "World"}), 'Hello, World!');
 
+var tpl3 = require("./subdir/parent.ejs");
+assert.equal(tpl3({foo: "foo"}), "parent: child: foo\n");
+
+var tpl4 = require("./htmlmin.ejs");
+assert.equal(tpl4({test: 123}), '123');
+
 var tpl2 = require("!!../?delimiter=?!./template2.ejs");
 assert.equal(tpl2({hobbies: ["food", "code"]}).trimRight(), "  I like food.\n  I like code.");
-
-var tpl3 = require("./subdir/parent.ejs");
-assert.equal(tpl3({foo: "foo"}), "parent: child: foo\n\n");

test/htmlmin.ejs

@@ -0,0 +1 @@
+<!-- test minify --><%= test %>

test/template.ejs

@@ -1 +1 @@
-Hello, <%=noun%>!
+Hello, <%=noun%>!

test/webpack.config.js

@@ -1,12 +1,18 @@
 module.exports = {
-    entry: "./app.js",
-    output: {
-        path: __dirname,
-        filename: "bundle.js"
-    },
-    module: {
-        loaders: [
-            { test: /\.ejs$/, loader: require.resolve("../") }
-        ]
+  entry: "./app.js",
+  cache: false,
+  output: {
+    path: __dirname,
+    filename: "bundle.js"
+  },
+  module: {
+    loaders: [
+      {test: /\.ejs$/, loader: require.resolve("../") + "?htmlmin"}
+    ]
+  },
+  'ejs-compiled-loader': {
+    'htmlminOptions': {
+      removeComments: true
     }
-}
+  }
+}