DEV: Use `yarn`-installed terser in assets.rake (#28422)
This was previously relying on a globally-installed terser, which comes from a time before Discourse had proper JS dependency management
This commit is contained in:
parent
3f5b0dc98d
commit
02678b3107
|
@ -57,7 +57,7 @@ task "assets:precompile:before": %w[
|
||||||
# is recompiled
|
# is recompiled
|
||||||
Emoji.clear_cache
|
Emoji.clear_cache
|
||||||
|
|
||||||
$node_compress = `which terser`.present? && !ENV["SKIP_NODE_UGLIFY"]
|
$node_compress = !ENV["SKIP_NODE_UGLIFY"]
|
||||||
|
|
||||||
unless ENV["USE_SPROCKETS_UGLIFY"]
|
unless ENV["USE_SPROCKETS_UGLIFY"]
|
||||||
$bypass_sprockets_uglify = true
|
$bypass_sprockets_uglify = true
|
||||||
|
@ -158,7 +158,7 @@ def compress_node(from, to)
|
||||||
base_source_map = assets_path + assets_additional_path
|
base_source_map = assets_path + assets_additional_path
|
||||||
|
|
||||||
cmd = <<~SH
|
cmd = <<~SH
|
||||||
terser '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}',includeSources=true"
|
yarn terser '#{assets_path}/#{from}' -m -c -o '#{to_path}' --source-map "base='#{base_source_map}',root='#{source_map_root}',url='#{source_map_url}',includeSources=true"
|
||||||
SH
|
SH
|
||||||
|
|
||||||
STDERR.puts cmd
|
STDERR.puts cmd
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
"prettier": "^2.8.8",
|
"prettier": "^2.8.8",
|
||||||
"puppeteer-core": "^23.1.0",
|
"puppeteer-core": "^23.1.0",
|
||||||
"squoosh": "discourse/squoosh#dc9649d",
|
"squoosh": "discourse/squoosh#dc9649d",
|
||||||
|
"terser": "^5.31.6",
|
||||||
"typescript": "^5.5.4"
|
"typescript": "^5.5.4"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in New Issue