From b8ae1011d7c29e185a921f5ffc24e1c48c5e7a5f Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@digital.cabinet-office.gov.uk>
Date: Tue, 4 Jun 2024 09:38:46 +0100
Subject: [PATCH] Update icon references

- Include icons references in the new manifest.json file in the head section instead
- Remove request to the manifest.json and the asset path for this file
---
 app/assets/config/govuk_publishing_components_manifest.js      | 1 -
 .../components/_layout_for_public.html.erb                     | 3 ++-
 config/initializers/assets.rb                                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/config/govuk_publishing_components_manifest.js b/app/assets/config/govuk_publishing_components_manifest.js
index 5d2f149b13..59491a681e 100644
--- a/app/assets/config/govuk_publishing_components_manifest.js
+++ b/app/assets/config/govuk_publishing_components_manifest.js
@@ -2,7 +2,6 @@
 //= link_tree ../images
 //= link_tree ../../../node_modules/govuk-frontend/dist/govuk/assets/images
 //= link_tree ../../../node_modules/govuk-frontend/dist/govuk/assets/fonts
-//= link_tree ../../../node_modules/govuk-frontend/dist/govuk/assets
 
 // Create asset files of each of the files in these directory
 //= link_directory ../javascripts/component_guide
diff --git a/app/views/govuk_publishing_components/components/_layout_for_public.html.erb b/app/views/govuk_publishing_components/components/_layout_for_public.html.erb
index 10058e7aa3..cc1fe22aca 100644
--- a/app/views/govuk_publishing_components/components/_layout_for_public.html.erb
+++ b/app/views/govuk_publishing_components/components/_layout_for_public.html.erb
@@ -83,8 +83,9 @@
     <link rel="icon" sizes="48x48" href="<%= asset_path 'favicon.ico' %>">
     <link rel="icon" sizes="any" href="<%= asset_path 'favicon.svg' %>" type="image/svg+xml">
     <link rel="mask-icon" href="<%= asset_path 'govuk-icon-mask.svg' %>" color="#0b0c0c">
+    <link rel="icon" href="<%= asset_path 'govuk-icon-512.png' %>">
+    <link rel="icon" href="<%= asset_path 'govuk-icon-192.png' %>">
     <link rel="apple-touch-icon" href="<%= asset_path 'govuk-icon-180.png' %>">
-    <link rel="manifest" href="<%= asset_path "manifest.json" %>">
 
     <meta name="theme-color" content="#0b0c0c" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 292cbbce4a..26d1aa001e 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -18,7 +18,6 @@
 Rails.application.config.assets.paths += %W[
   #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/images
   #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/fonts
-  #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets
   #{__dir__}/../../node_modules/govuk-frontend/dist
   #{__dir__}/../../node_modules/
 ]