tapioca 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd1124c2c3feac470d361a45577dc6384e85873e93f19a2bea4eb91b01da593c
-  data.tar.gz: 0d6a664089314ff666abd93615dae440274af183b0a7ef2d60035cee73299de9
+  metadata.gz: 84489402f0ea53d60251615f8b40358f946e88fd302d33d2b06adb09bfadfeb6
+  data.tar.gz: 34f1790682595d9f63479463c6a3e76dbff2682e40680e9d0971fb7ce3fd7de8
 SHA512:
-  metadata.gz: b599a8e5a0dbee29e0e64ff458eb7a6e7c85c3beb0ffae20ae3487fb1d080714e80490d0e0c089bc32ab9dd33670901692396fc2d25c2064d0ab8012158dbb4b
-  data.tar.gz: b2a58b28c77a0b33c9f83f48f2663c106b9dc465ae137c6f71ac04601dbf3ec63ca8c6b7fde45820577c2d0bd237a65ce07a45f440195b5514a20614f33e80e5
+  metadata.gz: 8defde6f57d9d373d2982e7450ac217e0ba7e3cc2402ec740b124bdd0a7e1def41bf8bc8432699029016c98c83fd0c036248879ec6532869b350facdde4a4bc5
+  data.tar.gz: f8225d925a796ba74424637b6b843c5a53a14fb52de6e5fcce4751a136639f3738d48373f053111cc5958ba55e3bbda055d00259b629b94cd0b80b2f4c815b44

data/lib/tapioca/loaders/loader.rb

@@ -80,8 +80,6 @@ module Tapioca
       def load_rails_engines
         return if engines.empty?
 
-        normalize_eager_load_paths_configuration!
-
         with_rails_application do
           run_initializers
 
@@ -112,7 +110,7 @@ module Tapioca
         autoloader = Zeitwerk::Loader.new
 
         engines.each do |engine|
-          engine.config.all_eager_load_paths.each do |path|
+          eager_load_paths(engine).each do |path|
             # Zeitwerk only accepts existing directories in `push_dir`.
             next unless File.directory?(path)
             # We should not add directories that are already managed by a Zeitwerk loader.
@@ -133,7 +131,7 @@ module Tapioca
         # We can't use `Rails::Engine#eager_load!` directly because it will raise as soon as it encounters
         # an error, which is not what we want. We want to try to load as much as we can.
         engines.each do |engine|
-          engine.config.all_eager_load_paths.each do |load_path|
+          eager_load_paths(engine).each do |load_path|
             Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
               require_dependency file
             end
@@ -181,19 +179,6 @@ module Tapioca
           .reject { |engine| gem_in_app_dir?(project_path, engine.config.root.to_path) }
       end
 
-      # Rails 7.2 renamed `eager_load_paths` to `all_eager_load_paths`, which maintains the same original functionality.
-      # The `eager_load_paths` method still exists, but doesn't return all paths anymore and causes Tapioca to miss some
-      # engine paths. The following commit is the change:
-      # https://github.com/rails/rails/commit/ebfca905db14020589c22e6937382e6f8f687664
-      #
-      # Here we make sure that the new `all_eager_load_paths` is always defined for every Rails version below 7.2, so
-      # that we can use it everywhere
-      def normalize_eager_load_paths_configuration!
-        return if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 2
-
-        engines.each { |e| e.config.all_eager_load_paths = e.config.eager_load_paths }
-      end
-
       sig { params(path: String).void }
       def safe_require(path)
         require path
@@ -239,6 +224,17 @@ module Tapioca
 
         require(file)
       end
+
+      # Rails 7.2 renamed `eager_load_paths` to `all_eager_load_paths`, which maintains the same original functionality.
+      # The `eager_load_paths` method still exists, but doesn't return all paths anymore and causes Tapioca to miss some
+      # engine paths. The following commit is the change:
+      # https://github.com/rails/rails/commit/ebfca905db14020589c22e6937382e6f8f687664
+      sig { params(engine: T.class_of(Rails::Engine)).returns(T::Array[String]) }
+      def eager_load_paths(engine)
+        config = engine.config
+
+        (config.respond_to?(:all_eager_load_paths) && config.all_eager_load_paths) || config.eager_load_paths
+      end
     end
   end
 end

data/lib/tapioca/static/symbol_loader.rb

@@ -27,7 +27,15 @@ module Tapioca
 
           return Set.new unless gem_engine
 
-          paths = gem_engine.config.all_eager_load_paths.flat_map do |load_path|
+          # https://github.com/rails/rails/commit/ebfca905db14020589c22e6937382e6f8f687664
+          config = gem_engine.config
+          eager_load_paths = if config.respond_to?(:all_eager_load_paths)
+            config.all_eager_load_paths
+          else
+            config.eager_load_paths
+          end
+
+          paths = eager_load_paths.flat_map do |load_path|
             Pathname.glob("#{load_path}/**/*.rb")
           end
 

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.11.10"
+  VERSION = "0.11.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,22 +59,22 @@ dependencies:
   name: rbi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sorbet-static-and-runtime
   requirement: !ruby/object:Gem::Requirement