Skip to content

Commit 87e6394

Browse files
authored
Merge branch 'main' into dependabot-automerge
2 parents 686dc2b + 1722b70 commit 87e6394

12 files changed

Lines changed: 19 additions & 17 deletions

File tree

.github/workflows/push_gem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: ruby/setup-ruby@v1
3333
with:
3434
bundler-cache: true
35-
ruby-version: ruby
35+
ruby-version: 3.4
3636

3737
# Release
3838
- uses: rubygems/release-gem@v1

Appraisals

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
appraise "rails-7.1" do
4-
ruby "~> 3.2.0"
4+
ruby "~> 3.2"
55

66
gem "rails", "~> 7.1.0"
77

@@ -12,7 +12,7 @@ appraise "rails-7.1" do
1212
end
1313

1414
appraise "rails-7.2" do
15-
ruby "~> 3.3.0"
15+
ruby "~> 3.3"
1616

1717
gem "rails", "~> 7.2.0"
1818

@@ -23,7 +23,7 @@ appraise "rails-7.2" do
2323
end
2424

2525
appraise "rails-8.0" do
26-
ruby "~> 3.4.0"
26+
ruby "~> 3.4"
2727

2828
gem "rails", "~> 8.0.0"
2929

@@ -34,7 +34,7 @@ appraise "rails-8.0" do
3434
end
3535

3636
appraise "rails-8.1" do
37-
ruby "~> 3.4.0"
37+
ruby "~> 4.0"
3838

3939
gem "rails", "~> 8.1.0"
4040

@@ -45,7 +45,7 @@ appraise "rails-8.1" do
4545
end
4646

4747
appraise "rails-main" do
48-
ruby "4.0.0.dev"
48+
ruby "4.1.0.dev"
4949

5050
gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
5151
gem "rails", github: "rails/rails", branch: "main"

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
view_component (4.1.1)
4+
view_component (4.2.0)
55
actionview (>= 7.1.0)
66
activesupport (>= 7.1.0)
77
concurrent-ruby (~> 1)
@@ -456,7 +456,7 @@ DEPENDENCIES
456456
yard-activesupport-concern (< 1)
457457

458458
RUBY VERSION
459-
ruby 3.3.0p0
459+
ruby 3.4.7p58
460460

461461
BUNDLED WITH
462462
2.6.2

docs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ nav_order: 6
1414

1515
*Joel Hawksley*
1616

17+
## 4.2.0
18+
1719
* 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.
1820

1921
*Nathaniel Watts*

docs/_data/library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 4.1.1
1+
version: 4.2.0

gemfiles/rails_7.1.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
view_component (4.1.1)
4+
view_component (4.2.0)
55
actionview (>= 7.1.0)
66
activesupport (>= 7.1.0)
77
concurrent-ruby (~> 1)

gemfiles/rails_7.2.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
view_component (4.1.1)
4+
view_component (4.2.0)
55
actionview (>= 7.1.0)
66
activesupport (>= 7.1.0)
77
concurrent-ruby (~> 1)

gemfiles/rails_8.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.4.0"
5+
ruby "~> 3.4"
66

77
gem "rails", "~> 8.0.0"
88

gemfiles/rails_8.0.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
view_component (4.1.1)
4+
view_component (4.2.0)
55
actionview (>= 7.1.0)
66
activesupport (>= 7.1.0)
77
concurrent-ruby (~> 1)

gemfiles/rails_8.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.4.0"
5+
ruby "~> 3.4"
66

77
gem "rails", "~> 8.1.0"
88

0 commit comments

Comments
 (0)