Revert "FIX: deprecation warning - initialization autoloaded the constant (#12347)" (#12381)

This reverts commit 9a5a38a529.

This change was preventing `rake multisite:migrate` from working

config/application.rb

@@ -55,8 +55,6 @@ require 'pry-rails' if Rails.env.development?
 
 require 'discourse_fonts'
 
-require_relative '../lib/zeitwerk_config.rb'
-
 if defined?(Bundler)
   bundler_groups = [:default]
 
@@ -118,7 +116,6 @@ module Discourse
     config.autoload_paths += Dir["#{config.root}/lib/validators/"]
 
     Rails.autoloaders.main.ignore(Dir["#{config.root}/app/models/reports"])
-    Rails.autoloaders.main.ignore(Dir["#{config.root}/lib/freedom_patches"])
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

config/initializers/002-freedom_patches.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-Rails.application.reloader.to_prepare do
-  Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f|
+Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f|
   require(f)
-  end
 end

config/initializers/005-site_settings.rb

@@ -16,8 +16,7 @@ if GlobalSetting.skip_redis?
   return
 end
 
-Rails.application.reloader.to_prepare do
-  reload_settings = lambda {
+reload_settings = lambda {
   RailsMultisite::ConnectionManagement.safe_each_connection do
     begin
       SiteSetting.refresh!
@@ -29,13 +28,12 @@ Rails.application.reloader.to_prepare do
       # This will happen when migrating a new database
     end
   end
-  }
+}
 
-  reload_settings.call
+reload_settings.call
 
-  if !Rails.configuration.cache_classes
+if !Rails.configuration.cache_classes
   ActiveSupport::Reloader.to_prepare do
     reload_settings.call
   end
-  end
 end

config/initializers/100-i18n.rb

@@ -5,17 +5,15 @@
 require 'i18n/backend/discourse_i18n'
 require 'i18n/backend/fallback_locale_list'
 
-Rails.application.reloader.to_prepare do
-  I18n.backend = I18n::Backend::DiscourseI18n.new
-  I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
-  I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
-  I18n.reload!
-  I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
+I18n.backend = I18n::Backend::DiscourseI18n.new
+I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
+I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
+I18n.reload!
+I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
 
-  unless Rails.env.test?
+unless Rails.env.test?
   MessageBus.subscribe("/i18n-flush") do
     I18n.reload!
     ExtraLocalesController.clear_cache!
   end
-  end
 end

config/initializers/100-logster.rb

@@ -1,25 +1,22 @@
 # frozen_string_literal: true
 
 if GlobalSetting.skip_redis?
-  Rails.application.reloader.to_prepare do
   if Rails.logger.respond_to? :chained
     Rails.logger = Rails.logger.chained.first
   end
-  end
   return
 end
 
-Rails.application.reloader.to_prepare do
-  if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
+if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
   STDERR.puts "WARNING: Discourse development environment runs slower on Ruby 2.5.3 or below"
   STDERR.puts "We recommend you upgrade to Ruby 2.6.1 for the optimal development performance"
 
   # we have to used to older and slower version of the logger cause the new one exposes a Ruby bug in
   # the Queue class which causes segmentation faults
   Logster::Scheduler.disable
-  end
+end
 
-  if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
+if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
   console = ActiveSupport::Logger.new(STDOUT)
   original_logger = Rails.logger.chained.first
   console.formatter = original_logger.formatter
@@ -28,9 +25,9 @@ Rails.application.reloader.to_prepare do
   unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
     original_logger.extend(ActiveSupport::Logger.broadcast(console))
   end
-  end
+end
 
-  if Rails.env.production?
+if Rails.env.production?
   Logster.store.ignore = [
     # honestly, Rails should not be logging this, its real noisy
     /^ActionController::RoutingError \(No route matches/,
@@ -82,24 +79,24 @@ Rails.application.reloader.to_prepare do
     /^Creating scope :open\. Overwriting existing method Poll\.open\./,
   ]
   Logster.config.env_expandable_keys.push(:hostname, :problem_db)
-  end
+end
 
-  Logster.store.max_backlog = GlobalSetting.max_logster_logs
+Logster.store.max_backlog = GlobalSetting.max_logster_logs
 
-  # TODO logster should be able to do this automatically
-  Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs"
+# TODO logster should be able to do this automatically
+Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs"
 
-  Logster.config.application_version = Discourse.git_version
-  Logster.config.enable_custom_patterns_via_ui = true
-  Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting
+Logster.config.application_version = Discourse.git_version
+Logster.config.enable_custom_patterns_via_ui = true
+Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting
 
-  store = Logster.store
-  redis = Logster.store.redis
-  store.redis_prefix = Proc.new { redis.namespace }
-  store.redis_raw_connection = redis.without_namespace
-  severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN]
+store = Logster.store
+redis = Logster.store.redis
+store.redis_prefix = Proc.new { redis.namespace }
+store.redis_raw_connection = redis.without_namespace
+severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN]
 
-  RailsMultisite::ConnectionManagement.each_connection do
+RailsMultisite::ConnectionManagement.each_connection do
   error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0
 
   if (error_rate_per_minute || 0) > 0
@@ -129,24 +126,23 @@ Rails.application.reloader.to_prepare do
       )
     end
   end
-  end
+end
 
-  if Rails.configuration.multisite
+if Rails.configuration.multisite
   if Rails.logger.respond_to? :chained
     chained = Rails.logger.chained
     chained && chained.first.formatter = RailsMultisite::Formatter.new
   end
-  end
+end
 
-  Logster.config.project_directories = [
+Logster.config.project_directories = [
   { path: Rails.root.to_s, url: "https://github.com/discourse/discourse", main_app: true }
-  ]
-  Discourse.plugins.each do |plugin|
+]
+Discourse.plugins.each do |plugin|
   next if !plugin.metadata.url
 
   Logster.config.project_directories << {
     path: "#{Rails.root.to_s}/plugins/#{plugin.directory_name}",
     url: plugin.metadata.url
   }
-  end
 end