SSR fixes

.github/workflows/ruby.yml

@@ -6,39 +6,28 @@
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
 name: Ruby
-on: [push, pull_request]
+on: [push]
 jobs:
   test:
     strategy:
       fail-fast: false
-      matrix:
-        ruby:
-          - 2.7.0
-          - 2.6.5
-          # TODO restore testing against JRuby w/ therubyrhino
-          # - jruby-9.3.7.0
-        gemfile:
-          # These have webpacker:
-          - rails_5.2_no_sprockets
-          - rails_5.2_no_sprockets_webpacker_3
-          - rails_5.2_no_sprockets_webpacker_4
-          # These don't have webpacker:
-          - rails_5.2_sprockets_3
-          - rails_5.2_sprockets_4
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
-      # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       # Workaround b/c upgrading Minitest broke some mocking expectations
       # having to do with automatic kwarg splatting
       MT_KWARGS_HACK: 1
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
+    - run: npm -g install yalc
+    - run: yalc publish
+    - run: cd test/dummy && yalc add react_ujs
+    - run: cd test/dummy && yarn
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
+        ruby-version: 2.7.3
         # TODO: Impalement caching
         # bundler-cache: true
     - run: bundle install
     - run: bundle exec rake test
+

.gitignore

@@ -7,3 +7,5 @@ test/*/public/packs
 **/node_modules
 react-builds/build
 coverage/
+**/.yalc
+**/yalc.*

CONTRIBUTING.md

@@ -92,14 +92,20 @@ gem 'react-rails', path: '../react-rails'
 
 To develop the React_UJS NPM Package, make your changes and run `npm pack` to make a `.tgz` bundle, then in react-rails-example-app `yarn add ../react_ujs-<version>.tgz`
 
+You're also going to need a global version of [yalc](https://github.com/wclr/yalc)
 ##### Running tests
 
-`bundle exec appraisal install` to install gems on every gemfile Appraisal contains.
-`rake test` or `bundle exec appraisal rake test` runs everything.
-or run a specific suite using `bundle exec appraisal <appraisal name> rake test`
-- Find appraisal names in [Appraisals](Appraisals)
-- Integration tests run in Headless Chrome which is included in Chrome (59+ linux,OSX | 60+ Windows)
-- ChromeDriver is included with `chromedriver-helper` gem so no need to manually install that 👍
+- `bundle`
+- `yalc publish`
+- `cd test/dummy && yalc add react_ujs`
+- `yarn`
+- `bundle exec rake test`
+
+If you update react-rails code, then to test the new code:
+
+- `yalc publish` in the root directory
+- `cd test/dummy && yalc update react_ujs`
+- `bundle exec rake test`
 
 ##### Updating the pre-bundled react
 - Update React with `rake react:update`

Gemfile

@@ -1,4 +1,3 @@
 source 'http://rubygems.org'
 
 gemspec
-# This is an optional dev-dependency, required whenever sprockets is required

Gemfile.lock

@@ -68,10 +68,6 @@ GEM
       zeitwerk (~> 2.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -147,12 +143,12 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.0.2)
-    mini_portile2 (2.8.0)
     minitest (5.17.0)
     nenv (0.3.0)
     nio4r (2.5.2)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -166,6 +162,8 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.1)
     rack (2.2.6.2)
+    rack-proxy (0.7.6)
+      rack
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (6.0.2.1)
@@ -205,6 +203,12 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
+    semantic_range (3.0.0)
+    shakapacker (6.6.0)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     shellany (0.0.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
@@ -239,11 +243,11 @@ GEM
     zeitwerk (2.6.6)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
-  appraisal
-  bundler (~> 2.0)
+  bundler (= 2.4.9)
   capybara
   codeclimate-test-reporter
   coffee-rails
@@ -256,9 +260,11 @@ DEPENDENCIES
   rails (>= 3.2)
   react-rails!
   selenium-webdriver
+  shakapacker
+  sprockets (~> 4.0.x)
   test-unit (~> 2.5)
   turbolinks
   webdrivers
 
 BUNDLED WITH
-   2.1.4
+   2.4.9

Rakefile

@@ -70,25 +70,21 @@ namespace :ujs do
   end
 end
 
-require 'appraisal'
-require 'rake/testtask'
+require "minitest/test_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = ENV['TEST_PATTERN'] || 'test/**/*_test.rb'
-  t.verbose = ENV['TEST_VERBOSE'] == '1'
+Minitest::TestTask.create(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
   t.warning = false
+  t.test_globs = ENV['TEST_PATTERN'] || 'test/**/*_test.rb'
+  t.verbose = ENV['TEST_VERBOSE'] == '1'
 end
 
 task default: :test
 
 task :test_setup do
   load 'webdrivers/Rakefile'
-  Dir.chdir('./test/dummy_sprockets') do
-    `yarn install`
-  end
-  Dir.chdir('./test/dummy_webpacker3') do
+  Dir.chdir('./test/dummy') do
     `yarn install`
   end
 end