Merge branch 'master' into master

Author: cymen

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,18 @@
 ### Summary
 
-Provide a general description of the code changes in your pull
+_Remove this paragraph and provide a general description of the code changes in your pull
 request... were there any bugs you had fixed? If so, mention them. If
 these bugs have open GitHub issues, be sure to tag them here as well,
-to keep the conversation linked together.
+to keep the conversation linked together._
 
 ### Other Information
 
-If there's anything else that's important and relevant to your pull
-request, mention that information here. This could include
-benchmarks, or other information.
+_Remove this parapraph and mention any other important and relevant information such as benchmarks._
 
-If you are updating any of the CHANGELOG files or are asked to update the
-CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the file.
+### Pull Request checklist
+_Remove this line after checking all the items here. If the item is not applicable to the PR, both check it out and wrap it by `~`._
 
-Thanks for contributing!
+- [ ] Add/update test to cover these changes
+- [ ] Update documentation
+- [ ] Update CHANGELOG file  
+  _Add the CHANGELOG entry at the top of the file._

CHANGELOG.md

@@ -1,12 +1,21 @@
 # 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. 
+
+[#1209 2.7 Release Discussion](https://github.com/reactjs/react-rails/issues/1209)
+
+## Unrelease 
+
 #### Breaking Changes
 
 #### New Features
 - Camelizes keys with primitive values, in addition to hashes #946
 - Expose alternative implementations for `ReactUJS.getConstructor` #1050
+- Include turbolinks in dev and update webdrivers #1174
 - Add support for multiple `require.context` with addition of `useContexts` #1144
 - Update dependencies
+
+#### Update dependencies
   - react to 17.0.2 #1218
   - webpack to 5.74.0
   - webpack-dev-server to 2.11.5 #1150
@@ -18,7 +27,6 @@
   - eventsource to 1.1.1 #1183
   - rails-html-sanitizer to 1.4.3 #1188
   - tzinfo to 1.2.10 #1190
-- Include turbolinks in dev and update webdrivers #1174
 
 #### Deprecation
 

Gemfile.lock

@@ -98,7 +98,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.10)
     connection_pool (2.3.0)
     crass (1.0.6)
     docile (1.1.5)
@@ -109,8 +109,8 @@ GEM
     execjs (2.7.0)
     ffi (1.11.3)
     formatador (0.2.5)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.0.1)
+      activesupport (>= 5.0)
     guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -124,7 +124,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    i18n (1.7.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
@@ -133,7 +133,7 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
@@ -148,10 +148,10 @@ GEM
       rake
     mini_mime (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     nenv (0.3.0)
     nio4r (2.5.2)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -164,8 +164,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.6.1)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (6.0.2.1)
@@ -186,8 +186,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (6.0.2.1)
       actionpack (= 6.0.2.1)
       activesupport (= 6.0.2.1)
@@ -236,7 +236,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

README.md

@@ -14,6 +14,7 @@ React-Rails is a flexible tool to use [React](http://facebook.github.io/react/)
 ## Resouces
 * [Click to join **React + Rails Slack**](https://reactrails.slack.com/join/shared_invite/enQtNjY3NTczMjczNzYxLTlmYjdiZmY3MTVlMzU2YWE0OWM0MzNiZDI0MzdkZGFiZTFkYTFkOGVjODBmOWEyYWQ3MzA2NGE1YWJjNmVlMGE). Then join the channel `#react-rails`.
 * If you need help upgrading `react-rails`, `webpacker`, or JS packages, contact [[email protected]](mailto:[email protected]). The [ShakaCode.com](https://www.shakacode.com) team is helping to maintain this Ruby gem. Check out [this discussion](https://github.com/reactjs/react-rails/discussions/1200).
+* If you are upgrading, you might consider migrating to the [react_on_rails](https://github.com/shakacode/react_on_rails) gem.
 * Source code example utilizing React-Rails: https://github.com/BookOfGreg/react-rails-example-app
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->

react_ujs/src/renderHelpers.js

@@ -1,4 +1,4 @@
-const ReactDOM = require("react-dom")
+import ReactDOM from "react-dom"
 
 export function supportsHydration() {
   return typeof ReactDOM.hydrate === "function" || typeof ReactDOM.hydrateRoot === "function"