Update electron to 6.0.10

Change-type: patch
Changelog-entry: Update electron to 6.0.10
This commit is contained in:
Alexis Svinartchouk 2019-09-23 15:34:27 +02:00
parent 4909766cd8
commit 584e8b8ff5
5 changed files with 1116 additions and 759 deletions

View File

@ -91,7 +91,9 @@ const createMainWindow = () => {
icon: path.join(__dirname, '..', '..', 'assets', 'icon.png'),
darkTheme: true,
webPreferences: {
backgroundThrottling: false
backgroundThrottling: false,
nodeIntegration: true,
webviewTag: true
}
})

1851
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff

View File

@ -54,7 +54,7 @@
"debug": "^3.1.0",
"electron-is-running-in-asar": "^1.0.0",
"electron-updater": "4.0.6",
"etcher-sdk": "^2.0.13",
"etcher-sdk": "^2.0.15",
"flexboxgrid": "^6.3.0",
"immutable": "^3.8.1",
"inactivity-timer": "^1.0.0",
@ -82,16 +82,16 @@
"xml2js": "^0.4.17"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/core": "^7.6.0",
"@babel/plugin-proposal-function-bind": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@types/react-dom": "^16.8.4",
"acorn": "^6.0.5",
"angular-mocks": "1.7.6",
"babel-loader": "^8.0.4",
"chalk": "^1.1.3",
"electron": "3.1.9",
"electron": "6.0.10",
"electron-builder": "^20.40.2",
"electron-mocha": "^6.0.4",
"eslint": "^4.17.0",
@ -109,7 +109,7 @@
"mochainon": "^2.0.0",
"nock": "^9.2.3",
"node-gyp": "^3.8.0",
"node-sass": "^4.7.2",
"node-sass": "^4.12.0",
"omit-deep-lodash": "1.1.4",
"pkg": "^4.3.0",
"resin-lint": "^3.1.0",
@ -119,8 +119,8 @@
"ts-loader": "^6.0.4",
"ts-node": "^8.3.0",
"typescript": "^3.5.3",
"webpack": "^4.31.0",
"webpack-cli": "^3.1.2",
"webpack": "^4.40.2",
"webpack-cli": "^3.3.9",
"webpack-node-externals": "^1.7.2"
}
}

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.9'; }
+ catch (_) { electron_version = '6.0.10'; }
+ }
+ return get_electron_abi(runtime, electron_version);
} else {

View File

@ -38,7 +38,7 @@ const commonConfig = {
options: {
presets: [
'@babel/preset-react',
[ '@babel/preset-env', { targets: { electron: '3' } } ]
[ '@babel/preset-env', { targets: { electron: '6' } } ]
],
plugins: [ '@babel/plugin-proposal-function-bind' ],
cacheDirectory: true