Skip to content

Commit

Permalink
chore: Update to Electron 34 (#2982)
Browse files Browse the repository at this point in the history
* update to Electron 34

* bump bundleVersion

* bump version

* change checksum for aws on pull request build
  • Loading branch information
jeanfbrito authored Jan 23, 2025
1 parent 1106a88 commit 9848717
Show file tree
Hide file tree
Showing 5 changed files with 523 additions and 161 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pull-request-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
aws s3 cp dist/ s3://${{ secrets.WASABI_BUCKET_NAME }}/pr-${{ github.event.pull_request.number }}/${{ matrix.os }}/ --recursive \
--acl public-read \
--endpoint-url=https://s3.us-east-1.wasabisys.com \
--checksum-algorithm SHA1 \
--exclude "*" \
--include "rocketchat-*.dmg" \
--include "rocketchat-*.pkg"
Expand Down
2 changes: 1 addition & 1 deletion electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"category": "public.app-category.productivity",
"target": ["dmg", "pkg", "zip", "mas"],
"icon": "build/icon.icns",
"bundleVersion": "24110",
"bundleVersion": "25010",
"helperBundleId": "chat.rocket.electron.helper",
"type": "distribution",
"artifactName": "rocketchat-${version}-${os}.${ext}",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"productName": "Rocket.Chat",
"name": "rocketchat",
"description": "Official OSX, Windows, and Linux Desktop Clients for Rocket.Chat",
"version": "4.1.2",
"version": "4.1.3",
"author": "Rocket.Chat Support <[email protected]>",
"copyright": "© 2016-2024, Rocket.Chat",
"homepage": "https://rocket.chat",
Expand Down Expand Up @@ -109,8 +109,8 @@
"chokidar": "~3.5.3",
"conventional-changelog-cli": "~4.1.0",
"convert-svg-to-png": "~0.6.4",
"electron": "31.6.0",
"electron-builder": "24.13.3",
"electron": "34.0.0",
"electron-builder": "25.1.8",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.2.2",
"eslint": "~8.56.0",
Expand Down
4 changes: 2 additions & 2 deletions src/ui/main/rootWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ export const setupRootWindow = (): void => {

rootWindow.addListener('close', async () => {
if (rootWindow?.isFullScreen()) {
await new Promise((resolve) =>
rootWindow.once('leave-full-screen', resolve)
await new Promise<void>((resolve) =>
rootWindow.once('leave-full-screen', () => resolve())
);
rootWindow.setFullScreen(false);
}
Expand Down
Loading

0 comments on commit 9848717

Please sign in to comment.