From b3364e894f09eac13e934ac5630a0bf0b57fad34 Mon Sep 17 00:00:00 2001 From: sul-devops-team Date: Mon, 30 Sep 2024 02:48:02 -0700 Subject: [PATCH 1/3] Update Ruby dependencies --- Gemfile.lock | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 676047a..8e19c04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,8 +146,9 @@ GEM xpath (~> 3.2) chronic (0.10.2) concurrent-ruby (1.3.4) - config (5.5.1) + config (5.5.2) deep_merge (~> 1.2, >= 1.2.1) + ostruct connection_pool (2.4.1) crack (1.0.0) bigdecimal @@ -188,6 +189,8 @@ GEM faraday-net_http (>= 2.0, < 3.4) json logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) faraday-net_http (3.3.0) net-http faraday-retry (2.2.1) @@ -228,7 +231,7 @@ GEM activesupport (>= 6.0.0) railties (>= 6.0.0) io-console (0.7.2) - irb (1.14.0) + irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.13.0) @@ -320,7 +323,7 @@ GEM ruby-rc4 ttfunk pg (1.5.8) - propshaft (1.0.0) + propshaft (1.0.1) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack @@ -384,7 +387,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.3.7) + rexml (3.3.8) rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) @@ -451,17 +454,19 @@ GEM rack (>= 2.2.4) redis-client (>= 0.22.2) slop (4.10.1) - solr_wrapper (4.0.2) - http + solr_wrapper (4.1.0) + faraday + faraday-follow_redirects minitar + ostruct retriable ruby-progressbar - sqlite3 (2.0.4-aarch64-linux-gnu) - sqlite3 (2.0.4-arm-linux-gnu) - sqlite3 (2.0.4-arm64-darwin) - sqlite3 (2.0.4-x86-linux-gnu) - sqlite3 (2.0.4-x86_64-darwin) - sqlite3 (2.0.4-x86_64-linux-gnu) + sqlite3 (2.1.0-aarch64-linux-gnu) + sqlite3 (2.1.0-arm-linux-gnu) + sqlite3 (2.1.0-arm64-darwin) + sqlite3 (2.1.0-x86-linux-gnu) + sqlite3 (2.1.0-x86_64-darwin) + sqlite3 (2.1.0-x86_64-linux-gnu) sshkit (1.23.1) base64 net-scp (>= 1.1.2) @@ -499,7 +504,7 @@ GEM unf (0.2.0) unicode-display_width (2.6.0) uri (0.13.1) - view_component (3.14.0) + view_component (3.15.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -514,7 +519,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.1) + webrick (1.8.2) websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) From 133b0da917f75c0b03df16d2b22a58ee65e9dc80 Mon Sep 17 00:00:00 2001 From: sul-devops-team Date: Mon, 30 Sep 2024 02:48:03 -0700 Subject: [PATCH 2/3] Update Yarn dependencies --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 083561f..baee697 100644 --- a/yarn.lock +++ b/yarn.lock @@ -37,9 +37,9 @@ readdirp@^4.0.1: integrity sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw== sass@^1.59.3: - version "1.79.3" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.3.tgz#7811b000eb68195fe51dea89177e73e7ef7f546f" - integrity sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA== + version "1.79.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267" + integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg== dependencies: chokidar "^4.0.0" immutable "^4.0.0" From 8cb807311983f8213d8898f4a3101b6dd8dd9691 Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Mon, 7 Oct 2024 10:01:55 -0400 Subject: [PATCH 3/3] Pin view_component to 3.14.0 --- Gemfile | 4 ++++ Gemfile.lock | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 9341949..34a5e25 100644 --- a/Gemfile +++ b/Gemfile @@ -116,3 +116,7 @@ gem 'whenever', require: false gem 'recaptcha', '~> 5.16' gem 'redis', '~> 5.2' + +# Pin view_component to 3.14.0 until the fix in Blacklight is released +# https://github.com/projectblacklight/blacklight/commit/26651bfc038a4f6f0aba035bc5fc4e5a0678eb20 +gem 'view_component', '~> 3.14.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8e19c04..26050d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -226,7 +226,7 @@ GEM httpclient (2.8.3) i18n (1.14.6) concurrent-ruby (~> 1.0) - importmap-rails (2.0.1) + importmap-rails (2.0.2) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) @@ -277,7 +277,7 @@ GEM mini_mime (1.1.5) minitar (1.0.2) minitest (5.25.1) - msgpack (1.7.2) + msgpack (1.7.3) multi_json (1.15.0) mutex_m (0.2.0) net-http (0.4.1) @@ -295,7 +295,7 @@ GEM net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol - net-ssh (7.2.3) + net-ssh (7.3.0) nio4r (2.7.3) nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) @@ -323,7 +323,7 @@ GEM ruby-rc4 ttfunk pg (1.5.8) - propshaft (1.0.1) + propshaft (1.1.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack @@ -396,7 +396,7 @@ GEM rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (6.1.5) @@ -432,7 +432,7 @@ GEM rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.0.5) + rubocop-rspec (3.1.0) rubocop (~> 1.61) rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) @@ -504,7 +504,7 @@ GEM unf (0.2.0) unicode-display_width (2.6.0) uri (0.13.1) - view_component (3.15.0) + view_component (3.14.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -515,7 +515,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.23.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -584,6 +584,7 @@ DEPENDENCIES stimulus-rails turbo-rails tzinfo-data + view_component (~> 3.14.0) web-console webmock whenever