From 518e913ad9fa7acae6ccaf1dd2d72f9480ca3505 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Mon, 2 Dec 2024 10:09:54 -0500 Subject: [PATCH] Update Uglifier gem --- Gemfile | 6 +++++- Gemfile.lock | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a138ad8..e0ca7ce 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'sass-rails', '~> 5.0' # Use Devise for authentication gem 'devise' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 2.7', '>= 2.7.2' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'mini_racer', platforms: :ruby # Use CoffeeScript for .coffee assets and views @@ -121,7 +121,11 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] +# Required by net-ssh for supporting ssh-ed25519 keys during deployment gem 'bcrypt_pbkdf', '~> 1.0', '>= 1.0.0' gem 'ed25519', '~> 1.2', '>= 1.2.4' gem 'net-ssh', '>= 6.0.0' +# Required for mutex_m since Ruby 3.4.0 will not include it by default +gem 'mutex_m' + diff --git a/Gemfile.lock b/Gemfile.lock index bea35c5..10b9e53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,6 +186,7 @@ GEM mini_mime (1.1.5) minitest (5.25.2) msgpack (1.7.5) + mutex_m (0.3.0) mysql2 (0.5.6) net-imap (0.5.1) date @@ -378,8 +379,9 @@ GEM turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (4.2.1) - execjs (>= 0.3.0, < 3) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) unicode-display_width (3.1.2) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) @@ -441,6 +443,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails listen (>= 3.0.5, < 3.2) + mutex_m mysql2 net-pop (~> 0.1.2) net-protocol @@ -469,7 +472,7 @@ DEPENDENCIES sqlite3 (~> 1.4) turbolinks (~> 5) tzinfo-data - uglifier (>= 1.3.0) + uglifier (~> 2.7, >= 2.7.2) web-console (>= 3.3.0) RUBY VERSION