fix(favicon): use publicPath with favicon

craftamap · Dec 28, 2022 · 9489cb7 · 9489cb7
1 parent a0b0278
commit 9489cb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/cjs/index.js b/lib/cjs/index.js
@@ -216,7 +216,11 @@ const htmlPlugin = (configuration = { files: [], }) => {
                         await fs_1.default.promises.copyFile(htmlFileConfiguration.favicon, `${outdir}/favicon.ico`);
                         const linkTag = document.createElement('link');
                         linkTag.setAttribute('rel', 'icon');
-                        linkTag.setAttribute('href', '/favicon.ico');
+                        let faviconPublicPath = '/favicon.ico';
+                        if (publicPath) {
+                            faviconPublicPath = joinWithPublicPath(publicPath, 'favicon.ico');
+                        }
+                        linkTag.setAttribute('href', faviconPublicPath);
                         document.head.appendChild(linkTag);
                     }
                     injectFiles(dom, collectedOutputFiles, outdir, publicPath, htmlFileConfiguration);

diff --git a/src/index.ts b/src/index.ts
@@ -254,7 +254,12 @@ export const htmlPlugin = (configuration: Configuration = { files: [], }): esbui
 
                         const linkTag = document.createElement('link')
                         linkTag.setAttribute('rel', 'icon')
-                        linkTag.setAttribute('href', '/favicon.ico')
+
+                        let faviconPublicPath = '/favicon.ico' 
+                        if (publicPath) {
+                            faviconPublicPath = joinWithPublicPath(publicPath, 'favicon.ico')
+                        }
+                        linkTag.setAttribute('href', faviconPublicPath)
                         document.head.appendChild(linkTag)
                     }