shakacode
diff --git a/‎.github/workflows/benchmark.yml‎
Lines changed: 3 additions & 11 deletions b/‎.github/workflows/benchmark.yml‎
Lines changed: 3 additions & 11 deletions
diff --git a/‎.github/workflows/lint-js-and-ruby.yml‎
Lines changed: 10 additions & 4 deletions b/‎.github/workflows/lint-js-and-ruby.yml‎
Lines changed: 10 additions & 4 deletions
diff --git a/‎.github/workflows/pro-test-package-and-gem.yml‎
Lines changed: 10 additions & 3 deletions b/‎.github/workflows/pro-test-package-and-gem.yml‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 3 deletions b/‎.gitignore‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎AGENTS.md‎
Lines changed: 12 additions & 7 deletions b/‎AGENTS.md‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎Gemfile‎
Lines changed: 8 additions & 2 deletions b/‎Gemfile‎
Lines changed: 8 additions & 2 deletions
@@ -135,20 +135,12 @@ jobs:
         shell: bash
       # Only pay the Bundler setup when benchmarks will run or the scripts
       # themselves changed; unrelated PRs keep this job stdlib-only and fast.
-      # TODO: when fixing #2214 this should switch to the new root Gemfile.
-      - name: Setup Ruby
+      - name: Install gems for benchmark specs
         if: steps.benchmark-matrices.outputs.run_benchmark_suites == 'true' || steps.detect.outputs.benchmarks_changed == 'true'
-        uses: ./.github/actions/setup-ruby
+        uses: ./.github/actions/setup-bundle
         with:
+          working-directory: .
           ruby-version: ${{ env.RUBY_VERSION }}
-      # The benchmark specs only need rspec, which the root Gemfile provides (it
-      # delegates to react_on_rails/Gemfile). The setup-bundle action can't manage
-      # it because there is no committed root Gemfile.lock yet, so install manually.
-      # TODO(#2214): once a root Gemfile.lock is committed, replace this step with
-      # the setup-bundle action (working-directory: ".") and delete it.
-      - name: Install gems for benchmark specs
-        if: steps.benchmark-matrices.outputs.run_benchmark_suites == 'true' || steps.detect.outputs.benchmarks_changed == 'true'
-        run: bundle install --jobs 4 --retry 3
       # Validate the benchmark scripts (matrix generation, route discovery) before
       # any benchmark runs: if this logic is wrong, the matrix and routes feeding
       # the run are wrong, so the results would be invalid. Running it here (rather
 
@@ -151,6 +151,12 @@ jobs:
           echo "Bundler version: "; bundle --version
       - name: Check Gemfile.lock platforms
         run: ruby script/check-gemfile-lock-platforms
+      - name: Install Ruby Gems for root lint tools
+        uses: ./.github/actions/setup-bundle
+        with:
+          working-directory: .
+          ruby-version: '4.0'
+          install-libyaml: 'false'
       - name: Install Ruby Gems for package
         uses: ./.github/actions/setup-bundle
         with:
@@ -160,17 +166,17 @@ jobs:
       - name: Install Node modules with pnpm
         run: pnpm install --frozen-lockfile
 
-      # Pin the package Gemfile explicitly for parity with pro-lint.yml and to
-      # stay robust if the package and dummy Gemfiles ever diverge.
+      # RuboCop is owned by the root Gemfile/Gemfile.lock so OSS and Pro use one
+      # locked lint version. Keep package bundles for package-specific tasks.
       - name: Lint Ruby
         env:
-          BUNDLE_GEMFILE: ${{ github.workspace }}/react_on_rails/Gemfile
+          BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile
         run: cd react_on_rails && bundle exec rubocop
       # The benchmarks/ scripts live outside the gem, so the package rubocop run
       # above doesn't see them. Lint them from the repo root (root .rubocop.yml).
       - name: Lint benchmark scripts
         env:
-          BUNDLE_GEMFILE: ${{ github.workspace }}/react_on_rails/Gemfile
+          BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile
         run: bundle exec rubocop benchmarks
       - name: Validate RBS type signatures
         env:
 
@@ -178,11 +178,18 @@ jobs:
         working-directory: .
         run: pnpm --filter react-on-rails-pro build
 
