Merge branch 'main' into tyriar/179476

Author: Tyriar

.yarnrc

@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.5"
+target "22.3.10"
 runtime "electron"
 build_from_source "true"

build/gulpfile.reh.js

@@ -72,14 +72,13 @@ const serverResources = [
 	'out-build/vs/base/node/ps.sh',
 
 	// Terminal shell integration
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish',
+	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
 
 	'!**/test/**'
 ];

build/gulpfile.vscode.js

@@ -68,7 +68,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.fish',
+	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/*.fish',
 	'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1',
 	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',

build/lib/electron.js

@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 }
 
 export const config = {
-	version: product.electronRepository ? '22.5.2' : util.getElectronVersion(),
+	version: product.electronRepository ? '22.5.3' : util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = product.electronRepository ? '22.5.2' : util.getElectronVersion();
+	const version = product.electronRepository ? '22.5.3' : util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/electron.ts

@@ -322,10 +322,6 @@
 			"name": "vs/workbench/contrib/bracketPairColorizer2Telemetry",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/offline",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/remoteTunnel",
 			"project": "vscode-workbench"
@@ -514,6 +510,10 @@
 			"name": "vs/workbench/services/localization",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/share",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/accessibility",
 			"project": "vscode-workbench"

build/lib/i18n.resources.json

@@ -36,6 +36,8 @@
 		"--vscode-charts-purple",
 		"--vscode-charts-red",
 		"--vscode-charts-yellow",
+		"--vscode-chat-requestBackground",
+		"--vscode-chat-requestBorder",
 		"--vscode-checkbox-background",
 		"--vscode-checkbox-border",
 		"--vscode-checkbox-foreground",
@@ -304,8 +306,6 @@
 		"--vscode-inputValidation-warningBackground",
 		"--vscode-inputValidation-warningBorder",
 		"--vscode-inputValidation-warningForeground",
-		"--vscode-interactive-requestBackground",
-		"--vscode-interactive-requestBorder",
 		"--vscode-interactiveEditor-border",
 		"--vscode-interactiveEditor-regionHighlight",
 		"--vscode-interactiveEditor-shadow",
@@ -457,6 +457,7 @@
 		"--vscode-problemsErrorIcon-foreground",
 		"--vscode-problemsInfoIcon-foreground",
 		"--vscode-problemsWarningIcon-foreground",
+		"--vscode-problemsSuccessIcon-foreground",
 		"--vscode-profileBadge-background",
 		"--vscode-profileBadge-foreground",
 		"--vscode-progressBar-background",
@@ -692,6 +693,8 @@
 		"--tab-border-top-color",
 		"--tab-dirty-border-top-color",
 		"--tabs-border-bottom-color",
+		"--tab-sizing-current-width",
+		"--tab-sizing-fixed-max-width",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",

build/lib/stylelint/vscode-known-variables.json

@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "0b17a201195ae6445e11cee50e436a3511717600"
+					"commitHash": "b07f2f0f42a1483cd2e5ec8fa3c77ebaa0507069"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "22.3.5"
+			"version": "22.3.10"
 		},
 		{
 			"component": {

cgmanifest.json

@@ -22,7 +22,7 @@ flate2 = { version = "1.0.22" }
 zip = { version = "0.5.13", default-features = false, features = ["time", "deflate"] }
 regex = { version = "1.5.5" }
 lazy_static = { version = "1.4.0" }
-sysinfo = { version = "0.27.7" }
+sysinfo = { version = "0.27.7", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 rmp-serde = "1.0"