From c29d0934bbdee7e165c48350bfac3a64aff924f6 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 5 Jan 2021 16:38:23 +0000 Subject: [PATCH 1/2] Upgrade to Ruby 3.0.0 --- .ruby-version | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 37c2961..4a36342 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.0.0 diff --git a/Gemfile.lock b/Gemfile.lock index 581914d..9179a01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 2.7.2p137 + ruby 3.0.0p0 BUNDLED WITH - 2.1.4 + 2.2.3 From 202578cc3310443081e3ae42282172af52cf1d4f Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 5 Jan 2021 16:39:15 +0000 Subject: [PATCH 2/2] Fix webpacker warning when running specs Caused by resolved_paths being deprecated, additional_paths is used instead --- config/webpacker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/webpacker.yml b/config/webpacker.yml index 2641d70..2d2b84a 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -11,7 +11,7 @@ default: &default # Additional paths webpack should lookup modules # ['app/assets', 'engine/foo/app/assets'] - resolved_paths: ['node_modules/govuk-frontend/govuk'] + additional_paths: ['node_modules/govuk-frontend/govuk'] # Reload manifest.json on all requests so we reload latest compiled packs cache_manifest: false