Use lodash to solve dependency issues for the fallback loader

Jan Nicklas · Jan Nicklas · commit 8e89ea23decb · 2015-06-29T16:52:50.000+02:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ HTML Webpack Plugin
 This is a [webpack](http://webpack.github.io/) plugin that simplifies creation of HTML files to serve your
 webpack bundles. This is especially useful for webpack bundles that include
 a hash in the filename which changes every compilation. You can either let the plugin generate an HTML file for you or supply
-your own template (using [blueimp templates](https://github.com/blueimp/JavaScript-Templates)).
+your own template (using lodash/ejs templates.
 
 Installation
 ------------
@@ -70,7 +70,7 @@ Allowed values are as follows:
 - `hash`: `true | false` if `true` then append a unique webpack compilation hash to all
   included scripts and css files. This is useful for cache busting.
 - `chunks`: Allows you to add only some chunks (e.g. only the unit-test chunk)
-- `excludeChunks`: Allows you to skip some chunks (e.g. don't add the unit-test chunk) 
+- `excludeChunks`: Allows you to skip some chunks (e.g. don't add the unit-test chunk)
 
 Here's an example webpack config illustrating how to use these options:
 ```javascript
@@ -121,7 +121,7 @@ and favicon files into the markup.
 ```javascript
 plugins: [
   new HtmlWebpackPlugin({
-    title: 'Custom template', 
+    title: 'Custom template',
     template: 'my-index.html', // Load a custom template
     inject: 'body' // Inject all scripts into the body
   })
@@ -135,7 +135,7 @@ plugins: [
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-    <title>{%=o.htmlWebpackPlugin.options.title}</title>
+    <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
   </body>
@@ -153,7 +153,7 @@ plugins: [
 ]
 ```
 
-You can use the [blueimp template](https://github.com/blueimp/JavaScript-Templates) syntax out of the box.
+You can use the lodash/ejs syntax out of the box.
 If the `inject` feature doesn't fit your needs and you want full control over the asset placement use the [default template](https://github.com/ampedandwired/html-webpack-plugin/blob/master/default_index.html)
 as a starting point for writing your own.
 
diff --git a/default_index.html b/default_index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>{%=o.htmlWebpackPlugin.options.title %}</title>
+    <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
   </body>
diff --git a/index.js b/index.js
@@ -27,7 +27,7 @@ function HtmlWebpackPlugin(options) {
   }, options);
   // If the template doesn't use a loader use the blueimp template loader
   if(this.options.template.indexOf('!') === -1) {
-    this.options.template = 'blueimp-tmpl!' + path.resolve(this.options.template);
+    this.options.template = require.resolve('./loader.js') + '!' + path.resolve(this.options.template);
   }
   // Resolve template path
   this.options.template = this.options.template.replace(
@@ -302,7 +302,7 @@ HtmlWebpackPlugin.prototype.htmlWebpackPluginAssets = function(compilation, chun
 
   // Use the configured public path or build a relative path
   var publicPath = typeof compilation.options.output.publicPath !== 'undefined' ?
-      compilation.options.output.publicPath : 
+      compilation.options.output.publicPath :
       path.relative(path.dirname(self.options.filename), '.');
 
   if (publicPath.length && publicPath.substr(-1, 1) !== '/') {
diff --git a/loader.js b/loader.js
@@ -0,0 +1,20 @@
+var _ = require('lodash');
+var loaderUtils = require('loader-utils');
+
+module.exports = function (source) {
+  'use strict';
+  var allLoadersButThisOne = this.loaders.filter(function(loader) {
+    return loader.module !== module.exports;
+  });
+  // This loader shouldn't kick in if there is any other loader
+  if (allLoadersButThisOne.length > 0) {
+    return source;
+  }
+  // Use underscore for a minimalistic loader
+  if (this.cacheable) {
+    this.cacheable();
+  }
+  var options = loaderUtils.parseQuery(this.query);
+  var template = _.template(source, options);
+  return 'module.exports = ' + template;
+};
diff --git a/package.json b/package.json
@@ -42,9 +42,8 @@
   },
   "dependencies": {
     "bluebird": "^2.9.25",
-    "blueimp-tmpl": "^2.5.4",
-    "blueimp-tmpl-loader": "0.0.3",
     "html-minifier": "^0.7.2",
+    "loader-utils": "^0.2.10",
     "lodash": "~3.9.3",
     "raw-loader": "^0.5.1"
   }
diff --git a/spec/fixtures/webpackconfig.html b/spec/fixtures/webpackconfig.html
@@ -5,7 +5,7 @@
     <title>Test</title>
   </head>
   <body>
-    <p>Public path is {%=o.webpackConfig.output.publicPath%}</p>
-    <script src="{%=o.htmlWebpackPlugin.files.chunks.app.entry%}"></script>
+    <p>Public path is <%= webpackConfig.output.publicPath %></p>
+    <script src="<%= htmlWebpackPlugin.files.chunks.app.entry %>"></script>
   </body>
 </html>
