Bump govuk-components and govuk-frontend

.github/workflows/deploy.yml

@@ -30,16 +30,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20.9.0
-          cache: 'npm'
+          cache: "npm"
       - name: Install dependencies
         run: |
           sudo apt-get update && sudo apt-get -yqq install libpq-dev
           bundle install --jobs 4 --retry 3
           bundle exec rails assets:precompile
         env:
-            DATABASE_URL: postgres://postgres:password@localhost:5432
-            GOVUK_NOTIFY_API_KEY: fake_key
-            SIGN_IN_METHOD: persona
+          DATABASE_URL: postgres://postgres:password@localhost:5432
+          GOVUK_NOTIFY_API_KEY: fake_key
+          SIGN_IN_METHOD: persona
       - name: ${{ matrix.tests }}
         run: ${{ env.COMMAND }}
         env:
@@ -52,16 +52,16 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     services:
-        postgres:
-          image: postgres:16
-          env:
-            POSTGRES_PASSWORD: password
-          ports: ['5432:5432']
-          options: >-
-            --health-cmd pg_isready
-            --health-interval 10s
-            --health-timeout 5s
-            --health-retries 5
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: password
+        ports: ["5432:5432"]
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     strategy:
       fail-fast: false
     steps:
@@ -77,16 +77,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20.9.0
-          cache: 'npm'
+          cache: "npm"
       - name: Install dependencies
         run: |
           sudo apt-get update && sudo apt-get -yqq install libpq-dev
           bundle install --jobs 4 --retry 3
           bundle exec rails assets:precompile
         env:
-            DATABASE_URL: postgres://postgres:password@localhost:5432
-            GOVUK_NOTIFY_API_KEY: fake_key
-            SIGN_IN_METHOD: persona
+          DATABASE_URL: postgres://postgres:password@localhost:5432
+          GOVUK_NOTIFY_API_KEY: fake_key
+          SIGN_IN_METHOD: persona
       - name: Run Tests
         env:
           RAILS_ENV: test
@@ -98,4 +98,4 @@ jobs:
         run: |
           bundle exec rake db:create
           bundle exec rails db:schema:load
-          bundle exec rspec --format progress
+          bundle exec rspec --format progress

Gemfile

@@ -47,7 +47,7 @@ gem "bootsnap", require: false
 
 gem "flipflop"
 
-gem "govuk-components"
+gem "govuk-components", "~> 5.0.0"
 gem "govuk_design_system_formbuilder", "~> 5.0.0"
 
 # DfE Sign-in

Gemfile.lock

@@ -165,10 +165,10 @@ GEM
       terminal-table (>= 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    govuk-components (4.1.2)
+    govuk-components (5.0.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (~> 6.0)
-      view_component (>= 3.3, < 3.7)
+      view_component (>= 3.3, < 3.8)
     govuk_design_system_formbuilder (5.0.0)
       actionview (>= 6.1)
       activemodel (>= 6.1)
@@ -516,7 +516,7 @@ DEPENDENCIES
   erb_lint
   factory_bot_rails
   flipflop
-  govuk-components
+  govuk-components (~> 5.0.0)
   govuk_design_system_formbuilder (~> 5.0.0)
   jsbundling-rails
   mail-notify

app/assets/stylesheets/application.sass.scss

@@ -1,5 +1,5 @@
 $govuk-global-styles: true;
 $govuk-new-link-styles: true;
-$govuk-assets-path: "/";
+$govuk-assets-path: "";
 
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";

app/views/layouts/application.html.erb

@@ -9,20 +9,18 @@
     <%= tag.meta(name: "viewport", content: "width=device-width, initial-scale=1") %>
     <%= tag.meta(property: "og:image", content: asset_path("images/govuk-opengraph-image.png")) %>
     <%= tag.meta(name: "theme-color", content: "#0b0c0c") %>
-    <%= favicon_link_tag asset_path("images/favicon.ico") %>
-    <%= favicon_link_tag asset_path("images/govuk-mask-icon.svg"), rel: "mask-icon", type: "image/svg", color: "#0b0c0c" %>
-    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon.png"), rel: "apple-touch-icon", type: "image/png" %>
-    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-152x152.png"), rel: "apple-touch-icon", type: "image/png", size: "152x152" %>
-    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-167x167.png"), rel: "apple-touch-icon", type: "image/png", size: "167x167" %>
-    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-180x180.png"), rel: "apple-touch-icon", type: "image/png", size: "180x180" %>
+    <%= favicon_link_tag asset_path("images/favicon.ico"), type: nil, sizes: "48x48" %>
+    <%= favicon_link_tag asset_path("images/favicon.svg"), type: "image/svg+xml", sizes: "any" %>
+    <%= favicon_link_tag asset_path("images/govuk-icon-mask.svg"), rel: "mask-icon", color: "#0b0c0c", type: nil %>
+    <%= favicon_link_tag asset_path("images/govuk-icon-180.png"), rel: "apple-touch-icon", type: nil %>
 
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
   </head>
 
   <body class="govuk-template__body">
     <script>
-      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' : '');
     </script>
 
     <%= govuk_skip_link %>

config/application.rb

@@ -32,7 +32,7 @@ class Application < Rails::Application
     # config.eager_load_paths << Rails.root.join("extras")
 
     config.assets.paths << Rails.root.join(
-      "node_modules/govuk-frontend/govuk/assets"
+      "node_modules/govuk-frontend/dist/govuk/assets"
     )
 
     config.exceptions_app = routes

package.json

@@ -3,7 +3,7 @@
   "private": "true",
   "dependencies": {
     "esbuild": "^0.19.9",
-    "govuk-frontend": "4.7.0",
+    "govuk-frontend": "5.0.0",
     "sass": "^1.69.5"
   },
   "scripts": {

yarn.lock

@@ -199,10 +199,10 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-govuk-frontend@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-4.7.0.tgz#69950b6c2e69f435ffe9aa60d8dee232dac977de"
-  integrity sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==
+govuk-frontend@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.0.0.tgz#c08a4d1115fb31eb39b6d19979c627f816185dd7"
+  integrity sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g==
 
 immutable@^4.0.0:
   version "4.3.4"