Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b05c8a7

Browse files
🐛 Prevent root from being recreated on react 18
Standardize changelog entry
1 parent 4aa7fb1 commit b05c8a7

File tree

18 files changed

+322
-153
lines changed

18 files changed

+322
-153
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.2.0'
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
- Support other JS package managers using `package_json` gem #1306

‎gemfiles/base.gemfile.lock

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,13 @@ GEM
230230
simplecov-html (~> 0.10.0)
231231
simplecov-html (0.10.2)
232232
test-unit (2.5.5)
233-
thor (1.2.1)
234-
tilt (2.1.0)
235-
timeout (0.3.2)
233+
thor (1.2.2)
234+
tilt (2.2.0)
235+
timeout (0.4.0)
236+
turbo-rails (1.4.0)
237+
actionpack (>= 6.0.0)
238+
activejob (>= 6.0.0)
239+
railties (>= 6.0.0)
236240
tzinfo (2.0.6)
237241
concurrent-ruby (~> 1.0)
238242
websocket (1.2.9)
@@ -265,6 +269,7 @@ DEPENDENCIES
265269
react-rails!
266270
selenium-webdriver
267271
test-unit (~> 2.5)
272+
turbo-rails
268273

269274
BUNDLED WITH
270275
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.2.0"
7+
gem "turbo-rails"
78

89
gemspec path: "../"

‎gemfiles/shakapacker.gemfile.lock

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,13 @@ GEM
241241
simplecov-html (~> 0.10.0)
242242
simplecov-html (0.10.2)
243243
test-unit (2.5.5)
244-
thor (1.2.1)
245-
tilt (2.1.0)
246-
timeout (0.3.2)
244+
thor (1.2.2)
245+
tilt (2.2.0)
246+
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)
@@ -277,6 +281,7 @@ DEPENDENCIES
277281
selenium-webdriver
278282
shakapacker (= 7.2.0)
279283
test-unit (~> 2.5)
284+
turbo-rails
280285

281286
BUNDLED WITH
282287
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)

AltStyle によって変換されたページ (->オリジナル) /