Commit 4d3613a0 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'switch-uglifier-with-terser' into 'master'

Switch to terser gem to replace uglifier

See merge request gitlab-org/gitlab!44034
parents 15e4eedd 533e323d
...@@ -290,7 +290,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2' ...@@ -290,7 +290,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
gem 'sassc-rails', '~> 2.1.0' gem 'sassc-rails', '~> 2.1.0'
gem 'uglifier', '~> 2.7.2' gem 'terser', '~> 1.0'
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
......
...@@ -312,7 +312,7 @@ GEM ...@@ -312,7 +312,7 @@ GEM
tzinfo tzinfo
eventmachine (1.2.7) eventmachine (1.2.7)
excon (0.71.1) excon (0.71.1)
execjs (2.6.0) execjs (2.7.0)
expression_parser (0.9.0) expression_parser (0.9.0)
extended-markdown-filter (0.6.0) extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0) html-pipeline (~> 2.0)
...@@ -1130,6 +1130,8 @@ GEM ...@@ -1130,6 +1130,8 @@ GEM
temple (0.8.2) temple (0.8.2)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
terser (1.0.1)
execjs (>= 0.3.0, < 3)
test-prof (0.12.0) test-prof (0.12.0)
text (1.3.1) text (1.3.1)
thin (1.7.2) thin (1.7.2)
...@@ -1157,9 +1159,6 @@ GEM ...@@ -1157,9 +1159,6 @@ GEM
thread_safe (~> 0.1) thread_safe (~> 0.1)
u2f (0.2.1) u2f (0.2.1)
uber (0.1.0) uber (0.1.0)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.5) unf_ext (0.0.7.5)
...@@ -1483,13 +1482,13 @@ DEPENDENCIES ...@@ -1483,13 +1482,13 @@ DEPENDENCIES
stackprof (~> 0.2.15) stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.6.0) state_machines-activerecord (~> 0.6.0)
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
terser (~> 1.0)
test-prof (~> 0.12.0) test-prof (~> 0.12.0)
thin (~> 1.7.0) thin (~> 1.7.0)
timecop (~> 0.9.1) timecop (~> 0.9.1)
toml-rb (~> 1.0.0) toml-rb (~> 1.0.0)
truncato (~> 0.7.11) truncato (~> 0.7.11)
u2f (~> 0.2.1) u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4) unf (~> 0.1.4)
unicorn (~> 5.5) unicorn (~> 5.5)
unicorn-worker-killer (~> 0.4.4) unicorn-worker-killer (~> 0.4.4)
......
...@@ -12,7 +12,7 @@ Rails.application.configure do ...@@ -12,7 +12,7 @@ Rails.application.configure do
config.public_file_server.enabled = false config.public_file_server.enabled = false
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :terser
# config.assets.css_compressor = :sass # config.assets.css_compressor = :sass
# Don't fallback to assets pipeline if a precompiled asset is missed # Don't fallback to assets pipeline if a precompiled asset is missed
......
Sprockets.register_compressor 'application/javascript', :terser, Terser::Compressor
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment