Update the ccs frontend helpers package

Crown-Commercial-Service · Mar 14, 2024 · 75c0b12 · 75c0b12
1 parent e2301a8
commit 75c0b12
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 46 deletions.
diff --git a/Gemfile b/Gemfile
@@ -47,7 +47,7 @@ gem 'aws-sdk-ssm', '~> 1.162.0'
 gem 'rack-attack', '~> 6.7.0'
 
 # GOV.UK Frontend helpers
-gem 'ccs-frontend_helpers', '~> 0.1.2'
+gem 'ccs-frontend_helpers', '~> 0.2.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -127,7 +127,7 @@ GEM
       racc
     builder (3.2.4)
     byebug (11.1.3)
-    ccs-frontend_helpers (0.1.2)
+    ccs-frontend_helpers (0.2.0)
       rails (>= 6.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
@@ -396,7 +396,7 @@ DEPENDENCIES
   brakeman (~> 6.1.2)
   byebug (~> 11.1.3)
   canonical-rails!
-  ccs-frontend_helpers (~> 0.1.2)
+  ccs-frontend_helpers (~> 0.2.0)
   dotenv-rails (~> 3.1.0)
   i18n-tasks (~> 1.0.13)
   jbuilder (~> 2.11, >= 2.11.5)

diff --git a/app/javascript/packs/govuk.js b/app/javascript/packs/govuk.js
@@ -1,3 +1,3 @@
-require("govuk-frontend/govuk/all").initAll()
-require.context('govuk-frontend/govuk/assets/images', true)
+require("govuk-frontend/dist/govuk/all").initAll()
+require.context('govuk-frontend/dist/govuk/assets/images', true)
 import "./stylesheets/govuk.scss"
diff --git a/app/javascript/packs/stylesheets/govuk.scss b/app/javascript/packs/stylesheets/govuk.scss
@@ -1,9 +1,9 @@
 @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700");
 
-$govuk-assets-path: "~govuk-frontend/govuk/assets/";
+$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
 $govuk-button-background-colour: #007e8a;
 
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";
 @import "accessible-autocomplete";
 
 $ccs-border-colour: #b1b4b6;
@@ -77,10 +77,8 @@ $ccs-footer-columns-to-rows-point: 501px;
   // alphagov/govuk_template includes a specific a:link:focus selector
   // designed to make unvisited links a slightly darker blue when focussed, so
   // we need to override the text colour for that combination of selectors.
-  @include govuk-compatibility(govuk_template) {
-    &:link:focus {
-      @include govuk-text-colour;
-    }
+  &:link:focus {
+    @include govuk-text-colour;
   }
 }
 

diff --git a/app/views/layouts/_logo.html.erb b/app/views/layouts/_logo.html.erb
diff --git a/app/views/layouts/_logotype.html.erb b/app/views/layouts/_logotype.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,16 +8,14 @@
   <%= csp_meta_tag %>
 
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-  <meta name="theme-color" content="blue" />
+  <meta name="theme-color" content="#0b0c0c" />
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-  <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
-  <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
-  <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
-  <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
-  <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
-  <link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
+  <link rel="icon" sizes="48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>">
+  <link rel="icon" sizes="any" href="<%= asset_pack_url('media/images/favicon.svg') %>" type="image/svg+xml">
+  <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-icon-mask.svg') %>" color="#0b0c0c">
+  <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-icon-180.png') %>">
+  <link rel="apple-touch-icon" sizes="192x192" href="<%= asset_pack_url('media/images/govuk-icon-192.png') %>">
+  <link rel="apple-touch-icon" sizes="512x512" href="<%= asset_pack_url('media/images/govuk-icon-512.png') %>">
 
   <%= stylesheet_pack_tag 'govuk' %>
 
@@ -34,7 +32,7 @@
   <%= render partial: '/shared/google/tag_manager_body' if PmpIdam.google_tag_manager_tracking_id.present? %>
 
   <%= javascript_tag nonce: true do -%>
-    document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
+    document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
   <% end -%>
 
   <div id="wrapper">
@@ -52,7 +50,7 @@
     <%= render partial: '/layouts/footer' %>
   </div>
 
-  <%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload' %>
+  <%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload', type: 'module' %>
 </body>
 
 </html>
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb
@@ -8,16 +8,14 @@
   <%= csp_meta_tag %>
 
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-  <meta name="theme-color" content="blue" />
+  <meta name="theme-color" content="#0b0c0c" />
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-  <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
-  <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
-  <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
-  <link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
-  <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
-  <link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
+  <link rel="icon" sizes="48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>">
+  <link rel="icon" sizes="any" href="<%= asset_pack_url('media/images/favicon.svg') %>" type="image/svg+xml">
+  <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-icon-mask.svg') %>" color="#0b0c0c">
+  <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-icon-180.png') %>">
+  <link rel="apple-touch-icon" sizes="192x192" href="<%= asset_pack_url('media/images/govuk-icon-192.png') %>">
+  <link rel="apple-touch-icon" sizes="512x512" href="<%= asset_pack_url('media/images/govuk-icon-512.png') %>">
 
   <%= stylesheet_pack_tag 'govuk' %>
 
@@ -34,7 +32,7 @@
   <%= render partial: '/shared/google/tag_manager_body' if PmpIdam.google_tag_manager_tracking_id.present? %>
 
   <%= javascript_tag nonce: true do -%>
-    document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
+    document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
   <% end -%>
 
   <div class="error-content">
@@ -52,7 +50,7 @@
 
   <%= render partial: '/layouts/footer' %>
 
-  <%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload' %>
+  <%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload', type: 'module' %>
 </body>
 
 </html>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon.ico b/public/favicon.ico