Skip to content

Commit a8d132b

Browse files
flavioislimaflavioislima
committed
Merge branch 'tech/elec_build_yml' of https://github.com/HyperPlay-Gaming/hyperplay-desktop-client into tech/elec_build_yml
2 parents 26d8173 + 841f3a4 commit a8d132b

File tree

120 files changed

+9522
-2922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+9522
-2922
lines changed

‎.github/workflows/build-mac-arm64.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ jobs:
2222
node-version: '20'
2323
- uses: pnpm/action-setup@v3
2424
with:
25-
version: 9
2625
standalone: ${{ runner.os == 'Windows' }}
2726
- name: Install node-gyp
2827
run: pnpm add --global node-gyp
2928
shell: bash
29+
- name: install python setuptools
30+
run: pip3 install setuptools
31+
shell: bash
3032
- name: Reconfigure git to use HTTP authentication
3133
run: >
3234
git config --global url."https://github.com/".insteadOf

‎.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
node-version: '20'
2929
- uses: pnpm/action-setup@v3
3030
with:
31-
version: 9
3231
standalone: ${{ runner.os == 'Windows' }}
3332
- name: Install node-gyp
3433
run: pnpm add --global node-gyp
@@ -40,7 +39,7 @@ jobs:
4039
- name: Authenticate with private NPM package
4140
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
4241
- name: Install modules.
43-
run: pnpm install --ignore-scripts --fetch-timeout 600000 && pnpm allow-scripts
42+
run: pnpm run setup
4443
- name: setup env file
4544
run: |
4645
echo "VITE_LD_ENVIRONMENT_ID=${{ secrets.VITE_LD_ENVIRONMENT_ID_TEST }}" > .env
@@ -74,7 +73,6 @@ jobs:
7473
node-version: '20'
7574
- uses: pnpm/action-setup@v3
7675
with:
77-
version: 9
7876
standalone: ${{ runner.os == 'Windows' }}
7977
- name: Install node-gyp
8078
run: pnpm add --global node-gyp
@@ -112,11 +110,13 @@ jobs:
112110
node-version: '20'
113111
- uses: pnpm/action-setup@v3
114112
with:
115-
version: 9
116113
standalone: ${{ runner.os == 'Windows' }}
117114
- name: Install node-gyp
118115
run: pnpm add --global node-gyp
119116
shell: bash
117+
- name: install python setuptools
118+
run: pip3 install setuptools
119+
shell: bash
120120
- name: Reconfigure git to use HTTP authentication
121121
run: >
122122
git config --global url."https://github.com/".insteadOf

‎.github/workflows/codecheck.yml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
node-version: '20'
2020
- uses: pnpm/action-setup@v3
2121
with:
22-
version: 9
2322
standalone: ${{ runner.os == 'Windows' }}
2423
- name: Install node-gyp
2524
run: pnpm add --global node-gyp

‎.github/workflows/flatpak-build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ jobs:
3737
node-version: '22'
3838
- uses: pnpm/action-setup@v3
3939
with:
40-
version: 9
4140
standalone: ${{ runner.os == 'Windows' }}
4241
- name: Install node-gyp
4342
run: pnpm add --global node-gyp
4443
shell: bash
44+
- name: install python setuptools
45+
run: pip3 install setuptools
4546
- name: Reconfigure git to use HTTP authentication
4647
run: >
4748
git config --global url."https://github.com/".insteadOf

‎.github/workflows/lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
node-version: '20'
1919
- uses: pnpm/action-setup@v3
2020
with:
21-
version: 9
2221
standalone: ${{ runner.os == 'Windows' }}
2322
- name: Install node-gyp
2423
run: pnpm add --global node-gyp

‎.github/workflows/release_flathub.yml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
node-version: '20'
2525
- uses: pnpm/action-setup@v3
2626
with:
27-
version: 9
2827
standalone: ${{ runner.os == 'Windows' }}
2928
- name: Install node-gyp
3029
run: pnpm add --global node-gyp

