Skip to content

Commit d5fdd16

Browse files
diogobedaJudahmeek
authored andcommitted
🐛 Prevent root from being recreated on react 18
Standardize changelog entry
1 parent 081e33c commit d5fdd16

File tree

18 files changed

+322
-153
lines changed

18 files changed

+322
-153
lines changed

Diff for: Appraisals

+1
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

Diff for: CHANGELOG.md

+3-1
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 [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.
3+
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.
44

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

@@ -11,6 +11,8 @@ _Please add entries here for your pull requests that are not yet released. Inclu
1111

1212
## [3.2.0] - 2024-01-10
1313

14+
- 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)
15+
1416
#### Changed
1517
- Support other JS package managers using `package_json` gem [PR #1306](https://github.com/reactjs/react-rails/pull/1306) by [G-Rath](https://github.com/G-Rath).
1618
- Make es6 and ts usable at same time. #1299

Diff for: gemfiles/base.gemfile.lock

+8-3
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

Diff for: gemfiles/shakapacker.gemfile

+1
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: "../"

Diff for: gemfiles/shakapacker.gemfile.lock

+8-3
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

Diff for: lib/assets/javascripts/react_ujs.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)