Skip to content

Commit

Permalink
chore: upgrade to Electron 15 (#858)
Browse files Browse the repository at this point in the history
* chore: upgrade to Electron 15

* fix show test
  • Loading branch information
erickzhao committed Sep 23, 2021
1 parent 78dceb8 commit 2691a9b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -93,7 +93,7 @@
"@typescript-eslint/eslint-plugin": "^4.15.2",
"@typescript-eslint/parser": "^4.15.2",
"cross-fetch": "^3.1.0",
"electron": "12.0.14",
"electron": "15.0.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-to-json": "^3.6.1",
Expand Down
1 change: 1 addition & 0 deletions src/main/windows.ts
Expand Up @@ -22,6 +22,7 @@ export function getMainWindowOptions(): Electron.BrowserWindowConstructorOptions
titleBarStyle: process.platform === 'darwin' ? 'hidden' : undefined,
acceptFirstMouse: true,
backgroundColor: '#1d2427',
show: false,
webPreferences: {
webviewTag: false,
nodeIntegration: true,
Expand Down
1 change: 1 addition & 0 deletions tests/main/windows-spec.ts
Expand Up @@ -34,6 +34,7 @@ describe('windows', () => {
minWidth: 600,
acceptFirstMouse: true,
backgroundColor: '#1d2427',
show: false,
titleBarStyle: undefined,
webPreferences: {
webviewTag: false,
Expand Down
28 changes: 22 additions & 6 deletions yarn.lock
Expand Up @@ -1232,7 +1232,7 @@
"@electron-forge/template-base" "6.0.0-beta.59"
fs-extra "^10.0.0"

"@electron/get@^1.0.1", "@electron/get@^1.12.4", "@electron/get@^1.6.0", "@electron/get@^1.9.0":
"@electron/get@^1.12.4", "@electron/get@^1.6.0", "@electron/get@^1.9.0":
version "1.12.4"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab"
integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==
Expand All @@ -1248,6 +1248,22 @@
global-agent "^2.0.2"
global-tunnel-ng "^2.7.1"

"@electron/get@^1.13.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c"
integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
fs-extra "^8.1.0"
got "^9.6.0"
progress "^2.0.3"
semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
global-agent "^2.0.2"
global-tunnel-ng "^2.7.1"

"@eslint/eslintrc@^0.2.1":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
Expand Down Expand Up @@ -4625,12 +4641,12 @@ electron-winstaller@^5.0.0:
lodash.template "^4.2.2"
temp "^0.9.0"

electron@12.0.14:
version "12.0.14"
resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.14.tgz#7c5547f8248633a4bbbba89c88c57aa9e6410892"
integrity sha512-RcU++BiL+DlwhP62sUTasjAOwXOloWQS3oLk4PE0s2eERNs7hr2LoKqbUpbShw9nY+aqNw4mgd+ojyBJsOE2fg==
electron@15.0.0:
version "15.0.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-15.0.0.tgz#b1b6244b1cffddf348c27c54b1310b3a3680246e"
integrity sha512-LlBjN5nCJoC7EDrgfDQwEGSGSAo/o08nSP5uJxN2m+ZtNA69SxpnWv4yPgo1K08X/iQPoGhoZu6C8LYYlk1Dtg==
dependencies:
"@electron/get" "^1.0.1"
"@electron/get" "^1.13.0"
"@types/node" "^14.6.2"
extract-zip "^1.0.3"

Expand Down

0 comments on commit 2691a9b

Please sign in to comment.