some improves, works with webpack-html-plugin and like loader with extract loader

Author: rorkflash

index.js

@@ -6,14 +6,16 @@ var ejs = require('ejs'),
   merge = require('merge');
 
 
-module.exports = function (source) {
+module.exports = function(source) {
   this.cacheable && this.cacheable();
-
   var query = typeof this.query === 'object' ? this.query : utils.parseQuery(this.query);
   var _options = typeof this.options === 'object' ? this.options['ejs-compiled-loader'] || {} : {};
   _options = typeof utils.getOptions === 'function' ? merge(utils.getOptions(this), _options) : _options;
   var opts = merge(_options, query);
-  opts.client = true;
+
+  if (opts.client == undefined) {
+    opts.client = true;
+  }
 
   // Skip compile debug for production when running with
   // webpack --optimize-minimize
@@ -31,11 +33,14 @@ module.exports = function (source) {
   var template = ejs.compile(source, opts);
 
   // Beautify javascript code
-  if (!this.minimize && opts.beautify !== false) {
-    var ast = UglifyJS.parse(template.toString());
-    ast.figure_out_scope();
-    template = ast.print_to_string({beautify: true});
+  if (this.loaders.length > 1) {
+    template = JSON.stringify(template());
+  } else {
+    if (!this.minimize && opts.beautify !== false) {
+      var ast = UglifyJS.parse(template.toString());
+      ast.figure_out_scope();
+      template = ast.print_to_string({beautify: true});
+    }
   }
-
   return 'module.exports = ' + template;
 };