diff --git a/Appraisals b/Appraisals index 8dd66aa4f..e0d1a66bd 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,7 @@ # frozen_string_literal: true appraise "rails-7.1" do - ruby "~> 3.2.0" + ruby "~> 3.2" gem "rails", "~> 7.1.0" @@ -12,7 +12,7 @@ appraise "rails-7.1" do end appraise "rails-7.2" do - ruby "~> 3.3.0" + ruby "~> 3.3" gem "rails", "~> 7.2.0" @@ -23,7 +23,7 @@ appraise "rails-7.2" do end appraise "rails-8.0" do - ruby "~> 3.4.0" + ruby "~> 3.4" gem "rails", "~> 8.0.0" @@ -34,7 +34,7 @@ appraise "rails-8.0" do end appraise "rails-8.1" do - ruby "~> 3.4.0" + ruby "~> 4.0" gem "rails", "~> 8.1.0" @@ -45,7 +45,7 @@ appraise "rails-8.1" do end appraise "rails-main" do - ruby "4.0.0.dev" + ruby "4.1.0.dev" gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0" gem "rails", github: "rails/rails", branch: "main" diff --git a/Gemfile.lock b/Gemfile.lock index 4ccbdef1c..b704511fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - view_component (4.1.1) + view_component (4.2.0) actionview (>= 7.1.0) activesupport (>= 7.1.0) concurrent-ruby (~> 1) @@ -456,7 +456,7 @@ DEPENDENCIES yard-activesupport-concern (< 1) RUBY VERSION - ruby 3.3.0p0 + ruby 3.4.7p58 BUNDLED WITH 2.6.2 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e9639eb01..0083c72aa 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -10,6 +10,8 @@ nav_order: 6 ## main +## 4.2.0 + * Fix translation scope resolution in deeply nested component blocks (3+ levels). Translations called inside deeply nested slot blocks using `renders_many`/`renders_one` were incorrectly resolving to an intermediate component's scope instead of the partial's scope where the block was defined. The fix captures the virtual path at block definition time and restores it during block execution, ensuring translations always resolve relative to where the block was created regardless of nesting depth. *Nathaniel Watts* diff --git a/docs/_data/library.yml b/docs/_data/library.yml index ace041e8d..0d4065d24 100644 --- a/docs/_data/library.yml +++ b/docs/_data/library.yml @@ -1 +1 @@ -version: 4.1.1 +version: 4.2.0 diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 17a370e7e..c199f223d 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - view_component (4.1.1) + view_component (4.2.0) actionview (>= 7.1.0) activesupport (>= 7.1.0) concurrent-ruby (~> 1) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 8cceb3f4a..b38185d33 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - view_component (4.1.1) + view_component (4.2.0) actionview (>= 7.1.0) activesupport (>= 7.1.0) concurrent-ruby (~> 1) diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index d2f462281..078907d81 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "~> 3.4.0" +ruby "~> 3.4" gem "rails", "~> 8.0.0" diff --git a/gemfiles/rails_8.0.gemfile.lock b/gemfiles/rails_8.0.gemfile.lock index 69bda960a..92bfbd880 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.1.1) + view_component (4.2.0) actionview (>= 7.1.0) activesupport (>= 7.1.0) concurrent-ruby (~> 1) diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile index f68c97352..3e14049df 100644 --- a/gemfiles/rails_8.1.gemfile +++ b/gemfiles/rails_8.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby "~> 3.4.0" +ruby "~> 3.4" gem "rails", "~> 8.1.0" diff --git a/gemfiles/rails_8.1.gemfile.lock b/gemfiles/rails_8.1.gemfile.lock index 892d58e7d..045156006 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.1.1) + view_component (4.2.0) actionview (>= 7.1.0) activesupport (>= 7.1.0) concurrent-ruby (~> 1) diff --git a/lib/view_component/version.rb b/lib/view_component/version.rb index f4bdd54c0..a0560e0c0 100644 --- a/lib/view_component/version.rb +++ b/lib/view_component/version.rb @@ -3,8 +3,8 @@ module ViewComponent module VERSION MAJOR = 4 - MINOR = 1 - PATCH = 1 + MINOR = 2 + PATCH = 0 PRE = nil STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")