From 838e2fa287c775ecd87b8b8f7cadd5eb41ff4843 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Sat, 2 Mar 2019 23:21:07 +0100 Subject: [PATCH] Update electron --- package.json | 2 +- src/MenuTemplate.ts | 34 +++++++++---------- src/electron.ts | 7 ++-- yarn.lock | 83 +++++++++++++++++++++++++++++++++++++++------ 4 files changed, 93 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 8a2e5da..27d009c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@types/sha1": "^1.1.1", "axios": "^0.18.0", "chai": "^4.2.0", - "electron": "^4.0.2", + "electron": "^5.0.0-beta.4", "electron-builder": "^20.38.5", "fs-extra": "^7.0.1", "mime": "^2.4.0", diff --git a/src/MenuTemplate.ts b/src/MenuTemplate.ts index 8a9f124..d2065cd 100644 --- a/src/MenuTemplate.ts +++ b/src/MenuTemplate.ts @@ -1,8 +1,8 @@ -import { Menu, app, BrowserWindow, webContents } from 'electron' +import { Menu, app, BrowserWindow, webContents, MenuItemConstructorOptions, MenuItem } from 'electron' import openAboutWindow from 'about-window' import * as path from 'path' -const applicationMenu = { +const applicationMenu: MenuItemConstructorOptions = { label: 'Application', submenu: [ { @@ -23,7 +23,7 @@ const applicationMenu = { { label: 'Dev Tools', accelerator: 'CmdOrCtrl+Alt+I', - role: 'toggleDevTools', + role: 'toggledevtools' as 'toggledevtools', }, { label: 'Quit', @@ -35,41 +35,41 @@ const applicationMenu = { ], } -const editMenu = { +const editMenu: MenuItemConstructorOptions = { label: 'Edit', submenu: [ { label: 'Undo', accelerator: 'CmdOrCtrl+Z', - selector: 'undo:', + role: 'undo', }, { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', - selector: 'redo:', + role: 'redo', }, { - type: 'separator' as 'separator', + type: 'separator', }, { label: 'Cut', accelerator: 'CmdOrCtrl+X', - selector: 'cut:', + role: 'cut', }, { label: 'Copy', accelerator: 'CmdOrCtrl+C', - selector: 'copy:', + role: 'copy', }, { label: 'Paste', accelerator: 'CmdOrCtrl+V', - selector: 'paste:', + role: 'paste', }, { label: 'Select All', accelerator: 'CmdOrCtrl+A', - selector: 'selectAll:', + role: 'selectall', }, ], } @@ -93,9 +93,8 @@ const viewMenu = { click: () => { const window = BrowserWindow.getFocusedWindow() if (window) { - window.webContents.getZoomFactor((zoom) => { - window.webContents.setZoomFactor(Math.min(zoom + 0.1, 2.0)) - }) + const zoom = window.webContents.getZoomFactor() + window.webContents.setZoomFactor(Math.min(zoom + 0.1, 2.0)) } }, }, @@ -105,16 +104,15 @@ const viewMenu = { click: () => { const window = BrowserWindow.getFocusedWindow() if (window) { - window.webContents.getZoomFactor((zoom) => { - window.webContents.setZoomFactor(Math.max(zoom - 0.1, 0.5)) - }) + const zoom = window.webContents.getZoomFactor() + window.webContents.setZoomFactor(Math.max(zoom - 0.1, 0.5)) } }, }, ], } -const template = [ +const template: Array<(MenuItemConstructorOptions) | (MenuItem)> = [ applicationMenu, editMenu, viewMenu, diff --git a/src/electron.ts b/src/electron.ts index 0bc183e..a342e5e 100644 --- a/src/electron.ts +++ b/src/electron.ts @@ -9,15 +9,14 @@ import { menuTemplate } from './MenuTemplate' import { UpdateInfo } from '../events' const isDev = require('electron-is-dev') -let electronTelemetry: any if (!isDev) { - electronTelemetry = electronTelemetryFactory('9b0c8ca04a361eb8160d98c5') + const electronTelemetry = electronTelemetryFactory('9b0c8ca04a361eb8160d98c5') } -const isDebugEnabled = Boolean(process.argv.find(arg => arg === 'debug')) +// const isDebugEnabled = Boolean(process.argv.find(arg => arg === 'debug')) const runningUiTestOnCi = Boolean(process.argv.find(arg => arg === '--runningUiTestOnCi')) -require('electron-debug')({ enabled: isDebugEnabled }) +// require('electron-debug')({ enabled: isDebugEnabled }) autoUpdater.logger = log log.info('App starting...') diff --git a/yarn.lock b/yarn.lock index ecde2fc..05dab96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,6 +62,13 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" integrity sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA== +"@babel/runtime@^7.2.0": + version "7.3.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" + integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== + dependencies: + regenerator-runtime "^0.12.0" + "@babel/template@^7.0.0", "@babel/template@^7.1.0": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" @@ -114,6 +121,26 @@ reflect-metadata "^0.1.12" tslib "^1.8.1" +"@material-ui/lab@^4.0.0-alpha.0": + version "4.0.0-alpha.0" + resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.0.tgz#c986a353901da5b9f3a60b3c6714a5c2d9dd11fa" + integrity sha512-ilvJ6oCYr61kIXGidkVdZ4c44EeozmNb/T8z/soYJvHsuST3xBh7L5BSnnYLRGwH1Lbd0sunGF7i3PbS4qGF2A== + dependencies: + "@babel/runtime" "^7.2.0" + "@material-ui/utils" "^4.0.0-alpha.0" + clsx "^1.0.2" + keycode "^2.1.9" + prop-types "^15.6.0" + +"@material-ui/utils@^4.0.0-alpha.0": + version "4.0.0-alpha.0" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.0.0-alpha.0.tgz#b8ed6953ae07d36856a5867ffe759bc0e08147b4" + integrity sha512-w8zSXDuAyS0J5Z8mnU0+HgFf+GP3vGno8wecHT011DM7P3ZoS/2ngU2SqJGwRxuNk7N65tWX1h8NKvoevDPUyQ== + dependencies: + "@babel/runtime" "^7.2.0" + prop-types "^15.6.0" + react-is "^16.8.0" + "@types/chai@^4.1.7": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a" @@ -690,6 +717,11 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" +clsx@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.0.3.tgz#e164004f4064b372888f20fdafbd436fb960bac9" + integrity sha512-xLoSw6DMp7YvbEeLrQJBcWWRRerdHrU1WHoL1hYJOKUeDpVMRq7pv7NI2JHQbCRAe5ptINNzhdYmtfN6MsdCUw== + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -1196,10 +1228,10 @@ electron-updater@^4.0.6: semver "^5.6.0" source-map-support "^0.5.9" -electron@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.2.tgz#b5e074c149841490825d0785aa2bc4f5e29bbea4" - integrity sha512-H0pmSvOVuC+Mq/+cYNXbCDBmqq5d1xYUVdBOjqGJuwuwJeP7qDHF35JA3cq+ARzq/CbwlXq98zdW6i6+x3U24g== +electron@^5.0.0-beta.4: + version "5.0.0-beta.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.0-beta.4.tgz#436af638c20c7563e749d9d7599c4267b665759b" + integrity sha512-8rBHuR04zcyJP1MfnhbbqExeIywxrbzR9FyKyrLc8O/ho4tEpKbxgGWoRStFDrv9YYL9BEjsaaExPseI7Rwu5A== dependencies: "@types/node" "^10.12.18" electron-download "^4.1.0" @@ -2013,16 +2045,16 @@ istanbul-reports@^2.0.1: dependencies: handlebars "^4.0.11" +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.7.0: version "3.12.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" @@ -2100,6 +2132,11 @@ keyboardevents-areequal@^0.2.1: resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== +keycode@^2.1.9: + version "2.2.0" + resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" + integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ= + latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" @@ -2210,6 +2247,13 @@ loglevel@^1.6.0: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po= +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" @@ -2528,7 +2572,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -2827,6 +2871,15 @@ progress-stream@^1.1.0: speedometer "~0.1.2" through2 "~0.2.3" +prop-types@^15.6.0: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -2902,6 +2955,11 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-is@^16.8.0, react-is@^16.8.1: + version "16.8.3" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.3.tgz#4ad8b029c2a718fc0cfc746c8d4e1b7221e5387d" + integrity sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA== + read-config-file@3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.1.tgz#112dc8636121fa71fd524e1a8a5b4470ef7a2732" @@ -2997,6 +3055,11 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== +regenerator-runtime@^0.12.0: + version "0.12.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" + integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== + registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"