Merge pull request #1834 from webtorrent/electron10

package.json

@@ -51,7 +51,7 @@
     "buble": "^0.20.0",
     "cross-zip": "^3.1.0",
     "depcheck": "^1.0.0",
-    "electron": "~9.1.0",
+    "electron": "~10.0.0-beta.11",
     "electron-osx-sign": "^0.4.17",
     "electron-packager": "^15.0.0",
     "electron-winstaller": "^4.0.1",

src/crash-reporter.js

@@ -7,8 +7,9 @@ function init () {
   const electron = require('electron')
 
   electron.crashReporter.start({
-    companyName: config.APP_NAME,
     productName: config.APP_NAME,
-    submitURL: config.CRASH_REPORT_URL
+    submitURL: config.CRASH_REPORT_URL,
+    globalExtra: { _companyName: config.APP_NAME },
+    compress: true
   })
 }

src/main/index.js

@@ -3,10 +3,13 @@ console.time('init')
 const electron = require('electron')
 const app = electron.app
 
+// Start crash reporter early, so it takes effect for child processes
+const crashReporter = require('../crash-reporter')
+crashReporter.init()
+
 const parallel = require('run-parallel')
 
 const config = require('../config')
-const crashReporter = require('../crash-reporter')
 const ipc = require('./ipc')
 const log = require('./log')
 const menu = require('./menu')
@@ -109,10 +112,6 @@ function init () {
 
   ipc.init()
 
-  app.once('will-finish-launching', function () {
-    crashReporter.init()
-  })
-
   app.once('ipcReady', function () {
     log('Command line args:', argv)
     processArgv(argv)

src/main/windows/about.js

@@ -26,7 +26,8 @@ function init () {
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks'
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true
     },
     width: 300
   })

src/main/windows/main.js

@@ -44,7 +44,8 @@ function init (state, options) {
     width: initialBounds.width,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks'
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true
     },
     x: initialBounds.x,
     y: initialBounds.y

src/main/windows/webtorrent.js

@@ -26,7 +26,8 @@ function init () {
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,
-      enableBlinkFeatures: 'AudioVideoTracks'
+      enableBlinkFeatures: 'AudioVideoTracks',
+      enableRemoteModule: true
     },
     width: 150
   })

src/renderer/main.js

@@ -14,9 +14,6 @@ Module.prototype.require = function (id) {
 
 console.time('init')
 
-const crashReporter = require('../crash-reporter')
-crashReporter.init()
-
 // Perf optimization: Start asynchronously read on config file before all the
 // blocking require() calls below.
 

src/renderer/webtorrent.js

@@ -12,14 +12,10 @@ const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
 
-const crashReporter = require('../crash-reporter')
 const config = require('../config')
 const { TorrentKeyNotFoundError } = require('./lib/errors')
 const torrentPoster = require('./lib/torrent-poster')
 
-// Report when the process crashes
-crashReporter.init()
-
 // Send & receive messages from the main window
 const ipc = electron.ipcRenderer