Skip to content

Commit e9d1b5e

Browse files
committed
🐛 Prevent root from being recreated on react 18
Standardize changelog entry
1 parent c61c171 commit e9d1b5e

File tree

18 files changed

+316
-147
lines changed

18 files changed

+316
-147
lines changed

Appraisals

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ end
1717
appraise 'shakapacker' do
1818
gem 'rails', '~> 7.0.x'
1919
gem 'shakapacker', '7.0.2'
20+
gem 'turbo-rails'
2021
end
2122

2223
appraise 'base' do

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# react-rails
22

3-
If you need help upgrading `react-rails`, `webpacker` to `shakapacker`, or JS packages, contact justin@shakacode.com. 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.
3+
If you need help upgrading `react-rails`, `webpacker` to `shakapacker`, or JS packages, contact justin@shakacode.com. 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.
44

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

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

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

12+
- 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)
13+
1214
#### Changed
1315
- Make es6 and ts usable at same time. #1299
1416

gemfiles/base.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ GEM
236236
thor (1.2.2)
237237
tilt (2.2.0)
238238
timeout (0.4.0)
239+
turbo-rails (1.4.0)
240+
actionpack (>= 6.0.0)
241+
activejob (>= 6.0.0)
242+
railties (>= 6.0.0)
239243
tzinfo (2.0.6)
240244
concurrent-ruby (~> 1.0)
241245
websocket (1.2.9)
@@ -267,6 +271,7 @@ DEPENDENCIES
267271
react-rails!
268272
selenium-webdriver
269273
test-unit (~> 2.5)
274+
turbo-rails
270275

271276
BUNDLED WITH
272277
2.4.9

gemfiles/shakapacker.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ source "http://rubygems.org"
44

55
gem "rails", "~> 7.0.x"
66
gem "shakapacker", "7.0.2"
7+
gem "turbo-rails"
78

89
gemspec path: "../"

gemfiles/shakapacker.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ GEM
244244
thor (1.2.2)
245245
tilt (2.2.0)
246246
timeout (0.4.0)
247+
turbo-rails (1.5.0)
248+
actionpack (>= 6.0.0)
249+
activejob (>= 6.0.0)
250+
railties (>= 6.0.0)
247251
tzinfo (2.0.6)
248252
concurrent-ruby (~> 1.0)
249253
websocket (1.2.9)
@@ -276,6 +280,7 @@ DEPENDENCIES
276280
selenium-webdriver
277281
shakapacker (= 7.0.2)
278282
test-unit (~> 2.5)
283+
turbo-rails
279284

280285
BUNDLED WITH
281286
2.4.9

lib/assets/javascripts/react_ujs.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)