mirror of
https://github.com/discourse/discourse.git
synced 2024-12-15 00:23:49 +08:00
86f1c177d6
This patch removes two freedom patches: - `mail_disable_starttls.rb`: this has been fixed in the 2.8 release of the mail gem, so we don’t need it anymore. - `rails4.rb`: those methods have been deprecated for a while now and should have been dropped with Discourse v3.2.
63 lines
2.1 KiB
Ruby
63 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# This contains two patches to make sprockets more tolerable in dev
|
|
#
|
|
# 1. Stop computing asset paths which triggers sprockets to do mountains of work
|
|
# All our assets in dev are in the /assets folder anyway
|
|
#
|
|
# 2. Stop using a concatenator that does tons of work checking for semicolons when
|
|
# when rebuilding an asset
|
|
|
|
module FreedomPatches
|
|
module SprocketsPatches
|
|
def self.concat_javascript_sources(buf, source)
|
|
if buf.bytesize > 0
|
|
# CODE REMOVED HERE
|
|
buf << ";" # unless string_end_with_semicolon?(buf)
|
|
buf << "\n" # unless buf.end_with?("\n")
|
|
end
|
|
buf << source
|
|
end
|
|
|
|
if Rails.env.local?
|
|
Sprockets.register_bundle_metadata_reducer "application/javascript",
|
|
:data,
|
|
proc { +"" },
|
|
method(:concat_javascript_sources)
|
|
end
|
|
end
|
|
end
|
|
|
|
if Rails.env.local?
|
|
ActiveSupport.on_load(:action_view) do
|
|
def compute_asset_path(source, _options = {})
|
|
"/assets/#{source}"
|
|
end
|
|
alias_method :public_compute_asset_path, :compute_asset_path
|
|
end
|
|
end
|
|
|
|
# By default, the Sprockets DirectiveProcessor introduces a newline between possible 'header' comments
|
|
# and the rest of the JS file. (https://github.com/rails/sprockets/blob/f4d3dae71e/lib/sprockets/directive_processor.rb#L121)
|
|
# This causes sourcemaps to be offset by 1 line, and therefore breaks browser tooling.
|
|
# We know that Ember-Cli assets do not use Sprockets directives, so we can totally bypass the DirectiveProcessor for those files.
|
|
Sprockets::DirectiveProcessor.prepend(
|
|
Module.new do
|
|
def process_source(source)
|
|
return source, [] if EmberCli.is_ember_cli_asset?(File.basename(@filename))
|
|
super
|
|
end
|
|
end,
|
|
)
|
|
|
|
# Skip sprockets fingerprinting for some assets
|
|
Sprockets::Asset.prepend(
|
|
Module.new do
|
|
def digest_path
|
|
# Webpack chunks are already named based on their contents
|
|
return logical_path if logical_path.start_with?("chunk.")
|
|
super
|
|
end
|
|
end,
|
|
)
|