refactor root (un)mount to properly support multiple roots

reactjs · May 15, 2024 · bfb0da9 · bfb0da9
1 parent 9fce794
commit bfb0da9
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 23 deletions.
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)
 
@@ -11,6 +11,8 @@ _Please add entries here for your pull requests that are not yet released. Inclu
 
 ## [3.2.0] - 2024-01-10
 
+- 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
 - 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).
 - Make es6 and ts usable at same time. #1299

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -237,6 +237,10 @@ GEM
     thor (1.2.1)
     tilt (2.1.0)
     timeout (0.4.1)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     websocket (1.2.9)
@@ -270,6 +274,7 @@ DEPENDENCIES
   react-rails!
   selenium-webdriver
   test-unit (~> 2.5)
+  turbo-rails
 
 BUNDLED WITH
    2.4.9
diff --git a/gemfiles/shakapacker.gemfile.lock b/gemfiles/shakapacker.gemfile.lock
@@ -246,6 +246,10 @@ GEM
     thor (1.2.2)
     tilt (2.2.0)
     timeout (0.4.1)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     websocket (1.2.10)
@@ -280,6 +284,7 @@ DEPENDENCIES
   selenium-webdriver
   shakapacker (= 7.2.0)
   test-unit (~> 2.5)
+  turbo-rails
 
 BUNDLED WITH
    2.4.9
diff --git a/gemfiles/sprockets_3.gemfile.lock b/gemfiles/sprockets_3.gemfile.lock
@@ -245,6 +245,10 @@ GEM
     thor (1.2.1)
     tilt (2.0.10)
     timeout (0.4.1)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -284,6 +288,7 @@ DEPENDENCIES
   sprockets (~> 3.5)
   sprockets-rails
   test-unit (~> 2.5)
+  turbo-rails
   turbolinks (~> 5)
 
 BUNDLED WITH

diff --git a/gemfiles/sprockets_4.gemfile.lock b/gemfiles/sprockets_4.gemfile.lock
@@ -245,6 +245,10 @@ GEM
     thor (1.2.1)
     tilt (2.0.10)
     timeout (0.4.1)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -284,6 +288,7 @@ DEPENDENCIES
   sprockets (~> 4.0.x)
   sprockets-rails
   test-unit (~> 2.5)
+  turbo-rails
   turbolinks (~> 5)
 
 BUNDLED WITH

diff --git a/lib/assets/javascripts/react_ujs.js b/lib/assets/javascripts/react_ujs.js
diff --git a/react-rails.gemspec b/react-rails.gemspec
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'package_json'
   s.add_development_dependency 'rails', '~> 7.0.7', '>= 7.0.7.2'
+  s.add_development_dependency 'turbo-rails'
   s.add_development_dependency 'minitest-retry'
 
   s.add_dependency 'connection_pool'