From 1538cd344d1fb20c3b2fa07e86c184c02b56e5d9 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Sat, 10 Feb 2024 15:19:03 +0100
Subject: [PATCH] Only install direct dependencies.

---
 .github/workflows/frontend-admin-tests.yml       |  2 +-
 .github/workflows/frontend-tests.yml             | 16 ++++++++++++++++
 .../workflows/upgrade-from-latest-release.yml    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index c320e07d5..c12ec1cc4 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -55,7 +55,7 @@ jobs:
         # We intentionally install an old ep_align version to test upgrades to
         # the minor version number. The --legacy-peer-deps flag is required to
         # work around a bug in npm v7: https://github.com/npm/cli/issues/2199
-        run: pnpm install --legacy-peer-deps ep_align@0.2.27
+        run: pnpm install ep_align@0.2.27
       # Etherpad core dependencies must be installed after installing the
       # plugin's dependencies, otherwise npm will try to hoist common
       # dependencies by removing them from src/node_modules and installing them
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 3a7ff5b91..a0d7b07b8 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -95,6 +95,22 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       -
         name: Install Etherpad plugins
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/workflows/upgrade-from-latest-release.yml
index fc5074315..12a383f5d 100644
--- a/.github/workflows/upgrade-from-latest-release.yml
+++ b/.github/workflows/upgrade-from-latest-release.yml
@@ -106,7 +106,7 @@ jobs:
       -
         name: Install Cypress
         working-directory: ./src
-        run: npm install cypress --legacy-peer-deps
+        run: pnpm install cypress
       -
         name: Run Etherpad & Test Frontend
         working-directory: ./src