fix: add support for webpack@5 'auto' publicPath

jantimon · Oct 30, 2020 · 30c0d35 · 30c0d35
1 parent fb1b5ed
commit 30c0d35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/compiler.js b/src/compiler.js
@@ -130,7 +130,7 @@ module.exports.run = (faviconOptions, context, compilation) => {
 function getPublicPath(faviconsPublicPath, compilerPublicPath) {
   return faviconsPublicPath !== undefined
     ? faviconsPublicPath
-    : compilerPublicPath !== undefined
+    : compilerPublicPath !== undefined && compilerPublicPath !== 'auto'
     ? compilerPublicPath
     : '/';
 }

diff --git a/src/index.js b/src/index.js
@@ -30,8 +30,14 @@ class FaviconsWebpackPlugin {
       ...options
     };
   }
-
+  
   apply(compiler) {
+    compiler.hooks.initialize.tap('FaviconsWebpackPlugin', () => {
+      this.hookIntoCompiler(compiler);
+    });
+  }
+
+  hookIntoCompiler(compiler) {
     const oracle = new Oracle(compiler.context);
 
     {

diff --git a/test/oracle.test.js b/test/oracle.test.js
@@ -29,7 +29,7 @@ test('should infer missing information from the nearest parent package.json', as
 
   {
     const plugin = new FaviconsWebpackPlugin(logo);
-    plugin.apply(compiler({ context }));
+    plugin.hookIntoCompiler(compiler({ context }));
 
     t.is(plugin.options.favicons.appName, pkg.name);
     t.is(plugin.options.favicons.version, pkg.version);
@@ -42,7 +42,7 @@ test('should infer missing information from the nearest parent package.json', as
 
   {
     const plugin = new FaviconsWebpackPlugin(logo);
-    plugin.apply(compiler({ context }));
+    plugin.hookIntoCompiler(compiler({ context }));
 
     t.is(plugin.options.favicons.appName, undefined);
     t.is(plugin.options.favicons.version, undefined);
@@ -60,11 +60,7 @@ test('should parse author string from package.json', async t => {
   });
 
   const plugin = new FaviconsWebpackPlugin(logo);
-  plugin.apply(
-    compiler({
-      context: t.context.root
-    })
-  );
+  plugin.hookIntoCompiler(compiler({ context: t.context.root }));
 
   t.is(plugin.options.favicons.developerName, parseAuthor(pkg.author).name);
   t.is(plugin.options.favicons.developerURL, parseAuthor(pkg.author).url);