FIX: Production asset compilation following c62a4a47 (#32491)

The bypass_sprockets_uglify was removed in that commit
This commit is contained in:
David Taylor
2025-04-28 15:04:56 +01:00
committed by GitHub
parent a91f8cee0a
commit c89245beff

View File

@ -169,52 +169,50 @@ def log_task_duration(task_description, &task)
end end
task "assets:precompile:compress_js": "environment" do task "assets:precompile:compress_js": "environment" do
if $bypass_sprockets_uglify puts "Compressing Javascript and Generating Source Maps"
puts "Compressing Javascript and Generating Source Maps" manifest = Sprockets::Manifest.new(assets_path)
manifest = Sprockets::Manifest.new(assets_path)
locales = Set.new(["en"]) locales = Set.new(["en"])
RailsMultisite::ConnectionManagement.each_connection do |db| RailsMultisite::ConnectionManagement.each_connection do |db|
locales.add(SiteSetting.default_locale) locales.add(SiteSetting.default_locale)
end end
log_task_duration("Done compressing all JS files") do log_task_duration("Done compressing all JS files") do
concurrent? do |proc| concurrent? do |proc|
manifest manifest
.files .files
.select { |k, v| k =~ /\.js\z/ } .select { |k, v| k =~ /\.js\z/ }
.each do |file, info| .each do |file, info|
path = "#{assets_path}/#{file}" path = "#{assets_path}/#{file}"
if file.include? "discourse/tests" if file.include? "discourse/tests"
STDERR.puts "Skipping: #{file}" STDERR.puts "Skipping: #{file}"
else else
proc.call do proc.call do
log_task_duration(file) do log_task_duration(file) do
STDERR.puts "Compressing: #{file}" STDERR.puts "Compressing: #{file}"
info["size"] = File.size(path) info["size"] = File.size(path)
info["mtime"] = File.mtime(path).iso8601 info["mtime"] = File.mtime(path).iso8601
gzip(path) gzip(path)
brotli(path) brotli(path)
end
end end
end end
end end
end end
end end
end
# protected # protected
manifest.send :save manifest.send :save
if GlobalSetting.fallback_assets_path.present? if GlobalSetting.fallback_assets_path.present?
begin begin
FileUtils.cp_r("#{Rails.root}/public/assets/.", GlobalSetting.fallback_assets_path) FileUtils.cp_r("#{Rails.root}/public/assets/.", GlobalSetting.fallback_assets_path)
rescue => e rescue => e
STDERR.puts "Failed to backup assets to #{GlobalSetting.fallback_assets_path}" STDERR.puts "Failed to backup assets to #{GlobalSetting.fallback_assets_path}"
STDERR.puts e STDERR.puts e
STDERR.puts e.backtrace STDERR.puts e.backtrace
end
end end
end end
end end