favicon working in chrome (#2542)

replicatedhq · Feb 23, 2022 · 4e446b0 · 4e446b0
1 parent b807d7c
commit 4e446b0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 18 deletions.
diff --git a/web/src/Root.jsx b/web/src/Root.jsx
@@ -323,8 +323,8 @@ class Root extends PureComponent {
           <meta httpEquiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
           <meta httpEquiv="Pragma" content="no-cache" />
           <meta httpEquiv="Expires" content="0" />
-          {this.state.appLogo &&
-            <link rel="shortcut icon" href={this.state.appLogo} />
+          {this.state.appLogo && 
+            <link rel="icon" type="image/png" href={this.state.appLogo} />
           }
         </Helmet>
         <ThemeContext.Provider value={{

diff --git a/web/src/favicon-32x32.png b/web/src/favicon-32x32.png
diff --git a/web/src/favicon-64.png b/web/src/favicon-64.png
diff --git a/web/src/favicon.ico b/web/src/favicon.ico
diff --git a/web/src/index.ejs b/web/src/index.ejs
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title><%= htmlWebpackPlugin.options.title %></title>
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" data-react-helmet="true" />
   </head>
   <body>
     <div id="app"></div>

diff --git a/web/webpack.config.js b/web/webpack.config.js
@@ -2,7 +2,6 @@ const path = require("path");
 const { merge } = require("webpack-merge");
 const webpack = require("webpack");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-const FaviconsWebpackPlugin = require("favicons-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 const NodePolyfillPlugin = require("node-polyfill-webpack-plugin");
@@ -125,21 +124,6 @@ module.exports = function (env) {
         title: "Admin Console",
         inject: "body",
       }),
-      new FaviconsWebpackPlugin({
-        logo: srcPath + "/favicon-64.png",
-        icons: {
-          android: false,
-          appleIcon: false,
-          appleStartup: false,
-          coast: false,
-          favicons: true,
-          firefox: true,
-          opengraph: false,
-          twitter: false,
-          yandex: false,
-          windows: false
-        }
-      }),
       new MonacoWebpackPlugin({
         languages: [
           "yaml",