Skip to content

Commit

Permalink
Updated electron to version 10
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschwendener committed Sep 28, 2020
1 parent bd849ac commit 781bdb6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@types/vue-color": "^2.4.2",
"axios": "^0.20.0",
"color": "^3.1.2",
"electron": "^8.2.4",
"electron": "^10.1.2",
"electron-builder": "^22.4.1",
"electron-store": "^5.1.1",
"electron-updater": "^4.0.14",
Expand Down
2 changes: 1 addition & 1 deletion src/main/executors/file-path-executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function executeFilePathMacOs(filePath: string, privileged: boolean): Pro

function openFile(filePath: string): Promise<void> {
return new Promise((resolve, reject) => {
const result = shell.openItem(filePath);
const result = shell.openPath(filePath);
if (result) {
resolve();
} else {
Expand Down
2 changes: 2 additions & 0 deletions src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ function createMainWindow() {
transparent: mainWindowNeedsToBeTransparent(config),
webPreferences: {
nodeIntegration: true,
enableRemoteModule: true,
},
width: config.appearanceOptions.windowWidth,
});
Expand Down Expand Up @@ -562,6 +563,7 @@ function openSettings() {
title: translationSet.settings,
webPreferences: {
nodeIntegration: true,
enableRemoteModule: true,
},
width: 1000,
});
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2301,10 +2301,10 @@ electron-updater@^4.0.14:
lodash.isequal "^4.5.0"
semver "^7.3.2"

electron@^8.2.4:
version "8.5.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.5.0.tgz#a202738672214775fda27450b00ee516a66bffc4"
integrity sha512-ERqSTRlaQ4PqME5a1z9DWQbwQy2LbgSN1Jnau1MJCRRvHgq1FJlqbbb/ij/RGWuQuaxy4Djb2KnTs5rsemR5mQ==
electron@^10.1.2:
version "10.1.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.2.tgz#30b6fd7669f8daf08c56219a61dfa053fa2b0c70"
integrity sha512-SvN8DcKCmPZ0UcQSNAJBfaUu+LGACqtRhUn1rW0UBLHgdbbDM76L0GU5/XGQEllH5pu5bwlCZwax3srzIl+Aeg==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
Expand Down

0 comments on commit 781bdb6

Please sign in to comment.