From af6673800818d9bdb4d94461e6a6ae5049b5c359 Mon Sep 17 00:00:00 2001
From: Christian Weiss <cweiss@stripe.com>
Date: Fri, 1 Apr 2016 10:34:59 -0700
Subject: [PATCH 1/2] add support for [hash] in filename

---
 index.js            | 14 ++++++++++----
 spec/BasicSpec.js   | 21 +++++++++++++++++++++
 spec/CachingSpec.js | 24 +++++++++++++++++-------
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/index.js b/index.js
index 762d0962..0931ddc6 100644
--- a/index.js
+++ b/index.js
@@ -43,8 +43,12 @@ HtmlWebpackPlugin.prototype.apply = function (compiler) {
   }
 
   compiler.plugin('make', function (compilation, callback) {
+    // Remove occurences of '[hash]' in the filename so the child
+    // compiler does not try to replace it.
+    var escapedFilename = self.options.filename.replace('[hash]', '');
+
     // Compile the template (queued)
-    compilationPromise = childCompiler.compileTemplate(self.options.template, compiler.context, self.options.filename, compilation)
+    compilationPromise = childCompiler.compileTemplate(self.options.template, compiler.context, escapedFilename, compilation)
       .catch(function (err) {
         compilation.errors.push(prettyError(err, compiler.context).toString());
         return {
@@ -149,8 +153,9 @@ HtmlWebpackPlugin.prototype.apply = function (compiler) {
         return self.options.showErrors ? prettyError(err, compiler.context).toHtml() : 'ERROR';
       })
       .then(function (html) {
+        var outputFilename = self.options.filename.replace('[hash]', self.childCompilerHash);
         // Replace the compilation result with the evaluated html code
-        compilation.assets[self.options.filename] = {
+        compilation.assets[outputFilename] = {
           source: function () {
             return html;
           },
@@ -158,11 +163,12 @@ HtmlWebpackPlugin.prototype.apply = function (compiler) {
             return html.length;
           }
         };
+        return outputFilename;
       })
-      .then(function () {
+      .then(function (outputFilename) {
         // Let other plugins know that we are done:
         return applyPluginsAsyncWaterfall('html-webpack-plugin-after-emit', {
-          html: compilation.assets[self.options.filename],
+          html: compilation.assets[outputFilename],
           plugin: self
         });
       })
diff --git a/spec/BasicSpec.js b/spec/BasicSpec.js
index fc70fd09..bf8de01c 100644
--- a/spec/BasicSpec.js
+++ b/spec/BasicSpec.js
@@ -38,6 +38,14 @@ function testHtmlPlugin (webpackConfig, expectedResults, outputFile, done, expec
     } else {
       expect(compilationWarnings).toBe('');
     }
+    if (outputFile instanceof RegExp) {
+      var matches = Object.keys(stats.compilation.assets).filter(function (item) {
+        return outputFile.test(item);
+      });
+      expect(matches.length).toBe(1);
+      outputFile = matches[0];
+    }
+    expect(outputFile.indexOf('[hash]') === -1).toBe(true);
     var outputFileExists = fs.existsSync(path.join(OUTPUT_DIR, outputFile));
     expect(outputFileExists).toBe(true);
     if (!outputFileExists) {
@@ -573,6 +581,19 @@ describe('HtmlWebpackPlugin', function () {
     }, ['<script src="index_bundle.js"'], 'test.html', done);
   });
 
+  it('will replace [hash] in the filename with the child compilation hash', function (done) {
+    testHtmlPlugin({
+      entry: path.join(__dirname, 'fixtures/index.js'),
+      output: {
+        path: OUTPUT_DIR,
+        filename: 'index_bundle.js'
+      },
+      plugins: [new HtmlWebpackPlugin({
+        filename: 'test-[hash].html'
+      })]
+    }, ['<script src="index_bundle.js"'], /test-\S+\.html$/, done);
+  });
+
   it('allows you to use an absolute output filename', function (done) {
     testHtmlPlugin({
       entry: path.join(__dirname, 'fixtures/index.js'),
diff --git a/spec/CachingSpec.js b/spec/CachingSpec.js
index 0e026591..4e8e0d8b 100644
--- a/spec/CachingSpec.js
+++ b/spec/CachingSpec.js
@@ -10,6 +10,7 @@ if (!global.Promise) {
   require('es6-promise').polyfill();
 }
 
+var _ = require('lodash');
 var path = require('path');
 var webpack = require('webpack');
 var rm_rf = require('rimraf');
@@ -39,6 +40,14 @@ function getCompiledModuleCount (statsJson) {
   }, 0);
 }
 
+var baseConfigurations = [
+  {},
+  {
+    filename: 'test-[hash].html'
+  }
+];
+
+baseConfigurations.forEach(function (baseConfiguration) {
 describe('HtmlWebpackPluginCaching', function () {
   beforeEach(function (done) {
     rm_rf(OUTPUT_DIR, done);
@@ -46,9 +55,9 @@ describe('HtmlWebpackPluginCaching', function () {
 
   it('should compile nothing if no file was changed', function (done) {
     var template = path.join(__dirname, 'fixtures/plain.html');
-    var htmlWebpackPlugin = new HtmlWebpackPlugin({
+    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
       template: template
-    });
+    }));
     var childCompilerHash;
     var compiler = setUpCompiler(htmlWebpackPlugin);
     compiler.run()
@@ -72,7 +81,7 @@ describe('HtmlWebpackPluginCaching', function () {
   });
 
   it('should not compile the webpack html file if only a javascript file was changed', function (done) {
-    var htmlWebpackPlugin = new HtmlWebpackPlugin();
+    var htmlWebpackPlugin = new HtmlWebpackPlugin(baseConfiguration);
     var compiler = setUpCompiler(htmlWebpackPlugin);
     var childCompilerHash;
     compiler.run()
@@ -97,9 +106,9 @@ describe('HtmlWebpackPluginCaching', function () {
   });
 
   it('should compile the webpack html file even if only a javascript file was changed if caching is disabled', function (done) {
-    var htmlWebpackPlugin = new HtmlWebpackPlugin({
+    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
       cache: false
-    });
+    }));
     var childCompilerHash;
     var compiler = setUpCompiler(htmlWebpackPlugin);
     compiler.run()
@@ -125,9 +134,9 @@ describe('HtmlWebpackPluginCaching', function () {
 
   it('should compile the webpack html if the template file was changed', function (done) {
     var template = path.join(__dirname, 'fixtures/plain.html');
-    var htmlWebpackPlugin = new HtmlWebpackPlugin({
+    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
       template: template
-    });
+    }));
     var childCompilerHash;
     var compiler = setUpCompiler(htmlWebpackPlugin);
     compiler.run()
@@ -151,3 +160,4 @@ describe('HtmlWebpackPluginCaching', function () {
       .then(done);
   });
 });
+});

From 67f35743c9255430ead8cde18fdcd98d9ca12bea Mon Sep 17 00:00:00 2001
From: Christian Weiss <cweiss@stripe.com>
Date: Fri, 1 Apr 2016 10:35:20 -0700
Subject: [PATCH 2/2] fix whitespace in caching spec

---
 spec/CachingSpec.js | 214 ++++++++++++++++++++++----------------------
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/spec/CachingSpec.js b/spec/CachingSpec.js
index 4e8e0d8b..67b1b11d 100644
--- a/spec/CachingSpec.js
+++ b/spec/CachingSpec.js
@@ -48,116 +48,116 @@ var baseConfigurations = [
 ];
 
 baseConfigurations.forEach(function (baseConfiguration) {
-describe('HtmlWebpackPluginCaching', function () {
-  beforeEach(function (done) {
-    rm_rf(OUTPUT_DIR, done);
-  });
+  describe('HtmlWebpackPluginCaching', function () {
+    beforeEach(function (done) {
+      rm_rf(OUTPUT_DIR, done);
+    });
 
-  it('should compile nothing if no file was changed', function (done) {
-    var template = path.join(__dirname, 'fixtures/plain.html');
-    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
-      template: template
-    }));
-    var childCompilerHash;
-    var compiler = setUpCompiler(htmlWebpackPlugin);
-    compiler.run()
-      // Change the template file and compile again
-      .then(function () {
-        childCompilerHash = htmlWebpackPlugin.childCompilerHash;
-        return compiler.run();
-      })
-      .then(function (stats) {
-        // Verify that no file was built
-        expect(getCompiledModuleCount(stats.toJson()))
-          .toBe(0);
-        // Verify that the html was processed only during the inital build
-        expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
-          .toBe(1);
-        // Verify that the child compilation was executed twice
-        expect(htmlWebpackPlugin.childCompilerHash)
-          .toBe(childCompilerHash);
-      })
-      .then(done);
-  });
+    it('should compile nothing if no file was changed', function (done) {
+      var template = path.join(__dirname, 'fixtures/plain.html');
+      var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
+        template: template
+      }));
+      var childCompilerHash;
+      var compiler = setUpCompiler(htmlWebpackPlugin);
+      compiler.run()
+        // Change the template file and compile again
+        .then(function () {
+          childCompilerHash = htmlWebpackPlugin.childCompilerHash;
+          return compiler.run();
+        })
+        .then(function (stats) {
+          // Verify that no file was built
+          expect(getCompiledModuleCount(stats.toJson()))
+            .toBe(0);
+          // Verify that the html was processed only during the inital build
+          expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
+            .toBe(1);
+          // Verify that the child compilation was executed twice
+          expect(htmlWebpackPlugin.childCompilerHash)
+            .toBe(childCompilerHash);
+        })
+        .then(done);
+    });
 
-  it('should not compile the webpack html file if only a javascript file was changed', function (done) {
-    var htmlWebpackPlugin = new HtmlWebpackPlugin(baseConfiguration);
-    var compiler = setUpCompiler(htmlWebpackPlugin);
-    var childCompilerHash;
-    compiler.run()
-      // Change a js file and compile again
-      .then(function () {
-        childCompilerHash = htmlWebpackPlugin.childCompilerHash;
-        compiler.simulateFileChange(path.join(__dirname, 'fixtures/index.js'), {footer: '//1'});
-        return compiler.run();
-      })
-      .then(function (stats) {
-        // Verify that only one file was built
-        expect(getCompiledModuleCount(stats.toJson()))
-          .toBe(1);
-        // Verify that the html was processed only during the inital build
-        expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
-          .toBe(1);
-        // Verify that the child compilation was executed only once
-        expect(htmlWebpackPlugin.childCompilerHash)
-          .toBe(childCompilerHash);
-      })
-      .then(done);
-  });
+    it('should not compile the webpack html file if only a javascript file was changed', function (done) {
+      var htmlWebpackPlugin = new HtmlWebpackPlugin(baseConfiguration);
+      var compiler = setUpCompiler(htmlWebpackPlugin);
+      var childCompilerHash;
+      compiler.run()
+        // Change a js file and compile again
+        .then(function () {
+          childCompilerHash = htmlWebpackPlugin.childCompilerHash;
+          compiler.simulateFileChange(path.join(__dirname, 'fixtures/index.js'), {footer: '//1'});
+          return compiler.run();
+        })
+        .then(function (stats) {
+          // Verify that only one file was built
+          expect(getCompiledModuleCount(stats.toJson()))
+            .toBe(1);
+          // Verify that the html was processed only during the inital build
+          expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
+            .toBe(1);
+          // Verify that the child compilation was executed only once
+          expect(htmlWebpackPlugin.childCompilerHash)
+            .toBe(childCompilerHash);
+        })
+        .then(done);
+    });
 
-  it('should compile the webpack html file even if only a javascript file was changed if caching is disabled', function (done) {
-    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
-      cache: false
-    }));
-    var childCompilerHash;
-    var compiler = setUpCompiler(htmlWebpackPlugin);
-    compiler.run()
-      // Change a js file and compile again
-      .then(function () {
-        childCompilerHash = htmlWebpackPlugin.childCompilerHash;
-        compiler.simulateFileChange(path.join(__dirname, 'fixtures/index.js'), {footer: '//1'});
-        return compiler.run();
-      })
-      .then(function (stats) {
-        // Verify that only one file was built
-        expect(getCompiledModuleCount(stats.toJson()))
-          .toBe(1);
-        // Verify that the html was processed on every run
-        expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
-          .toBe(2);
-        // Verify that the child compilation was executed only once
-        expect(htmlWebpackPlugin.childCompilerHash)
-          .toBe(childCompilerHash);
-      })
-      .then(done);
-  });
+    it('should compile the webpack html file even if only a javascript file was changed if caching is disabled', function (done) {
+      var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
+        cache: false
+      }));
+      var childCompilerHash;
+      var compiler = setUpCompiler(htmlWebpackPlugin);
+      compiler.run()
+        // Change a js file and compile again
+        .then(function () {
+          childCompilerHash = htmlWebpackPlugin.childCompilerHash;
+          compiler.simulateFileChange(path.join(__dirname, 'fixtures/index.js'), {footer: '//1'});
+          return compiler.run();
+        })
+        .then(function (stats) {
+          // Verify that only one file was built
+          expect(getCompiledModuleCount(stats.toJson()))
+            .toBe(1);
+          // Verify that the html was processed on every run
+          expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
+            .toBe(2);
+          // Verify that the child compilation was executed only once
+          expect(htmlWebpackPlugin.childCompilerHash)
+            .toBe(childCompilerHash);
+        })
+        .then(done);
+    });
 
-  it('should compile the webpack html if the template file was changed', function (done) {
-    var template = path.join(__dirname, 'fixtures/plain.html');
-    var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
-      template: template
-    }));
-    var childCompilerHash;
-    var compiler = setUpCompiler(htmlWebpackPlugin);
-    compiler.run()
-      // Change the template file and compile again
-      .then(function () {
-        childCompilerHash = htmlWebpackPlugin.childCompilerHash;
-        compiler.simulateFileChange(template, {footer: '<!-- 1 -->'});
-        return compiler.run();
-      })
-      .then(function (stats) {
-        // Verify that only one file was built
-        expect(getCompiledModuleCount(stats.toJson()))
-          .toBe(1);
-        // Verify that the html was processed twice
-        expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
-          .toBe(2);
-        // Verify that the child compilation was executed twice
-        expect(htmlWebpackPlugin.childCompilerHash)
-          .not.toBe(childCompilerHash);
-      })
-      .then(done);
+    it('should compile the webpack html if the template file was changed', function (done) {
+      var template = path.join(__dirname, 'fixtures/plain.html');
+      var htmlWebpackPlugin = new HtmlWebpackPlugin(_.assign(baseConfiguration, {
+        template: template
+      }));
+      var childCompilerHash;
+      var compiler = setUpCompiler(htmlWebpackPlugin);
+      compiler.run()
+        // Change the template file and compile again
+        .then(function () {
+          childCompilerHash = htmlWebpackPlugin.childCompilerHash;
+          compiler.simulateFileChange(template, {footer: '<!-- 1 -->'});
+          return compiler.run();
+        })
+        .then(function (stats) {
+          // Verify that only one file was built
+          expect(getCompiledModuleCount(stats.toJson()))
+            .toBe(1);
+          // Verify that the html was processed twice
+          expect(htmlWebpackPlugin.evaluateCompilationResult.calls.count())
+            .toBe(2);
+          // Verify that the child compilation was executed twice
+          expect(htmlWebpackPlugin.childCompilerHash)
+            .not.toBe(childCompilerHash);
+        })
+        .then(done);
+    });
   });
 });
-});