github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:04:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Use Terser for minification even if uglify-js is not available (#13683)

Browse Source
This commit is contained in:
Kim Lindberger 2021-07-14 08:20:57 +02:00 committed by GitHub
parent 1fb48fc9a6
commit 7e52eada20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tasks/assets.rake
View File

@ -18,7 +18,7 @@ task 'assets:precompile:before' do
# is recompiled
Emoji.clear_cache
if !`which uglifyjs`.empty? && !ENV['SKIP_NODE_UGLIFY']
if !`which terser`.empty? && !ENV['SKIP_NODE_UGLIFY']
$node_uglify = true
end
@ -102,11 +102,8 @@ def compress_node(from, to)
source_map_url = cdn_path "/assets/#{to}.map"
base_source_map = assets_path + assets_additional_path
# TODO: Remove uglifyjs when base image only includes terser
js_compressor = `which terser`.empty? ? 'uglifyjs' : 'terser'
cmd = <<~EOS
#{js_compressor} '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}'"
terser '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}'"
EOS
STDERR.puts cmd