‎.github/workflows/release_linux.yml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
node-version: '20'
2727
- uses: pnpm/action-setup@v3
2828
with:
29-
version: 9
3029
standalone: ${{ runner.os == 'Windows' }}
3130
- name: Install node-gyp
3231
run: pnpm add --global node-gyp

‎.github/workflows/release_macOS.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@ jobs:
2828
uses: actions/setup-node@v4
2929
with:
3030
node-version: '20'
31-
- uses: pnpm/action-setup@v3
31+
- uses: pnpm/action-setup@v4
3232
with:
33-
version: 9
3433
standalone: ${{ runner.os == 'Windows' }}
3534
- name: Install node-gyp
3635
run: pnpm add --global node-gyp
3736
shell: bash
3837

38+
- name: install python setuptools
39+
run: pip3 install setuptools
40+
shell: bash
41+
3942
- name: Reconfigure git to use HTTP authentication
4043
run: >
4144
git config --global url."https://github.com/".insteadOf
@@ -79,6 +82,8 @@ jobs:
7982
with:
8083
node-version: '20'
8184

85+
- uses: pnpm/action-setup@v4
86+
8287
- name: Reconfigure git to use HTTP authentication
8388
run: >
8489
git config --global url."https://github.com/".insteadOf
@@ -125,6 +130,8 @@ jobs:
125130
with:
126131
node-version: '20'
127132

133+
- uses: pnpm/action-setup@v4
134+
128135
- name: Reconfigure git to use HTTP authentication
129136
run: >
130137
git config --global url."https://github.com/".insteadOf

‎.github/workflows/release_snap.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
node-version: '20'
2424
- uses: pnpm/action-setup@v3
2525
with:
26-
version: 9
2726
standalone: ${{ runner.os == 'Windows' }}
2827
- name: Install node-gyp
2928
run: pnpm add --global node-gyp

‎.github/workflows/release_windows.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Cache dependencies
20-
uses: actions/cache@v2
20+
uses: actions/cache@v4
2121
with:
2222
path: |
2323
node_modules
@@ -37,7 +37,6 @@ jobs:
3737
node-version: '20'
3838
- uses: pnpm/action-setup@v3
3939
with:
40-
version: 9
4140
standalone: ${{ runner.os == 'Windows' }}
4241
- name: Install node-gyp
4342
run: pnpm add --global node-gyp
@@ -59,7 +58,7 @@ jobs:
5958
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env.production
6059
6160
- name: Cache artifacts
62-
uses: actions/cache@v2
61+
uses: actions/cache@v4
6362
with:
6463
path: |
6564
dist

‎.github/workflows/test-e2e-dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ jobs:
8787
node-version: '20'
8888
- uses: pnpm/action-setup@v3
8989
with:
90-
version: 9
9190
standalone: ${{ runner.os == 'Windows' }}
9291
- name: Install node-gyp
9392
run: pnpm add --global node-gyp

‎.github/workflows/test-e2e-packaged.yml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
node-version: '20'
3131
- uses: pnpm/action-setup@v3
3232
with:
33-
version: 9
3433
standalone: ${{ runner.os == 'Windows' }}
3534
- name: Install node-gyp
3635
run: pnpm add --global node-gyp

‎.github/workflows/test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
echo "VITE_IPFS_API=${{ secrets.VITE_IPFS_API }}" >> .env
3434
- uses: pnpm/action-setup@v3
3535
with:
36-
version: 9
3736
standalone: ${{ runner.os == 'Windows' }}
3837
- name: Install node-gyp
3938
run: pnpm add --global node-gyp

‎.npmrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
node-linker=hoisted
1+
node-linker=hoisted
2+
ignore-dep-scripts=true

‎.yarnrc

-1
This file was deleted.

‎.yarnrc.yml

-1
This file was deleted.

