diff --git a/lib/gui/etcher.js b/lib/gui/etcher.js index db2350e8..c02fd6f5 100644 --- a/lib/gui/etcher.js +++ b/lib/gui/etcher.js @@ -86,16 +86,6 @@ const createMainWindow = () => { mainWindow.show() }) - // Prevent the user from being allowed to zoom-in the application. - // - // This function should be called on the renderer process. We use - // `executeJavaScript()` rather than moving this to a file in the - // renderer process for convenience, since we have all other - // electron desktop experience fixes in this file. - // - // See https://github.com/electron/electron/issues/3609 - mainWindow.webContents.executeJavaScript('require(\'electron\').webFrame.setVisualZoomLevelLimits(1, 1);') - // Prevent external resources from being loaded (like images) // when dropping them on the WebView. // See https://github.com/electron/electron/issues/5919 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2f455c8d..a5ccf18d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -4174,20 +4174,20 @@ "dev": true }, "electron": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.3.tgz", - "integrity": "sha512-Y1TbV5py2O0br0JVYh+ew1cW4cIOOgRNRMzwTwWuZNMZ9fK/XLlqsbZr1GpYHdiN2yIU1koO+g4Cw8VuW86NXQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.5.tgz", + "integrity": "sha512-0VZzUd4vZaUeSLdxJI/XMrMnPN7AROjPFZOiNgZZkYRUUEjGHfaSAbCJyxuXtii52KGhzGL0JgW0q5QmQ3ykKQ==", "dev": true, "requires": { - "@types/node": "^8.0.24", + "@types/node": "^10.12.18", "electron-download": "^4.1.0", "extract-zip": "^1.0.3" }, "dependencies": { "@types/node": { - "version": "8.10.40", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz", - "integrity": "sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==", + "version": "10.14.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz", + "integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g==", "dev": true } } diff --git a/package.json b/package.json index 08b3bd04..9e252da3 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "angular-mocks": "1.7.6", "babel-loader": "^8.0.4", "chalk": "^1.1.3", - "electron": "3.1.3", + "electron": "4.1.5", "electron-builder": "^20.40.2", "electron-mocha": "^6.0.4", "eslint": "^4.17.0", diff --git a/patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch b/patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch index 0449f32b..214e16c4 100644 --- a/patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch +++ b/patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch @@ -10,7 +10,7 @@ + // TODO PR something to electron to pass in the version number for forks + // https://github.com/electron/electron/issues/9058 + try { electron_version = require('electron/package.json').version; } -+ catch (_) { electron_version = '3.1.3'; } ++ catch (_) { electron_version = '4.1.5'; } + } + return get_electron_abi(runtime, electron_version); } else {