chore: Update to Electron 6.x

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "4.2.5"
+target "6.0.0-beta.12"
 runtime "electron"

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -47,6 +47,11 @@ steps:
     git config user.name "VSCode"
   displayName: Prepare tooling
 
+- script: |
+    set -e
+    git merge origin/master
+  displayName: Merge master
+
 - script: |
     set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"

build/azure-pipelines/linux/product-build-linux.yml

@@ -48,6 +48,11 @@ steps:
     git config user.name "VSCode"
   displayName: Prepare tooling
 
+- script: |
+    set -e
+    git merge origin/master
+  displayName: Merge master
+
 - script: |
     set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"

build/azure-pipelines/product-build.yml

@@ -134,4 +134,4 @@ jobs:
 #   displayName: Mon-Fri at 6:00
 #   branches:
 #     include:
-#     - master
+#     - master

build/azure-pipelines/win32/product-build-win32.yml

@@ -49,6 +49,12 @@ steps:
     "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
   displayName: Prepare tooling
 
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { git merge origin/master }
+  displayName: Merge master
+
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"

build/builtin/main.js

@@ -10,7 +10,7 @@ const path = require('path');
 let window = null;
 
 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600 });
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();