Update electron to 11.1.1 (#247)
This commit is contained in:
parent
9ddec9baf8
commit
d1c46e6bdc
File diff suppressed because it is too large
Load Diff
|
@ -40,7 +40,7 @@
|
||||||
"@types/zxcvbn": "^4.4.0",
|
"@types/zxcvbn": "^4.4.0",
|
||||||
"concurrently": "3.5.1",
|
"concurrently": "3.5.1",
|
||||||
"cssstyle": "1.2.1",
|
"cssstyle": "1.2.1",
|
||||||
"electron": "6.1.7",
|
"electron": "11.1.1",
|
||||||
"jasmine": "^3.3.1",
|
"jasmine": "^3.3.1",
|
||||||
"jasmine-core": "^3.3.0",
|
"jasmine-core": "^3.3.0",
|
||||||
"jasmine-spec-reporter": "^4.2.1",
|
"jasmine-spec-reporter": "^4.2.1",
|
||||||
|
@ -82,8 +82,8 @@
|
||||||
"commander": "2.18.0",
|
"commander": "2.18.0",
|
||||||
"core-js": "2.6.2",
|
"core-js": "2.6.2",
|
||||||
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
|
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
|
||||||
"electron-log": "2.2.17",
|
"electron-log": "4.3.0",
|
||||||
"electron-store": "1.3.0",
|
"electron-store": "6.0.1",
|
||||||
"electron-updater": "4.3.5",
|
"electron-updater": "4.3.5",
|
||||||
"forcefocus": "^1.1.0",
|
"forcefocus": "^1.1.0",
|
||||||
"form-data": "2.3.2",
|
"form-data": "2.3.2",
|
||||||
|
|
|
@ -16,11 +16,12 @@ export function isMacAppStore() {
|
||||||
|
|
||||||
export function isWindowsStore() {
|
export function isWindowsStore() {
|
||||||
const isWindows = process.platform === 'win32';
|
const isWindows = process.platform === 'win32';
|
||||||
if (isWindows && !process.windowsStore &&
|
let windowsStore = process.windowsStore;
|
||||||
|
if (isWindows && !windowsStore &&
|
||||||
process.resourcesPath.indexOf('8bitSolutionsLLC.bitwardendesktop_') > -1) {
|
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() {
|
export function isSnapStore() {
|
||||||
|
|
|
@ -110,7 +110,7 @@ export class WindowMain {
|
||||||
minHeight: 500,
|
minHeight: 500,
|
||||||
x: this.windowStates[Keys.mainWindowSize].x,
|
x: this.windowStates[Keys.mainWindowSize].x,
|
||||||
y: this.windowStates[Keys.mainWindowSize].y,
|
y: this.windowStates[Keys.mainWindowSize].y,
|
||||||
title: app.getName(),
|
title: app.name,
|
||||||
icon: process.platform === 'linux' ? path.join(__dirname, '/images/icon.png') : undefined,
|
icon: process.platform === 'linux' ? path.join(__dirname, '/images/icon.png') : undefined,
|
||||||
titleBarStyle: this.hideTitleBar && process.platform === 'darwin' ? 'hiddenInset' : undefined,
|
titleBarStyle: this.hideTitleBar && process.platform === 'darwin' ? 'hiddenInset' : undefined,
|
||||||
show: false,
|
show: false,
|
||||||
|
@ -119,6 +119,7 @@ export class WindowMain {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webviewTag: true,
|
webviewTag: true,
|
||||||
backgroundThrottling: false,
|
backgroundThrottling: false,
|
||||||
|
enableRemoteModule: true, // TODO: This needs to be removed prior to Electron 14.
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue