mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 13:41:31 +08:00
FIX: S3 rake task can ignore yarn.lock
This commit is contained in:
parent
bc1f7bd659
commit
08fbf199ad
|
@ -71,27 +71,26 @@ def assets
|
|||
manifest.assets.each do |_, path|
|
||||
fullpath = (Rails.root + "public/assets/#{path}").to_s
|
||||
|
||||
mime = MiniMime.lookup_by_filename(fullpath)
|
||||
if mime.nil?
|
||||
STDERR.puts "ERROR: could not determine mime type for #{fullpath}"
|
||||
# Ignore files we can't find the mime type of, like yarn.lock
|
||||
if mime = MiniMime.lookup_by_filename(fullpath)
|
||||
content_type = mime.content_type
|
||||
|
||||
asset_path = "assets/#{path}"
|
||||
results << [fullpath, asset_path, content_type]
|
||||
|
||||
if File.exist?(fullpath + '.br')
|
||||
results << [fullpath + '.br', brotli_s3_path(asset_path), content_type, 'br']
|
||||
end
|
||||
|
||||
if File.exist?(fullpath + '.gz')
|
||||
results << [fullpath + '.gz', gzip_s3_path(asset_path), content_type, 'gzip']
|
||||
end
|
||||
|
||||
if File.exist?(fullpath + '.map')
|
||||
results << [fullpath + '.map', asset_path + '.map', 'application/json']
|
||||
end
|
||||
end
|
||||
|
||||
content_type = mime.content_type
|
||||
|
||||
asset_path = "assets/#{path}"
|
||||
results << [fullpath, asset_path, content_type]
|
||||
|
||||
if File.exist?(fullpath + '.br')
|
||||
results << [fullpath + '.br', brotli_s3_path(asset_path), content_type, 'br']
|
||||
end
|
||||
|
||||
if File.exist?(fullpath + '.gz')
|
||||
results << [fullpath + '.gz', gzip_s3_path(asset_path), content_type, 'gzip']
|
||||
end
|
||||
|
||||
if File.exist?(fullpath + '.map')
|
||||
results << [fullpath + '.map', asset_path + '.map', 'application/json']
|
||||
end
|
||||
end
|
||||
|
||||
results
|
||||
|
|
Loading…
Reference in New Issue
Block a user