mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #38026 from Edouard-chin/ec-av-base-loadorder
Don't require "action_view/base" in action pack:
This commit is contained in:
commit
e36d4a0381
5 changed files with 37 additions and 43 deletions
|
@ -26,12 +26,10 @@ module ActionController
|
|||
included do
|
||||
class_attribute :etag_with_template_digest, default: true
|
||||
|
||||
ActiveSupport.on_load :action_view, yield: true do
|
||||
etag do |options|
|
||||
determine_template_etag(options) if etag_with_template_digest
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def determine_template_etag(options)
|
||||
|
|
|
@ -5,7 +5,6 @@ require "action_dispatch/middleware/exception_wrapper"
|
|||
require "action_dispatch/routing/inspector"
|
||||
|
||||
require "action_view"
|
||||
require "action_view/base"
|
||||
|
||||
module ActionDispatch
|
||||
# This middleware is responsible for logging exceptions and
|
||||
|
|
|
@ -58,6 +58,7 @@ module ActionView
|
|||
autoload_at "action_view/template/resolver" do
|
||||
autoload :Resolver
|
||||
autoload :PathResolver
|
||||
autoload :FileSystemResolver
|
||||
autoload :OptimizedFileSystemResolver
|
||||
autoload :FallbackFileSystemResolver
|
||||
end
|
||||
|
|
|
@ -16,36 +16,36 @@ module ActionView
|
|||
|
||||
config.eager_load_namespaces << ActionView
|
||||
|
||||
initializer "action_view.embed_authenticity_token_in_remote_forms" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
config.after_initialize do |app|
|
||||
ActionView::Helpers::FormTagHelper.embed_authenticity_token_in_remote_forms =
|
||||
app.config.action_view.delete(:embed_authenticity_token_in_remote_forms)
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.form_with_generates_remote_forms" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
config.after_initialize do |app|
|
||||
form_with_generates_remote_forms = app.config.action_view.delete(:form_with_generates_remote_forms)
|
||||
ActionView::Helpers::FormHelper.form_with_generates_remote_forms = form_with_generates_remote_forms
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.form_with_generates_ids" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
config.after_initialize do |app|
|
||||
form_with_generates_ids = app.config.action_view.delete(:form_with_generates_ids)
|
||||
unless form_with_generates_ids.nil?
|
||||
ActionView::Helpers::FormHelper.form_with_generates_ids = form_with_generates_ids
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.default_enforce_utf8" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
config.after_initialize do |app|
|
||||
default_enforce_utf8 = app.config.action_view.delete(:default_enforce_utf8)
|
||||
unless default_enforce_utf8.nil?
|
||||
ActionView::Helpers::FormTagHelper.default_enforce_utf8 = default_enforce_utf8
|
||||
end
|
||||
end
|
||||
|
||||
config.after_initialize do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
app.config.action_view.each do |k, v|
|
||||
send "#{k}=", v
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.finalize_compiled_template_methods" do |app|
|
||||
|
@ -62,14 +62,6 @@ module ActionView
|
|||
ActiveSupport.on_load(:action_view) { self.logger ||= Rails.logger }
|
||||
end
|
||||
|
||||
initializer "action_view.set_configs" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
app.config.action_view.each do |k, v|
|
||||
send "#{k}=", v
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.caching" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
if app.config.action_view.cache_template_loading.nil?
|
||||
|
@ -78,14 +70,6 @@ module ActionView
|
|||
end
|
||||
end
|
||||
|
||||
initializer "action_view.per_request_digest_cache" do |app|
|
||||
ActiveSupport.on_load(:action_view) do
|
||||
unless ActionView::Resolver.caching?
|
||||
app.executor.to_run ActionView::CacheExpiry::Executor.new(watcher: app.config.file_watcher)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
initializer "action_view.setup_action_pack" do |app|
|
||||
ActiveSupport.on_load(:action_controller) do
|
||||
ActionView::RoutingUrlFor.include(ActionDispatch::Routing::UrlFor)
|
||||
|
@ -96,6 +80,18 @@ module ActionView
|
|||
PartialRenderer.collection_cache = app.config.action_controller.cache_store
|
||||
end
|
||||
|
||||
config.after_initialize do |app|
|
||||
enable_caching = if app.config.action_view.cache_template_loading.nil?
|
||||
app.config.cache_classes
|
||||
else
|
||||
app.config.action_view.cache_template_loading
|
||||
end
|
||||
|
||||
unless enable_caching
|
||||
app.executor.to_run ActionView::CacheExpiry::Executor.new(watcher: app.config.file_watcher)
|
||||
end
|
||||
end
|
||||
|
||||
rake_tasks do |app|
|
||||
unless app.config.api_only
|
||||
load "action_view/tasks/cache_digests.rake"
|
||||
|
|
|
@ -378,7 +378,7 @@ class LoadingTest < ActiveSupport::TestCase
|
|||
|
||||
test "frameworks aren't loaded during initialization" do
|
||||
app_file "config/initializers/raise_when_frameworks_load.rb", <<-RUBY
|
||||
%i(action_controller action_mailer active_job active_record).each do |framework|
|
||||
%i(action_controller action_mailer active_job active_record action_view).each do |framework|
|
||||
ActiveSupport.on_load(framework) { raise "\#{framework} loaded!" }
|
||||
end
|
||||
RUBY
|
||||
|
|
Loading…
Reference in a new issue