chore: update to electron 9-x-y (#102011)

* chore: bump electron@9.0.5 * remove exploration config * fix compile error * fix compile error * crashReporter has to be called only once before app ready * chore: bump electron@9.1.0 * enable LayoutNG * fix cron schedule * allow disabling appcenter crash reporting * set additional crash reporting parameters * start crashreporter for child process on linux * setup crash parameters only once * remove unused crashReporter.guid * address review feedback * reuse argv.json for storing crash reporter id * remove trailing commas * update localized name * update argv based on telemetry optout * update initial config based on setting * fix conditional errors * remove telemetry.enableCrashReporter * move default crash reporter config to electron-main * update comment for ext host crash reporting * set default value for configuration * some 💄 changes * address review feedback * do not use ES7 features in JS yet * add app.focus({ steal: true }) usage Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
microsoft · Jul 21, 2020 · 6ab5fba · 6ab5fba
1 parent bde0a7e
commit 6ab5fba
Show file tree

Hide file tree

Showing 43 changed files with 249 additions and 244 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "8.4.0"
+target "9.1.0"
 runtime "electron"
diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
@@ -8,7 +8,7 @@ pr:
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'

diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
@@ -11,7 +11,7 @@ pr:
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: AzureKeyVault@1
   displayName: 'Azure Key Vault: Get Secrets'

diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -10,7 +10,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/linux/product-build-linux-multiarch.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
@@ -16,7 +16,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2

diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
@@ -9,7 +9,7 @@ pr: none
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/sync-mooncake.yml b/build/azure-pipelines/sync-mooncake.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml
@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/win32/product-build-win32-arm64.yml b/build/azure-pipelines/win32/product-build-win32-arm64.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
@@ -21,7 +21,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: "12.13.0"
+    versionSpec: "12.14.1"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:

diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
@@ -246,10 +246,6 @@
 			"name": "vs/workbench/services/configurationResolver",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/crashReporter",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/dialogs",
 			"project": "vscode-workbench"

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
+					"commitHash": "894fb9eb56c6cbda65e3c3ae9ada6d4cb5850cc9"
 				}
 			},
 			"licenseDetail": [
@@ -40,32 +40,32 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "80.0.3987.165"
+			"version": "83.0.4103.122"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
+					"commitHash": "9622fed3fb2cffcea9efff6c8cb4cc2def99d75d"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.13.0"
+			"version": "12.14.1"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "94a5b304d0ce738ad036c8e359241b4acba330b2"
+					"commitHash": "a822d2639a9c9c2c670e91d73f78e921865ce38e"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "8.4.0"
+			"version": "9.1.0"
 		},
 		{
 			"component": {

diff --git a/package.json b/package.json
@@ -108,7 +108,7 @@
     "css-loader": "^3.2.0",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "8.4.0",
+    "electron": "9.1.0",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",

diff --git a/remote/.yarnrc b/remote/.yarnrc
@@ -1,3 +1,3 @@
 disturl "http://nodejs.org/dist"
-target "12.4.0"
+target "12.14.1"
 runtime "node"
diff --git a/src/main.js b/src/main.js
@@ -18,7 +18,11 @@ const bootstrap = require('./bootstrap');
 const paths = require('./paths');
 /** @type {any} */
 const product = require('../product.json');
-const { app, protocol } = require('electron');
+const { app, protocol, crashReporter } = require('electron');
+
+// Disable render process reuse, we still have
+// non-context aware native modules in the renderer.
+app.allowRendererProcessReuse = false;
 
 // Enable portable support
 const portable = bootstrap.configurePortable(product);
@@ -31,13 +35,13 @@ const args = parseCLIArgs();
 const userDataPath = getUserDataPath(args);
 app.setPath('userData', userDataPath);
 
-// Set temp directory based on crash-reporter-directory CLI argument
-// The crash reporter will store crashes in temp folder so we need
-// to change that location accordingly.
+// Configure static command line arguments
+const argvConfig = configureCommandlineSwitchesSync(args);
 
-// If a crash-reporter-directory is specified we setup the crash reporter
-// right from the beginning as early as possible to monitor all processes.
+// If a crash-reporter-directory is specified we store the crash reports
+// in the specified directory and don't upload them to the crash server.
 let crashReporterDirectory = args['crash-reporter-directory'];
+let submitURL = '';
 if (crashReporterDirectory) {
 	crashReporterDirectory = path.normalize(crashReporterDirectory);
 
@@ -55,23 +59,41 @@ if (crashReporterDirectory) {
 		}
 	}
 
-	// Crashes are stored in the temp directory by default, so we
+	// Crashes are stored in the crashDumps directory by default, so we
 	// need to change that directory to the provided one
-	console.log(`Found --crash-reporter-directory argument. Setting temp directory to be '${crashReporterDirectory}'`);
-	app.setPath('temp', crashReporterDirectory);
-
-	// Start crash reporter
-	const { crashReporter } = require('electron');
-	const productName = (product.crashReporter && product.crashReporter.productName) || product.nameShort;
-	const companyName = (product.crashReporter && product.crashReporter.companyName) || 'Microsoft';
-	crashReporter.start({
-		companyName: companyName,
-		productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
-		submitURL: '',
-		uploadToServer: false
-	});
+	console.log(`Found --crash-reporter-directory argument. Setting crashDumps directory to be '${crashReporterDirectory}'`);
+	app.setPath('crashDumps', crashReporterDirectory);
+} else {
+	const appCenter = product.appCenter;
+	// Disable Appcenter crash reporting if
+	// * --crash-reporter-directory is specified
+	// * enable-crash-reporter runtime argument is set to 'false'
+	// * --disable-crash-reporter command line parameter is set
+	if (appCenter && argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter']) {
+		const isWindows = (process.platform === 'win32');
+		const isLinux = (process.platform === 'linux');
+		const crashReporterId = argvConfig['crash-reporter-id'];
+		const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+		if (uuidPattern.test(crashReporterId)) {
+			submitURL = isWindows ? appCenter[process.arch === 'ia32' ? 'win32-ia32' : 'win32-x64'] : isLinux ? appCenter[`linux-x64`] : appCenter.darwin;
+			submitURL = submitURL.concat('&uid=', crashReporterId, '&iid=', crashReporterId, '&sid=', crashReporterId);
+			// Send the id for child node process that are explicitly starting crash reporter.
+			// For vscode this is ExtensionHost process currently.
+			process.argv.push('--crash-reporter-id', crashReporterId);
+		}
+	}
 }
 
+// Start crash reporter for all processes
+const productName = (product.crashReporter ? product.crashReporter.productName : undefined) || product.nameShort;
+const companyName = (product.crashReporter ? product.crashReporter.companyName : undefined) || 'Microsoft';
+crashReporter.start({
+	companyName: companyName,
+	productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
+	submitURL,
+	uploadToServer: !crashReporterDirectory
+});
+
 // Set logs path before app 'ready' event if running portable
 // to ensure that no 'logs' folder is created on disk at a
 // location outside of the portable directory
@@ -110,9 +132,6 @@ registerListeners();
 // Cached data
 const nodeCachedDataDir = getNodeCachedDir();
 
-// Configure static command line arguments
-const argvConfig = configureCommandlineSwitchesSync(args);
-
 // Remove env set by snap https://github.com/microsoft/vscode/issues/85344
 if (process.env['SNAP']) {
 	delete process.env['GDK_PIXBUF_MODULE_FILE'];
@@ -254,9 +273,6 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		app.commandLine.appendSwitch('js-flags', jsFlags);
 	}
 
-	// TODO@Deepak Electron 7 workaround for https://github.com/microsoft/vscode/issues/88873
-	app.commandLine.appendSwitch('disable-features', 'LayoutNG');
-
 	return argvConfig;
 }
 

diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -5,14 +5,14 @@
 
 import { Menu, MenuItem, BrowserWindow, ipcMain, IpcMainEvent } from 'electron';
 import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_CHANNEL, IPopupOptions } from 'vs/base/parts/contextmenu/common/contextmenu';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 export function registerContextMenuListener(): void {
 	ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
 		const menu = createMenu(event, onClickChannel, items);
-		const window = BrowserWindow.fromWebContents(event.sender);
 
 		menu.popup({
-			window: window ? window : undefined,
+			window: withNullAsUndefined(BrowserWindow.fromWebContents(event.sender)),
 			x: options ? options.x : undefined,
 			y: options ? options.y : undefined,
 			positioningItem: options ? options.positioningItem : undefined,