From 6a172fed120abcc041c0626dd42f10b004a0f539 Mon Sep 17 00:00:00 2001 From: Hamed Asghari Date: Fri, 24 Oct 2025 11:40:42 -0600 Subject: [PATCH 1/2] Isolate ActiveSupport deprecation warning to Configurable module --- docs/CHANGELOG.md | 4 ++++ lib/view_component/base.rb | 1 - lib/view_component/configurable.rb | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f1ae0cd8f..1ba2d97ab 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -10,6 +10,10 @@ nav_order: 6 ## main +* Isolate ActiveSupport deprecation warning to Configurable module + + *Hamed Asghari* + * Added Reinvented Hospitality to the list of companies using ViewComponent. *Torgil Zechel* diff --git a/lib/view_component/base.rb b/lib/view_component/base.rb index 97ba41815..8f8619c67 100644 --- a/lib/view_component/base.rb +++ b/lib/view_component/base.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "action_view" -require "active_support/configurable" require "view_component/collection" require "view_component/compile_cache" require "view_component/compiler" diff --git a/lib/view_component/configurable.rb b/lib/view_component/configurable.rb index b878a7ab3..0d5122488 100644 --- a/lib/view_component/configurable.rb +++ b/lib/view_component/configurable.rb @@ -7,6 +7,7 @@ module Configurable included do next if respond_to?(:config) && config.respond_to?(:view_component) && config.respond_to_missing?(:instrumentation_enabled) + require "active_support/configurable" include ActiveSupport::Configurable configure do |config| From 71f0bb4c59c53e7fb2b114fc0560387bf70c490b Mon Sep 17 00:00:00 2001 From: Hamed Asghari Date: Fri, 24 Oct 2025 12:35:33 -0600 Subject: [PATCH 2/2] Update Appraisal lockfiles --- gemfiles/rails_8.0.gemfile.lock | 2 +- gemfiles/rails_8.1.gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gemfiles/rails_8.0.gemfile.lock b/gemfiles/rails_8.0.gemfile.lock index 0e25a00fc..b98731090 100644 --- a/gemfiles/rails_8.0.gemfile.lock +++ b/gemfiles/rails_8.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - view_component (4.0.2) + view_component (4.1.0) activesupport (>= 7.1.0, < 8.2) concurrent-ruby (~> 1) diff --git a/gemfiles/rails_8.1.gemfile.lock b/gemfiles/rails_8.1.gemfile.lock index b8b95a54e..90b2bb3d1 100644 --- a/gemfiles/rails_8.1.gemfile.lock +++ b/gemfiles/rails_8.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - view_component (4.0.2) + view_component (4.1.0) activesupport (>= 7.1.0, < 8.2) concurrent-ruby (~> 1)