Skip to content

Commit

Permalink
🐛 Prevent root from being recreated on react 18
Browse files Browse the repository at this point in the history
Standardize changelog entry
  • Loading branch information
diogobeda committed Nov 10, 2023
1 parent c61c171 commit e9d1b5e
Show file tree
Hide file tree
Showing 18 changed files with 316 additions and 147 deletions.
1 change: 1 addition & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ end
appraise 'shakapacker' do
gem 'rails', '~> 7.0.x'
gem 'shakapacker', '7.0.2'
gem 'turbo-rails'
end

appraise 'base' do
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# react-rails

If you need help upgrading `react-rails`, `webpacker` to `shakapacker`, or JS packages, contact [email protected]. The ShakaCode.com team is helping to maintain this Ruby gem. You also might want to consider the [react_on_rails](https://github.com/shakacode/react_on_rails) gem.
If you need help upgrading `react-rails`, `webpacker` to `shakapacker`, or JS packages, contact [email protected]. The ShakaCode.com team is helping to maintain this Ruby gem. You also might want to consider the [react_on_rails](https://github.com/shakacode/react_on_rails) gem.

[#1209 2.7 Release Discussion](https://github.com/reactjs/react-rails/issues/1209)

Expand All @@ -9,6 +9,8 @@ Changes since the last non-beta release.

_Please add entries here for your pull requests that are not yet released._

- Prevent roots from being re-created when using React 18 [PR 1305](https://github.com/reactjs/react-rails/pull/1305) by [diogobeda](https://github.com/diogobeda)

#### Changed
- Make es6 and ts usable at same time. #1299

Expand Down
5 changes: 5 additions & 0 deletions gemfiles/base.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ GEM
thor (1.2.2)
tilt (2.2.0)
timeout (0.4.0)
turbo-rails (1.4.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
websocket (1.2.9)
Expand Down Expand Up @@ -267,6 +271,7 @@ DEPENDENCIES
react-rails!
selenium-webdriver
test-unit (~> 2.5)
turbo-rails

BUNDLED WITH
2.4.9
1 change: 1 addition & 0 deletions gemfiles/shakapacker.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ source "http://rubygems.org"

gem "rails", "~> 7.0.x"
gem "shakapacker", "7.0.2"
gem "turbo-rails"

gemspec path: "../"
5 changes: 5 additions & 0 deletions gemfiles/shakapacker.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,10 @@ GEM
thor (1.2.2)
tilt (2.2.0)
timeout (0.4.0)
turbo-rails (1.5.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
websocket (1.2.9)
Expand Down Expand Up @@ -276,6 +280,7 @@ DEPENDENCIES
selenium-webdriver
shakapacker (= 7.0.2)
test-unit (~> 2.5)
turbo-rails

BUNDLED WITH
2.4.9
2 changes: 1 addition & 1 deletion lib/assets/javascripts/react_ujs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e9d1b5e

Please sign in to comment.