Better favicon definitions, 2021 bullet proof (#2948)

plone · Dec 22, 2021 · 2d33eea · 2d33eea
1 parent 2ba0ade
commit 2d33eea
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
 
 ### Internal
 
+- Better favicon definitions, 2021 bullet proof @sneridagh
+
 ## 14.0.1 (2021-12-21)
 
 ### Bugfix

diff --git a/public/icon.svg b/public/icon.svg
diff --git a/src/helpers/Html/Html.jsx b/src/helpers/Html/Html.jsx
@@ -123,23 +123,13 @@ class Html extends Component {
             }}
           />
 
+          <link rel="icon" href="/favicon.ico" sizes="any" />
+          <link rel="icon" href="/icon.svg" type="image/svg+xml" />
           <link
             rel="apple-touch-icon"
             sizes="180x180"
             href="/apple-touch-icon.png"
           />
-          <link
-            rel="icon"
-            type="image/png"
-            sizes="32x32"
-            href="/favicon-32x32.png"
-          />
-          <link
-            rel="icon"
-            type="image/png"
-            sizes="16x16"
-            href="/favicon-16x16.png"
-          />
           <link rel="manifest" href="/site.webmanifest" />
           <meta name="generator" content="Plone 6 - https://plone.org" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/src/helpers/Html/__snapshots__/Html.test.jsx.snap b/src/helpers/Html/__snapshots__/Html.test.jsx.snap
@@ -21,21 +21,19 @@ exports[`Html renders a html component 1`] = `
       }
     />
     <link
-      href="/apple-touch-icon.png"
-      rel="apple-touch-icon"
-      sizes="180x180"
+      href="/favicon.ico"
+      rel="icon"
+      sizes="any"
     />
     <link
-      href="/favicon-32x32.png"
+      href="/icon.svg"
       rel="icon"
-      sizes="32x32"
-      type="image/png"
+      type="image/svg+xml"
     />
     <link
-      href="/favicon-16x16.png"
-      rel="icon"
-      sizes="16x16"
-      type="image/png"
+      href="/apple-touch-icon.png"
+      rel="apple-touch-icon"
+      sizes="180x180"
     />
     <link
       href="/site.webmanifest"
@@ -118,21 +116,19 @@ exports[`Html renders a html component with apiPath present 1`] = `
       }
     />
     <link
-      href="/apple-touch-icon.png"
-      rel="apple-touch-icon"
-      sizes="180x180"
+      href="/favicon.ico"
+      rel="icon"
+      sizes="any"
     />
     <link
-      href="/favicon-32x32.png"
+      href="/icon.svg"
       rel="icon"
-      sizes="32x32"
-      type="image/png"
+      type="image/svg+xml"
     />
     <link
-      href="/favicon-16x16.png"
-      rel="icon"
-      sizes="16x16"
-      type="image/png"
+      href="/apple-touch-icon.png"
+      rel="apple-touch-icon"
+      sizes="180x180"
     />
     <link
       href="/site.webmanifest"