git push origin masterMerge branch 'vwochnik-master'

README.md

@@ -32,6 +32,16 @@ rollup({
       // You can pass options to _.template(code, templateOptions)
       templateOptions: {
         variable: 'data' // default variable for template is 'data',
+      },
+
+      // You can enable HTML minification before the template is compiled
+      // by default turned off
+      minify: true,
+
+      // You can pass options to HTMLMinifier
+      // see github.com/kangax/html-minifier for documentation
+      minifyOptions: {
+        collapseWhitespace: true
       }
     }),
     resolve({

package.json

@@ -2,18 +2,18 @@
   "name": "rollup-plugin-jst",
   "version": "1.0.1",
   "description": "",
-  "main": "dist/rollup-plugin-jst.cjs.js",
   "scripts": {
     "test": "mocha test/test.js"
   },
   "author": "Denis Bardadym <bardadymchik@gmail.com>",
   "license": "MIT",
-  "jsnext:main": "src/index.js",
+  "main": "src/index.js",
   "files": [
     "src/",
     "README.md"
   ],
   "dependencies": {
+    "html-minifier": "^3.5.6",
     "lodash": "^4.9.0",
     "rollup-pluginutils": "^2.0.1"
   },

src/index.js

@@ -2,14 +2,19 @@ const { extname } = require("path");
 const { createFilter } = require("rollup-pluginutils");
 
 const template = require("lodash/template");
+const htmlMinifier = require("html-minifier");
 
-export default function(options = {}) {
+module.exports = function(options = {}) {
   const filter = createFilter(options.include, options.exclude);
 
   const extensions = options.extensions || [".html", ".ejs", ".jst"];
 
   const templateOptions = options.templateOptions || { variable: "data" };
 
+  const minify = options.minify || false;
+
+  const minifyOptions = options.minifyOptions || {};
+
   return {
     transform(code, id) {
       if (!filter(id)) {
@@ -20,6 +25,10 @@ export default function(options = {}) {
         return null;
       }
 
+      if (minify) {
+        code = htmlMinifier.minify(code, minifyOptions);
+      }
+
       const tpl = template(code, templateOptions);
 
       let hasEscape = false;
@@ -36,4 +45,4 @@ export default function(options = {}) {
       `;
     }
   };
-}
+};

test/sample/c.ejs

@@ -0,0 +1,3 @@
+ <div  >
+  <p>   <%= data %></p >
+</div>

test/test.js

@@ -14,17 +14,24 @@ function executeBundle(bundle) {
 }
 
 describe("rollup-plugin-jst", () => {
-  it("compiles a component - escape", () => {
+  it("escape", () => {
     return rollup({
       input: "sample/a.ejs",
       plugins: [jst()]
     }).then(executeBundle);
   });
 
-  it("compiles a component - noescape", () => {
+  it("noescape", () => {
     return rollup({
       input: "sample/b.ejs",
       plugins: [jst()]
     }).then(executeBundle);
   });
+
+  it("htmlclean", () => {
+    return rollup({
+      input: "sample/c.ejs",
+      plugins: [jst({ minify: true, minifyOptions: { collapseWhitespace: true } })]
+    }).then(executeBundle);
+  });
 });