Skip to content

Commit

Permalink
Merge branch 'chore/update-electron' into chore/update-notarize
Browse files Browse the repository at this point in the history
  • Loading branch information
rajivshah3 committed Nov 2, 2023
2 parents 45ab111 + 4922311 commit 6e0c495
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 611 deletions.
19 changes: 10 additions & 9 deletions packages/desktop/electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,18 +357,19 @@ app.on('window-all-closed', () => {
}
})

powerMonitor.on('suspend', () => {
// MacOS, Windows and Linux
windows.main?.webContents?.send('power-monitor-suspend')
})
app.once('ready', () => {
powerMonitor.on('suspend', () => {
// MacOS, Windows and Linux
windows.main?.webContents?.send('power-monitor-suspend')
})

powerMonitor.on('lock-screen', () => {
// MacOS and Windows
windows.main?.webContents?.send('power-monitor-lock-screen')
})
powerMonitor.on('lock-screen', () => {
// MacOS and Windows
windows.main?.webContents?.send('power-monitor-lock-screen')
})

app.once('ready', () => {
ipcMain.handle('error-data', () => lastError)

app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
Expand Down
10 changes: 5 additions & 5 deletions packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@sentry/electron": "^2.5.4",
"@types/webpack-dev-server": "^4.7.2",
"dotenv": "^16.0.3",
"electron-dl": "^3.5.0",
"electron-log": "^4.3.1",
"electron-updater": "5.3.0",
"electron-dl": "^3.5.1",
"electron-log": "^4.4.8",
"electron-updater": "6.1.4",
"https-browserify": "^1.0.0",
"keytar": "^7.9.0",
"node-machine-id": "^1.1.12",
Expand All @@ -49,8 +49,8 @@
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.2",
"css-loader": "^6.7.3",
"electron": "22.3.27",
"electron-builder": "^24.0.0",
"electron": "27.0.2",
"electron-builder": "^24.6.4",
"esbuild-loader": "^4.0.2",
"lodash.merge": "^4.6.2",
"mini-css-extract-plugin": "^2.7.6",
Expand Down
25 changes: 0 additions & 25 deletions patches/electron-updater+5.3.0.patch

This file was deleted.

Loading

0 comments on commit 6e0c495

Please sign in to comment.