fix: fix hash generation for light-mode

fix #159
jantimon · Aug 16, 2019 · 67a8850 · 67a8850
1 parent 3fe5163
commit 67a8850
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -3,6 +3,7 @@ const child = require('./compiler');
 const Oracle = require('./oracle');
 const { tap, tapHtml, getAssetPath } = require('./compat');
 const path = require('path');
+const crypto = require('crypto');
 
 const faviconCompilations = new WeakMap();
 
@@ -105,13 +106,20 @@ module.exports = class FaviconsWebpackPlugin {
     return new Promise((resolve, reject) => {
       const logoFileName = path.resolve(compilation.compiler.context, this.options.logo);
       const webpackPublicPath = compilation.outputOptions.publicPath || '/';
-      const outputPath = webpackPublicPath + getAssetPath(compilation, this.options.prefix, {hash: compilation.hash, chunk: {}});
       const faviconExt = path.extname(this.options.logo);
-      const logoOutputPath = outputPath + 'favicon' + faviconExt;
+      // Copy file to output directory
       compiler.inputFileSystem.readFile(logoFileName, (err, content) => {
         if (err) {
           return reject(err);
         }
+        const hasher = crypto.createHash("md5");
+        hasher.update(content.toString('utf8'));
+        const hash = hasher.digest('hex');
+        const outputPath = webpackPublicPath + getAssetPath(compilation, this.options.prefix, {hash, chunk: {
+          hash: hash,
+          contentHash: hash
+        }});
+        const logoOutputPath = outputPath + (outputPath.substr(-1) === '/' ? '' : '/') + 'favicon' + faviconExt;  
         compilation.assets[logoOutputPath] = {
           source: () => content,
           size: () => content.length

diff --git a/test/fixtures/expected/prefixedlight/custom/prefix/98487f08/favicon.png b/test/fixtures/expected/prefixedlight/custom/prefix/98487f08/favicon.png
diff --git a/test/fixtures/expected/prefixedlight/index.html b/test/fixtures/expected/prefixedlight/index.html
@@ -0,0 +1 @@
+<!doctype html><html><head><link rel="icon" href="/custom/prefix/98487f08/favicon.png"></head><body></body></html>
diff --git a/test/fixtures/expected/prefixedlight/main.js b/test/fixtures/expected/prefixedlight/main.js
diff --git a/test/prefixed.test.js b/test/prefixed.test.js
@@ -24,4 +24,20 @@ test('should allow configuring the output prefix', async t => {
   t.deepEqual(await compare(dist, path.resolve(expected, 'prefixed')), []);
 });
 
+test('should allow configuring the output prefix for light mode', async t => {
+  const dist = path.join(t.context.root, 'dist');
+  await generate({
+    context: t.context.root,
+    output: {
+      path: dist,
+    },
+    plugins: [
+      new HtmlWebpackPlugin(),
+      new FaviconsWebpackPlugin({ logo, mode:'light', prefix: 'custom/prefix/[hash:8]' }),
+    ],
+  });
+
+  t.deepEqual(await compare(dist, path.resolve(expected, 'prefixedlight')), []);
+});
+
 test.afterEach(t => fs.remove(t.context.root));