From 2f2476db0f458e22474083faf062703b4f527e49 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Feb 2026 13:23:36 +0000
Subject: [PATCH 1/5] Add support for pnpm in install-js-sdk.sh

---
 .github/workflows/install-js-sdk.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/install-js-sdk.sh b/.github/workflows/install-js-sdk.sh
index 870e8d5..5e6ecfe 100755
--- a/.github/workflows/install-js-sdk.sh
+++ b/.github/workflows/install-js-sdk.sh
@@ -24,7 +24,13 @@ echo "Installing matrix-js-sdk @ $js_sdk_src"
 if [ "$js_sdk_src" = "." ]; then
     # If we install from a local directory, we have to build the js-sdk ourselves.
     echo "Building js-sdk @ $(pwd)"
-    yarn install
+
+    PM=$(cat package.json | jq -r '.packageManager')
+    if [[ $PM == "pnpm@"* ]]; then
+        pnpm install
+    else
+        yarn install
+    fi
 
     yarn_path="file:$(pwd)"
 else

From cb68e8f6a1dbc3d948f6d976bafe81189129b9d9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Feb 2026 14:12:19 +0000
Subject: [PATCH 2/5] Add PNPM setup step for JS SDK in workflow

---
 .github/workflows/single_sdk_tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/single_sdk_tests.yml b/.github/workflows/single_sdk_tests.yml
index 14efe67..a193cfd 100644
--- a/.github/workflows/single_sdk_tests.yml
+++ b/.github/workflows/single_sdk_tests.yml
@@ -113,6 +113,11 @@ jobs:
           go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
 
       # JS SDK only steps
+      - name: Setup | PNPM
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+        if: ${{ inputs.use_js_sdk != '' }}
+        with:
+          package_json_file: ${{ inputs.use_js_sdk }}/package.json
       - name: Setup | Node.js LTS
         if: ${{ inputs.use_js_sdk != '' }}
         uses: actions/setup-node@v3

From ffcbf19e05b0e19a30fc0a0f6fa0f1783c538c28 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Feb 2026 14:17:49 +0000
Subject: [PATCH 3/5] Discard changes to .github/workflows/single_sdk_tests.yml

---
 .github/workflows/single_sdk_tests.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/single_sdk_tests.yml b/.github/workflows/single_sdk_tests.yml
index a193cfd..14efe67 100644
--- a/.github/workflows/single_sdk_tests.yml
+++ b/.github/workflows/single_sdk_tests.yml
@@ -113,11 +113,6 @@ jobs:
           go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
 
       # JS SDK only steps
-      - name: Setup | PNPM
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
-        if: ${{ inputs.use_js_sdk != '' }}
-        with:
-          package_json_file: ${{ inputs.use_js_sdk }}/package.json
       - name: Setup | Node.js LTS
         if: ${{ inputs.use_js_sdk != '' }}
         uses: actions/setup-node@v3

From d27ed3f527e76d2e1745349a1a1c2c7d17bba057 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Feb 2026 14:18:07 +0000
Subject: [PATCH 4/5] Enable corepack in install-js-sdk.sh

---
 .github/workflows/install-js-sdk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/install-js-sdk.sh b/.github/workflows/install-js-sdk.sh
index 5e6ecfe..992d53d 100755
--- a/.github/workflows/install-js-sdk.sh
+++ b/.github/workflows/install-js-sdk.sh
@@ -19,6 +19,7 @@ fi
 
 complement_crypto_dir="$(dirname $0)/../../"
 
+corepack enable
 echo "Installing matrix-js-sdk @ $js_sdk_src"
 
 if [ "$js_sdk_src" = "." ]; then

From 18407f5cdf07861fb85af2777b88ce15ca4e751e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Feb 2026 14:20:51 +0000
Subject: [PATCH 5/5] Enable corepack and update js-sdk rebuild script

---
 rebuild_js_sdk.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rebuild_js_sdk.sh b/rebuild_js_sdk.sh
index b0ff0a7..a2d32c5 100755
--- a/rebuild_js_sdk.sh
+++ b/rebuild_js_sdk.sh
@@ -17,6 +17,7 @@ then
     exit 1
 fi
 
+corepack enable
 (cd ./internal/api/js/js-sdk && yarn add $1 && yarn install && yarn build)
 rm -rf ./internal/api/js/chrome/dist || echo 'no dist directory detected';
 cp -r ./internal/api/js/js-sdk/dist/. ./internal/api/js/chrome/dist