jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-19 09:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2753 from balena-io/electron-4

Browse Source 
Update electron to 4.1.5
This commit is contained in:
Alexis Svinartchouk 2019-04-30 12:52:46 +02:00 committed by GitHub
commit ccf11b9861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gui/etcher.js
View File

@ -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

38
npm-shrinkwrap.json generated
View File

@ -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
}
}
@ -5273,9 +5273,9 @@
"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
},
"etcher-sdk": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-2.0.1.tgz",
"integrity": "sha512-8C5uUq+CaQLCU4PuIRNJJ43mR7NN6tTpxUr5CVAroXtlJ360uq2eFa6AsuxOdQv+vZXxY345thqoF0flrHBeBQ==",
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-2.0.3.tgz",
"integrity": "sha512-Ix+d7czuIMXyjCztmqD75iJdAY4b17HdLhMDjXd5vLUhWdq/qBPkjyuNn1TZosyrEyZ+hoe3+ZOSLjLFL2GHLA==",
"requires": {
"@types/node": "^6.0.112",
"axios": "^0.18.0",
@ -8348,9 +8348,9 @@
"dev": true
},
"needle": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz",
"integrity": "sha512-CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg==",
"requires": {
"debug": "^4.1.0",
"iconv-lite": "^0.4.4",
@ -8428,9 +8428,9 @@
}
},
"node-abi": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz",
"integrity": "sha512-OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw==",
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
"integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
"requires": {
"semver": "^5.4.1"
}
@ -9457,9 +9457,9 @@
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
},
"prebuild-install": {
"version": "5.2.5",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz",
"integrity": "sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==",
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz",
"integrity": "sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==",
"requires": {
"detect-libc": "^1.0.3",
"expand-template": "^2.0.3",

4
package.json
View File

@ -48,8 +48,8 @@
"d3": "^4.13.0",
"debug": "^3.1.0",
"electron-is-running-in-asar": "^1.0.0",
"etcher-sdk": "^2.0.1",
"electron-updater": "4.0.6",
"etcher-sdk": "^2.0.3",
"flexboxgrid": "^6.3.0",
"immutable": "^3.8.1",
"inactivity-timer": "^1.0.0",
@ -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",

2
patches/allow-electron-forks-of-modules-that-use-pre-gyp.patch
View File

@ -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 {