react_on_rails 16.2.0.beta.3 → 16.2.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2a3d0ee113d4426f2ae46455c0282ff9a10a82bdb94a98f672f1fe652739da
-  data.tar.gz: 1482e197a6163d60efdb53cfe9a16b5cb6664c528c51ff016f5588b5af129df3
+  metadata.gz: e2d569c0148019a12155710806cbd6f3d94f6641ffd074099dc9b4255b0202d6
+  data.tar.gz: 8abd5fedee13d2d2d1bfa6fc6a03e8a6d11710ece7fb84b26fb3afc387156d75
 SHA512:
-  metadata.gz: d3293fe6a1cb649957957b89a29a1ae8469a2ab68d00c8bab6b3671a105143146819c5f37e2cde4a62d0b4b2c054f331fbd3f663faa8782bca44824da3d42f1c
-  data.tar.gz: 0cd4ce31fc18dcf684f9526bde096217b3352ae3dabe8bc23443a65e6fe1afab5829e06c3d44928f300ede280571b81e05d7a7c8b1ac6348373d15bad1586691
+  metadata.gz: 22ef214ab6d5c12257a9ebc3fbf01c56c4211405ac4398628b1d69813d236d39dfe02d48168d4fabb0a0eb5d54ce624fb37790776952e4300547e502170432a4
+  data.tar.gz: e1fdf86179a42c10af444265839d2e95fe15b3771f0606038ce1c01611efcd96c03d34c1e94682b718b6011c6f0d9c049b59b1713bdb75fa942a23e08e0c60b2

data/CHANGELOG.md

@@ -23,6 +23,18 @@ After a release, please make sure to run `bundle exec rake update_changelog`. Th
 
 Changes since the last non-beta release.
 
