Restructure monorepo with two top-level product directories

.claude/docs/master-health-monitoring.md

@@ -21,6 +21,31 @@ Within 30 minutes of your PR merging to master:
    - Don't assume "someone else will fix it"
    - You are responsible for ensuring your PR doesn't break master
 
+## Polling CI Status While Waiting
+
+**When actively monitoring CI, poll every 30 seconds (not 180 seconds):**
+
+```bash
+# Poll every 30 seconds while CI is running
+while true; do
+  gh pr view --json statusCheckRollup --jq '.statusCheckRollup | group_by(.conclusion) | map({conclusion: .[0].conclusion, count: length})'
+  sleep 30
+done
+```
+
+Or use the automated tool which polls at 30-second intervals:
+
+```bash
+bin/ci-rerun-failures  # Automatically waits for in-progress CI, polling every 30s
+```
+
+**Why 30 seconds?**
+
+- CI jobs typically complete in 3-15 minutes
+- 30-second polling gives responsive feedback without excessive API calls
+- 180 seconds (3 minutes) is too slow—you waste time waiting unnecessarily
+- GitHub API rate limits are 5000 requests/hour, so 30-second polls are fine
+
 ## When You Discover Master is Broken
 
 1. **Determine if it's from your PR:**

.github/workflows/examples.yml

