Skip to content

Commit

Permalink
[deps] Platform: Update electron to v33 - abandoned (#11580)
Browse files Browse the repository at this point in the history
* [deps] Platform: Update electron to v33

* fix: remove event from minimize

* chore: update electron version in `electron-builder.json`

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Andreas Coroiu <[email protected]>
Co-authored-by: Bernd Schoolmann <[email protected]>
  • Loading branch information
3 people authored Dec 12, 2024
1 parent 8dd904f commit cecf1f2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion apps/desktop/electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"**/node_modules/@bitwarden/desktop-napi/index.js",
"**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
],
"electronVersion": "32.1.1",
"electronVersion": "33.2.1",
"generateUpdatesFilesForAllChannels": true,
"publish": {
"provider": "generic",
Expand Down
3 changes: 1 addition & 2 deletions apps/desktop/src/main/tray.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ export class TrayMain {
}

setupWindowListeners(win: BrowserWindow) {
win.on("minimize", async (e: Event) => {
win.on("minimize", async () => {
if (await firstValueFrom(this.desktopSettingsService.minimizeToTray$)) {
e.preventDefault();
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises
this.hideToTray();
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"copy-webpack-plugin": "12.0.2",
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"electron": "32.1.1",
"electron": "33.2.1",
"electron-builder": "24.13.3",
"electron-log": "5.2.4",
"electron-reload": "2.0.0-alpha.1",
Expand Down

0 comments on commit cecf1f2

Please sign in to comment.