From 61ea149417151000b7b984f473b60e20360409f3 Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Tue, 17 Sep 2024 11:23:30 +0100
Subject: [PATCH] WIP Upgrade govuk_publishing_components

- upgrade to last version before the more complex switch to govuk-frontend v5
- update manifest files and Sass to compile all CSS into one file
- remove print stylesheet as no longer relevant
- update Sass variables/mixins for newer govuk-frontend
---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  | 240 +++++++++---------
 app/assets/config/manifest.js                 |   3 +-
 app/assets/stylesheets/application.scss       |   4 +
 app/assets/stylesheets/components.scss        |  31 +--
 app/assets/stylesheets/govuk-overrides.scss   |  12 +-
 .../govuk_publishing_components.rb            |   1 -
 7 files changed, 147 insertions(+), 146 deletions(-)

diff --git a/Gemfile b/Gemfile
index db5e5504..39fddaec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "elasticsearch-rails", "~> 7.2.1"
 gem "faraday"
 gem "faraday_middleware"
 gem "govuk_elements_rails"
-gem "govuk_publishing_components", "~> 28.7.1" # TODO: Revert https://github.com/alphagov/datagovuk_find/pull/1286 once 39.2.3+
+gem "govuk_publishing_components", "~> 39.2.0" # TODO: Revert https://github.com/alphagov/datagovuk_find/pull/1286 once 39.2.3+
 gem "htmlentities"
 gem "jbuilder"
 gem "jquery-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index af56d1c9..f6fb8d41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.18.3)
@@ -78,7 +78,7 @@ GEM
     brakeman (6.1.2)
       racc
     browser (5.3.1)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
       addressable
@@ -90,7 +90,7 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -113,7 +113,7 @@ GEM
     elasticsearch-transport (7.11.2)
       faraday (~> 1)
       multi_json
-    erubi (1.12.0)
+    erubi (1.13.0)
     execjs (2.9.1)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
@@ -145,13 +145,15 @@ GEM
     ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (3.25.3)
-    googleapis-common-protos-types (1.12.0)
-      google-protobuf (~> 3.18)
-    govuk_app_config (9.9.1)
+    google-protobuf (4.28.1)
+      bigdecimal
+      rake (>= 13)
+    googleapis-common-protos-types (1.16.0)
+      google-protobuf (>= 3.18, < 5.a)
+    govuk_app_config (9.14.0)
       logstasher (~> 2.1)
-      opentelemetry-exporter-otlp (>= 0.25, < 0.27)
-      opentelemetry-instrumentation-all (>= 0.39.1, < 0.57.0)
+      opentelemetry-exporter-otlp (>= 0.25, < 0.29)
+      opentelemetry-instrumentation-all (>= 0.39.1, < 0.63.0)
       opentelemetry-sdk (~> 1.2)
       plek (>= 4, < 6)
       prometheus_exporter (~> 2.0)
@@ -166,18 +168,18 @@ GEM
       sass (>= 3.2.0)
     govuk_frontend_toolkit (9.0.1)
       railties (>= 3.1.0)
-    govuk_personalisation (0.15.0)
+    govuk_personalisation (1.0.0)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (28.7.1)
+    govuk_publishing_components (39.2.5)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
       kramdown
       plek
-      psych (>= 4)
       rails (>= 6)
       rouge
-      sprockets (< 4)
+      sprockets (>= 3)
+      sprockets-rails
     govuk_test (4.0.2)
       brakeman (>= 5.0.2)
       capybara (>= 3.36)