@@ -136,8 +136,8 @@ jobs:
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          path: react_on_rails/vendor/bundle
+          key: package-app-gem-cache-${{ hashFiles('react_on_rails/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - id: get-sha
         run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
       - name: Install Node modules with Yarn for renderer package
@@ -147,9 +147,10 @@ jobs:
       - name: yalc publish for react-on-rails
         # Use yarn workspace script to publish all workspace packages to yalc
         # Runs the "yalc:publish" script defined in each workspace's package.json
-        run: yarn yalc publish
+        run: yarn run yalc:publish
       - name: Install Ruby Gems for package
         run: |
+          cd react_on_rails
           bundle lock --add-platform 'x86_64-linux'
           if ! bundle check --path=vendor/bundle; then
             bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
@@ -172,7 +173,7 @@ jobs:
         run: |
           echo "CI_DEPENDENCY_LEVEL=${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Main CI
-        run: bundle exec rake run_rspec:shakapacker_examples
+        run: cd react_on_rails && bundle exec rake run_rspec:shakapacker_examples
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:

.github/workflows/gem-tests.yml

@@ -128,10 +128,10 @@ jobs:
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          path: react_on_rails/vendor/bundle
+          key: package-app-gem-cache-${{ hashFiles('react_on_rails/Gemfile.lock') }}-${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Ruby Gems for package
-        run: bundle check --path=vendor/bundle || bundle  _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
+        run: cd react_on_rails && (bundle check --path=vendor/bundle || bundle  _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3)
       - name: Git Stuff
         if: matrix.dependency-level == 'minimum'
         run: |
@@ -142,7 +142,7 @@ jobs:
         run: |
           echo "CI_DEPENDENCY_LEVEL=${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Run rspec tests
-        run: bundle exec rspec spec/react_on_rails
+        run: cd react_on_rails && bundle exec rspec spec/react_on_rails
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:

.github/workflows/integration-tests.yml

@@ -142,31 +142,31 @@ jobs:
       - name: yalc publish for react-on-rails
         run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
-        run: cd spec/dummy && yalc add react-on-rails
+        run: cd react_on_rails/spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
-        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
+        run: cd react_on_rails/spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
       - name: Save dummy app ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: spec/dummy/vendor/bundle
-          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          path: react_on_rails/spec/dummy/vendor/bundle
+          key: dummy-app-gem-cache-${{ hashFiles('react_on_rails/spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Ruby Gems for dummy app
         run: |
-          cd spec/dummy
+          cd react_on_rails/spec/dummy
           bundle lock --add-platform 'x86_64-linux'
           if ! bundle check --path=vendor/bundle; then
             bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
           fi
       - name: generate file system-based packs
-        run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
+        run: cd react_on_rails/spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
       - name: Build test bundles for dummy app
-        run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/shakapacker
+        run: cd react_on_rails/spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/shakapacker
       - id: get-sha
         run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
       - name: Save test Webpack bundles to cache (for build number checksum used by RSpec job)
         uses: actions/cache/save@v4
         with:
-          path: spec/dummy/public/webpack
+          path: react_on_rails/spec/dummy/public/webpack
           key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
 
   dummy-app-integration-tests:
@@ -217,19 +217,19 @@ jobs:
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          path: react_on_rails/vendor/bundle
+          key: package-app-gem-cache-${{ hashFiles('react_on_rails/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Save dummy app ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: spec/dummy/vendor/bundle
-          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
+          path: react_on_rails/spec/dummy/vendor/bundle
+          key: dummy-app-gem-cache-${{ hashFiles('react_on_rails/spec/dummy/Gemfile.lock') }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - id: get-sha
         run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
       - name: Save test Webpack bundles to cache (for build number checksum used by RSpec job)
         uses: actions/cache@v4
         with:
-          path: spec/dummy/public/webpack
+          path: react_on_rails/spec/dummy/public/webpack
           key: dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
       - name: Install Node modules with Yarn
         run: |
@@ -238,22 +238,23 @@ jobs:
       - name: yalc publish for react-on-rails
         run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
-        run: cd spec/dummy && yalc add react-on-rails
+        run: cd react_on_rails/spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
-        run: cd spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
+        run: cd react_on_rails/spec/dummy && yarn install --no-progress --no-emoji ${{ matrix.dependency-level == 'latest' && '--frozen-lockfile' || '' }}
       - name: Dummy JS tests
         run: |
-          cd spec/dummy
+          cd react_on_rails/spec/dummy
           yarn run test:js
       - name: Install Ruby Gems for package
         run: |
+          cd react_on_rails
           bundle lock --add-platform 'x86_64-linux'
           if ! bundle check --path=vendor/bundle; then
             bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
           fi
       - name: Install Ruby Gems for dummy app
         run: |
-          cd spec/dummy
+          cd react_on_rails/spec/dummy
           bundle lock --add-platform 'x86_64-linux'
           if ! bundle check --path=vendor/bundle; then
             bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
@@ -273,19 +274,19 @@ jobs:
       - name: Increase the amount of inotify watchers
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: generate file system-based packs
-        run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
+        run: cd react_on_rails/spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
       - name: Git Stuff
         if: matrix.dependency-level == 'minimum'
         run: |
           git config user.email "you@example.com"
           git config user.name "Your Name"
           git commit -am "stop generators from complaining about uncommitted code"
-      - run: cd spec/dummy && bundle info shakapacker
+      - run: cd react_on_rails/spec/dummy && bundle info shakapacker
       - name: Set packer version environment variable
         run: |
           echo "CI_DEPENDENCY_LEVEL=ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}" >> $GITHUB_ENV
       - name: Main CI
-        run: bundle exec rake run_rspec:all_dummy
+        run: cd react_on_rails && bundle exec rake run_rspec:all_dummy
       - name: Store test results
         uses: actions/upload-artifact@v4
         with:
@@ -295,14 +296,14 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: dummy-app-capybara-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
-          path: spec/dummy/tmp/capybara
+          path: react_on_rails/spec/dummy/tmp/capybara
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
           name: dummy-app-test-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
-          path: spec/dummy/log/test.log
+          path: react_on_rails/spec/dummy/log/test.log
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
           name: dummy-app-yarn-log-${{ github.run_id }}-${{ github.job }}-ruby${{ matrix.ruby-version }}-${{ matrix.dependency-level }}
-          path: spec/dummy/yarn-error.log
+          path: react_on_rails/spec/dummy/yarn-error.log

.github/workflows/lint-js-and-ruby.yml

@@ -112,46 +112,45 @@ jobs:
       - name: Save root ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: vendor/bundle
-          key: package-app-gem-cache-${{ hashFiles('Gemfile.lock') }}-lint
+          path: react_on_rails/vendor/bundle
+          key: package-app-gem-cache-${{ hashFiles('react_on_rails/Gemfile.lock') }}-lint
       - name: Install Node modules with Yarn for renderer package
         run: |
           yarn install --no-progress --no-emoji --frozen-lockfile
           sudo yarn global add yalc
       - name: yalc publish for react-on-rails
         run: cd packages/react-on-rails && yalc publish
       - name: yalc add react-on-rails
-        run: cd spec/dummy && yalc add react-on-rails
+        run: cd react_on_rails/spec/dummy && yalc add react-on-rails
       - name: Install Node modules with Yarn for dummy app
-        run: cd spec/dummy && yarn install --no-progress --no-emoji --frozen-lockfile
+        run: cd react_on_rails/spec/dummy && yarn install --no-progress --no-emoji
       - name: Install Ruby Gems for package
-        run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
+        run: cd react_on_rails && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
       - name: Lint Ruby
-        run: bundle exec rubocop
+        run: cd react_on_rails && bundle exec rubocop
       - name: Validate RBS type signatures
-        run: bundle exec rake rbs:validate
+        run: cd react_on_rails && bundle exec rake rbs:validate
       # TODO: Re-enable Steep once RBS signatures are complete for all checked files
       # Currently disabled because 374 type errors need to be fixed first
       # - name: Run Steep type checker
       #   run: bundle exec rake rbs:steep
       - name: Save dummy app ruby gems to cache
         uses: actions/cache@v4
         with:
-          path: spec/dummy/vendor/bundle
-          key: dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}-lint
+          path: react_on_rails/spec/dummy/vendor/bundle
+          key: dummy-app-gem-cache-${{ hashFiles('react_on_rails/spec/dummy/Gemfile.lock') }}-lint
       - name: Install Ruby Gems for dummy app
         run: |
-          cd spec/dummy
+          cd react_on_rails/spec/dummy
           bundle lock --add-platform 'x86_64-linux'
           if ! bundle check --path=vendor/bundle; then
             bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
           fi
       - name: generate file system-based packs
-        run: cd spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
+        run: cd react_on_rails/spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
       - name: Detect dead code
         run: |
           yarn run knip --exclude binaries
-          yarn run knip --production --exclude binaries
       - name: Lint JS
         run: yarn run eslint --report-unused-disable-directives
       - name: Check formatting

.github/workflows/package-js-tests.yml

@@ -9,8 +9,8 @@ on:
     paths-ignore:
       - '**.md'
       - 'docs/**'
-      - 'lib/**'
-      - 'spec/react_on_rails/**'
+      - 'react_on_rails/lib/**'
+      - 'react_on_rails/spec/react_on_rails/**'
       - 'react_on_rails_pro/**'
   workflow_dispatch:
     inputs:

.github/workflows/playwright.yml

@@ -61,32 +61,32 @@ jobs:
         run: yarn install
 
       - name: Install dummy app dependencies
-        working-directory: spec/dummy
+        working-directory: react_on_rails/spec/dummy
         run: |
           bundle install
           yarn install
 
       - name: Install Playwright browsers
-        working-directory: spec/dummy
+        working-directory: react_on_rails/spec/dummy
         run: yarn playwright install --with-deps
 
       - name: Generate React on Rails packs
-        working-directory: spec/dummy
+        working-directory: react_on_rails/spec/dummy
         env:
           RAILS_ENV: test
         run: bundle exec rake react_on_rails:generate_packs
 
       - name: Build test assets
-        working-directory: spec/dummy
+        working-directory: react_on_rails/spec/dummy
         run: yarn run build:test
 
       - name: Run Playwright tests
-        working-directory: spec/dummy
+        working-directory: react_on_rails/spec/dummy
         run: yarn run test:e2e
 
       - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report
-          path: spec/dummy/e2e/playwright-report/
+          path: react_on_rails/spec/dummy/e2e/playwright-report/
           retention-days: 30

.github/workflows/pro-integration-tests.yml

@@ -9,8 +9,8 @@ on:
     paths-ignore:
       - '**.md'
       - 'docs/**'
-      - 'lib/**'
-      - 'spec/**'
+      - 'react_on_rails/lib/**'
+      - 'react_on_rails/spec/**'
       - 'packages/react_on_rails/**'
   workflow_dispatch:
     inputs:

.github/workflows/pro-lint.yml

@@ -9,8 +9,8 @@ on:
     paths-ignore:
       - '**.md'
       - 'docs/**'
-      - 'lib/**'
-      - 'spec/**'
+      - 'react_on_rails/lib/**'
+      - 'react_on_rails/spec/**'
       - 'packages/react_on_rails/**'
   workflow_dispatch:
     inputs:
@@ -178,4 +178,5 @@ jobs:
         run: yarn run nps format.listDifferent
 
       - name: Check TypeScript
+        working-directory: .
         run: yarn run nps check-typescript

.github/workflows/pro-test-package-and-gem.yml

@@ -9,8 +9,8 @@ on:
     paths-ignore:
       - '**.md'
       - 'docs/**'
-      - 'lib/**'
-      - 'spec/**'
+      - 'react_on_rails/lib/**'
+      - 'react_on_rails/spec/**'
       - 'packages/react_on_rails/**'
   workflow_dispatch:
     inputs:
@@ -241,6 +241,7 @@ jobs:
           yarn install --frozen-lockfile --no-progress --no-emoji
 
       - name: Run JS unit tests for Pro package
+        working-directory: .
         run: yarn workspace react-on-rails-pro-node-renderer run ci
         env:
           JEST_JUNIT_OUTPUT_DIR: ./jest