‎buildResetExtension.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (existsSync(resetExtensionScript)) {
1313
const result = spawnSync(
1414
command,
1515
[
16-
'run',
16+
'exec',
1717
'pkg',
1818
resetExtensionScript,
1919
'--out-path',

‎package.json

+53-52
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hyperplay",
3-
"version": "0.22.3",
3+
"version": "0.22.5",
44
"private": true,
55
"main": "build/main/main.js",
66
"homepage": "./",
@@ -14,6 +14,51 @@
1414
"name": "HyperPlay",
1515
"email": "support@hyperplay.xyz"
1616
},
17+
"scripts": {
18+
"setup": "pnpm install --ignore-scripts && patch-package && pnpm exec allow-scripts",
19+
"setupWithoutOptional": "node ./dev/rmOptionalDependencies.js && pnpm prettier-fix && pnpm install --ignore-optional && pnpm exec allow-scripts",
20+
"start": "electron-vite dev --watch",
21+
"debug:react": "react-devtools",
22+
"codecheck": "tsc --noEmit",
23+
"find-deadcode": "ts-prune --error",
24+
"test": "jest",
25+
"testProxy": "jest proxy.test.ts",
26+
"test-watch": "jest --watch --maxWorkers=25%",
27+
"test:ci": "jest --runInBand --silent",
28+
"test:e2e-ci": "cross-env-shell bash e2e/entrypoint.sh",
29+
"test:e2ePackaged-ci": "cross-env TEST_PACKAGED=true pnpm test:e2e-ci",
30+
"test:e2e": "cross-env-shell docker compose -f e2e/docker-compose.yml run --rm --build process_all bash e2e/entrypoint.sh",
31+
"test:e2ePackaged": "cross-env TEST_PACKAGED=true pnpm test:e2e",
32+
"manualTestProxyJest": "jest mmExtIntegration.test.ts",
33+
"release:linux": "pnpm pkgResetExtension:x64:linux && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --linux deb rpm pacman tar.xz",
34+
"release:updateFlathub:ci": "tsc flathub/update-flathub.ts --skipLibCheck --target es2015 --moduleResolution node --module commonjs && node flathub/update-flathub.js",
35+
"release:mac:x64": "pnpm pkgResetExtension:x64:mac && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --mac --x64",
36+
"release:mac:arm64": "pnpm pkgResetExtension:arm64:mac && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --mac --arm64",
37+
"dist:linux": "pnpm pkgResetExtension:x64:linux && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --linux",
38+
"dist:linux:ci:deb": "pnpm dist:linux deb --publish=never",
39+
"dist:linux:ci:rpm": "pnpm dist:linux rpm --publish=never",
40+
"dist:linux:ci:pacman": "pnpm dist:linux pacman --publish=never",
41+
"dist:linux:ci:flatpak": "pnpm dist:linux tar.xz --publish=never",
42+
"dist:mac:base": "export NODE_ENV_ELECTRON_VITE=production && export CSC_IDENTITY_AUTO_DISCOVERY=false && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --mac",
43+
"dist:mac:x64": "pnpm pkgResetExtension:x64:mac && pnpm dist:mac:base --x64 --publish=never",
44+
"dist:mac:arm64": "pnpm pkgResetExtension:arm64:mac && pnpm dist:mac:base --arm64 --publish=never",
45+
"dist:win": "pnpm pkgResetExtension:x64:win && cross-env NODE_ENV_ELECTRON_VITE=production electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --win nsis --publish=never",
46+
"build-signed:win": "electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --win -c.win.certificateSubjectName=\"HyperPlay Labs Inc.\"",
47+
"lint": "eslint --cache -c .eslintrc.json --ext .tsx,ts ./src",
48+
"lint-fix": "eslint --fix -c .eslintrc.json --ext .tsx,ts ./src",
49+
"flatpak:build": "cd flatpak-build && flatpak-builder build xyz.hyperplay.HyperPlay.yml --install --force-clean --user",
50+
"flatpak:prepare": "node ./flatpak/prepareFlatpak.js",
51+
"flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release",
52+
"i18n": "i18next",
53+
"prepare": "husky install",
54+
"prettier": "prettier --check .",
55+
"prettier-fix": "prettier --write .",
56+
"pkgResetExtension:base": "node ./buildResetExtension.js",
57+
"pkgResetExtension:arm64:mac": "pnpm pkgResetExtension:base -t node18-macos-arm64",
58+
"pkgResetExtension:x64:mac": "pnpm pkgResetExtension:base -t node18-macos-x64",
59+
"pkgResetExtension:x64:win": "pnpm pkgResetExtension:base -t node18-win-x64",
60+
"pkgResetExtension:x64:linux": "pnpm pkgResetExtension:base -t node18-linux-x64"
61+
},
1762
"dependencies": {
1863
"@emotion/react": "^11.13.0",
1964
"@emotion/styled": "^11.13.0",
@@ -26,9 +71,9 @@
2671
"@fortawesome/react-fontawesome": "^0.2.2",
2772
"@hyperplay/chains": "^0.3.0",
2873
"@hyperplay/check-disk-space": "^3.5.2",
29-
"@hyperplay/quests-ui": "^0.1.0",
74+
"@hyperplay/quests-ui": "^0.1.9",
3075
"@hyperplay/ui": "^1.8.18",
31-
"@hyperplay/utils": "^0.3.4",
76+
"@hyperplay/utils": "^0.3.6",
3277
"@mantine/carousel": "^7.12.0",
3378
"@mantine/core": "^7.12.0",
3479
"@mantine/dropzone": "^7.12.0",
@@ -56,7 +101,7 @@
56101
"crc": "^4.3.2",
57102
"discord-rich-presence-typescript": "^0.0.8",
58103
"electron-store": "^8.2.0",
59-
"electron-updater": "^6.2.1",
104+
"electron-updater": "^6.3.9",
60105
"embla-carousel-autoplay": ">=7.0.0",
61106
"embla-carousel-react": ">=7.0.0",
62107
"ethers": "^6.12.1",
@@ -110,51 +155,6 @@
110155
"yauzl": "^3.1.3",
111156
"zod": "^3.23.8"
112157
},
113-
"scripts": {
114-
"setup": "pnpm install --ignore-scripts && pnpm exec allow-scripts",
115-
"setupWithoutOptional": "node ./dev/rmOptionalDependencies.js && pnpm prettier-fix && pnpm install --ignore-optional && pnpm exec allow-scripts",
116-
"start": "electron-vite dev --watch",
117-
"debug:react": "react-devtools",
118-
"codecheck": "tsc --noEmit",
119-
"find-deadcode": "ts-prune --error",
120-
"test": "jest",
121-
"testProxy": "jest proxy.test.ts",
122-
"test-watch": "jest --watch --maxWorkers=25%",
123-
"test:ci": "jest --runInBand --silent",
124-
"test:e2e-ci": "cross-env-shell bash e2e/entrypoint.sh",
125-
"test:e2ePackaged-ci": "cross-env TEST_PACKAGED=true pnpm test:e2e-ci",
126-
"test:e2e": "cross-env-shell docker compose -f e2e/docker-compose.yml run --rm --build process_all bash e2e/entrypoint.sh",
127-
"test:e2ePackaged": "cross-env TEST_PACKAGED=true pnpm test:e2e",
128-
"manualTestProxyJest": "jest mmExtIntegration.test.ts",
129-
"release:linux": "pnpm pkgResetExtension:x64:linux && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --linux deb rpm pacman tar.xz",
130-
"release:updateFlathub:ci": "tsc flathub/update-flathub.ts --skipLibCheck --target es2015 --moduleResolution node --module commonjs && node flathub/update-flathub.js",
131-
"release:mac:x64": "pnpm pkgResetExtension:x64:mac && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --mac --x64",
132-
"release:mac:arm64": "pnpm pkgResetExtension:arm64:mac && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder -p always --mac --arm64",
133-
"dist:linux": "pnpm pkgResetExtension:x64:linux && export NODE_ENV_ELECTRON_VITE=production && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --linux",
134-
"dist:linux:ci:deb": "pnpm dist:linux deb --publish=never",
135-
"dist:linux:ci:rpm": "pnpm dist:linux rpm --publish=never",
136-
"dist:linux:ci:pacman": "pnpm dist:linux pacman --publish=never",
137-
"dist:linux:ci:flatpak": "pnpm dist:linux tar.xz --publish=never",
138-
"dist:mac:base": "export NODE_ENV_ELECTRON_VITE=production && export CSC_IDENTITY_AUTO_DISCOVERY=false && electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --mac",
139-
"dist:mac:x64": "pnpm pkgResetExtension:x64:mac && pnpm dist:mac:base --x64 --publish=never",
140-
"dist:mac:arm64": "pnpm pkgResetExtension:arm64:mac && pnpm dist:mac:base --arm64 --publish=never",
141-
"dist:win": "pnpm pkgResetExtension:x64:win && cross-env NODE_ENV_ELECTRON_VITE=production electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --win nsis --publish=never",
142-
"build-signed:win": "electron-vite build && cross-env ELECTRON_MIRROR=https://github.com/HyperPlay-Gaming/electron-releases/releases/download/ ELECTRON_CUSTOM_DIR=v33.2.0 electron-builder --win -c.win.certificateSubjectName=\"HyperPlay Labs Inc.\"",
143-
"lint": "eslint --cache -c .eslintrc.json --ext .tsx,ts ./src",
144-
"lint-fix": "eslint --fix -c .eslintrc.json --ext .tsx,ts ./src",
145-
"flatpak:build": "cd flatpak-build && flatpak-builder build xyz.hyperplay.HyperPlay.yml --install --force-clean --user",
146-
"flatpak:prepare": "node ./flatpak/prepareFlatpak.js",
147-
"flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release",
148-
"i18n": "i18next",
149-
"prepare": "husky install",
150-
"prettier": "prettier --check .",
151-
"prettier-fix": "prettier --write .",
152-
"pkgResetExtension:base": "node ./buildResetExtension.js",
153-
"pkgResetExtension:arm64:mac": "pnpm pkgResetExtension:base -t node18-macos-arm64",
154-
"pkgResetExtension:x64:mac": "pnpm pkgResetExtension:base -t node18-macos-x64",
155-
"pkgResetExtension:x64:win": "pnpm pkgResetExtension:base -t node18-win-x64",
156-
"pkgResetExtension:x64:linux": "pnpm pkgResetExtension:base -t node18-linux-x64"
157-
},
158158
"eslintConfig": {
159159
"extends": [
160160
"react-app",
@@ -198,7 +198,7 @@
198198
"@vitejs/plugin-react": "^4.3.1",
199199
"cross-env": "^7.0.3",
200200
"electron": "33.2.0",
201-
"electron-builder": "^24.13.3",
201+
"electron-builder": "^25.1.8",
202202
"electron-playwright-helpers": "^1.7.1",
203203
"electron-vite": "^2.3.0",
204204
"eslint": "^8.13.0",
@@ -224,7 +224,7 @@
224224
},
225225
"optionalDependencies": {
226226
"@hyperplay/extension-importer": "^0.1.1-alpha.0",
227-
"@hyperplay/extension-provider": "^0.0.8",
227+
"@hyperplay/extension-provider": "^0.0.9",
228228
"@hyperplay/mock-backend": "^0.0.1",
229229
"@hyperplay/overlay": "^0.0.7",
230230
"@hyperplay/patcher": "^0.0.18",
@@ -264,5 +264,6 @@
264264
"@hyperplay/overlay>electron": false,
265265
"sass>@parcel/watcher": false
266266
}
267-
}
267+
},
268+
"packageManager": "pnpm@9.15.0+sha256.09a8fe31a34fda706354680619f4002f4ccef6dadff93240d24ef6c831f0fd28"
268269
}

‎patches/app-builder-lib+24.13.3.patch

-13
This file was deleted.

0 commit comments

Comments
 (0)