Make GlobalConfig a proxy for Rails app config or ViewComponent base config as necessary

Author: boardfish

lib/view_component/base.rb

@@ -232,7 +232,7 @@ def controller
     # @return [ActionView::Base]
     def helpers
       raise HelpersCalledBeforeRenderError if view_context.nil?
-      raise StrictHelperError unless ViewComponent::Base.config.helpers_enabled
+      raise StrictHelperError unless GlobalConfig.helpers_enabled
       # Attempt to re-use the original view_context passed to the first
       # component rendered in the rendering pipeline. This prevents the
       # instantiation of a new view_context via `controller.view_context` which
@@ -249,7 +249,7 @@ def method_missing(method_name, *args) # rubocop:disable Style/MissingRespondToM
         super
       rescue => e # rubocop:disable Style/RescueStandardError
         e.set_backtrace e.backtrace.tap(&:shift)
-        if !ViewComponent::Base.config.helpers_enabled
+        if !GlobalConfig.helpers_enabled
           raise e, <<~MESSAGE.chomp if view_context && e.is_a?(NameError) && (__vc_original_view_context.respond_to?(method_name) || controller.view_context.respond_to?(method_name))
             #{e.message}
 
@@ -520,15 +520,13 @@ def inherited(child)
         # `compile` defines
         compile
 
-        child.include ActiveSupport::Configurable
-
         if child.superclass == ViewComponent::Base
-          child.define_singleton_method(:config) do
-            @@config ||= Rails.application.config.view_component.inheritable_copy
+          child.define_singleton_method(:component_config) do
+            @@component_config ||= Rails.application.config.view_component.inheritable_copy
           end
         else
-          child.define_singleton_method(:config) do
-            @@config ||= superclass.config.inheritable_copy
+          child.define_singleton_method(:component_config) do
+            @@component_config ||= superclass.component_config.inheritable_copy
           end
         end
 

test/sandbox/test/base_test.rb

@@ -163,12 +163,12 @@ def test_strict_helpers_enabled
       Rails.application.config.view_component[:strict_helpers_enabled?] = true
       refute ViewComponent::Base.config.strict_helpers_enabled?, ".strict_helpers_enabled? should not be changed by global config for ViewComponent::Base"
       # refute ViewComponent::Base.new.config.strict_helpers_enabled?, "#strict_helpers_enabled? should not be changed by global config for ViewComponent::Base"
-      assert top_level_component_class.config.strict_helpers_enabled?, ".strict_helpers_enabled? should inherit from global config"
-      assert top_level_component_class.new.config.strict_helpers_enabled?, "#strict_helpers_enabled? should inherit from global config"
+      assert top_level_component_class.component_config.strict_helpers_enabled?, ".strict_helpers_enabled? should inherit from global config"
+      assert top_level_component_class.new.component_config.strict_helpers_enabled?, "#strict_helpers_enabled? should inherit from global config"
       inherited_component_class = Class.new(top_level_component_class)
-      top_level_component_class.config[:strict_helpers_enabled?] = false
-      refute inherited_component_class.config.strict_helpers_enabled?, ".strict_helpers_enabled? should inherit from its parent"
-      refute inherited_component_class.new.config.strict_helpers_enabled?, "#strict_helpers_enabled? should inherit from its parent"
+      top_level_component_class.component_config[:strict_helpers_enabled?] = false
+      refute inherited_component_class.component_config.strict_helpers_enabled?, ".strict_helpers_enabled? should inherit from its parent"
+      refute inherited_component_class.new.component_config.strict_helpers_enabled?, "#strict_helpers_enabled? should inherit from its parent"
     end
   end
 end