Merge remote-tracking branch 'origin/main' into rebornix/silly-lynx

.vscode/launch.json

@@ -526,7 +526,7 @@
 			"name": "Monaco Editor Playground",
 			"type": "chrome",
 			"request": "launch",
-			"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5001%2Fout%2Fvs",
+			"url": "http://localhost:5001",
 			"preLaunchTask": "Launch Http Server",
 			"presentation": {
 				"group": "monaco",

.vscode/settings.json

@@ -125,5 +125,5 @@
 	],
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
-	"diffEditor.diffAlgorithm": "experimental"
+	"editor.experimental.asyncTokenizationVerification": true,
 }

.vscode/tasks.json

@@ -260,7 +260,7 @@
 			// Used for monaco editor playground launch config
 			"label": "Launch Http Server",
 			"type": "shell",
-			"command": "node_modules/.bin/http-server --cors --port 5001 -a 127.0.0.1 -c-1 -s",
+			"command": "node_modules/.bin/ts-node -T ./scripts/playground-server",
 			"isBackground": true,
 			"problemMatcher": {
 				"pattern": {

build/azure-pipelines/cli/prepare.ts

@@ -51,6 +51,8 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_DOCUMENTATION_URL', product.documentationUrl],
 		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
 		['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
+		['VSCODE_CLI_TUNNEL_SERVICE_MUTEX', product.tunnelApplicationConfig?.win32TunnelServiceMutex],
+		['VSCODE_CLI_TUNNEL_CLI_MUTEX', product.tunnelApplicationConfig?.win32TunnelMutex],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',

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

@@ -82,10 +82,28 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
+  - powershell: |
+      mkdir -Force .build/node-gyp
+    displayName: Create custom node-gyp directory
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - powershell: |
+      . ../../build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      # TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825
+      # gets merged.
+      exec { git clone https://github.com/rzhao271/node-gyp.git . } "Cloning rzhao271/node-gyp failed"
+      exec { git checkout 102b347da0c92c29f9c67df22e864e70249cf086 } "Checking out 102b347 failed"
+      exec { npm install } "Building rzhao271/node-gyp failed"
+    displayName: Install custom node-gyp
+    workingDirectory: .build/node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
+      $env:npm_config_node_gyp="$(Join-Path $pwd.Path '.build/node-gyp/bin/node-gyp.js')"
       $env:npm_config_arch="$(VSCODE_ARCH)"
       $env:CHILD_CONCURRENCY="1"
       retry { exec { yarn --frozen-lockfile --check-files } }

build/gulpfile.vscode.js

@@ -335,7 +335,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
-			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true }))
+			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
 			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
 
 		if (platform === 'linux') {