Merge pull request #1278 from reactjs/fix-bug-with-requiring-react-dom-with-sporockets

Fix ReactDomClient bug

Author: justin808

.github/workflows/ruby.yml

@@ -6,17 +6,34 @@
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
 name: Ruby
-on: [push, pull_request]
+
+on: [push]
 jobs:
+  check_react_and_ujs:
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby: [2.7]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler: 2.4.9
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/setup-node@v3
+      - run: bundle install
+      - run: yarn
+      - run: bundle exec rake react:update
+      - run: bundle exec rake ujs:update
+      - run: ./check_for_uncommitted_files.sh
+
   test:
+    needs: check_react_and_ujs
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - 2.7.0
-          - 2.6.5
-          # TODO restore testing against JRuby w/ therubyrhino
-          # - jruby-9.3.7.0
+        ruby: [2.7]
         gemfile:
           # These have webpacker:
           - rails_5.2_no_sprockets
@@ -37,6 +54,7 @@ jobs:
     - uses: actions/setup-node@v3
     - uses: ruby/setup-ruby@v1
       with:
+        bundler: 2.4.9
         ruby-version: ${{ matrix.ruby }}
         # TODO: Impalement caching
         # bundler-cache: true

CHANGELOG.md

@@ -9,6 +9,11 @@ Changes since last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+## [2.7.1] - 2023-05-19
+
+#### Bug Fixes
+- Fix ReactDomClient initialization error during SSR. #1278
+
 ## [2.7.0] - 2023-05-06
 
 #### New Features
@@ -541,5 +546,6 @@ _Please add entries here for your pull requests that are not yet released._
 - Server rendering with `prerender: true`
 - Transform `.jsx` in the asset pipeline
 
-[Unreleased]: https://github.com/reactjs/react-rails/compare/v2.7.0...master
+[Unreleased]: https://github.com/reactjs/react-rails/compare/v2.7.1...master
+[2.7.1]: https://github.com/shakacode/shakapacker/compare/v2.7.0...v2.7.1
 [2.7.0]: https://github.com/shakacode/shakapacker/compare/v2.6.2...v2.7.0

Gemfile.lock

@@ -244,7 +244,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
@@ -263,4 +263,4 @@ DEPENDENCIES
   webdrivers
 
 BUNDLED WITH
-   2.4.10
+   2.4.9

Rakefile

@@ -25,7 +25,7 @@ namespace :react do
 
   desc 'Install the JavaScript dependencies'
   task :install do
-    yarn_run_in('react-builds', 'upgrade')
+    yarn_run_in('react-builds', 'install')
   end
 
   desc 'Build the JS bundles with Webpack'
@@ -49,7 +49,7 @@ namespace :ujs do
 
   desc 'Install the JavaScript dependencies'
   task :install do
-    `yarn upgrade`
+    `yarn install`
   end
 
   desc 'Build the JS bundles with Webpack'
@@ -71,12 +71,12 @@ namespace :ujs do
 end
 
 require 'appraisal'
-require 'rake/testtask'
+require 'minitest/test_task'
 
-Rake::TestTask.new(:test) do |t|
+Minitest::TestTask.create(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = ENV['TEST_PATTERN'] || 'test/**/*_test.rb'
+  t.test_globs = ENV['TEST_PATTERN'] || 'test/**/*_test.rb'
   t.verbose = ENV['TEST_VERBOSE'] == '1'
   t.warning = false
 end

check_for_uncommitted_files.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+status=$(git status --porcelain)
+if [ -n "$status" ]; then
+  status="${status//'%'/'%25'}"
+  status="${status//$'\n'/'%0A'}"
+  status="${status//$'\r'/'%0D'}"
+  echo "$status"
+  exit 1
+else
+  echo "The repository is clean"
+  exit 0
+fi

gemfiles/rails_5.2_no_sprockets.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    react-rails (2.6.2)
+    react-rails (2.7.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -95,6 +95,7 @@ GEM
     execjs (2.7.0)
     ffi (1.11.3)
     formatador (0.2.5)
+    gem-release (2.2.2)
     globalid (0.6.0)
       activesupport (>= 5.0)
     guard (2.16.1)
@@ -127,12 +128,10 @@ GEM
     marcel (1.0.2)
     method_source (0.9.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     minitest (5.16.3)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -214,15 +213,16 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
   es5-shim-rails (>= 2.0.5)
+  gem-release
   guard
   guard-minitest
   jbuilder
@@ -236,4 +236,4 @@ DEPENDENCIES
   webdrivers
 
 BUNDLED WITH
-   2.1.4
+   2.4.9

gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    react-rails (2.6.2)
+    react-rails (2.7.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -95,6 +95,7 @@ GEM
     execjs (2.7.0)
     ffi (1.11.3)
     formatador (0.2.5)
+    gem-release (2.2.2)
     globalid (0.6.0)
       activesupport (>= 5.0)
     guard (2.16.1)
@@ -115,7 +116,7 @@ GEM
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     json (2.3.0)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-darwin-20)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -128,14 +129,12 @@ GEM
     marcel (1.0.2)
     method_source (0.9.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     mini_racer (0.2.8)
       libv8 (>= 6.9.411)
     minitest (5.16.3)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -223,15 +222,16 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
   es5-shim-rails (>= 2.0.5)
+  gem-release
   guard
   guard-minitest
   jbuilder
@@ -248,4 +248,4 @@ DEPENDENCIES
   webpacker (~> 3.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.9

gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    react-rails (2.6.2)
+    react-rails (2.7.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -95,6 +95,7 @@ GEM
     execjs (2.7.0)
     ffi (1.11.3)
     formatador (0.2.5)
+    gem-release (2.2.2)
     globalid (0.6.0)
       activesupport (>= 5.0)
     guard (2.16.1)
@@ -115,7 +116,7 @@ GEM
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     json (2.3.0)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-darwin-20)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -128,14 +129,12 @@ GEM
     marcel (1.0.2)
     method_source (0.9.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     mini_racer (0.2.8)
       libv8 (>= 6.9.411)
     minitest (5.16.3)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -223,15 +222,16 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
   es5-shim-rails (>= 2.0.5)
+  gem-release
   guard
   guard-minitest
   jbuilder
@@ -248,4 +248,4 @@ DEPENDENCIES
   webpacker (~> 4.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.9

gemfiles/rails_5.2_sprockets_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    react-rails (2.6.2)
+    react-rails (2.7.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -95,6 +95,7 @@ GEM
     execjs (2.7.0)
     ffi (1.11.3)
     formatador (0.2.5)
+    gem-release (2.2.2)
     globalid (0.6.0)
       activesupport (>= 5.0)
     guard (2.16.1)
@@ -115,7 +116,7 @@ GEM
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     json (2.3.0)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-darwin-20)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -128,14 +129,12 @@ GEM
     marcel (1.0.2)
     method_source (0.9.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     mini_racer (0.2.8)
       libv8 (>= 6.9.411)
     minitest (5.16.3)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -217,15 +216,16 @@ GEM
       nokogiri (~> 1.8)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
   es5-shim-rails (>= 2.0.5)
+  gem-release
   guard
   guard-minitest
   jbuilder
@@ -242,4 +242,4 @@ DEPENDENCIES
   webdrivers
 
 BUNDLED WITH
-   2.1.4
+   2.4.9