From f4593eec39e8d2d4804c0a0197b510cfd760087d Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 22 Dec 2021 15:47:08 -0500 Subject: [PATCH] 17417: switch our Rails codebases from therubyracer to mini_racer. Remove old dependency on `less` and `less-rails` from WB1. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- apps/workbench/Gemfile | 6 ++---- apps/workbench/Gemfile.lock | 19 ++++--------------- services/api/Gemfile | 2 +- services/api/Gemfile.lock | 10 ++++------ 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 46c1e8e60c..bc08b2dedd 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -31,8 +31,8 @@ group :assets do gem 'sassc-rails' gem 'uglifier', '~> 2.0' - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - gem 'therubyracer', :platforms => :ruby + # See https://github.com/rails/execjs#readme for more supported runtimes + gem 'mini_racer', :platforms => :ruby end group :development, :test, :performance do @@ -77,8 +77,6 @@ gem 'bootstrap-tab-history-rails' gem 'angularjs-rails', '~> 1.3.8' -gem 'less' -gem 'less-rails' gem 'sshkey' # To use ActiveModel has_secure_password diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 13c4430965..f9575ac503 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -118,7 +118,6 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - commonjs (0.2.7) concurrent-ruby (1.1.9) crass (1.0.6) deep_merge (1.2.1) @@ -152,13 +151,7 @@ GEM jwt (1.5.6) launchy (2.4.3) addressable (~> 2.3) - less (2.6.0) - commonjs (~> 0.2.7) - less-rails (4.0.0) - actionpack (>= 4) - less (~> 2.6.0) - sprockets (>= 2) - libv8 (3.16.14.19) + libv8-node (15.14.0.1) lograge (0.10.0) actionpack (>= 4) activesupport (>= 4) @@ -179,6 +172,8 @@ GEM mime-types-data (3.2019.0331) mini_mime (1.1.0) mini_portile2 (2.6.1) + mini_racer (0.4.0) + libv8-node (~> 15.14.0.0) minitest (5.10.3) mocha (1.8.0) metaclass (~> 0.0.1) @@ -254,7 +249,6 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - ref (2.0.0) request_store (1.4.1) rack (>= 1.4) responders (2.4.1) @@ -304,9 +298,6 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sshkey (2.0.0) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (1.1.0) thread_safe (0.3.6) tilt (2.0.9) @@ -342,11 +333,10 @@ DEPENDENCIES httpclient (~> 2.5) jquery-rails launchy (~> 2.4.0) - less - less-rails lograge logstash-event mime-types + mini_racer minitest (~> 5.10.3) mocha morrisjs-rails @@ -375,7 +365,6 @@ DEPENDENCIES sprockets (~> 3.0) sshkey themes_for_rails! - therubyracer uglifier (~> 2.0) BUNDLED WITH diff --git a/services/api/Gemfile b/services/api/Gemfile index 39ce5def17..677d4d0cda 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -30,7 +30,7 @@ gem 'pg', '~> 1.0' gem 'multi_json' gem 'oj' -gem 'therubyracer' +gem 'mini_racer' gem 'uglifier', '~> 2.0' gem 'jquery-rails' diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index bdf7911534..40f30782e5 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -122,7 +122,7 @@ GEM jwt (1.5.6) launchy (2.5.0) addressable (~> 2.7) - libv8 (3.16.14.19) + libv8-node (15.14.0.1) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -143,6 +143,8 @@ GEM method_source (1.0.0) mini_mime (1.1.0) mini_portile2 (2.6.1) + mini_racer (0.4.0) + libv8-node (~> 15.14.0.0) minitest (5.10.3) mocha (1.8.0) metaclass (~> 0.0.1) @@ -207,7 +209,6 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - ref (2.0.0) request_store (1.4.1) rack (>= 1.4) responders (2.4.1) @@ -250,9 +251,6 @@ GEM sshkey (2.0.0) test-unit (3.3.1) power_assert - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (1.1.0) thread_safe (0.3.6) tilt (2.0.8) @@ -279,6 +277,7 @@ DEPENDENCIES listen lograge logstash-event + mini_racer minitest (= 5.10.3) mocha multi_json @@ -301,7 +300,6 @@ DEPENDENCIES sshkey test-unit (~> 3.0) themes_for_rails! - therubyracer uglifier (~> 2.0) BUNDLED WITH -- 2.30.2