diff --git a/lib/loader.js b/lib/loader.js index 21396c3..16b6ef1 100644 --- a/lib/loader.js +++ b/lib/loader.js @@ -20,8 +20,31 @@ module.exports = function (source) { if (/\.js$/.test(this.request)) { return source; } - // Use underscore for a minimalistic loader + + // The following part renders the tempalte with lodash as aminimalistic loader + // + // Get templating options var options = loaderUtils.parseQuery(this.query); - var template = _.template(source, options); - return 'var _ = require(' + loaderUtils.stringifyRequest(this, require.resolve('lodash')) + ');module.exports = ' + template; + // Webpack 2 does not allow with() statements, which lodash templates use to unwrap + // the parameters passed to the compiled template inside the scope. We therefore + // need to unwrap them ourselves here. This is essentially what lodash does internally + // To tell lodash it should not use with we set a variable + var template = _.template(source, _.defaults(options, { variable: 'data' })); + // All templateVariables which should be available + // @see HtmlWebpackPlugin.prototype.executeTemplate + var templateVariables = [ + 'webpack', + 'webpackConfig', + 'htmlWebpackPlugin' + ]; + return 'var _ = require(' + loaderUtils.stringifyRequest(this, require.resolve('lodash')) + ');' + + 'module.exports = function (templateParams) {' + + // Declare the template variables in the outer scope of the + // lodash template to unwrap them + templateVariables.map(function (variableName) { + return 'var ' + variableName + ' = templateParams.' + variableName; + }).join(';') + ';' + + // Execute the lodash template + 'return (' + template.source + ')();' + + '}'; };