Skip to content

Commit 9848717

Browse files
authored
chore: Update to Electron 34 (#2982)
* update to Electron 34 * bump bundleVersion * bump version * change checksum for aws on pull request build
1 parent 1106a88 commit 9848717

File tree

5 files changed

+523
-161
lines changed

5 files changed

+523
-161
lines changed

.github/workflows/pull-request-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
aws s3 cp dist/ s3://${{ secrets.WASABI_BUCKET_NAME }}/pr-${{ github.event.pull_request.number }}/${{ matrix.os }}/ --recursive \
107107
--acl public-read \
108108
--endpoint-url=https://s3.us-east-1.wasabisys.com \
109+
--checksum-algorithm SHA1 \
109110
--exclude "*" \
110111
--include "rocketchat-*.dmg" \
111112
--include "rocketchat-*.pkg"

electron-builder.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"category": "public.app-category.productivity",
1111
"target": ["dmg", "pkg", "zip", "mas"],
1212
"icon": "build/icon.icns",
13-
"bundleVersion": "24110",
13+
"bundleVersion": "25010",
1414
"helperBundleId": "chat.rocket.electron.helper",
1515
"type": "distribution",
1616
"artifactName": "rocketchat-${version}-${os}.${ext}",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"productName": "Rocket.Chat",
77
"name": "rocketchat",
88
"description": "Official OSX, Windows, and Linux Desktop Clients for Rocket.Chat",
9-
"version": "4.1.2",
9+
"version": "4.1.3",
1010
"author": "Rocket.Chat Support <support@rocket.chat>",
1111
"copyright": "© 2016-2024, Rocket.Chat",
1212
"homepage": "https://rocket.chat",
@@ -109,8 +109,8 @@
109109
"chokidar": "~3.5.3",
110110
"conventional-changelog-cli": "~4.1.0",
111111
"convert-svg-to-png": "~0.6.4",
112-
"electron": "31.6.0",
113-
"electron-builder": "24.13.3",
112+
"electron": "34.0.0",
113+
"electron-builder": "25.1.8",
114114
"electron-devtools-installer": "^3.2.0",
115115
"electron-notarize": "^1.2.2",
116116
"eslint": "~8.56.0",

src/ui/main/rootWindow.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ export const setupRootWindow = (): void => {
257257

258258
rootWindow.addListener('close', async () => {
259259
if (rootWindow?.isFullScreen()) {
260-
await new Promise((resolve) =>
261-
rootWindow.once('leave-full-screen', resolve)
260+
await new Promise<void>((resolve) =>
261+
rootWindow.once('leave-full-screen', () => resolve())
262262
);
263263
rootWindow.setFullScreen(false);
264264
}

0 commit comments

Comments
 (0)