Merge pull request #30 from yardnsm/2.x

Use loader options if available for webpack 2
bazilio91 · Aug 31, 2017 · 6fea14b · 6fea14b
2 parents 3f164f1 + da13336
commit 6fea14b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -8,7 +8,9 @@ var ejs = require('ejs'),
 
 module.exports = function (source) {
   this.cacheable && this.cacheable();
-  var opts = merge(this.options['ejs-compiled-loader'] || {}, utils.parseQuery(this.query));
+
+  var query = typeof this.query === 'object' ? this.query : utils.parseQuery(this.query);
+  var opts = merge(this.options['ejs-compiled-loader'] || {}, query);
   opts.client = true;
 
   // Skip compile debug for production when running with