Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-16 20:21:31 +01:00
Code Issues Projects Releases Wiki Activity

Update electron to 11.1.1 (#247)

Browse Source
This commit is contained in:
Oscar Hinton 2021-01-26 22:49:47 +01:00 committed by GitHub
parent 9ddec9baf8
commit d1c46e6bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 711 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

925
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -40,7 +40,7 @@
"@types/zxcvbn": "^4.4.0",
"concurrently": "3.5.1",
"cssstyle": "1.2.1",
"electron": "6.1.7",
"electron": "11.1.1",
"jasmine": "^3.3.1",
"jasmine-core": "^3.3.0",
"jasmine-spec-reporter": "^4.2.1",
@ -82,8 +82,8 @@
"commander": "2.18.0",
"core-js": "2.6.2",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"electron-log": "2.2.17",
"electron-store": "1.3.0",
"electron-log": "4.3.0",
"electron-store": "6.0.1",
"electron-updater": "4.3.5",
"forcefocus": "^1.1.0",
"form-data": "2.3.2",

7
src/electron/utils.ts
View File

@ -16,11 +16,12 @@ export function isMacAppStore() {
export function isWindowsStore() {
const isWindows = process.platform === 'win32';
if (isWindows && !process.windowsStore &&
let windowsStore = process.windowsStore;
if (isWindows && !windowsStore &&
process.resourcesPath.indexOf('8bitSolutionsLLC.bitwardendesktop_') > -1) {
process.windowsStore = true;
windowsStore = true;
}
return isWindows && process.windowsStore && process.windowsStore === true;
return isWindows && windowsStore === true;
}
export function isSnapStore() {

3
src/electron/window.main.ts
View File

@ -110,7 +110,7 @@ export class WindowMain {
minHeight: 500,
x: this.windowStates[Keys.mainWindowSize].x,
y: this.windowStates[Keys.mainWindowSize].y,
title: app.getName(),
title: app.name,
icon: process.platform === 'linux' ? path.join(__dirname, '/images/icon.png') : undefined,
titleBarStyle: this.hideTitleBar && process.platform === 'darwin' ? 'hiddenInset' : undefined,
show: false,
@ -119,6 +119,7 @@ export class WindowMain {
nodeIntegration: true,
webviewTag: true,
backgroundThrottling: false,
enableRemoteModule: true, // TODO: This needs to be removed prior to Electron 14.
},
});