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 116da19

Browse files
Merge pull request #1335 from reactjs/diogo
Prevent root from being recreated on react 18 (recreation of #1305)
2 parents ac47fbd + 67d724e commit 116da19

File tree

20 files changed

+212
-23
lines changed

20 files changed

+212
-23
lines changed

‎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

@@ -12,6 +12,8 @@ _Please add entries here for your pull requests that are not yet released. Inclu
1212
#### Fixed
1313
- Replaced call to ReactRailsUJS.unmountComponents that was erroneously removed by #1290 in 3.0.0 #1339
1414

15+
- 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)
16+
1517
## [3.2.0] - 2024年01月10日
1618

1719
#### Changed

‎Gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ GEM
237237
thor (1.2.1)
238238
tilt (2.1.0)
239239
timeout (0.4.1)
240+
turbo-rails (2.0.5)
241+
actionpack (>= 6.0.0)
242+
activejob (>= 6.0.0)
243+
railties (>= 6.0.0)
240244
tzinfo (2.0.6)
241245
concurrent-ruby (~> 1.0)
242246
websocket (1.2.9)
@@ -270,6 +274,7 @@ DEPENDENCIES
270274
react-rails!
271275
selenium-webdriver
272276
test-unit (~> 2.5)
277+
turbo-rails
273278

274279
BUNDLED WITH
275280
2.4.9

‎gemfiles/shakapacker.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@ GEM
246246
thor (1.2.2)
247247
tilt (2.2.0)
248248
timeout (0.4.1)
249+
turbo-rails (2.0.5)
250+
actionpack (>= 6.0.0)
251+
activejob (>= 6.0.0)
252+
railties (>= 6.0.0)
249253
tzinfo (2.0.6)
250254
concurrent-ruby (~> 1.0)
251255
websocket (1.2.10)
@@ -280,6 +284,7 @@ DEPENDENCIES
280284
selenium-webdriver
281285
shakapacker (= 7.2.0)
282286
test-unit (~> 2.5)
287+
turbo-rails
283288

284289
BUNDLED WITH
285290
2.4.9

‎gemfiles/sprockets_3.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ GEM
245245
thor (1.2.1)
246246
tilt (2.0.10)
247247
timeout (0.4.1)
248+
turbo-rails (2.0.5)
249+
actionpack (>= 6.0.0)
250+
activejob (>= 6.0.0)
251+
railties (>= 6.0.0)
248252
turbolinks (5.2.1)
249253
turbolinks-source (~> 5.2)
250254
turbolinks-source (5.2.0)
@@ -284,6 +288,7 @@ DEPENDENCIES
284288
sprockets (~> 3.5)
285289
sprockets-rails
286290
test-unit (~> 2.5)
291+
turbo-rails
287292
turbolinks (~> 5)
288293

289294
BUNDLED WITH

‎gemfiles/sprockets_4.gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@ GEM
245245
thor (1.2.1)
246246
tilt (2.0.10)
247247
timeout (0.4.1)
248+
turbo-rails (2.0.5)
249+
actionpack (>= 6.0.0)
250+
activejob (>= 6.0.0)
251+
railties (>= 6.0.0)
248252
turbolinks (5.2.1)
249253
turbolinks-source (~> 5.2)
250254
turbolinks-source (5.2.0)
@@ -284,6 +288,7 @@ DEPENDENCIES
284288
sprockets (~> 4.0.x)
285289
sprockets-rails
286290
test-unit (~> 2.5)
291+
turbo-rails
287292
turbolinks (~> 5)
288293

289294
BUNDLED WITH

‎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.

‎react-rails.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
3030
s.add_development_dependency 'pry-byebug'
3131
s.add_development_dependency 'package_json'
3232
s.add_development_dependency 'rails', '~> 7.0.7', '>= 7.0.7.2'
33+
s.add_development_dependency 'turbo-rails'
3334
s.add_development_dependency 'minitest-retry'
3435

3536
s.add_dependency 'connection_pool'

0 commit comments

Comments
(0)

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