Skip to content

Commit cb23a81

Browse files
authored
fix: prevent error when using a proc in asset_host (close #202) (#203)
1 parent e75d5f1 commit cb23a81

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

vite_rails/lib/vite_rails/config.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ module ViteRails::Config
44
# Override: Default values for a Rails application.
55
def config_defaults
66
require 'rails'
7+
asset_host = Rails.application&.config&.action_controller&.asset_host
78
super(
8-
asset_host: Rails.application&.config&.action_controller&.asset_host,
9+
asset_host: asset_host.is_a?(Proc) ? nil : asset_host,
910
mode: Rails.env.to_s,
1011
root: Rails.root || Dir.pwd,
1112
)

vite_rails_legacy/lib/vite_rails_legacy/config.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ module ViteRailsLegacy::Config
44
# Override: Default values for a Rails application.
55
def config_defaults
66
require 'rails'
7+
asset_host = Rails.application&.config&.action_controller&.asset_host
78
super(
8-
asset_host: Rails.application&.config&.action_controller&.asset_host,
9+
asset_host: asset_host.is_a?(Proc) ? nil : asset_host,
910
mode: Rails.env.to_s,
1011
root: Rails.root || Dir.pwd,
1112
)

vite_ruby/lib/vite_ruby/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def config_defaults(asset_host: nil, mode: ENV.fetch('RACK_ENV', 'development'),
121121
'config_path' => option_from_env('config_path') || DEFAULT_CONFIG.fetch('config_path'),
122122
'mode' => option_from_env('mode') || mode,
123123
'root' => option_from_env('root') || root,
124-
}
124+
}.select { |_, value| value }
125125
end
126126

127127
# Internal: Used to load a JSON file from the specified path.

0 commit comments

Comments
 (0)