Merge branch 'main' of https://github.com/HyperPlay-Gaming/hyperplay-…

…desktop-client into UI]Fix-search-bar-sizing-on-Quest-Page
HyperPlay-Gaming · Dec 19, 2024 · 210907e · 210907e
2 parents 77bd50e + 7da58d7
commit 210907e
Show file tree

Hide file tree

Showing 23 changed files with 11,494 additions and 9,102 deletions.
diff --git a/.github/workflows/build-mac-arm64.yml b/.github/workflows/build-mac-arm64.yml
@@ -22,7 +22,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp
@@ -40,7 +39,7 @@ jobs:
       - name: Authenticate with private NPM package
         run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
       - name: Install modules.
-        run: pnpm install --ignore-scripts --fetch-timeout 600000 && pnpm allow-scripts
+        run: pnpm run setup
       - name: setup env file
         run: |
           echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
@@ -74,7 +73,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp
@@ -112,7 +110,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/codecheck.yml b/.github/workflows/codecheck.yml
@@ -19,7 +19,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml
@@ -37,7 +37,6 @@ jobs:
           node-version: '22'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,7 +18,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/release_flathub.yml b/.github/workflows/release_flathub.yml
@@ -24,7 +24,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
@@ -26,7 +26,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/release_macOS.yml b/.github/workflows/release_macOS.yml
@@ -28,9 +28,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v4
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp
@@ -79,6 +78,8 @@ jobs:
         with:
           node-version: '20'
 
+      - uses: pnpm/action-setup@v4
+
       - name: Reconfigure git to use HTTP authentication
         run: >
           git config --global url."https://github.com/".insteadOf
@@ -125,6 +126,8 @@ jobs:
         with:
           node-version: '20'
 
+      - uses: pnpm/action-setup@v4
+
       - name: Reconfigure git to use HTTP authentication
         run: >
           git config --global url."https://github.com/".insteadOf

diff --git a/.github/workflows/release_snap.yml b/.github/workflows/release_snap.yml
@@ -23,7 +23,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/release_windows.yml b/.github/workflows/release_windows.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             node_modules
@@ -37,7 +37,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp
@@ -59,7 +58,7 @@ jobs:
           echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env.production
 
       - name: Cache artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             dist

diff --git a/.github/workflows/test-e2e-dev.yml b/.github/workflows/test-e2e-dev.yml
@@ -87,7 +87,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/test-e2e-packaged.yml b/.github/workflows/test-e2e-packaged.yml
@@ -30,7 +30,6 @@ jobs:
           node-version: '20'
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,7 +33,6 @@ jobs:
           echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
       - uses: pnpm/action-setup@v3
         with:
-          version: 9
           standalone: ${{ runner.os == 'Windows' }}
       - name: Install node-gyp
         run: pnpm add --global node-gyp

diff --git a/buildResetExtension.js b/buildResetExtension.js
@@ -13,7 +13,7 @@ if (existsSync(resetExtensionScript)) {
   const result = spawnSync(
     command,
     [
-      'run',
+      'exec',
       'pkg',
       resetExtensionScript,
       '--out-path',

diff --git a/package.json b/package.json
@@ -254,7 +254,7 @@
     "zod": "^3.23.8"
   },
   "scripts": {
-    "setup": "pnpm install --ignore-scripts && pnpm exec allow-scripts",
+    "setup": "pnpm install --ignore-scripts && patch-package && pnpm exec allow-scripts",
     "setupWithoutOptional": "node ./dev/rmOptionalDependencies.js && pnpm prettier-fix && pnpm install --ignore-optional && pnpm exec allow-scripts",
     "start": "electron-vite dev --watch",
     "debug:react": "react-devtools",
@@ -367,7 +367,7 @@
   },
   "optionalDependencies": {
     "@hyperplay/extension-importer": "^0.1.1-alpha.0",
-    "@hyperplay/extension-provider": "^0.0.8",
+    "@hyperplay/extension-provider": "^0.0.9",
     "@hyperplay/mock-backend": "^0.0.1",
     "@hyperplay/overlay": "^0.0.7",
     "@hyperplay/patcher": "^0.0.18",
@@ -408,5 +408,5 @@
       "sass>@parcel/watcher": false
     }
   },
-  "packageManager": "pnpm@8.7.6+sha1.a428b12202bc4f23b17e6dffe730734dae5728e2"
+  "packageManager": "pnpm@9.15.0+sha256.09a8fe31a34fda706354680619f4002f4ccef6dadff93240d24ef6c831f0fd28"
 }