fix: prevent error when using a proc in asset_host (close #202) (#203)

ElMassimo · Apr 14, 2022 · cb23a81 · cb23a81
1 parent e75d5f1
commit cb23a81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/vite_rails/lib/vite_rails/config.rb b/vite_rails/lib/vite_rails/config.rb
@@ -4,8 +4,9 @@ module ViteRails::Config
   # Override: Default values for a Rails application.
   def config_defaults
     require 'rails'
+    asset_host = Rails.application&.config&.action_controller&.asset_host
     super(
-      asset_host: Rails.application&.config&.action_controller&.asset_host,
+      asset_host: asset_host.is_a?(Proc) ? nil : asset_host,
       mode: Rails.env.to_s,
       root: Rails.root || Dir.pwd,
     )

diff --git a/vite_rails_legacy/lib/vite_rails_legacy/config.rb b/vite_rails_legacy/lib/vite_rails_legacy/config.rb
@@ -4,8 +4,9 @@ module ViteRailsLegacy::Config
   # Override: Default values for a Rails application.
   def config_defaults
     require 'rails'
+    asset_host = Rails.application&.config&.action_controller&.asset_host
     super(
-      asset_host: Rails.application&.config&.action_controller&.asset_host,
+      asset_host: asset_host.is_a?(Proc) ? nil : asset_host,
       mode: Rails.env.to_s,
       root: Rails.root || Dir.pwd,
     )

diff --git a/vite_ruby/lib/vite_ruby/config.rb b/vite_ruby/lib/vite_ruby/config.rb
@@ -121,7 +121,7 @@ def config_defaults(asset_host: nil, mode: ENV.fetch('RACK_ENV', 'development'),
         'config_path' => option_from_env('config_path') || DEFAULT_CONFIG.fetch('config_path'),
         'mode' => option_from_env('mode') || mode,
         'root' => option_from_env('root') || root,
-      }
+      }.select { |_, value| value }
     end
 
     # Internal: Used to load a JSON file from the specified path.