fix: allow compiling multiple icon sets

jantimon · Jan 29, 2021 · 03c3514 · 03c3514
1 parent 8f0c1f6
commit 03c3514
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "favicons-webpack-plugin",
-  "version": "5.0.0-alpha.11",
+  "version": "5.0.0-alpha.12",
   "description": "Let webpack generate all your favicons and icons for you",
   "main": "src/index.js",
   "files": [

diff --git a/src/cache.js b/src/cache.js
@@ -39,8 +39,8 @@ function runCached(
   idGenerator,
   generator
 ) {
-  const logger = webpackLogger(compilation);
   const latestSnapShot = snapshots.get(pluginInstance);
+
   /** @type {Promise<TResult> | undefined} */
   const cachedFavicons = latestSnapShot && faviconCache.get(latestSnapShot);
 

diff --git a/src/index.js b/src/index.js
@@ -9,9 +9,6 @@ const url = require('url');
 const { resolvePublicPath, replaceContentHash } = require('./hash');
 const { webpackLogger } = require('./logger');
 
-/** @type {WeakMap<any, Promise<{tags: string[], assets: Array<{name: string, contents: import('webpack').sources.RawSource}>}>>} */
-const faviconCompilations = new WeakMap();
-
 class FaviconsWebpackPlugin {
   /**
    * @param {import('./options').FaviconWebpackPlugionOptions | string} args
@@ -48,6 +45,8 @@ class FaviconsWebpackPlugin {
     const webpack = compiler.webpack;
     const Compilation = webpack.Compilation;
     const oracle = new Oracle(compiler.context);
+    /** @type {WeakMap<any, Promise<{tags: string[], assets: Array<{name: string, contents: import('webpack').sources.RawSource}>}>>} */
+    const faviconCompilations = new WeakMap();
 
     {
       const {

diff --git a/test/light.multiple.test.js b/test/light.multiple.test.js
@@ -0,0 +1,27 @@
+const test = require('ava');
+const path = require('path');
+const fs = require('fs-extra');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const FaviconsWebpackPlugin = require('../');
+
+const { logo, mkdir, generate, snapshotCompilationAssets } = require('./util');
+
+test.beforeEach(async t => (t.context.root = await mkdir()));
+
+test('should generate multiple light icons', async t => {
+  const dist = path.join(t.context.root, 'dist');
+  const compilationStats = await generate({
+    context: t.context.root,
+    output: {
+      path: dist,
+      publicPath: '/'
+    },
+    plugins: [
+      new HtmlWebpackPlugin(),
+      new FaviconsWebpackPlugin({ logo, mode: 'light' }),
+      new FaviconsWebpackPlugin({ logo, mode: 'light', prefix: 'second/' })
+    ]
+  });
+
+  snapshotCompilationAssets(t, compilationStats);
+});
diff --git a/test/snapshots/light.multiple.test.js.md b/test/snapshots/light.multiple.test.js.md
@@ -0,0 +1,47 @@
+# Snapshot report for `test/light.multiple.test.js`
+
+The actual snapshot is saved in `light.multiple.test.js.snap`.
+
+Generated by [AVA](https://ava.li).
+
+## should generate multiple light icons
+
+> Snapshot 1
+
+    [
+      'assets/favicon.png',
+      'index.html',
+      'main.js',
+      'second/favicon.png',
+    ]
+
+> Snapshot 2
+
+    [
+      {
+        assetName: 'assets/favicon.png',
+        content: 'png 874x989',
+      },
+      {
+        assetName: 'index.html',
+        content: `␊
+        <!doctype html>␊
+        <html>␊
+          <head>␊
+            <link rel="icon"␊
+                  href="/assets/favicon.png"␊
+            >␊
+            <link rel="icon"␊
+                  href="/second/favicon.png"␊
+            >␊
+          </head>␊
+          <body>␊
+          </body>␊
+        </html>␊
+        `,
+      },
+      {
+        assetName: 'second/favicon.png',
+        content: 'png 874x989',
+      },
+    ]
diff --git a/test/snapshots/light.multiple.test.js.snap b/test/snapshots/light.multiple.test.js.snap