diff --git a/Gemfile b/Gemfile index e5ebad5a0..a8c50228a 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,8 @@ gem 'open_uri_redirections' # for stylesheets gem 'sassc-rails' -# as compressor for JavaScript assets -gem 'uglifier' +# as javascript asset compressor +gem 'terser' # for translations gem 'fast_gettext', '>= 0.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5c7790692..4d93a3dbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,7 +90,7 @@ GEM dalli (3.2.1) digest (3.1.0) erubi (1.10.0) - execjs (2.7.0) + execjs (2.8.1) faker (2.20.0) i18n (>= 1.8.11, < 2) faraday (1.10.0) @@ -278,14 +278,14 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) strscan (3.0.1) + terser (1.1.8) + execjs (>= 0.3.0, < 3) text (1.3.1) thor (1.2.1) tilt (2.0.10) timeout (0.2.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) unicode-display_width (2.1.0) vcr (6.1.0) webmock (3.14.0) @@ -338,7 +338,7 @@ DEPENDENCIES sassc-rails selenium-webdriver sprockets-rails - uglifier + terser vcr webmock xmlhash (>= 1.2.2) diff --git a/config/environments/production.rb b/config/environments/production.rb index 5a2c5a9df..84bde36da 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -24,8 +24,9 @@ # Apache or NGINX already handles this. config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? - # Compress CSS using a preprocessor. - config.assets.css_compressor = :uglifier + # Compress assets using a preprocessor + config.assets.css_compressor = :sass + config.assets.js_compressor = :terser # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false diff --git a/vendor/cache/execjs-2.7.0.gem b/vendor/cache/execjs-2.7.0.gem deleted file mode 100644 index 1247cce45..000000000 Binary files a/vendor/cache/execjs-2.7.0.gem and /dev/null differ diff --git a/vendor/cache/execjs-2.8.1.gem b/vendor/cache/execjs-2.8.1.gem new file mode 100644 index 000000000..b8c2d2fc4 Binary files /dev/null and b/vendor/cache/execjs-2.8.1.gem differ diff --git a/vendor/cache/terser-1.1.8.gem b/vendor/cache/terser-1.1.8.gem new file mode 100644 index 000000000..726ebfbc6 Binary files /dev/null and b/vendor/cache/terser-1.1.8.gem differ diff --git a/vendor/cache/uglifier-4.2.0.gem b/vendor/cache/uglifier-4.2.0.gem deleted file mode 100644 index 9b97e3c83..000000000 Binary files a/vendor/cache/uglifier-4.2.0.gem and /dev/null differ