🐛 Prevent root from being recreated on react 18

Standardize changelog entry
reactjs · Jan 8, 2024 · b05c8a7 · b05c8a7
1 parent 4aa7fb1
commit b05c8a7
Show file tree

Hide file tree

Showing 18 changed files with 322 additions and 153 deletions.
diff --git a/Appraisals b/Appraisals
@@ -17,6 +17,7 @@ end
 appraise 'shakapacker' do
   gem 'rails', '~> 7.0.x'
   gem 'shakapacker', '7.2.0'
+  gem 'turbo-rails'
 end
 
 appraise 'base' do

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 
@@ -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
 - Support other JS package managers using `package_json` gem #1306

diff --git a/gemfiles/base.gemfile.lock b/gemfiles/base.gemfile.lock
@@ -230,9 +230,13 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     test-unit (2.5.5)
-    thor (1.2.1)
-    tilt (2.1.0)
-    timeout (0.3.2)
+    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)
@@ -265,6 +269,7 @@ DEPENDENCIES
   react-rails!
   selenium-webdriver
   test-unit (~> 2.5)
+  turbo-rails
 
 BUNDLED WITH
    2.4.9
diff --git a/gemfiles/shakapacker.gemfile b/gemfiles/shakapacker.gemfile
@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 7.0.x"
 gem "shakapacker", "7.2.0"
+gem "turbo-rails"
 
 gemspec path: "../"
diff --git a/gemfiles/shakapacker.gemfile.lock b/gemfiles/shakapacker.gemfile.lock
@@ -241,9 +241,13 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     test-unit (2.5.5)
-    thor (1.2.1)
-    tilt (2.1.0)
-    timeout (0.3.2)
+    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)
@@ -277,6 +281,7 @@ DEPENDENCIES
   selenium-webdriver
   shakapacker (= 7.2.0)
   test-unit (~> 2.5)
+  turbo-rails
 
 BUNDLED WITH
    2.4.9
diff --git a/lib/assets/javascripts/react_ujs.js b/lib/assets/javascripts/react_ujs.js