Switch benchmark.yml to pnpm and new directory structure

Author: alexeyr

.github/workflows/benchmark.yml

@@ -208,12 +208,18 @@ jobs:
       - name: Fix dependency for libyaml-dev
         run: sudo apt install libyaml-dev -y
 
+      # Follow https://github.com/pnpm/action-setup?tab=readme-ov-file#use-cache-to-reduce-installation-time
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: '22'
-          cache: yarn
-          cache-dependency-path: '**/yarn.lock'
+          cache: pnpm
+          cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Print system information
         run: |
@@ -222,24 +228,34 @@ jobs:
           echo "Current directory: "; pwd
           echo "Ruby version: "; ruby -v
           echo "Node version: "; node -v
-          echo "Yarn version: "; yarn --version
+          echo "Pnpm version: "; pnpm --version
           echo "Bundler version: "; bundle --version
 
-      - name: Install Node modules with Yarn for renderer package
+      - name: Install Node modules with Pnpm for all packages
         run: |
-          yarn install --no-progress --no-emoji --frozen-lockfile
-          npm install --global yalc
+          pnpm install --recursive --frozen-lockfile
+          pnpm add --global yalc
 
       - name: yalc publish for react-on-rails
-        run: cd packages/react-on-rails && yarn install --no-progress --no-emoji --frozen-lockfile && yalc publish
+        run: cd packages/react-on-rails && yalc publish
 
-      - name: yalc add react-on-rails
+      # TODO only needed while we use --ignore-workspace below
+      - name: Cache core dummy app node modules
         if: env.RUN_CORE
-        run: cd react_on_rails/spec/dummy && yalc add react-on-rails
+        uses: actions/cache@v4
+        with:
+          path: react_on_rails/spec/dummy/node_modules
+          key: v4-pro-dummy-app-node-modules-cache-${{ hashFiles('pnpm-lock.yaml', 'react_on_rails/spec/dummy/package.json') }}
 
-      - name: Install Node modules with Yarn for Core dummy app
+      - name: Install Node modules for the dummy app
         if: env.RUN_CORE
-        run: cd react_on_rails/spec/dummy && yarn install --frozen-lockfile --no-progress --no-emoji
+        # TODO simplify this both here and in integration tests
+        # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
+        # The dummy app doesn't have a pnpm-lock.yaml and shouldn't use frozen lockfile
+        run: |
+          cd react_on_rails/spec/dummy
+          yalc add react-on-rails
+          pnpm install --ignore-workspace
 
       - name: Save Core dummy app ruby gems to cache
         if: env.RUN_CORE
@@ -356,19 +372,12 @@ jobs:
       # ============================================
       # STEP 6: SETUP PRO APPLICATION SERVER
       # ============================================
-      - name: Cache Pro package node modules
-        if: env.RUN_PRO
-        uses: actions/cache@v4
-        with:
-          path: react_on_rails_pro/node_modules
-          key: v4-pro-package-node-modules-cache-${{ hashFiles('react_on_rails_pro/yarn.lock') }}
-
       - name: Cache Pro dummy app node modules
         if: env.RUN_PRO
         uses: actions/cache@v4
         with:
           path: react_on_rails_pro/spec/dummy/node_modules
-          key: v4-pro-dummy-app-node-modules-cache-${{ hashFiles('react_on_rails_pro/spec/dummy/yarn.lock') }}
+          key: v4-pro-dummy-app-node-modules-cache-${{ hashFiles('pnpm-lock.yaml', 'react_on_rails_pro/spec/dummy/package.json') }}
 
       - name: Cache Pro dummy app Ruby gems
         if: env.RUN_PRO
@@ -377,16 +386,14 @@ jobs:
           path: react_on_rails_pro/spec/dummy/vendor/bundle
           key: v4-pro-dummy-app-gem-cache-${{ hashFiles('react_on_rails_pro/spec/dummy/Gemfile.lock') }}
 
-      - name: Install Node modules with Yarn for Pro package
+      # Same reason for --ignore-workspace as for core
+      # TODO Remove it here as well
+      - name: Install Node modules with Pnpm for Pro dummy app
         if: env.RUN_PRO
         run: |
-          cd react_on_rails_pro
-          sudo yarn global add yalc
-          yarn install --frozen-lockfile --no-progress --no-emoji
-
-      - name: Install Node modules with Yarn for Pro dummy app
-        if: env.RUN_PRO
-        run: cd react_on_rails_pro/spec/dummy && yarn install --frozen-lockfile --no-progress --no-emoji
+          cd react_on_rails_pro/spec/dummy
+          yalc add react-on-rails
+          pnpm install --ignore-workspace
 
       - name: Install Ruby Gems for Pro dummy app
         if: env.RUN_PRO

react_on_rails/spec/dummy/bin/prod-assets

@@ -5,5 +5,5 @@ export RAILS_ENV=production
 if [ "$CI" = "true" ]; then
   bundle exec bootsnap precompile --gemfile app/ lib/ config/
 fi
-yarn run build:rescript
+pnpm run build:rescript
 bundle exec rails assets:precompile