Feature/loaders

appveyor.yml

@@ -0,0 +1,23 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+
+environment:
+  matrix:
+    - nodejs_version: 0.10
+    - nodejs_version: 0.12
+    - nodejs_version: 4
+
+version: "{build}"
+build: off
+deploy: off
+matrix:
+  fast_finish: true
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+test_script:
+  - node --version
+  - npm --version
+  - npm test

index.js

@@ -35,22 +35,20 @@ HtmlWebpackPlugin.prototype.apply = function(compiler) {
 
   compiler.plugin('make', function(compilation, callback) {
     // Compile the template (queued)
-    compilationPromise = getNextCompilationSlot(compiler, function() {
-      return childCompiler.compileTemplate(self.options.template, compiler.context, self.options.filename, compilation)
-        .catch(function(err) {
-          compilation.errors.push(prettyError(err, compiler.context).toString());
-          return {
-            content: self.options.showErrors ? prettyError(err, compiler.context).toJsonHtml() : 'ERROR',
-          };
-        })
-        .then(function(compilationResult) {
-          // If the compilation change didnt change the cache is valid
-          isCompilationCached = compilationResult.hash && self.hash === compilationResult.hash;
-          self.hash = compilation.hash;
-          callback();
-          return compilationResult.content;
-        });
-    });
+    compilationPromise = childCompiler.compileTemplate(self.options.template, compiler.context, self.options.filename, compilation)
+      .catch(function(err) {
+        compilation.errors.push(prettyError(err, compiler.context).toString());
+        return {
+          content: self.options.showErrors ? prettyError(err, compiler.context).toJsonHtml() : 'ERROR'
+        };
+      })
+      .then(function(compilationResult) {
+        // If the compilation change didnt change the cache is valid
+        isCompilationCached = compilationResult.hash && self.hash === compilationResult.hash;
+        self.hash = compilation.hash;
+        callback();
+        return compilationResult.content;
+      });
   });
 
   compiler.plugin('after-compile', function(compilation, callback) {
@@ -498,14 +496,4 @@ HtmlWebpackPlugin.prototype.getFullTemplatePath = function(template, context) {
     });
 };
 
-/**
- * Helper to prevent html-plugin compilation in parallel
- * Fixes "No source available" where incomplete cache modules were used
- */
-function getNextCompilationSlot(compiler, newEntry) {
-  compiler.HtmlWebpackPluginQueue = (compiler.HtmlWebpackPluginQueue || Promise.resolve())
-    .then(newEntry);
-  return compiler.HtmlWebpackPluginQueue;
-}
-
 module.exports = HtmlWebpackPlugin;

lib/compiler.js

@@ -50,7 +50,11 @@ module.exports.compileTemplate = function compileTemplate(template, context, out
     new SingleEntryPlugin(this.context, template),
     new LoaderTargetPlugin('node')
   );
-  childCompiler.plugin("compilation", function(compilation) {
+
+  // Fix for "Uncaught TypeError: __webpack_require__(...) is not a function"
+  // Hot module replacement requires that every child compiler has its own
+  // cache. @see https://github.com/ampedandwired/html-webpack-plugin/pull/179
+  childCompiler.plugin('compilation', function(compilation) {
     if(compilation.cache) {
       if(!compilation.cache[compilerName])
         compilation.cache[compilerName] = {};

lib/loader.js

@@ -22,5 +22,5 @@ module.exports = function (source) {
   // Use underscore for a minimalistic loader
   var options = loaderUtils.parseQuery(this.query);
   var template = _.template(source, options);
-  return 'var _ = require("' + require.resolve('lodash') + '");module.exports = ' + template;
+  return 'var _ = require(' + loaderUtils.stringifyRequest(this, require.resolve('lodash')) + ');module.exports = ' + template;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-plugin",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "Simplifies creation of HTML files to serve your webpack bundles",
   "main": "index.js",
   "files": [