Require the top file and autoload Base class

The generators entry point file is rails/generators so we need to make
sure uers will be able to use the generators when requiring that file.

Fixes #12802

3 files changed, 2 insertions, 3 deletions

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 1c0952cc55..dce734b54e 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -15,6 +15,7 @@ module Rails
   module Generators
     autoload :Actions,         'rails/generators/actions'
     autoload :ActiveModel,     'rails/generators/active_model'
+    autoload :Base,            'rails/generators/base'
     autoload :Migration,       'rails/generators/migration'
     autoload :NamedBase,       'rails/generators/named_base'
     autoload :ResourceHelpers, 'rails/generators/resource_helpers'
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index eab6e52cd9..d79cf2b2f0 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/string/strip'
 require 'rails/version' unless defined?(Rails::VERSION)
 require 'open-uri'
 require 'uri'
-require 'rails/generators/base'
+require 'rails/generators'
 require 'active_support/core_ext/array/extract_options'
 
 module Rails
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index dc1d4fa181..cf33b13fd8 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -7,8 +7,6 @@ rescue LoadError
   exit
 end
 
-require 'rails/generators'
-
 module Rails
   module Generators
     class Error < Thor::Error # :nodoc: