chore: Update to Electron 6.x

.yarnrc

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

build/.cachesalt

@@ -1 +1 @@
-2019-07-11T05:47:05.444Z
+2019-07-13T05:47:05.444Z

build/azure-pipelines/product-build.yml

@@ -6,6 +6,9 @@ resources:
   - container: snapcraft
     image: snapcore/snapcraft:stable
 
+variables:
+  VSCODE_QUALITY: exploration
+
 jobs:
 - job: Compile
   pool:
@@ -128,8 +131,8 @@ jobs:
   - template: sync-mooncake.yml
 
 schedules:
-- cron: "0 5 * * Mon-Fri"
-  displayName: Mon-Fri at 7:00
+- cron: "0 6 * * Mon-Fri"
+  displayName: Mon-Fri at 8:00
   branches:
     include:
-    - master
+    - electron-6.0.x

build/azure-pipelines/product-compile.yml

@@ -1,4 +1,11 @@
 steps:
+- script: |
+    set -e
+    git config user.email "[email protected]"
+    git config user.name "VSCode"
+    git merge origin/master
+  displayName: Merge master
+
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit

build/npm/preinstall.js

@@ -7,8 +7,8 @@ let err = false;
 
 const majorNodeVersion = parseInt(/^(\d+)\./.exec(process.versions.node)[1]);
 
-if (majorNodeVersion < 8 || majorNodeVersion >= 11) {
-	console.error('\033[1;31m*** Please use node >=8 and <11.\033[0;0m');
+if (majorNodeVersion < 8 || majorNodeVersion > 12) {
+	console.error('\033[1;31m*** Please use node >=8 and <=12.\033[0;0m');
 	err = true;
 }
 

cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "c6a08e5368de4352903e702cde750b33239a50ab"
+					"commitHash": "618a21a8c96c52b0f6dbe7fa33ff215b7aa01200"
 				}
 			},
 			"licenseDetail": [
@@ -40,32 +40,32 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "69.0.3497.128"
+			"version": "76.0.3809.88"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
+					"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "10.11.0"
+			"version": "12.4.0"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "36ea114ac0616e469e75ae94e6d53af48925e036"
+					"commitHash": "825bd6d45ed0914bd8749c077e6d7533efd5d9c2"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "4.2.7"
+			"version": "6.0.0"
 		},
 		{
 			"component": {

package.json

@@ -83,7 +83,7 @@
     "fast-plist": "0.1.2",
     "glob": "^5.0.13",
     "gulp": "^4.0.0",
-    "gulp-atom-electron": "^1.21.1",
+    "gulp-atom-electron": "deepak1556/gulp-atom-electron#update_helper_rename",
     "gulp-azure-storage": "^0.10.0",
     "gulp-buffer": "0.0.2",
     "gulp-concat": "^2.6.1",
@@ -153,7 +153,7 @@
   },
   "optionalDependencies": {
     "vscode-windows-ca-certs": "0.1.0",
-    "vscode-windows-registry": "1.0.1",
+    "vscode-windows-registry": "microsoft/vscode-windows-registry#n-api",
     "windows-foreground-love": "0.2.0",
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"

src/bootstrap.js

@@ -36,18 +36,16 @@ exports.injectNodeModuleLookupPath = function (injectPath) {
 	const originalResolveLookupPaths = Module._resolveLookupPaths;
 
 	// @ts-ignore
-	Module._resolveLookupPaths = function (moduleName, parent, newReturn) {
-		const result = originalResolveLookupPaths(moduleName, parent, newReturn);
-
-		const paths = newReturn ? result : result[1];
+	Module._resolveLookupPaths = function (moduleName, parent) {
+		const paths = originalResolveLookupPaths(moduleName, parent);
 		for (let i = 0, len = paths.length; i < len; i++) {
 			if (paths[i] === nodeModulesPath) {
 				paths.splice(i, 0, injectPath);
 				break;
 			}
 		}
 
-		return result;
+		return paths;
 	};
 };
 //#endregion
@@ -72,18 +70,16 @@ exports.enableASARSupport = function (nodeModulesPath) {
 	// @ts-ignore
 	const originalResolveLookupPaths = Module._resolveLookupPaths;
 	// @ts-ignore
-	Module._resolveLookupPaths = function (request, parent, newReturn) {
-		const result = originalResolveLookupPaths(request, parent, newReturn);
-
-		const paths = newReturn ? result : result[1];
+	Module._resolveLookupPaths = function (request, parent) {
+		const paths = originalResolveLookupPaths(request, parent);
 		for (let i = 0, len = paths.length; i < len; i++) {
 			if (paths[i] === NODE_MODULES_PATH) {
 				paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
 				break;
 			}
 		}
 
-		return result;
+		return paths;
 	};
 };
 //#endregion

src/main.js

@@ -17,7 +17,7 @@ const paths = require('./paths');
 // @ts-ignore
 const product = require('../product.json');
 // @ts-ignore
-const app = require('electron').app;
+const { app, protocol } = require('electron');
 
 // Enable portable support
 const portable = bootstrap.configurePortable();
@@ -33,6 +33,11 @@ app.setPath('userData', userDataPath);
 // Update cwd based on environment and platform
 setCurrentWorkingDirectory();
 
+// Register custom schemes with privileges
+protocol.registerSchemesAsPrivileged([
+	{ scheme: 'vscode-resource', privileges: { secure: true, supportFetchAPI: true, corsEnabled: true } }
+]);
+
 // Global app listeners
 registerListeners();