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

Merge pull request #2775 from balena-io/electron-3.1.9

Browse Source 
Downgrade electron 4.1.5 -> 3.1.9
This commit is contained in:
Alexis Svinartchouk 2019-05-10 19:27:31 +02:00 committed by GitHub
commit dc92d010fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
npm-shrinkwrap.json generated
View File

@ -4174,20 +4174,20 @@
"dev": true "dev": true
}, },
"electron": { "electron": {
"version": "4.1.5", "version": "3.1.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-4.1.5.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.9.tgz",
"integrity": "sha512-0VZzUd4vZaUeSLdxJI/XMrMnPN7AROjPFZOiNgZZkYRUUEjGHfaSAbCJyxuXtii52KGhzGL0JgW0q5QmQ3ykKQ==", "integrity": "sha512-F9AoMjY9zuQBdxmjZz644wHnJehNlYD+WQK2kBMXKoRKrzkYgD5k6QU6mqZuT5OGARpYp9zFOJ8uuJVcAB+TbQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^10.12.18", "@types/node": "^8.0.24",
"electron-download": "^4.1.0", "electron-download": "^4.1.0",
"extract-zip": "^1.0.3" "extract-zip": "^1.0.3"
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "10.14.5", "version": "8.10.48",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz",
"integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g==", "integrity": "sha512-c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw==",
"dev": true "dev": true
} }
} }

2
package.json
View File

@ -85,7 +85,7 @@
"angular-mocks": "1.7.6", "angular-mocks": "1.7.6",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.4",
"chalk": "^1.1.3", "chalk": "^1.1.3",
"electron": "4.1.5", "electron": "3.1.9",
"electron-builder": "^20.40.2", "electron-builder": "^20.40.2",
"electron-mocha": "^6.0.4", "electron-mocha": "^6.0.4",
"eslint": "^4.17.0", "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 + // TODO PR something to electron to pass in the version number for forks
+ // https://github.com/electron/electron/issues/9058 + // https://github.com/electron/electron/issues/9058
+ try { electron_version = require('electron/package.json').version; } + try { electron_version = require('electron/package.json').version; }
+ catch (_) { electron_version = '4.1.5'; } + catch (_) { electron_version = '3.1.9'; }
+ } + }
+ return get_electron_abi(runtime, electron_version); + return get_electron_abi(runtime, electron_version);
} else { } else {