@@ -189,7 +191,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.14.4)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
@@ -234,65 +236,74 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0206)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
-    net-imap (0.4.10)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    opentelemetry-api (1.2.5)
-    opentelemetry-common (0.20.1)
+    opentelemetry-api (1.4.0)
+    opentelemetry-common (0.21.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.26.3)
-      google-protobuf (~> 3.14)
+    opentelemetry-exporter-otlp (0.28.1)
+      google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
+    opentelemetry-helpers-mysql (0.1.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.21)
+    opentelemetry-helpers-sql-obfuscation (0.2.0)
+      opentelemetry-common (~> 0.21)
+    opentelemetry-instrumentation-action_mailer (0.1.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-action_pack (0.9.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.7.0)
+    opentelemetry-instrumentation-action_view (0.7.3)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-active_support (~> 0.6)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.1)
+    opentelemetry-instrumentation-active_job (0.7.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_model_serializers (0.20.1)
+    opentelemetry-instrumentation-active_model_serializers (0.20.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_record (0.7.0)
+    opentelemetry-instrumentation-active_record (0.7.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-      ruby2_keywords
-    opentelemetry-instrumentation-active_support (0.5.1)
+    opentelemetry-instrumentation-active_support (0.6.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-all (0.56.0)
+    opentelemetry-instrumentation-all (0.62.1)
       opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
+      opentelemetry-instrumentation-aws_lambda (~> 0.1.0)
       opentelemetry-instrumentation-aws_sdk (~> 0.5.0)
       opentelemetry-instrumentation-bunny (~> 0.21.0)
       opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1)
@@ -300,22 +311,22 @@ GEM
       opentelemetry-instrumentation-delayed_job (~> 0.22.0)
       opentelemetry-instrumentation-ethon (~> 0.21.1)
       opentelemetry-instrumentation-excon (~> 0.22.0)
-      opentelemetry-instrumentation-faraday (~> 0.23.1)
-      opentelemetry-instrumentation-grape (~> 0.1.3)
-      opentelemetry-instrumentation-graphql (~> 0.27.0)
-      opentelemetry-instrumentation-gruf (~> 0.1.0)
+      opentelemetry-instrumentation-faraday (~> 0.24.0)
+      opentelemetry-instrumentation-grape (~> 0.2.0)
+      opentelemetry-instrumentation-graphql (~> 0.28.0)
+      opentelemetry-instrumentation-gruf (~> 0.2.0)
       opentelemetry-instrumentation-http (~> 0.23.1)
       opentelemetry-instrumentation-http_client (~> 0.22.1)
       opentelemetry-instrumentation-koala (~> 0.20.1)
       opentelemetry-instrumentation-lmdb (~> 0.22.1)
       opentelemetry-instrumentation-mongo (~> 0.22.1)
-      opentelemetry-instrumentation-mysql2 (~> 0.25.0)
+      opentelemetry-instrumentation-mysql2 (~> 0.27.0)
       opentelemetry-instrumentation-net_http (~> 0.22.1)
-      opentelemetry-instrumentation-pg (~> 0.26.0)
-      opentelemetry-instrumentation-que (~> 0.7.0)
+      opentelemetry-instrumentation-pg (~> 0.27.0)
+      opentelemetry-instrumentation-que (~> 0.8.0)
       opentelemetry-instrumentation-racecar (~> 0.3.0)
       opentelemetry-instrumentation-rack (~> 0.24.0)
-      opentelemetry-instrumentation-rails (~> 0.30.0)
+      opentelemetry-instrumentation-rails (~> 0.31.0)
       opentelemetry-instrumentation-rake (~> 0.2.1)
       opentelemetry-instrumentation-rdkafka (~> 0.4.0)
       opentelemetry-instrumentation-redis (~> 0.25.1)
@@ -323,136 +334,133 @@ GEM
       opentelemetry-instrumentation-restclient (~> 0.22.1)
       opentelemetry-instrumentation-ruby_kafka (~> 0.21.0)
       opentelemetry-instrumentation-sidekiq (~> 0.25.0)
-      opentelemetry-instrumentation-sinatra (~> 0.23.1)
-      opentelemetry-instrumentation-trilogy (~> 0.58.0)
-    opentelemetry-instrumentation-aws_sdk (0.5.1)
+      opentelemetry-instrumentation-sinatra (~> 0.24.0)
+      opentelemetry-instrumentation-trilogy (~> 0.59.0)
+    opentelemetry-instrumentation-aws_lambda (0.1.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-base (0.22.3)
+    opentelemetry-instrumentation-aws_sdk (0.5.4)
       opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-base (0.22.6)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.21)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-instrumentation-bunny (0.21.2)
+    opentelemetry-instrumentation-bunny (0.21.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-concurrent_ruby (0.21.2)
+    opentelemetry-instrumentation-concurrent_ruby (0.21.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-dalli (0.25.0)
+    opentelemetry-instrumentation-dalli (0.25.4)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-delayed_job (0.22.1)
+    opentelemetry-instrumentation-delayed_job (0.22.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-ethon (0.21.3)
+    opentelemetry-instrumentation-ethon (0.21.8)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.22.0)
+    opentelemetry-instrumentation-excon (0.22.4)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.23.4)
+    opentelemetry-instrumentation-faraday (0.24.6)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-grape (0.1.6)
+    opentelemetry-instrumentation-grape (0.2.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-graphql (0.27.0)
+    opentelemetry-instrumentation-graphql (0.28.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-gruf (0.1.1)
+    opentelemetry-instrumentation-gruf (0.2.1)
       opentelemetry-api (>= 1.0.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http (0.23.2)
+    opentelemetry-instrumentation-http (0.23.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http_client (0.22.3)
+    opentelemetry-instrumentation-http_client (0.22.7)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-koala (0.20.2)
+    opentelemetry-instrumentation-koala (0.20.5)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-lmdb (0.22.1)
+    opentelemetry-instrumentation-lmdb (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-mongo (0.22.2)
+    opentelemetry-instrumentation-mongo (0.22.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-mysql2 (0.25.0)
+    opentelemetry-instrumentation-mysql2 (0.27.2)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-net_http (0.22.4)
+    opentelemetry-instrumentation-net_http (0.22.7)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.26.1)
+    opentelemetry-instrumentation-pg (0.27.4)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-que (0.7.1)
+    opentelemetry-instrumentation-que (0.8.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-racecar (0.3.0)
+    opentelemetry-instrumentation-racecar (0.3.4)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rack (0.24.0)
+    opentelemetry-instrumentation-rack (0.24.6)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.30.0)
+    opentelemetry-instrumentation-rails (0.31.2)
       opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_mailer (~> 0.1.0)
       opentelemetry-instrumentation-action_pack (~> 0.9.0)
       opentelemetry-instrumentation-action_view (~> 0.7.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)
       opentelemetry-instrumentation-active_record (~> 0.7.0)
-      opentelemetry-instrumentation-active_support (~> 0.5.0)
+      opentelemetry-instrumentation-active_support (~> 0.6.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rake (0.2.1)
+    opentelemetry-instrumentation-rake (0.2.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rdkafka (0.4.2)
+    opentelemetry-instrumentation-rdkafka (0.4.8)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-redis (0.25.3)
+    opentelemetry-instrumentation-redis (0.25.7)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-resque (0.5.1)
+    opentelemetry-instrumentation-resque (0.5.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-restclient (0.22.3)
+    opentelemetry-instrumentation-restclient (0.22.7)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-ruby_kafka (0.21.0)
+    opentelemetry-instrumentation-ruby_kafka (0.21.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sidekiq (0.25.2)
+    opentelemetry-instrumentation-sidekiq (0.25.7)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-sinatra (0.23.2)
+    opentelemetry-instrumentation-sinatra (0.24.1)
       opentelemetry-api (~> 1.0)
-      opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-trilogy (0.58.0)
+    opentelemetry-instrumentation-trilogy (0.59.3)
       opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-mysql
+      opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-semantic_conventions (>= 1.8.0)
-    opentelemetry-registry (0.3.0)
+    opentelemetry-registry (0.3.1)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.4.0)
+    opentelemetry-sdk (1.5.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.10.0)
+    opentelemetry-semantic_conventions (1.10.1)
       opentelemetry-api (~> 1.0)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -461,7 +469,7 @@ GEM
     parslet (2.0.0)
     pg (1.5.5)
     plek (4.1.0)
-    prometheus_exporter (2.1.0)
+    prometheus_exporter (2.1.1)
       webrick
     pry (0.14.2)
       coderay (~> 1.1)
@@ -472,12 +480,10 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    psych (5.1.2)
-      stringio
     public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.3)
+    racc (1.8.1)
     rack (2.2.9)
     rack-proxy (0.7.7)
       rack
@@ -512,22 +518,21 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
     regexp_parser (2.9.0)
-    request_store (1.6.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rouge (4.2.0)
+    rexml (3.3.7)
+    rouge (4.3.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -607,12 +612,13 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.16.1)
+    sentry-rails (5.19.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.16.1)
+      sentry-ruby (~> 5.19.0)
     sentry-raven (3.1.2)
       faraday (>= 1.0)
-    sentry-ruby (5.16.1)
+    sentry-ruby (5.19.0)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -626,17 +632,15 @@ GEM
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
       spring (>= 4)
-    sprockets (3.7.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     statsd-ruby (1.5.0)
-    stringio (3.1.0)
-    strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tilt (2.3.0)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -655,7 +659,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -674,7 +678,7 @@ DEPENDENCIES
   faraday
   faraday_middleware
   govuk_elements_rails
-  govuk_publishing_components (~> 28.7.1)
+  govuk_publishing_components (~> 39.2.0)
   govuk_test
   htmlentities
   jbuilder
@@ -711,4 +715,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.5.6
+   2.4.10
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index b16e53d6..585fd8f2 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,3 +1,4 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
+
+//= link application.css
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index cf53924d..f489f0e5 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -20,6 +20,7 @@ $govuk-use-legacy-palette: false;
 @import 'govuk_publishing_components/component_support';
 @import 'govuk_publishing_components/components/_button';
 @import 'govuk_publishing_components/components/_breadcrumbs';
+@import 'govuk_publishing_components/components/_cards';
 @import 'govuk_publishing_components/components/_checkboxes';
 @import 'govuk_publishing_components/components/_cookie-banner';
 @import 'govuk_publishing_components/components/_error-summary';
@@ -57,3 +58,6 @@ $alpine-fresh: #128400;
 @import 'cookie-settings';
 @import 'accessible-autocomplete/dist/accessible-autocomplete.min';
 @import 'organograms';
+
+@import 'components';
+@import 'govuk-overrides';
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 47f25224..537d27fc 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -2,11 +2,11 @@
 // Front-end components go here
 
 .dgu-secondary-text {
-  color: $secondary-text-colour;
+  color: $govuk-secondary-text-colour;
 }
 
 .dgu-highlight {
-  background: $grey-3;
+  background: govuk-colour("light-grey");
   padding: em(2) em(5) em(2) em(5);
 }
 
@@ -83,7 +83,7 @@
 .dgu-metadata__box {
 
   &--in-dataset {
-    background: $highlight-colour;
+    // FIXME background: $highlight-colour;
     padding: 25px 30px 15px 30px;
   }
 
@@ -104,7 +104,7 @@
     width: 60%;
   }
 
-  @include media(mobile) {
+  @include govuk-media-query($until: tablet) {
     dt,dd {
       width: 100%;
     }
@@ -149,7 +149,6 @@
   margin-bottom: 20px;
 
   &__year {
-    font-family: $helvetica-regular;
     text-decoration: none !important;
 
     &:focus {
@@ -166,7 +165,7 @@
     }
   }
 
-  @include media(mobile) {
+  @include govuk-media-query($until: tablet) {
     th {
       white-space: normal;
       vertical-align: top;
@@ -189,7 +188,7 @@
     font-size: 19px;
   }
 
-  @include media(mobile) {
+  @include govuk-media-query($until: tablet) {
     th {
       white-space: normal;
       vertical-align: top;
@@ -201,7 +200,6 @@
       font-size: 16px;
     }
   }
-
 }
 
 
@@ -221,7 +219,7 @@
 
     }
   }
-  @include media(mobile) {
+  @include govuk-media-query($until: tablet) {
     padding-left: 15px;
   }
 }
@@ -246,7 +244,7 @@
 // Search filters ============================================================
 
 .dgu-filters {
-  @media (max-width: 641px) {
+  @include govuk-media-query($until: desktop) {
     margin-bottom: 2em;
   }
   padding-top: 30px;
@@ -319,7 +317,7 @@ section .year-expand {
   overflow: hidden;
   border-bottom: 1px solid #BFC1C3;
   &:hover {
-    background: $highlight-colour;
+    // FIXME background: $highlight-colour;
   }
   h3 {
     color: #005ea5;
@@ -345,7 +343,7 @@ span.showHide-open-all {
   float: right;
   font-weight: normal;
   display: inline-block;
-  color: $link-colour;
+  color: $govuk-link-colour;
   text-decoration: underline;
   cursor: pointer;
 }
@@ -370,12 +368,11 @@ span.showHide-open-all {
 
 
 .dgu-top-non-content {
-  @extend %site-width-container;
+  @include govuk-width-container($width: "$govuk-page-width");
 }
 
 
 .dgu-back-link {
-  font-family: $helvetica-regular;
   font-size: 16px;
   line-height: 20px;
   display: inline-block;
@@ -383,7 +380,7 @@ span.showHide-open-all {
   margin-top: 15px;
   margin-bottom: 15px;
   padding-left: 14px;
-  border-bottom: 1px solid $text-colour;
+  border-bottom: 1px solid $govuk-text-colour;
   text-decoration: none;
 
   &:link, &:visited, &:hover, &:active, &:focus {
@@ -391,9 +388,9 @@ span.showHide-open-all {
   }
 
   &:focus {
-    outline: 3px solid $focus-colour;
+    outline: 3px solid $govuk-focus-colour;
     outline-offset: 0;
-    background-color: $focus-colour;
+    background-color: $govuk-focus-colour;
   }
 
   &:before {
diff --git a/app/assets/stylesheets/govuk-overrides.scss b/app/assets/stylesheets/govuk-overrides.scss
index 5dd3d6f8..58221e3c 100644
--- a/app/assets/stylesheets/govuk-overrides.scss
+++ b/app/assets/stylesheets/govuk-overrides.scss
@@ -10,9 +10,9 @@
   &__logo {
     width: 75%;
   }
-  
+
   &__logo, &__content {
-    @include media(desktop) {
+    @include govuk-media-query($from: desktop) {
       width: 50%;
     }
   }
@@ -41,10 +41,6 @@
   margin-bottom: 40px;
 }
 
-* {
-  font-family: $helvetica-regular !important;
-}
-
 details {
   margin-bottom: 30px;
   p:last-child {
@@ -58,7 +54,7 @@ details {
 
 button.button.secondary {
   background: none;
-  color: $govuk-blue;
+  color: $govuk-brand-colour;
   text-decoration: underline;
   box-shadow: none;
   padding: .8em 0 0 0;
@@ -82,7 +78,7 @@ button.button.secondary {
 }
 
 .breadcrumbs li {
-  @include device-pixel-ratio() {
+  @include govuk-device-pixel-ratio {
     background-image: image-url("separator-2x.png");
   }
 }
diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb
index c82fea70..c70bbfe1 100644
--- a/config/initializers/govuk_publishing_components.rb
+++ b/config/initializers/govuk_publishing_components.rb
@@ -2,6 +2,5 @@
   c.component_guide_title = "Data.gov.uk component guide"
 
   c.application_stylesheet = "application"
-  c.application_print_stylesheet = "print"
   c.application_javascript = "application"
 end