-      # These steps need the Pro package Gemfile (which carries rubocop/rbs),
-      # so pin it via absolute path — robust to changes in defaults.run.
+      - name: Install Ruby Gems for root lint tools
+        uses: ./.github/actions/setup-bundle
+        with:
+          working-directory: .
+          ruby-version: ${{ env.RUBY_VERSION }}
+          install-libyaml: 'false'
+
+      # RuboCop is owned by the root Gemfile/Gemfile.lock so OSS and Pro use one
+      # locked lint version. Keep the Pro package Gemfile for RBS.
       - name: Lint Ruby
         env:
-          BUNDLE_GEMFILE: ${{ github.workspace }}/react_on_rails_pro/Gemfile
+          BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile
         run: bundle exec rubocop --ignore-parent-exclusion
 
       - name: Validate RBS type signatures
 
@@ -1,6 +1,3 @@
-# Root Gemfile.lock (delegates to react_on_rails/Gemfile, lock is there)
-/Gemfile.lock
-
 .bundle/
 /.yardoc
 /_yardoc/
 
@@ -37,21 +37,26 @@ If there is a conflict, `AGENTS.md` wins.
 
 ```bash
 # Install dependencies
+# The committed root Gemfile.lock is generated with Bundler 4.0.10; use Bundler
+# 4.0.10 or newer before running root bundle commands.
 bundle && pnpm install
 
+# After changing react_on_rails/Gemfile or Gemfile.shared_dev_dependencies,
+# also run bundle install at the repo root to keep the root Gemfile.lock synced.
+
 # Build TypeScript → JavaScript
 pnpm run build
 
 # Lint (MANDATORY before every commit)
-(cd react_on_rails && bundle exec rubocop)                       # OSS Ruby lint — CI-equivalent
+(cd react_on_rails && BUNDLE_GEMFILE=../Gemfile bundle exec rubocop) # OSS Ruby lint — CI-equivalent
 # Pro Ruby lint — CI-equivalent when Pro files or RuboCop config change
-(cd react_on_rails_pro && bundle exec rubocop --ignore-parent-exclusion)
+(cd react_on_rails_pro && BUNDLE_GEMFILE=../Gemfile bundle exec rubocop --ignore-parent-exclusion)
 pnpm run lint                                                    # JS/TS via ESLint
 pnpm start format.listDifferent                                  # Check Prettier formatting
 rake lint                                                        # All linting (Ruby + JS + formatting)
 
 # Optional Ruby diagnostic from the repo root (not the CI contract)
-bundle exec rubocop
+BUNDLE_GEMFILE=Gemfile bundle exec rubocop
 
 # Auto-fix formatting
 rake autofix                         # Preferred for all formatting
@@ -277,13 +282,13 @@ For small, focused PRs (roughly 5 files changed or fewer and one clear purpose):
 
 ### Always
 
-- Run the CI-equivalent Ruby lint before committing, not the root `bundle exec rubocop`:
+- Run the CI-equivalent Ruby lint before committing:
   ```bash
-  (cd react_on_rails && bundle exec rubocop)
+  (cd react_on_rails && BUNDLE_GEMFILE=../Gemfile bundle exec rubocop)
   # Also run when touching Pro Ruby or RuboCop config:
-  (cd react_on_rails_pro && bundle exec rubocop --ignore-parent-exclusion)
+  (cd react_on_rails_pro && BUNDLE_GEMFILE=../Gemfile bundle exec rubocop --ignore-parent-exclusion)
   ```
-  Root `bundle exec rubocop` is a broad local sweep, not the CI contract.
+  The root `Gemfile` owns the RuboCop version; package directories own their test and RBS bundles.
 - Use `pnpm` for all JS operations — never `npm` or `yarn`
 - Use `bundle exec` for Ruby commands
 - Ensure all files end with a newline
 
@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
-# Root Gemfile for developer convenience
-# Delegates to the react_on_rails gem for development
+# Root Gemfile for developer convenience and RuboCop tooling.
+# RuboCop is owned here so the monorepo uses one locked version.
 
 # Use the open-source gem's Gemfile
 eval_gemfile File.expand_path("react_on_rails/Gemfile", __dir__)
+
+group :development, :test do
+  gem "rubocop", "1.61.0", require: false
+  gem "rubocop-performance", "1.20.2", require: false
+  gem "rubocop-rspec", "2.31.0", require: false
+end