+#### Changed
+
+- **Generator Configuration Modernization**: Updated the generator to enable recommended configurations by default for new applications:
+
+  - `config.build_test_command` is now uncommented and set to `"RAILS_ENV=test bin/shakapacker"` by default, enabling automatic asset building during tests for better integration test reliability
+  - `config.auto_load_bundle = true` is now set by default, enabling automatic loading of component bundles
+  - `config.components_subdirectory = "ror_components"` is now set by default, organizing React components in a dedicated subdirectory
+
+  **Note:** These changes only affect newly generated applications. Existing applications are unaffected and do not need to make any changes. If you want to adopt these settings in an existing app, you can manually add them to your `config/initializers/react_on_rails.rb` file. [PR 2039](https://github.com/shakacode/react_on_rails/pull/2039) by [justin808](https://github.com/justin808).
+
+### [16.2.0.beta.4] - 2025-11-12
+
 #### Added
 
 - **Rspack Support**: Added `--rspack` flag to `react_on_rails:install` generator for significantly faster builds (~20x improvement with SWC). Includes unified webpack/rspack configuration templates and `bin/switch-bundler` utility to switch between bundlers post-installation. [PR #1852](https://github.com/shakacode/react_on_rails/pull/1852) by [justin808](https://github.com/justin808).
@@ -35,6 +47,8 @@ Changes since the last non-beta release.
 
 - **Improved RSC Payload Error Handling**: Errors that happen during generation of RSC payload are transferred properly to rails side and logs the error message and stack. [PR #1888](https://github.com/shakacode/react_on_rails/pull/1888) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
+- **Use as Git dependency**: All packages can now be installed as Git dependencies. This is useful for development and testing purposes. See [CONTRIBUTING.md](./CONTRIBUTING.md#git-dependencies) for documentation. [PR #1873](https://github.com/shakacode/react_on_rails/pull/1873) by [alexeyr-ci2](https://github.com/alexeyr-ci2).
+
 #### Changed
 
 - **Shakapacker 9.0.0 Upgrade**: Upgraded Shakapacker from 8.2.0 to 9.0.0 with Babel transpiler configuration for compatibility. Key changes include:
@@ -45,16 +59,38 @@ Changes since the last non-beta release.
   - Fixed webpack configuration to process SCSS rules and CSS loaders in a single pass for better performance
     [PR 1904](https://github.com/shakacode/react_on_rails/pull/1904) by [justin808](https://github.com/justin808).
 
-- **Shakapacker 9.1.0 Upgrade**: Upgraded Shakapacker from 9.0.0 to 9.1.0. This minor version update includes bug fixes and improvements. Updated webpack configuration in Pro dummy apps to use forEach pattern for better compatibility with multiple SCSS rules. [PR 1921](https://github.com/shakacode/react_on_rails/pull/1921) by [justin808](https://github.com/justin808).
+- **`immediate_hydration` now automatically enabled for Pro users**: The `config.immediate_hydration` configuration option has been removed. Immediate hydration is now automatically enabled for React on Rails Pro users and disabled for non-Pro users, simplifying configuration while providing optimal performance by default. Component-level overrides are still supported via the `immediate_hydration` parameter on `react_component`, `redux_store`, and `stream_react_component` helpers. [PR 1997](https://github.com/shakacode/react_on_rails/pull/1997) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
-- **Shakapacker 9.2.0 Upgrade**: Upgraded Shakapacker from 9.1.0 to 9.2.0. This minor version update adds a new `bin/shakapacker-config` utility for debugging webpack/rspack configurations with doctor mode, save mode, and stdout mode options. Supports YAML, JSON, and Node.js inspect output formats. by [justin808](https://github.com/justin808).
+- **`generated_component_packs_loading_strategy` now defaults based on Pro license**: When using Shakapacker >= 8.2.0, the default loading strategy is now `:async` for Pro users and `:defer` for non-Pro users. This provides optimal performance for Pro users while maintaining compatibility for non-Pro users. You can still explicitly set the strategy in your configuration. [PR #1993](https://github.com/shakacode/react_on_rails/pull/1993) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
-#### Bug Fixes
+#### Documentation
 
-- **Use as Git dependency**: All packages can now be installed as Git dependencies. This is useful for development and testing purposes. See [CONTRIBUTING.md](./CONTRIBUTING.md#git-dependencies) for documentation. [PR #1873](https://github.com/shakacode/react_on_rails/pull/1873) by [alexeyr-ci2](https://github.com/alexeyr-ci2).
+- **Simplified Configuration Files**: Improved configuration documentation and generator template for better clarity and usability. Reduced generator template from 67 to 42 lines (37% reduction). Added comprehensive testing configuration guide. Reorganized configuration docs into Essential vs Advanced sections. Enhanced Doctor program with diagnostics for server rendering and test compilation consistency. [PR #2011](https://github.com/shakacode/react_on_rails/pull/2011) by [justin808](https://github.com/justin808).
+
+#### Deprecated
+
+- **Node Renderer Configuration**: Renamed `bundlePath` configuration option to `serverBundleCachePath` in the node renderer to better describe its purpose and avoid confusion with Shakapacker's public bundle path. The old `bundlePath` option continues to work with deprecation warnings. Both `RENDERER_SERVER_BUNDLE_CACHE_PATH` (new) and `RENDERER_BUNDLE_PATH` (deprecated) environment variables are supported. [PR #2008](https://github.com/shakacode/react_on_rails/pull/2008) by [justin808](https://github.com/justin808).
+
+#### Fixed
+
+- **Node Renderer Worker Restart**: Fixed "descriptor closed" error that occurred when the node renderer restarts while handling an in-progress request (especially streaming requests). Workers now perform graceful shutdowns: they disconnect from the cluster to stop receiving new requests, wait for active requests to complete, then shut down cleanly. A configurable `gracefulWorkerRestartTimeout` ensures workers are forcibly killed if they don't shut down in time. [PR 1970](https://github.com/shakacode/react_on_rails/pull/1970) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
+
+- **Body Duplication Bug On Streaming**: Fixed a bug that happens while streaming if the node renderer connection closed after streaming some chunks to the client. [PR #1995](https://github.com/shakacode/react_on_rails/pull/1995) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
 #### Breaking Changes
 
+- **`config.immediate_hydration` configuration removed**: The `config.immediate_hydration` setting in `config/initializers/react_on_rails.rb` has been removed. Immediate hydration is now automatically enabled for React on Rails Pro users and automatically disabled for non-Pro users.
+
+  **Migration steps:**
+
+  - Remove any `config.immediate_hydration = true` or `config.immediate_hydration = false` lines from your `config/initializers/react_on_rails.rb` file
+  - Pro users: No action needed - immediate hydration is now enabled automatically for optimal performance
+  - Non-Pro users: No action needed - standard hydration behavior continues to work as before
+  - Component-level overrides: You can still override behavior per-component using `react_component("MyComponent", immediate_hydration: false)` or `redux_store("MyStore", immediate_hydration: true)`
+  - If a non-Pro user explicitly sets `immediate_hydration: true` on a component or store, a warning will be logged and it will be enforced to fall back to standard hydration (the value will be overridden to `false`)
+
+  [PR 1997](https://github.com/shakacode/react_on_rails/pull/1997) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
+
 - **React on Rails Core Package**: Several Pro-only methods have been removed from the core package and are now exclusively available in the `react-on-rails-pro` package. If you're using any of the following methods, you'll need to migrate to React on Rails Pro:
   - `getOrWaitForComponent()`
   - `getOrWaitForStore()`
@@ -1801,7 +1837,8 @@ such as:
 
 - Fix several generator-related issues.
 
-[unreleased]: https://github.com/shakacode/react_on_rails/compare/16.1.1...master
+[unreleased]: https://github.com/shakacode/react_on_rails/compare/16.2.0.beta.4...master
+[16.2.0.beta.4]: https://github.com/shakacode/react_on_rails/compare/16.1.1...16.2.0.beta.4
 [16.1.1]: https://github.com/shakacode/react_on_rails/compare/16.1.0...16.1.1
 [16.1.0]: https://github.com/shakacode/react_on_rails/compare/16.0.0...16.1.0
 [16.0.0]: https://github.com/shakacode/react_on_rails/compare/14.2.0...16.0.0

data/CLAUDE.md

@@ -45,6 +45,11 @@ Pre-commit hooks automatically run:
   - Check formatting without fixing: `yarn start format.listDifferent`
 - **Build**: `yarn run build` (compiles TypeScript to JavaScript in packages/react-on-rails/lib)
 - **Type checking**: `yarn run type-check`
+- **RBS Type Checking**:
+  - Validate RBS signatures: `bundle exec rake rbs:validate`
+  - Run Steep type checker: `bundle exec rake rbs:steep`
+  - Run both: `bundle exec rake rbs:all`
+  - List RBS files: `bundle exec rake rbs:list`
 - **⚠️ MANDATORY BEFORE GIT PUSH**: `bundle exec rubocop` and fix ALL violations + ensure trailing newlines
 - Never run `npm` commands, only equivalent Yarn Classic ones
 
@@ -117,6 +122,60 @@ This script:
 - 🔄 **Deduplicates** - removes duplicate specs
 - 📁 **Auto-detects directory** - runs from spec/dummy when needed
 
+## RBS Type Checking
+
+React on Rails uses RBS (Ruby Signature) for static type checking with Steep.
+
+### Quick Start
+
+- **Validate signatures**: `bundle exec rake rbs:validate` (run by CI)
+- **Run type checker**: `bundle exec rake rbs:steep` (currently disabled in CI due to existing errors)
+- **Runtime checking**: Enabled by default in tests when `rbs` gem is available
+
+### Runtime Type Checking
+
+Runtime type checking is **ENABLED BY DEFAULT** during test runs for:
+- `rake run_rspec:gem` - Unit tests
+- `rake run_rspec:dummy` - Integration tests
+- `rake run_rspec:dummy_no_turbolinks` - Integration tests without Turbolinks
+
+**Performance Impact**: Runtime type checking adds overhead (typically 5-15%) to test execution. This is acceptable during development and CI as it catches type errors in actual execution paths that static analysis might miss.
+
+To disable runtime checking (e.g., for faster test iterations during development):
+```bash
+DISABLE_RBS_RUNTIME_CHECKING=true rake run_rspec:gem
+```
+
+**When to disable**: Consider disabling during rapid test-driven development cycles where you're running tests frequently. Re-enable before committing to catch type violations.
+
+### Adding Type Signatures
+
+When creating new Ruby files in `lib/react_on_rails/`:
+
+1. **Create RBS signature**: Add `sig/react_on_rails/filename.rbs`
+2. **Add to Steepfile**: Include `check "lib/react_on_rails/filename.rb"` in Steepfile
+3. **Validate**: Run `bundle exec rake rbs:validate`
+4. **Type check**: Run `bundle exec rake rbs:steep`
+5. **Fix errors**: Address any type errors before committing
+
+### Files Currently Type-Checked
+
+See `Steepfile` for the complete list. Core files include:
+- `lib/react_on_rails.rb`
+- `lib/react_on_rails/configuration.rb`
+- `lib/react_on_rails/helper.rb`
+- `lib/react_on_rails/packer_utils.rb`
+- `lib/react_on_rails/server_rendering_pool.rb`
+- And 5 more (see Steepfile for full list)
+
+### Pro Package Type Checking
+
+The Pro package has its own RBS signatures in `react_on_rails_pro/sig/`.
+
+Validate Pro signatures:
+```bash
+cd react_on_rails_pro && bundle exec rake rbs:validate
+```
 ## Changelog
 
 - **Update CHANGELOG.md for user-visible changes only** (features, bug fixes, breaking changes, deprecations, performance improvements)

data/CONTRIBUTING.md

@@ -14,6 +14,7 @@ During this transition:
 
 - [docs/contributor-info/Releasing](./docs/contributor-info/releasing.md) for instructions on releasing.
 - [docs/contributor-info/pull-requests](./docs/contributor-info/pull-requests.md)
+- [docs/contributor-info/rbs-type-signatures](./docs/contributor-info/rbs-type-signatures.md) for information on RBS type signatures
 - See other docs in [docs/contributor-info](./docs/contributor-info)
 
 ## Prerequisites
@@ -128,7 +129,7 @@ Package react-on-rails@12.0.0-12070fd1 added ==> /Users/justin/shakacode/react-o
 Don't forget you may need to run yarn after adding packages with yalc to install/update dependencies/bin scripts.
 ```
 
-Of course, you can do the same with `react-on-rails-pro` and `@shakacode-tools/react-on-rails-pro-node-renderer` packages.
+Of course, you can do the same with `react-on-rails-pro` and `react-on-rails-pro-node-renderer` packages.
 
 This is the approach `spec/dummy` apps use, so you can also look at their implementation.
 
@@ -421,6 +422,53 @@ The CI system intelligently skips unnecessary work:
 
 For more details, see [`docs/CI_OPTIMIZATION.md`](./docs/CI_OPTIMIZATION.md).
 
+### CI Control Commands
+
+React on Rails provides PR comment commands to control CI behavior:
+
+#### `/run-skipped-ci` - Enable Full CI Mode
+
+Runs all skipped CI checks and enables full CI mode for the PR:
+
+```
+/run-skipped-ci
+```
+
+**What it does:**
+
+- Triggers all CI workflows that were skipped due to unchanged code
+- Adds the `full-ci` label to the PR
+- **Persists across future commits** - all subsequent pushes will run the full test suite
+- Runs minimum dependency tests (Ruby 3.2, Node 20, Shakapacker 8.2.0, React 18)
+
+**When to use:**
+
+- You want comprehensive testing across all configurations
+- Testing changes that might affect minimum supported versions
+- Validating generator changes or core functionality
+- Before merging PRs that touch critical paths
+
+#### `/stop-run-skipped-ci` - Disable Full CI Mode
+
+Removes the `full-ci` label and returns to standard CI behavior:
+
+```
+/stop-run-skipped-ci
+```
+
+**What it does:**
+
+- Removes the `full-ci` label from the PR
+- Future commits will use the optimized CI suite (tests only changed code)
+- Does not stop currently running workflows
+
+**When to use:**
+
+- You've validated changes with full CI and want to return to faster feedback
+- Reducing CI time during rapid iteration on a PR
+
+**Note:** The `full-ci` label is preserved on merged PRs as a historical record of which PRs ran with comprehensive testing.
+
 ### Install Generator
 
 In your Rails app add this gem with a path to your fork.

data/Gemfile.development_dependencies

@@ -34,10 +34,10 @@ group :development, :test do
   gem "pry-rails"
   gem "pry-rescue"
   gem "rbs", require: false
+  gem "steep", require: false
   gem "rubocop", "1.61.0", require: false
   gem "rubocop-performance", "~>1.20.0", require: false
   gem "rubocop-rspec", "~>2.26", require: false
-  gem "scss_lint", require: false
   gem "spring", "~> 4.0"
   gem "lefthook", require: false
   # Added for Ruby 3.5+ compatibility to silence warnings

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.2.0.beta.3)
+    react_on_rails (16.2.0.beta.8)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -120,7 +120,8 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    cypress-on-rails (1.19.0)
+    csv (3.3.5)
+    cypress-on-rails (1.20.0)
       rack
     date (3.3.4)
     debug (1.9.2)
@@ -135,6 +136,7 @@ GEM
     erubi (1.13.1)
     execjs (2.9.1)
     ffi (1.16.3)
+    fileutils (1.8.0)
     gem-release (2.2.2)
     generator_spec (0.10.0)
       activesupport (>= 3.0.0)
@@ -330,11 +332,6 @@ GEM
       rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -345,10 +342,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scss_lint (0.60.0)
-      sass (~> 3.5, >= 3.5.5)
     sdoc (2.6.1)
       rdoc (>= 5.0)
+    securerandom (0.4.1)
     selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -375,11 +371,29 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
+    steep (1.9.4)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (~> 3.8)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 4)
+      uri (>= 0.12.0)
     stringio (3.1.7)
     strscan (3.1.0)
     sync (0.5.0)
     term-ansicolor (1.8.0)
       tins (~> 1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thor (1.4.0)
     tilt (2.3.0)
     timeout (0.4.1)
@@ -399,6 +413,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
+    uri (1.1.1)
     webdrivers (5.3.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
@@ -451,13 +466,13 @@ DEPENDENCIES
   rubocop-performance (~> 1.20.0)
   rubocop-rspec (~> 2.26)
   sass-rails (~> 6.0)
-  scss_lint
   sdoc
   selenium-webdriver (= 4.9.0)
   shakapacker (= 9.3.0)
   spring (~> 4.0)
   sprockets (~> 4.0)
   sqlite3 (~> 1.6)
+  steep
   turbo-rails
   turbolinks
   uglifier

data/SWITCHING_CI_CONFIGS.md

@@ -53,24 +53,53 @@ The project runs tests against two configurations:
 
 ## Prerequisites
 
-You must have a version manager like [mise](https://mise.jdx.dev/) (recommended) or [asdf](https://asdf-vm.com/) installed to manage Ruby and Node versions.
+You must have a version manager installed to manage Ruby and Node versions. The script supports:
+
+- **[mise](https://mise.jdx.dev/)** - Recommended, modern, manages both Ruby and Node
+- **[asdf](https://asdf-vm.com/)** - Legacy option, manages both Ruby and Node
+- **[rvm](https://rvm.io/) + [nvm](https://github.com/nvm-sh/nvm)** - Separate managers for Ruby and Node
+
+### Option 1: mise (Recommended)
 
 ```bash
-# Install mise (recommended, modern alternative to asdf)
+# Install mise
 brew install mise
 echo 'eval "$(mise activate zsh)"' >> ~/.zshrc
 source ~/.zshrc
 
-# OR install asdf (legacy option)
+# mise automatically reads from .tool-versions
+```
+
+### Option 2: asdf
+
+```bash
+# Install asdf
 brew install asdf
 echo -e "\n. $(brew --prefix asdf)/libexec/asdf.sh" >> ~/.zshrc
 source ~/.zshrc
 
-# Install plugins (only needed for asdf, mise reads from mise.toml)
+# Install plugins
 asdf plugin add ruby
 asdf plugin add nodejs
 ```
 
+### Option 3: rvm + nvm
+
+```bash
+# Install rvm for Ruby
+\curl -sSL https://get.rvm.io | bash -s stable
+source ~/.rvm/scripts/rvm
+
+# Install nvm for Node
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+# Add to shell config (the installer usually does this automatically)
+```
+
+**Important Notes:**
+
+- If you only have rvm (no nvm) or only nvm (no rvm), the script will detect this and provide helpful error messages guiding you to install the missing manager or switch to mise/asdf.
+- **Do not mix version managers** (e.g., don't install both mise and rvm). The script prioritizes mise > asdf > rvm+nvm, so mise/asdf will always take precedence. Using multiple managers can cause confusion about which versions are active.
+
 ## Detailed Usage
 
 ### 1. Check Current Configuration
@@ -107,7 +136,9 @@ This will:
 ```bash
 # Reload your shell to pick up new Ruby/Node versions
 cd <project-root>
-mise current  # or: asdf current
+mise current           # For mise users
+# asdf current         # For asdf users
+# rvm current && nvm current  # For rvm+nvm users
 
 # Build and test
 rake node_package
@@ -137,7 +168,9 @@ This will:
 ```bash
 # Reload your shell to pick up new Ruby/Node versions
 cd <project-root>
-mise current  # or: asdf current
+mise current           # For mise users
+# asdf current         # For asdf users
+# rvm current && nvm current  # For rvm+nvm users
 
 # Build and test
 rake node_package
@@ -243,6 +276,22 @@ asdf reshim ruby
 asdf reshim nodejs
 ```
 
+**For rvm + nvm:**
+
+```bash
+# Install and use specific Ruby version
+rvm install 3.2.8   # or 3.4.3
+rvm use 3.2.8
+
+# Install and use specific Node version
+nvm install 20.18.1  # or 22.12.0
+nvm use 20.18.1
+
+# Verify versions
+ruby --version
+node --version
+```
+
 ### Yarn install fails
 
 If you get package resolution errors:

data/Steepfile

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Steepfile - Configuration for Steep type checker
+# See https://github.com/soutaro/steep for documentation
+#
+# IMPORTANT: This file lists only the files that are ready for type checking.
+# We use a positive list (explicit check statements) rather than checking all files
+# because not all files have RBS signatures yet.
+#
+# Files/directories intentionally excluded (no RBS signatures yet):
+# - lib/generators/**/*           - Rails generators (complex Rails integration)
+# - lib/react_on_rails/engine.rb  - Rails engine setup
+# - lib/react_on_rails/doctor.rb  - Diagnostic tool
+# - lib/react_on_rails/locales/**/* - I18n files
+# - lib/react_on_rails/props_js_builder.rb - TODO: Add signature
+# - lib/react_on_rails/shakapacker/**/* - Shakapacker integration (complex)
+#
+# To add a new file to type checking:
+# 1. Create corresponding RBS signature in sig/react_on_rails/filename.rbs
+# 2. Add `check "lib/react_on_rails/filename.rb"` below
+# 3. Run `bundle exec rake rbs:steep` to verify
+# 4. Fix any type errors before committing
+
+D = Steep::Diagnostic
+
+target :lib do
+  # Core files with RBS signatures (alphabetically ordered for easy maintenance)
+  check "lib/react_on_rails.rb"
+  check "lib/react_on_rails/configuration.rb"
+  check "lib/react_on_rails/controller.rb"
+  check "lib/react_on_rails/git_utils.rb"
+  check "lib/react_on_rails/helper.rb"
+  check "lib/react_on_rails/packer_utils.rb"
+  check "lib/react_on_rails/server_rendering_pool.rb"
+  check "lib/react_on_rails/test_helper.rb"
+  check "lib/react_on_rails/utils.rb"
+  check "lib/react_on_rails/version_checker.rb"
+
+  # Specify RBS signature directories
+  signature "sig"
+
+  # Configure libraries (gems) - Steep will load their RBS signatures
+  configure_code_diagnostics(D::Ruby.default)
+
+  # Library configuration - standard library gems used by checked files
+  library "pathname"
+  library "singleton"
+  library "logger"
+  library "monitor"
+  library "securerandom"
+end

data/bin/ci-rerun-failures

@@ -173,21 +173,66 @@ if [ -z "$FAILED_CHECKS" ]; then
   exit 0
 fi
 
+# Map CI job names to identifiers
+# NOTE: Version numbers below must match .github/workflows/main.yml matrix configuration
+declare -A JOB_MAP
+JOB_MAP["lint-js-and-ruby"]="lint-js-and-ruby"
+JOB_MAP["rspec-package-tests"]="rspec-package-tests"
+JOB_MAP["package-js-tests"]="package-js-tests"
+JOB_MAP["dummy-app-integration-tests (3.4, 22, latest)"]="dummy-app-integration-tests"
+JOB_MAP["dummy-app-integration-tests (3.2, 20, minimum)"]="dummy-app-integration-tests"
+JOB_MAP["examples"]="examples"
+
+# Function to execute commands without eval
+run_command() {
+  local cmd_id="$1"
+  case "$cmd_id" in
+    "lint-js-and-ruby")
+      bundle exec rubocop && yarn run eslint --report-unused-disable-directives && yarn start format.listDifferent
+      ;;
+    "rspec-package-tests")
+      bundle exec rake run_rspec:gem
+      ;;
+    "package-js-tests")
+      yarn test
+      ;;
+    "dummy-app-integration-tests")
+      bundle exec rake run_rspec:all_dummy
+      ;;
+    "examples")
+      bundle exec rake run_rspec:shakapacker_examples
+      ;;
+    *)
+      echo "Unknown command ID: $cmd_id"
+      return 1
+      ;;
+  esac
+}
+
+# Map CI job names to human-readable versions (matches SWITCHING_CI_CONFIGS.md)
+declare -A JOB_VERSION_MAP
+JOB_VERSION_MAP["dummy-app-integration-tests (3.4, 22, latest)"]="Ruby 3.4, Node 22, Shakapacker 9.3.0, React 19"
+JOB_VERSION_MAP["dummy-app-integration-tests (3.2, 20, minimum)"]="Ruby 3.2, Node 20, Shakapacker 8.2.0, React 18"
+
+# Helper function to get version info for a job name
+get_version_info() {
+  local job_name="$1"
+  for mapped_job_name in "${!JOB_VERSION_MAP[@]}"; do
+    if [[ "$job_name" == "$mapped_job_name"* ]]; then
+      echo " (${JOB_VERSION_MAP[$mapped_job_name]})"
+      return
+    fi
+  done
+  echo ""
+}
+
 echo -e "${YELLOW}Failed CI jobs:${NC}"
 echo "$FAILED_CHECKS" | while read -r check; do
-  echo -e "${RED}  ✗ $check${NC}"
+  version_info=$(get_version_info "$check")
+  echo -e "${RED}  ✗ $check${version_info}${NC}"
 done
 echo ""
 
-# Map CI job names to local commands
-declare -A JOB_MAP
-JOB_MAP["lint-js-and-ruby"]="bundle exec rubocop && yarn run eslint --report-unused-disable-directives && yarn start format.listDifferent"
-JOB_MAP["rspec-package-tests"]="bundle exec rake run_rspec:gem"
-JOB_MAP["package-js-tests"]="yarn test"
-JOB_MAP["dummy-app-integration-tests (3.4, 22, latest)"]="bundle exec rake run_rspec:all_dummy"
-JOB_MAP["dummy-app-integration-tests (3.2, 20, minimum)"]="bundle exec rake run_rspec:all_dummy"
-JOB_MAP["examples"]="bundle exec rake run_rspec:shakapacker_examples"
-
 # Track what we'll run (deduplicated)
 declare -A COMMANDS_TO_RUN
 
@@ -217,8 +262,10 @@ if [ "$NUM_COMMANDS" -eq 0 ]; then
 fi
 
 echo -e "${BLUE}Will run the following commands:${NC}"
-for cmd in "${!COMMANDS_TO_RUN[@]}"; do
-  echo -e "${BLUE}  • ${COMMANDS_TO_RUN[$cmd]}:${NC} $cmd"
+for cmd_id in "${!COMMANDS_TO_RUN[@]}"; do
+  job_name="${COMMANDS_TO_RUN[$cmd_id]}"
+  version_info=$(get_version_info "$job_name")
+  echo -e "${BLUE}  • $job_name${version_info}${NC}"
 done
 echo ""
 
@@ -249,21 +296,20 @@ fi
 # Run commands
 FAILED_COMMANDS=()
 
-for cmd in "${!COMMANDS_TO_RUN[@]}"; do
-  job_name="${COMMANDS_TO_RUN[$cmd]}"
-  echo -e "${BLUE}▶ Running: $job_name${NC}"
-  echo -e "${BLUE}Command: $cmd${NC}"
+for cmd_id in "${!COMMANDS_TO_RUN[@]}"; do
+  job_name="${COMMANDS_TO_RUN[$cmd_id]}"
+  version_info=$(get_version_info "$job_name")
+
+  echo -e "${BLUE}▶ Running: $job_name${version_info}${NC}"
   echo ""
 
-  # Note: Using eval here is safe because $cmd comes from predefined JOB_MAP,
-  # not from user input. Commands may contain shell operators like && and ||.
-  if eval "$cmd"; then
-    echo -e "${GREEN}✓ $job_name passed${NC}"
+  if run_command "$cmd_id"; then
+    echo -e "${GREEN}✓ $job_name${version_info} passed${NC}"
     echo ""
   else
-    echo -e "${RED}✗ $job_name failed${NC}"
+    echo -e "${RED}✗ $job_name${version_info} failed${NC}"
     echo ""
-    FAILED_COMMANDS+=("$job_name")
+    FAILED_COMMANDS+=("${job_name}${version_info}")
   fi
 done