From b471f5cc575a8dc6f5b688802e1bc52f547d4531 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 11:02:29 +0000
Subject: [PATCH 1/2] Bump govuk_publishing_components from 28.9.2 to 29.0.0

Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 28.9.2 to 29.0.0.
- [Release notes](https://github.com/alphagov/govuk_publishing_components/releases)
- [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/main/CHANGELOG.md)
- [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v28.9.2...v29.0.0)

---
updated-dependencies:
- dependency-name: govuk_publishing_components
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b1641c695..f9be1a7d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -121,14 +121,14 @@ GEM
     govuk_personalisation (0.11.2)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
-    govuk_publishing_components (28.9.2)
+    govuk_publishing_components (29.0.0)
       govuk_app_config
       govuk_personalisation (>= 0.7.0)
       kramdown
       plek
       rails (>= 6)
       rouge
-      sprockets (< 4)
+      sprockets (>= 3)
     govuk_schemas (4.3.0)
       json-schema (~> 2.8.0)
     govuk_test (3.0.0)
@@ -168,7 +168,7 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     kgio (2.11.4)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     link_header (0.0.8)
     logstasher (2.1.5)
@@ -330,7 +330,7 @@ GEM
       plek (>= 1.1.0)
       rack
       rest-client
-    sprockets (3.7.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)

From fedc39ee32818f611944e2e46c22018ca3a3017e Mon Sep 17 00:00:00 2001
From: Andy Sellick <andy.sellick@digital.cabinet-office.gov.uk>
Date: Fri, 25 Mar 2022 11:50:40 +0000
Subject: [PATCH 2/2] Changes for sprockets version update

- add manifest.js, this is now needed as part of the upgrade to sprockets, see https://github.com/rails/sprockets/blob/master/UPGRADING.md
- remove webdrivers, as now using chromedriver
---
 Gemfile                       |  1 -
 Gemfile.lock                  |  5 -----
 app/assets/config/manifest.js |  5 +++++
 config/initializers/assets.rb | 11 -----------
 4 files changed, 5 insertions(+), 17 deletions(-)
 create mode 100644 app/assets/config/manifest.js

diff --git a/Gemfile b/Gemfile
index 016f6dc57..c3c21c589 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,5 @@ group :test do
   gem "mocha"
   gem "simplecov"
   gem "timecop"
-  gem "webdrivers"
   gem "webmock", require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index f9be1a7d0..23d764d9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,10 +354,6 @@ GEM
     unicorn (5.8.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    webdrivers (4.4.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -405,7 +401,6 @@ DEPENDENCIES
   slimmer
   timecop
   uglifier
-  webdrivers
   webmock
 
 BUNDLED WITH
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
new file mode 100644
index 000000000..42b5fc062
--- /dev/null
+++ b/app/assets/config/manifest.js
@@ -0,0 +1,5 @@
+//= link_tree ../images
+//= link application.js
+//= link webchat.js
+//= link application.css
+//= link print.css
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 36635c51a..25edcd213 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -2,14 +2,3 @@
 
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = "1.0"
-
-# Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-Rails.application.config.assets.precompile += %w[
-  print.css
-  webchat.js
-]