From d3d146a4f966ae72275a7c580ba95223003d479e Mon Sep 17 00:00:00 2001
From: Martyn Whitwell <martyn.whitwell@gmail.com>
Date: Mon, 15 Apr 2024 16:10:47 +0100
Subject: [PATCH] update govuk frontend

remove redundant roles from main, header, footer and nav tags
---
 app/components/footer_component.html.erb | 2 +-
 app/components/header_component.html.erb | 2 +-
 app/helpers/application_helper.rb        | 1 -
 app/views/kaminari/_paginator.html.erb   | 2 +-
 package.json                             | 2 +-
 yarn.lock                                | 8 ++++----
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/components/footer_component.html.erb b/app/components/footer_component.html.erb
index 95658b0e8e..a022a8d6c5 100644
--- a/app/components/footer_component.html.erb
+++ b/app/components/footer_component.html.erb
@@ -12,7 +12,7 @@
 
 <%= render Footer::CookieAcceptanceComponent.new %>
 
-<footer class="site-footer" role="contentinfo">
+<footer class="site-footer">
   <div class="site-footer__wrapper limit-content-width">
     <div class="site-footer-top">
       <div class="site-footer-top__social">
diff --git a/app/components/header_component.html.erb b/app/components/header_component.html.erb
index 30ce5838f1..907ac6c62e 100644
--- a/app/components/header_component.html.erb
+++ b/app/components/header_component.html.erb
@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<header class="limit-content-width" data-controller="navigation" role="banner" data-module="govuk-header">
+<header class="limit-content-width" data-controller="navigation" data-module="govuk-header">
   <%= render Header::ExtraNavigationComponent.new(search_input_id: "searchbox__input--desktop") %>
   <%= render Header::LogoComponent.new %>
   <div class="menu-button" id="mobile-navigation-menu-button">
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 56490572bf..711a395001 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -18,7 +18,6 @@ def body_tag(attributes = {}, &block)
 
   def main_tag(attributes = {}, &block)
     attributes[:id] = "main-content"
-    attributes[:role] = "main"
 
     tag.main(**attributes, &block)
   end
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index 74f29f645c..f29bad7caf 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -7,7 +7,7 @@
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>
-  <nav class="pagination" aria-label="pager" role="navigation">
+  <nav class="pagination" aria-label="pager">
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>
       <% if page.display_tag? -%>
diff --git a/package.json b/package.json
index 0ade0cef6b..8152aa9689 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "dayjs": "^1.11.10",
     "file-loader": "^6.2.0",
     "flatpickr": "^4.6.13",
-    "govuk-frontend": "^5.2.0",
+    "govuk-frontend": "^5.3.0",
     "is-touch-device": "^1.0.1",
     "js-cookie": "^3.0.5",
     "lazysizes": "^5.3.2",
diff --git a/yarn.lock b/yarn.lock
index da0f3de13d..8b79ff84d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4154,10 +4154,10 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-govuk-frontend@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.2.0.tgz#f8e0bf98b771b8ee1501fd45bbba24a091f3846d"
-  integrity sha512-beD3wztHpkKz6JUpPwnwop1ejb4rTFMPLCutKLCIDmUS4BPpW59ggVUfctsRqHd2Zjw9wxljdRdeIJ8AZFyyTw==
+govuk-frontend@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.3.0.tgz#f9a2b405925beada90d074e17939f9d8ddcd256e"
+  integrity sha512-w6yaaDU3nqhVmWJFnOuJKRIUEB/2RrTFGzoA3z5n4cTG9h292EseT/q+JJA/LYTf5IYzeTIVAUbE5fFjUxefiQ==
 
 graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"