electron@2.0 upgrade

app/.npmrc

@@ -1,4 +1,4 @@
 runtime = electron
 disturl = https://atom.io/download/electron
-target = 1.8.7
+target = 2.0.5
 arch = x64

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "1.3.0-beta1",
+  "version": "1.2.7-test3",
   "main": "./main.js",
   "repository": {
     "type": "git",
@@ -57,8 +57,8 @@
   },
   "devDependencies": {
     "devtron": "^1.4.0",
-    "electron-debug": "^1.1.0",
-    "electron-devtools-installer": "^2.2.3",
+    "electron-debug": "^2.0.0",
+    "electron-devtools-installer": "^2.2.4",
     "temp": "^0.8.3",
     "webpack-hot-middleware": "^2.10.0"
   }

app/src/main-process/main.ts

@@ -287,7 +287,7 @@ app.on('ready', () => {
       )
 
       const window = BrowserWindow.fromWebContents(event.sender)
-      menu.popup(window, { async: true })
+      menu.popup({ window })
     }
   )
 

app/src/ui/lib/update-store.ts

@@ -166,7 +166,7 @@ class UpdateStore {
     this.userInitiatedUpdate = !inBackground
 
     try {
-      autoUpdater.setFeedURL(__UPDATES_URL__)
+      autoUpdater.setFeedURL({ url: __UPDATES_URL__ })
       autoUpdater.checkForUpdates()
     } catch (e) {
       this.emitError(e)

app/yarn.lock

@@ -255,16 +255,16 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-electron-debug@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.4.0.tgz#bec7005522220a9d0622153352e1bbff0f37af2e"
+electron-debug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-2.0.0.tgz#3059a6557acbfb091f138d83875f57bac80cea6d"
   dependencies:
     electron-is-dev "^0.3.0"
     electron-localshortcut "^3.0.0"
 
-electron-devtools-installer@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.3.tgz#58b9a4ec507377bc46e091cd43714188e0c369be"
+electron-devtools-installer@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz#261a50337e37121d338b966f07922eb4939a8763"
   dependencies:
     "7zip" "0.0.6"
     cross-unzip "0.0.2"

changelog.json

@@ -1,5 +1,8 @@
 {
   "releases": {
+    "1.2.7-test3": [
+      "Test deployment for electron version bump."
+    ],
     "1.3.0-beta1": [
       "[New] Notification displayed in History tab when the base branch moves ahead of the current branch - #4768",
       "[New] Repository list displays uncommitted changes count and ahead/behind information - #2259",
@@ -12,6 +15,9 @@
       "[Improved] Repository list badge style tweaks and tweaks for dark theme - #5095",
       "[Improved] Change primary button color to blue for dark theme - #5074"
     ],
+    "1.2.7-test2": [
+      "Test deployment for electron version bump."
+    ],
     "1.2.7-test1": [
       "Sanity check deployment for refactored scripts"
     ],

package.json

@@ -149,10 +149,10 @@
     "@types/webpack-merge": "^4.1.3",
     "@types/winston": "^2.2.0",
     "@types/xml2js": "^0.4.0",
-    "electron": "1.8.7",
-    "electron-builder": "20.2.0",
+    "electron": "2.0.5",
+    "electron-builder": "20.19.2",
     "electron-mocha": "^6.0.1",
-    "electron-packager": "^11.0.0",
+    "electron-packager": "^12.0.0",
     "electron-winstaller": "2.5.2"
   }
 }

vsts.yml

@@ -23,7 +23,7 @@ phases:
   steps:
   - script: |
       apt-get update
-      apt-get install -y --no-install-recommends libsecret-1-dev xvfb fakeroot dpkg rpm xz-utils xorriso zsync libxss1 libgconf2-4
+      apt-get install -y --no-install-recommends libsecret-1-dev xvfb fakeroot dpkg rpm xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0
   - task: NodeTool@0
     inputs:
       versionSpec: "8.11.1"