Skip to content

Commit 76ccf0f

Browse files
committed
chore: update electron version
1 parent bbf92d5 commit 76ccf0f

4 files changed

Lines changed: 466 additions & 487 deletions

File tree

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
"@types/koa-router": "^7.4.5",
4040
"@types/koa__cors": "^4.0.3",
4141
"@types/node": "24.19.0",
42-
"@types/underscore": "^1.11.9",
43-
"@types/url-join": "^4.0.1",
42+
"@types/underscore": "^1.13.0",
43+
"@types/url-join": "^5.0.0",
4444
"@types/ws": "^8.5.6",
4545
"concurrently": "^9.1.2",
46-
"electron": "^40.6.1",
47-
"electron-builder": "^26.8.1",
46+
"electron": "^44.4.5",
47+
"electron-builder": "^26.15.3",
4848
"jest": "^29.7.0",
4949
"nodemon": "^3.0.1",
5050
"ts-jest": "^29.4.11",
@@ -56,8 +56,8 @@
5656
"koa": "^2.14.2",
5757
"koa-bodyparser": "^4.4.1",
5858
"koa-router": "^13.0.1",
59-
"underscore": "^1.13.6",
60-
"url-join": "^4.0.1",
59+
"underscore": "^1.13.8",
60+
"url-join": "^5.0.0",
6161
"winston": "^3.10.0",
6262
"ws": "^8.14.2"
6363
},

‎src/helpers/WindowHelper.ts‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { BrowserWindow, screen } from 'electron'
22
import { EventEmitter } from 'events'
33
import { ConfigWindow, ConfigWindowAllowedWebHIDDevice, ConfigWindowShared } from '../lib/config'
4-
import _ = require('underscore')
4+
import { isEqual } from 'underscore'
55
import { Logger } from '../lib/logging'
66
import { ReportStatusIpcPayload, StatusCode, StatusObject } from '../lib/api'
77
import * as path from 'path'
8-
import urlJoin = require('url-join')
8+
import urlJoin from 'url-join'
99
import { Queue } from '../lib/queue'
1010
import { CrashRecovery } from '../lib/crashRecovery'
1111

@@ -172,7 +172,7 @@ export class WindowHelper extends EventEmitter {
172172
this._sharedConfig = sharedConfig
173173
this._config = config
174174

175-
if (!_.isEqual(oldConfig, config)) {
175+
if (!isEqual(oldConfig, config)) {
176176
await this._updateWindow(oldConfig)
177177
}
178178
}
@@ -397,15 +397,9 @@ export class WindowHelper extends EventEmitter {
397397

398398
this.crashRecovery.notifyCrash()
399399
}
400-
private _handleConsoleMessage = (
401-
_event: Electron.Event,
402-
level: number,
403-
message: string,
404-
line: number,
405-
sourceId: string
406-
): void => {
400+
private _handleConsoleMessage = (event: Electron.Event<Electron.WebContentsConsoleMessageEventParams>): void => {
407401
if (this.config.logContent) {
408-
const logMessage = `[${level}] ${message} at ${sourceId}:${line}`
402+
const logMessage = `[${event.level}] ${event.message} at ${event.sourceId}:${event.lineNumber}`
409403
this.logger.debug(`${this.id}: ${logMessage}`)
410404
}
411405
}

‎tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"types": [
88
"jest",
99
"node"
10-
]
10+
],
1111
}
1212
}

0 commit comments

Comments
 (0)