add throttling

Doc : Build command fix

.configurations/configuration.dsc.yaml

@@ -18,17 +18,6 @@ properties:
         id: OpenJS.NodeJS.LTS
         version: "20.14.0"
         source: winget
-    - resource: NpmDsc/NpmPackage
-      id: yarn
-      dependsOn:
-        - npm
-      directives:
-        description: Install Yarn
-        allowPrerelease: true
-      settings:
-        Name: 'yarn'
-        Global: true
-        PackageDirectory: '${WinGetConfigRoot}\..\'
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Python 3.10
@@ -56,7 +45,7 @@ properties:
         includeRecommended: true
         components:
           - Microsoft.VisualStudio.Workload.VCTools
-    - resource: YarnDsc/YarnInstall
+    - resource: NpmDsc/NpmInstall
       dependsOn:
         - npm
       directives:

.dependencygraph/setting.json

@@ -1,13 +0,0 @@
-{
-  "alias": false,
-  "resolveExtensions": [
-    ".js",
-    ".jsx",
-    ".ts",
-    ".tsx",
-    ".vue",
-    ".scss",
-    ".less"
-  ],
-  "entryFilePath": "/src/vs/code/electron-main/main.ts"
-}

.devcontainer/Dockerfile

@@ -7,8 +7,8 @@ RUN git config --system codespaces-theme.hide-status 1
 
 USER node
 RUN npm install -g node-gyp
-RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
+RUN NPM_CACHE="$(npm config get cache)" && rm -rf "$NPM_CACHE" && ln -s /vscode-dev/npm-cache "$NPM_CACHE"
 RUN echo 'export DISPLAY="${DISPLAY:-:1}"' | tee -a ~/.bashrc >> ~/.zshrc
 
 USER root
-CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf
+CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/npm-cache && sleep inf

.devcontainer/README.md

@@ -24,7 +24,7 @@ If you already have VS Code and Docker installed, you can click the badge above
 
 4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**.
 
-   > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
+   > **Tip:** While you can use your local source tree instead, operations like `npm i` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend using the WSL filesystem on Windows or the "clone repository in container" approach on Windows and macOS instead since it uses "named volume" rather than the local filesystem.
 
 5. Type `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box and press <kbd>Enter</kbd>.
 
@@ -85,7 +85,7 @@ To start working with Code - OSS, follow these steps:
 1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
 
    ```bash
-   yarn install
+   npm i
    bash scripts/code.sh
    ```
 

.devcontainer/post-create.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-yarn install --network-timeout 180000
-yarn electron
+npm i
+npm run electron

.eslintplugin/code-ensure-no-disposables-leak-in-test.ts

@@ -12,7 +12,8 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		type: 'problem',
 		messages: {
 			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
-		}
+		},
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -30,6 +31,10 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 					context.report({
 						node,
 						messageId: 'ensure',
+						fix: (fixer) => {
+							const updatedSrc = src.replace(/(suite\(.*\n)/, '$1\n\tensureNoDisposablesAreLeakedInTestSuite();\n');
+							return fixer.replaceText(node, updatedSrc);
+						}
 					});
 				}
 			},

.eslintplugin/code-import-patterns.ts

@@ -12,19 +12,19 @@ import { createImportRuleListener } from './utils';
 const REPO_ROOT = path.normalize(path.join(__dirname, '../'));
 
 interface ConditionalPattern {
-	when?: 'hasBrowser' | 'hasNode' | 'test';
+	when?: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test';
 	pattern: string;
 }
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
 
 interface LayerAllowRule {
-	when: 'hasBrowser' | 'hasNode' | 'test';
+	when: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test';
 	allow: string[];
 }
 
@@ -44,7 +44,9 @@ export = new class implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
 			badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization',
-			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json'
+			badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json',
+			badAbsolute: 'Imports have to be relative to support ESM',
+			badExtension: 'Imports have to end with `.js` or `.css` to support ESM',
 		},
 		docs: {
 			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
@@ -77,13 +79,14 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
 			deps: string;
 			isBrowser?: boolean;
 			isNode?: boolean;
+			isElectron?: boolean;
 		}
 
 		function orSegment(variants: Layer[]): string {
@@ -96,11 +99,13 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
 			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
-			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-main']), isNode: true },
+			{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
+			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },
 		];
 
 		let browserAllow: string[] = [];
 		let nodeAllow: string[] = [];
+		let electronAllow: string[] = [];
 		let testAllow: string[] = [];
 		for (const option of options) {
 			if (isLayerAllowRule(option)) {
@@ -108,6 +113,8 @@ export = new class implements eslint.Rule.RuleModule {
 					browserAllow = option.allow.slice(0);
 				} else if (option.when === 'hasNode') {
 					nodeAllow = option.allow.slice(0);
+				} else if (option.when === 'hasElectron') {
+					electronAllow = option.allow.slice(0);
 				} else if (option.when === 'test') {
 					testAllow = option.allow.slice(0);
 				}
@@ -135,9 +142,13 @@ export = new class implements eslint.Rule.RuleModule {
 				restrictions.push(...nodeAllow);
 			}
 
+			if (layerRule.isElectron) {
+				restrictions.push(...electronAllow);
+			}
+
 			for (const rawRestriction of rawRestrictions) {
 				let importPattern: string;
-				let when: 'hasBrowser' | 'hasNode' | 'test' | undefined = undefined;
+				let when: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test' | undefined = undefined;
 				if (typeof rawRestriction === 'string') {
 					importPattern = rawRestriction;
 				} else {
@@ -147,6 +158,7 @@ export = new class implements eslint.Rule.RuleModule {
 				if (typeof when === 'undefined'
 					|| (when === 'hasBrowser' && layerRule.isBrowser)
 					|| (when === 'hasNode' && layerRule.isNode)
+					|| (when === 'hasElectron' && layerRule.isElectron)
 				) {
 					restrictions.push(importPattern.replace(/\/\~$/, `/${layerRule.deps}/**`));
 					testRestrictions.push(importPattern.replace(/\/\~$/, `/test/${layerRule.deps}/**`));
@@ -181,8 +193,8 @@ export = new class implements eslint.Rule.RuleModule {
 
 			if (targetIsVS) {
 				// Always add "vs/nls" and "vs/amdX"
-				restrictions.push('vs/nls');
-				restrictions.push('vs/amdX'); // TODO@jrieken remove after ESM is real
+				restrictions.push('vs/nls.js');
+				restrictions.push('vs/amdX.js'); // TODO@jrieken remove after ESM is real
 			}
 
 			if (targetIsVS && option.layer) {
@@ -212,6 +224,25 @@ export = new class implements eslint.Rule.RuleModule {
 	}
 
 	private _checkImport(context: eslint.Rule.RuleContext, config: ImportPatternsConfig, node: TSESTree.Node, importPath: string) {
+		const targetIsVS = /^src\/vs\//.test(getRelativeFilename(context));
+		if (targetIsVS) {
+
+			// ESM: check for import ending with ".js" or ".css"
+			if (importPath[0] === '.' && !importPath.endsWith('.js') && !importPath.endsWith('.css')) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badExtension',
+				});
+			}
+
+			// check for import being relative
+			if (importPath.startsWith('vs/')) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badAbsolute',
+				});
+			}
+		}
 
 		// resolve relative paths
 		if (importPath[0] === '.') {

.eslintplugin/code-no-look-behind-regex.ts

@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as eslint from 'eslint';
-import { TSESTree } from '@typescript-eslint/experimental-utils';
-import * as ESTree from 'estree';
-
-//------------------------------------------------------------------------------
-// Rule Definition
-//------------------------------------------------------------------------------
-
-const _positiveLookBehind = /\(\?<=.+/;
-const _negativeLookBehind = /\(\?<!.+/;
-
-function _containsLookBehind(pattern: string | unknown): boolean {
-	if (typeof pattern !== 'string') {
-		return false;
-	}
-	return _positiveLookBehind.test(pattern) || _negativeLookBehind.test(pattern);
-}
-
-module.exports = {
-
-	create(context: eslint.Rule.RuleContext) {
-		return {
-			// /.../
-			['Literal[regex]']: (node: any) => {
-				type RegexLiteral = TSESTree.Literal & { regex: { pattern: string; flags: string } };
-				const pattern = (<RegexLiteral>node).regex?.pattern;
-				if (_containsLookBehind(pattern)) {
-					context.report({
-						node,
-						message: 'Look behind assertions are not yet supported in all browsers'
-					});
-				}
-			},
-			// new Regex("...")
-			['NewExpression[callee.name="RegExp"] Literal']: (node: ESTree.Literal) => {
-				if (_containsLookBehind(node.value)) {
-					context.report({
-						node,
-						message: 'Look behind assertions are not yet supported in all browsers'
-					});
-				}
-			}
-		};
-	}
-};

.eslintrc.json

@@ -92,12 +92,18 @@
 					"common",
 					"browser"
 				],
-				"electron-main": [
+				"electron-utility": [
 					"common",
 					"node"
+				],
+				"electron-main": [
+					"common",
+					"node",
+					"electron-utility"
 				]
 			}
 		]
+		// Void team commented this out:
 		// "header/header": [
 		// 	2,
 		// 	"block",
@@ -611,12 +617,64 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"src/**/electron-utility/**/*.ts"
+			],
+			"rules": {
+				"no-restricted-imports": [
+					"warn",
+					{
+						"paths": [
+							{
+								"name": "electron",
+								"importNames": [
+									"app",
+									"autoUpdater",
+									"BaseWindow",
+									"BrowserWindow",
+									"contentTracing",
+									"desktopCapturer",
+									"dialog",
+									"globalShortcut",
+									"inAppPurchase",
+									"ipcMain",
+									"Menu",
+									"MenuItem",
+									"MessageChannelMain",
+									"MessagePortMain",
+									"nativeTheme",
+									"netLog",
+									"Notification",
+									"powerMonitor",
+									"powerSaveBlocker",
+									"protocol",
+									"pushNotifications",
+									"safeStorage",
+									"screen",
+									"session",
+									"ShareMenu",
+									"TouchBar",
+									"Tray",
+									"utilityProcess",
+									"View",
+									"webContents",
+									"webFrameMain",
+									"webContentsView",
+									"default"
+								],
+								"message": "Only net and system-preferences are allowed to be imported from electron"
+							}
+						]
+					}
+				]
+			}
+		},
 		{
 			"files": [
 				"src/**/*.ts"
 			],
 			"rules": {
-				"local/code-no-look-behind-regex": "warn",
 				"local/code-import-patterns": [
 					"warn",
 					{
@@ -631,6 +689,7 @@
 					{
 						// imports that are allowed in all files of layers:
 						// - node
+						// - electron-utility
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
@@ -649,13 +708,13 @@
 							"cookie",
 							"crypto",
 							"dns",
-							"electron",
 							"events",
 							"fs",
 							"fs/promises",
 							"http",
 							"https",
 							"minimist",
+							"node:module",
 							"native-keymap",
 							"native-watchdog",
 							"net",
@@ -687,11 +746,21 @@
 							"zlib"
 						]
 					},
+					{
+						// imports that are allowed in all files of layers:
+						// - electron-utility
+						// - electron-main
+						"when": "hasElectron",
+						"allow": [
+							"electron"
+						]
+					},
 					{
 						// imports that are allowed in all /test/ files
 						"when": "test",
 						"allow": [
 							"vs/css.build",
+							"vs/css.build.js",
 							"assert",
 							"sinon",
 							"sinon-test"
@@ -746,7 +815,8 @@
 							"vs/platform/*/~",
 							"tas-client-umd", // node module allowed even in /common/
 							"@microsoft/1ds-core-js", // node module allowed even in /common/
-							"@microsoft/1ds-post-js" // node module allowed even in /common/
+							"@microsoft/1ds-post-js", // node module allowed even in /common/
+							"@xterm/headless" // node module allowed even in /common/
 						]
 					},
 					{
@@ -777,7 +847,8 @@
 							"vs/platform/*/~",
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
-							"vs/editor/standalone/~"
+							"vs/editor/standalone/~",
+							"@vscode/tree-sitter-wasm" // type import
 						]
 					},
 					{
@@ -863,6 +934,7 @@
 							"tas-client-umd", // node module allowed even in /common/
 							"vscode-textmate", // node module allowed even in /common/
 							"@vscode/vscode-languagedetection", // node module allowed even in /common/
+							"@vscode/tree-sitter-wasm", // type import
 							{
 								"when": "hasBrowser",
 								"pattern": "@xterm/xterm"
@@ -880,6 +952,7 @@
 							"vs/workbench/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
+							"vs/workbench/contrib/terminal/terminalContribExports*",
 							"vscode-notebook-renderer", // Type only import
 							{
 								"when": "hasBrowser",
@@ -909,6 +982,7 @@
 							// Only allow terminalContrib to import from itself, this works because
 							// terminalContrib is one extra folder deep
 							"vs/workbench/contrib/terminalContrib/*/~",
+							"vs/workbench/contrib/terminal/terminalContribExports*",
 							"vscode-notebook-renderer", // Type only import
 							{
 								"when": "hasBrowser",
@@ -921,7 +995,8 @@
 							{
 								"when": "hasBrowser",
 								"pattern": "vscode-textmate"
-							} // node module allowed even in /browser/
+							}, // node module allowed even in /browser/
+							"@xterm/headless" // node module allowed even in /common/ and /browser/
 						]
 					},
 					{
@@ -937,6 +1012,18 @@
 								"when": "hasBrowser",
 								"pattern": "vs/workbench/workbench.web.main"
 							},
+							{
+								"when": "hasBrowser",
+								"pattern": "vs/workbench/workbench.web.main.js"
+							},
+							{
+								"when": "hasBrowser",
+								"pattern": "vs/workbench/workbench.web.main.internal"
+							},
+							{
+								"when": "hasBrowser",
+								"pattern": "vs/workbench/workbench.web.main.internal.js"
+							},
 							{
 								"when": "hasBrowser",
 								"pattern": "vs/workbench/~"
@@ -967,6 +1054,13 @@
 							"vs/workbench/contrib/**"
 						]
 					},
+					{
+						"target": "src/vs/workbench/contrib/terminal/terminalContribExports.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/workbench/contrib/terminalContrib/*/~"
+						]
+					},
 					{
 						"target": "src/vs/workbench/workbench.common.main.ts",
 						"layer": "browser",
@@ -977,11 +1071,13 @@
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
 							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/contrib/terminal/terminal.all"
+							"vs/workbench/contrib/terminal/terminal.all",
+							"vs/workbench/contrib/terminal/terminal.all.js"
 						]
 					},
 					{
@@ -994,11 +1090,32 @@
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
 							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
+							"vs/workbench/workbench.common.main",
+							"vs/workbench/workbench.common.main.js"
+						]
+					},
+					{
+						"target": "src/vs/workbench/workbench.web.main.internal.ts",
+						"layer": "browser",
+						"restrictions": [
+							"vs/base/~",
+							"vs/base/parts/*/~",
+							"vs/platform/*/~",
+							"vs/editor/~",
+							"vs/editor/contrib/*/~",
+							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
+							"vs/workbench/~",
+							"vs/workbench/api/~",
+							"vs/workbench/services/*/~",
+							"vs/workbench/contrib/*/~",
+							"vs/workbench/workbench.common.main",
+							"vs/workbench/workbench.common.main.js"
 						]
 					},
 					{
@@ -1011,11 +1128,13 @@
 							"vs/editor/~",
 							"vs/editor/contrib/*/~",
 							"vs/editor/editor.all",
+							"vs/editor/editor.all.js",
 							"vs/workbench/~",
 							"vs/workbench/api/~",
 							"vs/workbench/services/*/~",
 							"vs/workbench/contrib/*/~",
-							"vs/workbench/workbench.common.main"
+							"vs/workbench/workbench.common.main",
+							"vs/workbench/workbench.common.main.js"
 						]
 					},
 					{
@@ -1025,7 +1144,7 @@
 						]
 					},
 					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.messages.ts,nls.ts}",
+						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.messages.ts}",
 						"restrictions": []
 					},
 					{

.git-blame-ignore-revs

@@ -26,3 +26,6 @@ ee1655a82ebdfd38bf8792088a6602c69f7bbd94
 
 # jrieken: new eslint-rule
 4a130c40ed876644ed8af2943809d08221375408
+
+# bpasero: ESM migration
+6b924c51528e663dda5091a1493229a361676aca

.gitignore

@@ -12,7 +12,7 @@ build/node_modules
 coverage/
 test_data/
 test-results/
-yarn-error.log
+test-results.xml
 vscode.lsif
 vscode.db
 /.profile-oss

.npmrc

@@ -0,0 +1,7 @@
+disturl="https://electronjs.org/headers"
+target="30.5.1"
+ms_build_id="10262041"
+runtime="electron"
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000

.nvmrc

@@ -1 +1 @@
-20.14.0
+20.16.0

.vscode/extensions/vscode-selfhost-import-aid/.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+	"configurations": [
+		{
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--enable-proposed-api=ms-vscode.vscode-selfhost-import-aid"
+			],
+			"name": "Launch Extension",
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"request": "launch",
+			"type": "extensionHost"
+		}
+	]
+}

.vscode/extensions/vscode-selfhost-import-aid/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "vscode.typescript-language-features",
+	"editor.codeActionsOnSave": {
+		"source.organizeImports": "always"
+	}
+}

.vscode/extensions/vscode-selfhost-import-aid/package-lock.json

@@ -0,0 +1,31 @@
+{
+  "name": "vscode-selfhost-import-aid",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-selfhost-import-aid",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "typescript": "5.5.4"
+      },
+      "engines": {
+        "vscode": "^1.88.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    }
+  }
+}

.vscode/extensions/vscode-selfhost-import-aid/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "vscode-selfhost-import-aid",
+  "displayName": "VS Code Selfhost Import Aid",
+  "description": "Util to improve dealing with imports",
+  "engines": {
+    "vscode": "^1.88.0"
+  },
+  "version": "0.0.1",
+  "publisher": "ms-vscode",
+  "categories": [
+    "Other"
+  ],
+  "activationEvents": [
+    "onLanguage:typescript"
+  ],
+  "main": "./out/extension.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  },
+  "license": "MIT",
+  "scripts": {
+    "compile": "gulp compile-extension:vscode-selfhost-import-aid",
+    "watch": "gulp watch-extension:vscode-selfhost-import-aid"
+  },
+  "dependencies": {
+    "typescript": "5.5.4"
+  }
+}

.vscode/extensions/vscode-selfhost-import-aid/src/extension.ts

@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as ts from 'typescript';
+import * as path from 'path';
+
+export async function activate(context: vscode.ExtensionContext) {
+
+	const fileIndex = new class {
+
+		private _currentRun?: Thenable<void>;
+
+		private _disposables: vscode.Disposable[] = [];
+
+		private readonly _index = new Map<string, vscode.Uri>();
+
+		constructor() {
+			const watcher = vscode.workspace.createFileSystemWatcher('**/*.ts', false, true, false);
+			this._disposables.push(watcher.onDidChange(e => { this._index.set(e.toString(), e); }));
+			this._disposables.push(watcher.onDidDelete(e => { this._index.delete(e.toString()); }));
+			this._disposables.push(watcher);
+
+			this._refresh(false);
+		}
+
+		dispose(): void {
+			for (const disposable of this._disposables) {
+				disposable.dispose();
+			}
+			this._disposables = [];
+			this._index.clear();
+		}
+
+		async all(token: vscode.CancellationToken) {
+
+			await Promise.race([this._currentRun, new Promise<void>(resolve => token.onCancellationRequested(resolve))]);
+
+			if (token.isCancellationRequested) {
+				return undefined;
+			}
+
+			return Array.from(this._index.values());
+		}
+
+		private _refresh(clear: boolean) {
+			// TODO@jrieken LATEST API! findFiles2New
+			this._currentRun = vscode.workspace.findFiles('src/vs/**/*.ts', '{**/node_modules/**,**/extensions/**}').then(all => {
+				if (clear) {
+					this._index.clear();
+				}
+				for (const item of all) {
+					this._index.set(item.toString(), item);
+				}
+			});
+		}
+	};
+
+	const selector: vscode.DocumentSelector = 'typescript';
+
+	function findNodeAtPosition(document: vscode.TextDocument, node: ts.Node, position: vscode.Position): ts.Node | undefined {
+		if (node.getStart() <= document.offsetAt(position) && node.getEnd() >= document.offsetAt(position)) {
+			return ts.forEachChild(node, child => findNodeAtPosition(document, child, position)) || node;
+		}
+		return undefined;
+	}
+
+	function findImportAt(document: vscode.TextDocument, position: vscode.Position): ts.ImportDeclaration | undefined {
+		const sourceFile = ts.createSourceFile(document.fileName, document.getText(), ts.ScriptTarget.Latest, true);
+		const node = findNodeAtPosition(document, sourceFile, position);
+		if (node && ts.isStringLiteral(node) && ts.isImportDeclaration(node.parent)) {
+			return node.parent;
+		}
+		return undefined;
+	}
+
+	const completionProvider = new class implements vscode.CompletionItemProvider {
+		async provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.CompletionList | undefined> {
+
+			const index = document.getText().lastIndexOf(' from \'');
+			if (index < 0 || document.positionAt(index).line < position.line) {
+				// line after last import is before position
+				// -> no completion, safe a parse call
+				return undefined;
+			}
+
+			const node = findImportAt(document, position);
+			if (!node) {
+				return undefined;
+			}
+
+			const range = new vscode.Range(document.positionAt(node.moduleSpecifier.pos), document.positionAt(node.moduleSpecifier.end));
+			const uris = await fileIndex.all(token);
+
+			if (!uris) {
+				return undefined;
+			}
+
+			const result = new vscode.CompletionList();
+			result.isIncomplete = true;
+
+			for (const item of uris) {
+
+				if (!item.path.endsWith('.ts')) {
+					continue;
+				}
+
+				let relativePath = path.relative(path.dirname(document.uri.path), item.path);
+				relativePath = relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+
+				const label = path.basename(item.path, path.extname(item.path));
+				const insertText = ` '${relativePath.replace(/\.ts$/, '.js')}'`;
+				const filterText = ` '${label}'`;
+
+				const completion = new vscode.CompletionItem({
+					label: label,
+					description: vscode.workspace.asRelativePath(item),
+				});
+				completion.kind = vscode.CompletionItemKind.File;
+				completion.insertText = insertText;
+				completion.filterText = filterText;
+				completion.range = range;
+
+				result.items.push(completion);
+			}
+
+			return result;
+		}
+	};
+
+	class ImportCodeActions implements vscode.CodeActionProvider {
+
+		static FixKind = vscode.CodeActionKind.QuickFix.append('esmImport');
+
+		static SourceKind = vscode.CodeActionKind.SourceFixAll.append('esmImport');
+
+		async provideCodeActions(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+
+			if (context.only && ImportCodeActions.SourceKind.intersects(context.only)) {
+				return this._provideFixAll(document, context, token);
+			}
+
+			return this._provideFix(document, range, context, token);
+		}
+
+		private async _provideFixAll(document: vscode.TextDocument, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+
+			const diagnostics = context.diagnostics
+				.filter(d => d.code === 2307)
+				.sort((a, b) => b.range.start.compareTo(a.range.start));
+
+			if (diagnostics.length === 0) {
+				return undefined;
+			}
+
+			const uris = await fileIndex.all(token);
+			if (!uris) {
+				return undefined;
+			}
+
+			const result = new vscode.CodeAction(`Fix All ESM Imports`, ImportCodeActions.SourceKind);
+			result.edit = new vscode.WorkspaceEdit();
+			result.diagnostics = [];
+
+			for (const diag of diagnostics) {
+
+				const actions = this._provideFixesForDiag(document, diag, uris);
+
+				if (actions.length === 0) {
+					console.log(`ESM: no fixes for "${diag.message}"`);
+					continue;
+				}
+
+				if (actions.length > 1) {
+					console.log(`ESM: more than one fix for "${diag.message}", taking first`);
+					console.log(actions);
+				}
+
+				const [first] = actions;
+				result.diagnostics.push(diag);
+
+				for (const [uri, edits] of first.edit!.entries()) {
+					result.edit.set(uri, edits);
+				}
+			}
+			// console.log(result.edit.get(document.uri));
+			return [result];
+		}
+
+		private async _provideFix(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.CodeAction[] | undefined> {
+			const uris = await fileIndex.all(token);
+			if (!uris) {
+				return [];
+			}
+
+			const diag = context.diagnostics.find(d => d.code === 2307 && d.range.intersection(range));
+			return diag && this._provideFixesForDiag(document, diag, uris);
+		}
+
+		private _provideFixesForDiag(document: vscode.TextDocument, diag: vscode.Diagnostic, uris: Iterable<vscode.Uri>): vscode.CodeAction[] {
+
+			const node = findImportAt(document, diag.range.start)?.moduleSpecifier;
+			if (!node || !ts.isStringLiteral(node)) {
+				return [];
+			}
+
+			const nodeRange = new vscode.Range(document.positionAt(node.pos), document.positionAt(node.end));
+			const name = path.basename(node.text, path.extname(node.text));
+
+			const result: vscode.CodeAction[] = [];
+
+			for (const item of uris) {
+				if (path.basename(item.path, path.extname(item.path)) === name) {
+					let relativePath = path.relative(path.dirname(document.uri.path), item.path).replace(/\.ts$/, '.js');
+					relativePath = relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+
+					const action = new vscode.CodeAction(`Fix to '${relativePath}'`, ImportCodeActions.FixKind);
+					action.edit = new vscode.WorkspaceEdit();
+					action.edit.replace(document.uri, nodeRange, ` '${relativePath}'`);
+					action.diagnostics = [diag];
+					result.push(action);
+				}
+			}
+
+			return result;
+		}
+	}
+
+	context.subscriptions.push(fileIndex);
+	context.subscriptions.push(vscode.languages.registerCompletionItemProvider(selector, completionProvider));
+	context.subscriptions.push(vscode.languages.registerCodeActionsProvider(selector, new ImportCodeActions(), { providedCodeActionKinds: [ImportCodeActions.FixKind, ImportCodeActions.SourceKind] }));
+}

.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json

@@ -0,0 +1,14 @@
+{
+	"extends": "../../../extensions/tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./out",
+		"types": [
+			"node",
+			"mocha",
+		]
+	},
+	"include": [
+		"src/**/*",
+		"../../../src/vscode-dts/vscode.d.ts"
+	]
+}

.vscode/extensions/vscode-selfhost-test-provider/package-lock.json

@@ -0,0 +1,101 @@
+{
+  "name": "vscode-selfhost-test-provider",
+  "version": "0.4.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vscode-selfhost-test-provider",
+      "version": "0.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "ansi-styles": "^5.2.0",
+        "cockatiel": "^3.1.3",
+        "istanbul-to-vscode": "^2.0.1"
+      },
+      "devDependencies": {
+        "@types/mocha": "^10.0.6",
+        "@types/node": "20.x"
+      },
+      "engines": {
+        "vscode": "^1.88.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
+    },
+    "node_modules/@types/mocha": {
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz",
+      "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz",
+      "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cockatiel": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.3.tgz",
+      "integrity": "sha512-xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/istanbul-to-vscode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-to-vscode/-/istanbul-to-vscode-2.0.1.tgz",
+      "integrity": "sha512-V9Hhr7kX3UvkvkaT1lK3AmCRPkaIAIogQBrduTpNiLTkp1eVsybnJhWiDSVeCQap/3aGeZ2019oIivhX9MNsCQ==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.6"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    }
+  }
+}

.vscode/extensions/vscode-selfhost-test-provider/src/sourceUtils.ts

@@ -8,6 +8,7 @@ import * as vscode from 'vscode';
 import { TestCase, TestConstruct, TestSuite, VSCodeTest } from './testTree';
 
 const suiteNames = new Set(['suite', 'flakySuite']);
+const testNames = new Set(['test']);
 
 export const enum Action {
 	Skip,
@@ -19,22 +20,19 @@ export const extractTestFromNode = (src: ts.SourceFile, node: ts.Node, parent: V
 		return Action.Recurse;
 	}
 
-	let lhs = node.expression;
-	if (isSkipCall(lhs)) {
+	const asSuite = identifyCall(node.expression, suiteNames);
+	const asTest = identifyCall(node.expression, testNames);
+	const either = asSuite || asTest;
+	if (either === IdentifiedCall.Skipped) {
 		return Action.Skip;
 	}
-
-	if (isPropertyCall(lhs) && lhs.name.text === 'only') {
-		lhs = lhs.expression;
+	if (either === IdentifiedCall.Nothing) {
+		return Action.Recurse;
 	}
 
 	const name = node.arguments[0];
 	const func = node.arguments[1];
-	if (!name || !ts.isIdentifier(lhs) || !ts.isStringLiteralLike(name)) {
-		return Action.Recurse;
-	}
-
-	if (!func) {
+	if (!name || !ts.isStringLiteralLike(name) || !func) {
 		return Action.Recurse;
 	}
 
@@ -46,23 +44,45 @@ export const extractTestFromNode = (src: ts.SourceFile, node: ts.Node, parent: V
 	);
 
 	const cparent = parent instanceof TestConstruct ? parent : undefined;
-	if (lhs.escapedText === 'test') {
+
+	// we know this is either a suite or a test because we checked for skipped/nothing above
+
+	if (asTest) {
 		return new TestCase(name.text, range, cparent);
 	}
 
-	if (suiteNames.has(lhs.escapedText.toString())) {
+	if (asSuite) {
 		return new TestSuite(name.text, range, cparent);
 	}
 
-	return Action.Recurse;
+	throw new Error('unreachable');
+};
+
+const enum IdentifiedCall {
+	Nothing,
+	Skipped,
+	IsThing,
+}
+
+const identifyCall = (lhs: ts.Node, needles: ReadonlySet<string>): IdentifiedCall => {
+	if (ts.isIdentifier(lhs)) {
+		return needles.has(lhs.escapedText || lhs.text) ? IdentifiedCall.IsThing : IdentifiedCall.Nothing;
+	}
+
+	if (isPropertyCall(lhs) && lhs.name.text === 'skip') {
+		return needles.has(lhs.expression.text) ? IdentifiedCall.Skipped : IdentifiedCall.Nothing;
+	}
+
+	if (ts.isParenthesizedExpression(lhs) && ts.isConditionalExpression(lhs.expression)) {
+		return Math.max(identifyCall(lhs.expression.whenTrue, needles), identifyCall(lhs.expression.whenFalse, needles));
+	}
+
+	return IdentifiedCall.Nothing;
 };
 
 const isPropertyCall = (
-	lhs: ts.LeftHandSideExpression
+	lhs: ts.Node
 ): lhs is ts.PropertyAccessExpression & { expression: ts.Identifier; name: ts.Identifier } =>
 	ts.isPropertyAccessExpression(lhs) &&
 	ts.isIdentifier(lhs.expression) &&
 	ts.isIdentifier(lhs.name);
-
-const isSkipCall = (lhs: ts.LeftHandSideExpression) =>
-	isPropertyCall(lhs) && suiteNames.has(lhs.expression.text) && lhs.name.text === 'skip';

.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts

@@ -63,7 +63,7 @@ export abstract class VSCodeTestRunner {
 		const cp = spawn(await this.binaryPath(), args, {
 			cwd: this.repoLocation.uri.fsPath,
 			stdio: 'pipe',
-			env: this.getEnvironment(),
+			env: this.getEnvironment(port),
 		});
 
 		// Register a descriptor factory that signals the server when any
@@ -139,7 +139,7 @@ export abstract class VSCodeTestRunner {
 		});
 	}
 
-	protected getEnvironment(): NodeJS.ProcessEnv {
+	protected getEnvironment(_remoteDebugPort?: number): NodeJS.ProcessEnv {
 		return {
 			...process.env,
 			ELECTRON_RUN_AS_NODE: undefined,
@@ -261,9 +261,10 @@ export class BrowserTestRunner extends VSCodeTestRunner {
 	}
 
 	/** @override */
-	protected override getEnvironment() {
+	protected override getEnvironment(remoteDebugPort?: number) {
 		return {
-			...super.getEnvironment(),
+			...super.getEnvironment(remoteDebugPort),
+			PLAYWRIGHT_CHROMIUM_DEBUG_PORT: remoteDebugPort ? String(remoteDebugPort) : undefined,
 			ELECTRON_RUN_AS_NODE: '1',
 		};
 	}

.vscode/extensions/vscode-selfhost-test-provider/yarn.lock

@@ -1,60 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@types/istanbul-lib-coverage@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
-  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
-
-"@types/mocha@^10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b"
-  integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==
-
-"@types/node@20.x":
-  version "20.12.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
-  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
-  dependencies:
-    undici-types "~5.26.4"
-
-ansi-styles@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-cockatiel@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/cockatiel/-/cockatiel-3.1.3.tgz#bb1774a498a17e739dd994d56610dc6538b02858"
-  integrity sha512-xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ==
-
-istanbul-to-vscode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-to-vscode/-/istanbul-to-vscode-2.0.1.tgz#84994d06e604b68cac7301840f338b1e74eb888b"
-  integrity sha512-V9Hhr7kX3UvkvkaT1lK3AmCRPkaIAIogQBrduTpNiLTkp1eVsybnJhWiDSVeCQap/3aGeZ2019oIivhX9MNsCQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.6"
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"August 2024\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"September 2024\""
   },
   {
     "kind": 1,

.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"August 2024\""
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"September 2024\""
   },
   {
     "kind": 1,

.vscode/notebooks/my-endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"August 2024\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"September 2024\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,

.vscode/notebooks/my-work.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$MILESTONE=milestone:\"August 2024\"\n"
+    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$MILESTONE=milestone:\"September 2024\"\n"
   },
   {
     "kind": 1,

.vscode/settings.json

@@ -34,10 +34,12 @@
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
 		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
+		"build/loader.min": true
 	},
 	"files.readonlyInclude": {
 		"**/node_modules/**/*.*": true,
 		"**/yarn.lock": true,
+		"**/package-lock.json": true,
 		"**/Cargo.lock": true,
 		"src/vs/workbench/workbench.web.main.css": true,
 		"src/vs/workbench/workbench.desktop.main.css": true,
@@ -74,9 +76,8 @@
 	],
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
-	"npm.packageManager": "yarn",
 	"emmet.excludeLanguages": [],
-	"typescript.preferences.importModuleSpecifier": "non-relative",
+	"typescript.preferences.importModuleSpecifier": "relative",
 	"typescript.preferences.quoteStyle": "single",
 	"json.schemas": [
 		{
@@ -93,7 +94,7 @@
 		}
 	],
 	"git.ignoreLimitWarning": true,
-	// we removed this for Void:
+	// Removing this for Void:
 	// "git.branchProtection": [
 	// 	"main",
 	// 	"distro",
@@ -163,7 +164,7 @@
 		"@xterm/headless",
 		"node-pty",
 		"vscode-notebook-renderer",
-		"src/vs/workbench/workbench.web.main.ts"
+		"src/vs/workbench/workbench.web.main.internal.ts"
 	],
 	"[github-issues]": {
 		"editor.wordWrap": "on"

.vscode/tasks.json

@@ -113,7 +113,7 @@
 			"problemMatcher": []
 		},
 		{
-			"label": "Kill VS Code - Build, Yarn, VS Code - Build",
+			"label": "Kill VS Code - Build, Npm, VS Code - Build",
 			"dependsOn": [
 				"Kill VS Code - Build",
 				"npm: install",

.yarnrc

@@ -1,5 +1,591 @@
-disturl "https://electronjs.org/headers"
-target "30.4.0"
-ms_build_id "10073054"
-runtime "electron"
-build_from_source "true"
+// -----------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------------------
+// This file overrides licenses only for OSS components which do not appear in `cgmanifest.json`.
+// i.e. for OSS components that are detected from `package-lock.json` or `Cargo.lock` files.
+//
+// DO NOT EDIT THIS FILE UNLESS THE OSS TOOL INDICATES THAT YOU SHOULD.
+//
+[
+	{
+		// Reason: The license at https://github.com/aadsm/jschardet/blob/master/LICENSE
+		// does not include a clear Copyright statement and does not credit authors.
+		"name": "jschardet",
+		"prependLicenseText": [
+			"Chardet was originally ported from C++ by Mark Pilgrim. It is now maintained",
+			" by Dan Blanchard and Ian Cordasco, and was formerly maintained by Erik Rose.",
+			" JSChardet was ported from python to JavaScript by António Afonso ",
+			" (https://github.com/aadsm/jschardet) and transformed into an npm package by ",
+			"Markus Ast (https://github.com/brainafk)"
+		]
+	},
+	{
+		// Reason: The license at https://github.com/microsoft/TypeScript/blob/master/LICENSE.txt
+		// does not include a clear Copyright statement.
+		"name": "typescript",
+		"prependLicenseText": [
+			"Copyright (c) Microsoft Corporation. All rights reserved."
+		]
+	},
+	{
+		"name": "tunnel-agent",
+		"prependLicenseText": [
+			"Copyright (c) tunnel-agent authors"
+		]
+	},
+	{
+		// Reason: The license at https://github.com/rbuckton/reflect-metadata/blob/master/LICENSE
+		// does not include a clear Copyright statement (it's in https://github.com/rbuckton/reflect-metadata/blob/master/CopyrightNotice.txt).
+		"name": "reflect-metadata",
+		"prependLicenseText": [
+			"Copyright (c) Microsoft Corporation. All rights reserved."
+		]
+	},
+	{
+		// Reason: The license cannot be found by the tool due to access controls on the repository
+		"name": "vscode-tas-client",
+		"fullLicenseText": [
+			"MIT License",
+			"Copyright (c) 2020 - present Microsoft Corporation",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: The license cannot be found by the tool due to access controls on the repository
+		"name": "tas-client",
+		"fullLicenseText": [
+			"MIT License",
+			"Copyright (c) 2020 - present Microsoft Corporation",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: The license cannot be found by the tool due to access controls on the repository
+		"name": "tas-client-umd",
+		"fullLicenseText": [
+			"MIT License",
+			"Copyright (c) 2020 - present Microsoft Corporation",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: Repository lacks license text.
+		// https://github.com/tjwebb/fnv-plus/blob/master/package.json declares MIT.
+		// https://github.com/tjwebb/fnv-plus/issues/14
+		"name": "@enonic/fnv-plus",
+		"fullLicenseText": [
+			"MIT License",
+			"Copyright (c) 2014 - present, Travis Webb <me@traviswebb.com>",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "@vscode/win32-app-container-tokens",
+		"fullLicenseText": [
+			"MIT License",
+			"",
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE"
+		]
+	},
+	{
+		// Reason: NPM package does not include repository URL https://github.com/microsoft/vscode-deviceid/issues/12
+		"name": "@vscode/deviceid",
+		"fullLicenseText": [
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"MIT License",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: Missing license file
+		"name": "@tokenizer/token",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"",
+			"Copyright (c) 2020 Borewit",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: Missing license file
+		"name": "readable-web-to-node-stream",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"",
+			"Copyright (c) 2019 Borewit",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: The substack org has been deleted on GH
+		"name": "concat-map",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: The substack org has been deleted on GH
+		"name": "github-from-package",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: The substack org has been deleted on GH
+		"name": "minimist",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
+		"name": "russh-cryptovec",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt"
+	},
+	{
+		// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
+		"name": "russh-keys",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "dirs-next",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/af4aa39daba0ac68e222962a5aca17360158b7cc/dirs/LICENSE-MIT"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "openssl",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl/LICENSE"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "openssl-sys",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl-sys/LICENSE-MIT"
+	},
+	{
+		// Reason: Missing license file
+		"name": "openssl-macros",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{ // Reason: Missing license file
+		"name": "const_format_proc_macros",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"
+	},
+	{ // Reason: Missing license file
+		"name": "const_format",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md"
+	},
+	{ // License is MIT/Apache and tool doesn't look in subfolders
+		"name": "toml_edit",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/toml-rs/toml/main/crates/toml_edit/LICENSE-MIT"
+	},
+	{ // License is MIT/Apache and tool doesn't look in subfolders
+		"name": "toml_datetime",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/toml-rs/toml/main/crates/toml_datetime/LICENSE-MIT"
+	},
+	{ // License is MIT/Apache and tool doesn't look in subfolders
+		"name": "dirs-sys-next",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/master/dirs-sys/LICENSE-MIT"
+	},
+	{ // License is MIT/Apache and gitlab API doesn't find the project
+		"name": "libredox",
+		"fullLicenseTextUri": "https://gitlab.redox-os.org/redox-os/libredox/-/raw/master/LICENSE"
+	},
+	{
+		"name": "https-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "data-uri-to-buffer",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "socks-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "http-proxy-agent",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "agent-base",
+		"fullLicenseText": [
+			"(The MIT License)",
+			"Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+			"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+			"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "anstyle",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "anstyle-query",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "anstyle-parse",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "anstyle-wincon",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "anstream",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "colorchoice",
+		"fullLicenseText": [
+			"This software is released under the MIT license:",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+			"this software and associated documentation files (the \"Software\"), to deal in",
+			"the Software without restriction, including without limitation the rights to",
+			"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software is furnished to do so,",
+			"subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
+			"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
+			"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
+			"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
+			"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		"name": "cacheable-request",
+		"prependLicenseText": [
+			"Copyright (c) cacheable-request authors"
+		]
+	},
+	{
+		"name": "@vscode/ts-package-manager",
+		"fullLicenseText": [
+			"MIT License",
+			"",
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE"
+		]
+	},
+	{
+		"name":"vscode-markdown-languageserver",
+		"fullLicenseText": [
+			"MIT License",
+			"",
+			"Copyright (c) Microsoft Corporation.",
+			"",
+			"Permission is hereby granted, free of charge, to any person obtaining a copy",
+			"of this software and associated documentation files (the \"Software\"), to deal",
+			"in the Software without restriction, including without limitation the rights",
+			"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+			"copies of the Software, and to permit persons to whom the Software is",
+			"furnished to do so, subject to the following conditions:",
+			"",
+			"The above copyright notice and this permission notice shall be included in all",
+			"copies or substantial portions of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+			"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+			"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+			"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+			"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+			"SOFTWARE"
+		]
+	},
+	{
+		// Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0
+		"name": "system-configuration",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/mullvad/system-configuration-rs/v0.6.0/system-configuration/LICENSE-MIT"
+	},
+	{
+		// Reason: mono-repo where the individual packages are also dual-licensed under MIT and Apache-2.0
+		"name": "system-configuration-sys",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/mullvad/system-configuration-rs/v0.6.0/system-configuration-sys/LICENSE-MIT"
+	},
+	{
+		// Reason: License missing from the repository https://github.com/isaacs/chownr/issues/35
+		"name": "chownr",
+		"fullLicenseText": [
+			"The ISC License",
+			"Copyright (c) Isaac Z. Schlueter and Contributors",
+			"Permission to use, copy, modify, and/or distribute this software for any",
+			"purpose with or without fee is hereby granted, provided that the above",
+			"copyright notice and this permission notice appear in all copies.",
+			"THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES",
+			"WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF",
+			"MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR",
+			"ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES",
+			"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN",
+			"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR",
+			"IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
+		]
+	}
+]

CONTRIBUTING.md

@@ -1,24 +1,19 @@
-
 # Contributing to Void
 
 Welcome! 👋 This is a guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
 
 There are two main ways to contribute:
 
-- Suggest New Features (discord)
-- Build New Features (roadmap)
+- Suggest New Features ([discord](https://discord.gg/RSNjgaugJs))
+- Build New Features ([project](https://github.com/orgs/voideditor/projects/2/views/3))
 
-
-See the [GitHub Issues](https://github.com/orgs/voideditor/projects/2/views/3) list for a list of the most important features to build, or feel free to create new issues.
-
-We use a [VSCode extension](https://code.visualstudio.com/api/get-started/your-first-extension) to implement most of Void's functionality.  Scroll down to see 1. How to build/contribute to the Extension, or 2. How to build/contribute to the full IDE (for more native changes).
+We use a [VSCode extension](https://code.visualstudio.com/api/get-started/your-first-extension) to implement most of Void's functionality. Scroll down to see 1. How to build/contribute to the Extension, or 2. How to build/contribute to the full IDE (for more native changes).
 
 For some useful links we've compiled see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
 
-
-
 ## 1. Building the Extension
-Here's how you can start contributing to the Void Extension, where much of our code lives right now:
+
+Here's how you can start contributing to the Void extension. This is where you should get started if you're new.
 
 1. Clone the repository:
 
@@ -26,11 +21,7 @@ Here's how you can start contributing to the Void Extension, where much of our c
 git clone https://github.com/voideditor/void
 ```
 
-2. Open the extension folder in VS Code (open it in a new workspace, *don't* just cd into it):
-
-```
-/extensions/void
-```
+2. Open the folder `/extensions/void` in VSCode (open it in a new workspace, _don't_ just cd into it).
 
 3. Install dependencies:
 
@@ -38,7 +29,7 @@ git clone https://github.com/voideditor/void
 npm install
 ```
 
-4. Build the project. We created this build command so that we could run React in vscode - it converts `sidebar/index.tsx` into a CSS/JS bundle in `dist/`.
+4. Compile the React by running `npm run build`. We created this build command to convert `sidebar/index.tsx` into `dist/`.
 
 ```
 npm run build
@@ -46,86 +37,122 @@ npm run build
 
 5. Run the project by pressing <kbd>F5</kbd>.
 
-This will start a new instance of VS Code with the extension enabled. If this does not work, you can press <kbd>Ctrl+Shift+P</kbd>, select "Debug: Start Debugging", and select "VS Code Extension Development".
-
-If you would like to use AI features, you need to provide an API key. You can do that by going to Settings (Ctrl+,) and modifying `void > "Anthropic Api Key"`. The "Which API" environment variable controls the provider and defaults to "anthropic".
-
-Now that you're set up, feel free to check out our [Issues](https://github.com/voideditor/void/issues) page!
+This will start a new instance of VSCode with the extension enabled. If this doesn't work, you can press <kbd>Ctrl+Shift+P</kbd>, select "Debug: Start Debugging", and select "VSCode Extension Development".
 
 ## 2. Building the full IDE
 
-Beyond the extension, we very occasionally edit the IDE when we need to access more functionality. If you want to work on the full IDE, please follow the steps below, or see VS Code's full [how to contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
+If you want to work on the full IDE, please follow the steps below. If you have any questions/issues, you can refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page, which is where the steps below come from. Also feel free to submit an issue or get in touch with us with any build errors.
 
+### a. Building on a Mac
+
+To build on a Mac, open `void/` in VSCode. Make sure you've built the extension by following the steps above (or just run `cd ./extensions/void && npm install && npm run build && npm run compile && cd ../..`). Also make sure you have Python and XCode installed on your system (you probably do by default).
+
+1. Install all dependencies.
 
-1. Install all dependencies. Make sure you have yarn installed (`npm install -g yarn`)
 ```
-yarn
+npm install
 ```
 
-2. In VS Code, press <kbd>Ctrl+Shift+B</kbd> to start the build process - this can take some time. If you're not using VS Code, run `yarn watch` instead.
+2. Run `npm run watch`.
 
-3. Run `./scripts/code.sh` in your terminal.
+This can take ~5 min. It's done when you see something like:
+
+```
+[watch-extensions] [00:37:39] Finished compilation extensions with 0 errors after 19303 ms
+[watch-client    ] [00:38:06] Finished compilation with 0 errors after 46248 ms
+[watch-client    ] [00:38:07] Starting compilation...
+[watch-client    ] [00:38:07] Finished compilation with 0 errors after 5 ms
+```
+
+<!-- 3. Press <kbd>Ctrl+Shift+B</kbd> to start the build process. -->
+
+3. In a new terminal, run `./scripts/code.sh`.
 
 This should open up the built IDE after loading for some time. To see new changes without restarting the build, use <kbd>Ctrl+Shift+P</kbd> and run "Reload Window".
 
-To bundle the IDE, run `yarn gulp vscode-win32-x64`. Here are the full options: vscode-{win32-ia32 | win32-x64 | darwin-x64 | darwin-arm64 | linux-ia32 | linux-x64 | linux-arm}(-min)
-
-If you're on Windows, we recommend running the project inside a dev container. VSCode should prompt you to do this automatically.
+To bundle the IDE, run `npm run gulp vscode-darwin-arm64`. Here are the full options: `vscode-{win32-ia32 | win32-x64 | darwin-x64 | darwin-arm64 | linux-ia32 | linux-x64 | linux-arm}(-min)`
 
 Now that you're set up, feel free to check out our [Issues](https://github.com/voideditor/void/issues) page!
 
+**Common Fixes:**
+
+- Make sure you have the same NodeJS version as `.nvmrc`.
+
+- If you see `X [ERROR] Cannot start service: Host version "0.23.1" does not match binary version "0.23.0"`, run `npm i -D esbuild@0.23.0`
+
+### b. Building on Windows
+
+To build on Windows, please refer to [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute). We recommend building on Mac; we're Windows users who switch to Mac to build right now.
+
+<!-- Get [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community). Also find the boxes for "Desktop development with C++" and "Node.js development" and get those, too.
+
+If you get a node-gyp error in the next few steps, you should also get [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools), find the Visual Studio Build Tools box, click Install (or Modify), then in Individual Components:
+check every item under `MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)`, `C++ ATL for latest build tools with Spectre Mitigations`, and `C++ MFC for latest build tools with Spectre Mitigations`.
+
+
+```
+npm config set msvs_version 2022
+```
+ -->
+
 ## Roadmap
 
 Here are the most important topics on our Roadmap. More ⭐'s = more important.
 
+These sometimes get outdated - please refer to our Issues page for the latest issues.
 
+## ⭐⭐⭐ Make History work well.
 
-
-
-
-## ⭐⭐⭐ Improve diffs.
-
-We define a "diff" as a single green/red pair that denotes a change. Here are improvements to make:
-
-1. Show deletion (-) diffs. Right now we're only showing insertion (+) diffs. Diffs currently work by highlighting all of the new code in green with a simple text decoration. Instead, we would like to use code from VS Code's native diffEditor to show the diffs ("inline" mode). We could alternatively keep what we have and add red zones of the deleted code to indicate a deletion diff (-).
-
-2. Fix bugginess when the user presses "Accept" or "Reject" on a diff. One issue is that when a diff is accepted/rejected all of the diffs below should be updated (because they are now on different line numbers). There are other miscellaneous issues too.
-
-3. Make diff highlighting dynamic. Right now when the user edits text, all of the diffs and their highlights are cleared. Instead, we should update the highlighting of the diff. Each diff lives on a range of lines, and all changes inside that range or intersecting with it should update its highlighting.
-
+When the user submits a response or presses the apply/accept/reject button, we should add these events to the history, allowing the user to undo/redo them. Right now there is unexpected behavior if the user tries to undo or redo their changes.
 
 ## ⭐⭐⭐ Build Cursor-style quick edits (ctrl+k).
 
 When the user presses ctrl+k, an input box should appear inline with the code that they were selecting. This is somewhat difficult to do because an extension alone cannot do this, and it requires creating a new component in the IDE. We think you can modify vscode's built-in "codelens" or "zone widget" components, but we are open to alternatives.
 
-## ⭐⭐⭐ Make History work well.
-When the user submits a response or presses the apply/accept/reject button, we should add these events to the history, allowing the user to undo/redo them. Right now there is unexpected behavior if the user tries to undo or redo their changes.
-
-## ⭐⭐⭐ Improve Ctrl+L backend.
-
-Right now, the model outputs entire files. Instead, we should change the prompt so that the model outputs partial changes like `// ... rest of file`. When the user clicks the "Apply" button, the model should rewrite the file and apply the partial changes in the correct locations.
-
-## ⭐⭐ Integrate with Ollama.
-
-We have an Ollama integration coded up in the extension, but it breaks. This is because Ollama has Node.js dependencies like 'path' and 'os' which cannot run in extensions (extensions have to be able to run in the browser). To fix this, we need to migrate Void's extension so that it runs natively into the VS Code editor so that we can access Node.js.
-
 ## ⭐⭐⭐ Creative.
 
-Feel free to build AI features beyond the standard Cursor ones. For example, creating better code search, or supporting AI agents that can edit across files and make multiple LLM calls.
+Examples: creating better code search, or supporting AI agents that can edit across files and make multiple LLM calls.
 
 Eventually, we want to build a convenient API for creating AI tools. The API will provide methods for creating the UI (showing an autocomplete suggestion, or creating a new diff), detecting event changes (like `onKeystroke` or `onFileOpen`), and modifying the user's file-system (storing indexes associated with each file), making it much easier to make your own AI plugin. We plan on building these features further along in timeline, but we wanted to list them for completeness.
 
-
 ## ⭐ One-stars.
 
-⭐ When user presses ctrl+L it should clear the sidebar's state.
-
 ⭐ Let the user accept / reject all Diffs in an entire file via the sidebar.
 
-⭐ Allow the user to make multiple selections of code or files at once.
+# Guidelines
 
-⭐ Allow user to X out of their current selection.
+Please don't make big refactors without speaking with us first. We'd like to keep the codebase similar to vscode so we can periodically rebase, and if we have big changes that gets complicated.
 
 # Submitting a Pull Request
 
-When you've made changes and want to submit them, please submit a pull request. 
+Please submit a pull request once you've made a change. Here are a few guidelines:
+
+- A PR should be about one _single_ feature change. The fewer items you change, the more likely the PR is to be accepted.
+
+- Your PR should contain a description that first explains at a high level what you did, and then describes the exact changes you made (and to which files). Please don't use vague statements like "refactored code" or "improved types" (instead, describe what code you refactored, or what types you changed).
+
+- Try to avoid refactoring and making feature changes in the same PR.
+
+# Relevant files
+
+We keep track of all the files we've changed with Void so it's easy to rebase:
+
+- README.md
+- CONTRIBUTING.md
+- VOID_USEFUL_LINKS.md
+- product.json
+- package.json
+
+- src/vs/workbench/api/common/{extHost.api.impl.ts | extHostApiCommands.ts}
+- src/vs/workbench/workbench.common.main.ts
+- src/vs/workbench/contrib/void/\*
+- extensions/void/\*
+
+- .github/\*
+- .vscode/settings/\*
+- .eslintrc.json
+- build/hygiene.js
+- build/lib/i18n.resources.json
+- build/npm/dirs.js
+
+- vscode.proposed.editorInsets.d.ts - not modified, but code copied

README.md

@@ -1,9 +1,9 @@
 # Welcome to Void.
 
 
-Void is the open-source Cursor alternative. 
+Void is the open-source Cursor alternative.
 
-If you're new, welcome! Feel free to check out our [Task board](https://github.com/orgs/voideditor/projects/2/views/3) for the most pressing Issues to work on, and see [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md) to get started with the build environment.
+If you're new, welcome! Feel free to check out our [Project board](https://github.com/orgs/voideditor/projects/2/views/3) for the most pressing Issues to work on, and see [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md) for instructions on building and running Void.
 
 This repo contains the full sourcecode for Void. We have a [waitlist](https://voideditor.com/email) for downloading the official release, but you can build and develop Void right now.
 
@@ -19,4 +19,4 @@ For some useful links we've compiled see [`VOID_USEFUL_LINKS.md`](https://github
 
 
 ## Support
-Feel free to reach out in our [Discord](https://discord.gg/PspNkKG5wt) or contact us via email.
+Feel free to reach out in our [Discord](https://discord.gg/RSNjgaugJs) or contact us via email.

ThirdPartyNotices.txt

@@ -440,6 +440,580 @@ Title to copyright in this work will at all times remain with copyright holders.
 
 ---------------------------------------------------------
 
+dompurify 3.0.5 - Apache 2.0
+https://github.com/cure53/DOMPurify
+
+DOMPurify
+Copyright 2024 Dr.-Ing. Mario Heiderich, Cure53
+
+DOMPurify is free software; you can redistribute it and/or modify it under the
+terms of either:
+
+a) the Apache License Version 2.0, or
+b) the Mozilla Public License Version 2.0
+
+-----------------------------------------------------------------------------
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-----------------------------------------------------------------------------
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 dotnet/csharp-tmLanguage 0.1.0 - MIT
 https://github.com/dotnet/csharp-tmLanguage
 
@@ -545,7 +1119,7 @@ to the base-name name of the original file, and an extension of txt, html, or si
 
 ---------------------------------------------------------
 
-go-syntax 0.7.5 - MIT
+go-syntax 0.7.6 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -1534,7 +2108,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-RedCMD/YAML-Syntax-Highlighter 1.1.1 - MIT
+RedCMD/YAML-Syntax-Highlighter 1.1.2 - MIT
 https://github.com/RedCMD/YAML-Syntax-Highlighter
 
 MIT License

build/.cachesalt

@@ -1 +1 @@
-2024-08-14T18:12:43.548Z
+2024-09-04T10:21:29.952Z

build/.gitignore

@@ -1,2 +1 @@
-.yarnrc
 *.js.map

build/.moduleignore

@@ -163,7 +163,7 @@ typescript/lib/tsserverlibrary.js
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 es6-promise/lib/**
 

build/.npmrc

@@ -0,0 +1,5 @@
+disturl="https://nodejs.org/dist"
+runtime="node"
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000

build/.webignore

@@ -14,7 +14,7 @@
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 vscode-textmate/webpack.config.js
 

build/azure-pipelines/alpine/cli-build-alpine.yml

@@ -19,17 +19,9 @@ steps:
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    # Install yarn as the ARM64 build agent is using vanilla Ubuntu
-    - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
-      - task: Npm@1
-        displayName: Install yarn
-        inputs:
-          command: custom
-          customCommand: install --global yarn
-
     - script: |
         set -e
-        yarn --frozen-lockfile --ignore-optional
+        npm ci
       workingDirectory: build
       displayName: Install pipeline build
 

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

@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -27,12 +27,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js alpine $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js alpine $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -43,18 +43,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -75,12 +74,12 @@ steps:
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -89,7 +88,7 @@ steps:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
       VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:alpine-$(VSCODE_ARCH)
       VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
-    displayName: Install build dependencies
+    displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: node build/azure-pipelines/distro/mixin-npm
@@ -112,7 +111,7 @@ steps:
   - script: |
       set -e
       TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64") # TODO@joaomoreno
-      yarn gulp vscode-reh-$TARGET-min-ci
+      npm run gulp vscode-reh-$TARGET-min-ci
       (cd .. && mv vscode-reh-$TARGET vscode-server-$TARGET) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/server/vscode-server-$TARGET.tar.gz"
       DIR_PATH="$(realpath ../vscode-server-$TARGET)"
@@ -127,7 +126,7 @@ steps:
   - script: |
       set -e
       TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64")
-      yarn gulp vscode-reh-web-$TARGET-min-ci
+      npm run gulp vscode-reh-web-$TARGET-min-ci
       (cd .. && mv vscode-reh-web-$TARGET vscode-server-$TARGET-web) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/web/vscode-server-$TARGET-web.tar.gz"
       DIR_PATH="$(realpath ../vscode-server-$TARGET-web)"

build/azure-pipelines/cli/cli-darwin-sign.yml

@@ -4,7 +4,7 @@ parameters:
     default: []
 
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"

build/azure-pipelines/cli/cli-win32-sign.yml

@@ -4,7 +4,7 @@ parameters:
     default: []
 
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"

build/azure-pipelines/cli/install-rust-posix.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.77
+    default: 1.81
   - name: targets
     default: []
     type: object

build/azure-pipelines/cli/install-rust-win32.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.77
+    default: 1.81
   - name: targets
     default: []
     type: object

build/azure-pipelines/common/computeNodeModulesCacheKey.js

@@ -11,9 +11,10 @@ const { dirs } = require('../../npm/dirs');
 const ROOT = path.join(__dirname, '../../../');
 const shasum = crypto.createHash('sha256');
 shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
-shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
-shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
-// Add `package.json` and `yarn.lock` files
+shasum.update(fs.readFileSync(path.join(ROOT, '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'build', '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote', '.npmrc')));
+// Add `package.json` and `package-lock.json` files
 for (const dir of dirs) {
     const packageJsonPath = path.join(ROOT, dir, 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
@@ -25,8 +26,8 @@ for (const dir of dirs) {
         distro: packageJson.distro
     };
     shasum.update(JSON.stringify(relevantPackageJsonSections));
-    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
-    shasum.update(fs.readFileSync(yarnLockPath));
+    const packageLockPath = path.join(ROOT, dir, 'package-lock.json');
+    shasum.update(fs.readFileSync(packageLockPath));
 }
 // Add any other command line arguments
 for (let i = 2; i < process.argv.length; i++) {

build/azure-pipelines/common/computeNodeModulesCacheKey.ts

@@ -13,10 +13,11 @@ const ROOT = path.join(__dirname, '../../../');
 const shasum = crypto.createHash('sha256');
 
 shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
-shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
-shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'build', '.npmrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote', '.npmrc')));
 
-// Add `package.json` and `yarn.lock` files
+// Add `package.json` and `package-lock.json` files
 for (const dir of dirs) {
 	const packageJsonPath = path.join(ROOT, dir, 'package.json');
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
@@ -29,8 +30,8 @@ for (const dir of dirs) {
 	};
 	shasum.update(JSON.stringify(relevantPackageJsonSections));
 
-	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
-	shasum.update(fs.readFileSync(yarnLockPath));
+	const packageLockPath = path.join(ROOT, dir, 'package-lock.json');
+	shasum.update(fs.readFileSync(packageLockPath));
 }
 
 // Add any other command line arguments

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

@@ -17,31 +17,30 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
   - script: |
       set -e
+
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     workingDirectory: build
     displayName: Install build dependencies

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

@@ -13,7 +13,7 @@ steps:
     continueOnError: true
     displayName: Download ESRPClient
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"

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

@@ -7,12 +7,12 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
 steps:
-  - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -20,52 +20,52 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-esm.sh --tfs "Unit Tests"
-          displayName: Run unit tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-amd.sh --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-node-esm
-          displayName: Run unit tests (node.js) [ESM]
+        - script: npm run test-node-amd
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-browser-esm-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        - script: npm run test-browser-amd-no-install -- --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
-          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          displayName: Run unit tests (Browser, Chromium & Webkit) [AMD]
           timeoutInMinutes: 30
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test.sh --tfs "Unit Tests"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - script: yarn test-node
+        - script: npm run test-node
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
-        - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        - script: npm run test-browser-no-install -- --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
           displayName: Run unit tests (Browser, Chromium & Webkit)
           timeoutInMinutes: 30
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
-          displayName: Run unit tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-amd.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-node-esm --build
-          displayName: Run unit tests (node.js) [ESM]
+        - script: npm run test-node-amd -- --build
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-browser-esm-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        - script: npm run test-browser-amd-no-install -- --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
-          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          displayName: Run unit tests (Browser, Chromium & Webkit) [AMD]
           timeoutInMinutes: 30
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test.sh --build --tfs "Unit Tests"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - script: yarn test-node --build
+        - script: npm run test-node -- --build
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
-        - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        - script: npm run test-browser-no-install -- --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
           displayName: Run unit tests (Browser, Chromium & Webkit)
@@ -74,7 +74,7 @@ steps:
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
         set -e
-        yarn gulp \
+        npm run gulp \
           compile-extension:configuration-editing \
           compile-extension:css-language-features-server \
           compile-extension:emmet \
@@ -94,17 +94,17 @@ steps:
       displayName: Build integration tests
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
-          displayName: Run integration tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-integration-amd.sh --tfs "Integration Tests"
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test-integration --tfs "Integration Tests"
           displayName: Run integration tests (Electron)
           timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
         - script: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -113,12 +113,12 @@ steps:
             APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
             APP_NAME="`ls $APP_ROOT | head -n 1`"
             INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-            ./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
+            ./scripts/test-integration-amd.sh --build --tfs "Integration Tests"
           env:
             VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
-          displayName: Run integration tests (Electron) [ESM]
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -157,13 +157,14 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn --cwd test/smoke compile
+      - script: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - script: yarn gulp compile-extension-media
+      - script: npm run gulp compile-extension-media
         displayName: Compile extensions for smoke tests
 
-      - script: yarn smoketest-no-compile --tracing
+      - script: npm run smoketest-no-compile -- --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
@@ -172,11 +173,11 @@ steps:
           set -e
           APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
           APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
+          npm run smoketest-no-compile -- --tracing --build "$APP_ROOT/$APP_NAME"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless
+      - script: npm run smoketest-no-compile -- --web --tracing --headless
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web
         timeoutInMinutes: 20
@@ -184,10 +185,10 @@ steps:
 
       - script: |
           set -e
-          yarn gulp compile-extension:vscode-test-resolver
+          npm run gulp compile-extension:vscode-test-resolver
           APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
           APP_NAME="`ls $APP_ROOT | head -n 1`"
-          yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
+          npm run smoketest-no-compile -- --tracing --remote --build "$APP_ROOT/$APP_NAME"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
         timeoutInMinutes: 20

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

@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -20,31 +20,30 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
   - script: |
       set -e
+
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     workingDirectory: build
     displayName: Install build dependencies

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

@@ -9,7 +9,7 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
@@ -28,7 +28,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -48,12 +48,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -64,18 +64,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -92,12 +91,12 @@ steps:
       python3 -m pip install setuptools
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(VSCODE_ARCH)
@@ -134,7 +133,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
         echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -142,7 +141,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH) # TODO@joaomoreno
         ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH).zip"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -154,7 +153,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-web-darwin-$(VSCODE_ARCH) ../vscode-server-darwin-$(VSCODE_ARCH)-web # TODO@joaomoreno
         ARCHIVE_PATH=".build/darwin/server/vscode-server-darwin-$(VSCODE_ARCH)-web.zip"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -165,7 +164,7 @@ steps:
       displayName: Build server (web)
 
   - ${{ else }}:
-      - script: yarn gulp transpile-client-swc transpile-extensions
+      - script: npm run gulp transpile-client-swc transpile-extensions
         env:
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Transpile
@@ -177,7 +176,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
-        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
+        VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }}
 
   - ${{ elseif and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
     - task: DownloadPipelineArtifact@2

build/azure-pipelines/distro/download-distro.yml

@@ -1,5 +1,5 @@
 steps:
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -51,6 +51,5 @@ steps:
 
       unzip $ArchivePath -d .build
       mv .build/microsoft-vscode-distro-$DistroVersion .build/distro
-      cp remote/.yarnrc .build/distro/npm/remote/.yarnrc
     condition: and(succeeded(), not(contains(variables['Agent.OS'], 'windows')))
     displayName: Download distro (non-Windows)

build/azure-pipelines/linux/apt-retry.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+################################################################################
+##  Copied from https://github.com/actions/runner-images/blob/ubuntu22/20240825.1/images/ubuntu/scripts/build/configure-apt-mock.sh
+################################################################################
+
+i=1
+while [ $i -le 30 ];do
+  err=$(mktemp)
+  "$@" 2>$err
+
+  # no errors, break the loop and continue normal flow
+  test -f $err || break
+  cat $err >&2
+
+  retry=false
+
+  if grep -q 'Could not get lock' $err;then
+    # apt db locked needs retry
+    retry=true
+  elif grep -q 'Could not open file /var/lib/apt/lists' $err;then
+    # apt update is not completed, needs retry
+    retry=true
+  elif grep -q 'IPC connect call failed' $err;then
+    # the delay should help with gpg-agent not ready
+    retry=true
+  elif grep -q 'Temporary failure in name resolution' $err;then
+    # It looks like DNS is not updated with random generated hostname yet
+    retry=true
+  elif grep -q 'dpkg frontend is locked by another process' $err;then
+    # dpkg process is busy by another process
+    retry=true
+  fi
+
+  rm $err
+  if [ $retry = false ]; then
+    break
+  fi
+
+  sleep 5
+  echo "...retry $i"
+  i=$((i + 1))
+done

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

@@ -40,24 +40,23 @@ steps:
     displayName: Extract openssl prebuilt
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: node build/setup-npm-registry.js $NPM_REGISTRY
+    - script: node build/setup-npm-registry.js $NPM_REGISTRY build
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Setup NPM Registry
 
     - script: |
         set -e
-        npm config set registry "$NPM_REGISTRY" --location=project
-        # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-        # following is a workaround for yarn to send authorization header
-        # for GET requests to the registry.
-        echo "always-auth=true" >> .npmrc
-        yarn config set registry "$NPM_REGISTRY"
+        # Set the private NPM registry to the global npmrc file
+        # so that authentication works for subfolders like build/, remote/, extensions/ etc
+        # which does not have their own .npmrc file
+        npm config set registry "$NPM_REGISTRY"
+        echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-      displayName: Setup NPM & Yarn
+      displayName: Setup NPM
 
     - task: npmAuthenticate@0
       inputs:
-        workingFile: .npmrc
+        workingFile: $(NPMRC_PATH)
       condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Setup NPM Authentication
 
@@ -65,13 +64,14 @@ steps:
       set -e
 
       for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
+    workingDirectory: build
     displayName: Install build dependencies
 
   - script: |

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

@@ -5,7 +5,7 @@ parameters:
     type: boolean
   - name: VSCODE_ARCH
     type: string
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
@@ -18,7 +18,7 @@ steps:
 
   - template: ../distro/download-distro.yml
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -37,8 +37,8 @@ steps:
   - script: |
       set -e
       # Start X server
-      sudo apt-get update
-      sudo apt-get install -y pkg-config \
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get install -y pkg-config \
         dbus \
         xvfb \
         libgtk-3-0 \
@@ -62,18 +62,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -89,28 +88,31 @@ steps:
 
   - script: |
       set -e
-      # To workaround the issue of yarn not respecting the registry value from .npmrc
-      yarn config set registry "$NPM_REGISTRY"
 
       for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
+    workingDirectory: build
+    displayName: Install build dependencies
+
+  - script: |
+      set -e
 
       export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
       source ./build/azure-pipelines/linux/setup-env.sh --only-remote
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -134,7 +136,7 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-linux-$(VSCODE_ARCH)-min-ci
       ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
       echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH"
@@ -152,7 +154,7 @@ steps:
   - script: |
       set -e
       export VSCODE_NODE_GLIBC="-glibc-2.17"
-      yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
       mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/server/vscode-server-linux-legacy-$(VSCODE_ARCH).tar.gz"
       UNARCHIVE_PATH="`pwd`/../vscode-server-linux-$(VSCODE_ARCH)"
@@ -167,7 +169,7 @@ steps:
   - script: |
       set -e
       export VSCODE_NODE_GLIBC="-glibc-2.17"
-      yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+      npm run gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
       mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno
       ARCHIVE_PATH=".build/linux/web/vscode-server-linux-legacy-$(VSCODE_ARCH)-web.tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
@@ -204,7 +206,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: false
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: false
-        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
+        VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 

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

@@ -10,12 +10,12 @@ parameters:
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
 steps:
-  - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -36,30 +36,30 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-esm.sh --tfs "Unit Tests"
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-amd.sh --tfs "Unit Tests"
           env:
             DISPLAY: ":10"
-          displayName: Run unit tests (Electron) [ESM]
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-node-esm
-          displayName: Run unit tests (node.js) [ESM]
+        - script: npm run test-node-amd
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-browser-esm-no-install --browser chromium --tfs "Browser Unit Tests"
+        - script: npm run test-browser-amd-no-install -- --browser chromium --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
-          displayName: Run unit tests (Browser, Chromium) [ESM]
+          displayName: Run unit tests (Browser, Chromium) [AMD]
           timeoutInMinutes: 15
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test.sh --tfs "Unit Tests"
           env:
             DISPLAY: ":10"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - script: yarn test-node
+        - script: npm run test-node
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
-        - script: yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests"
+        - script: npm run test-browser-no-install -- --browser chromium --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
           displayName: Run unit tests (Browser, Chromium)
@@ -67,26 +67,26 @@ steps:
 
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
-          displayName: Run unit tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-amd.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-node-esm --build
-          displayName: Run unit tests (node.js) [ESM]
+        - script: npm run test-node-amd -- --build
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-browser-esm-no-install --build --browser chromium --tfs "Browser Unit Tests"
+        - script: npm run test-browser-amd-no-install -- --build --browser chromium --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
-          displayName: Run unit tests (Browser, Chromium) [ESM]
+          displayName: Run unit tests (Browser, Chromium) [AMD]
           timeoutInMinutes: 15
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test.sh --build --tfs "Unit Tests"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - script: yarn test-node --build
+        - script: npm run test-node -- --build
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
-        - script: yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
+        - script: npm run test-browser-no-install -- --build --browser chromium --tfs "Browser Unit Tests"
           env:
             DEBUG: "*browser*"
           displayName: Run unit tests (Browser, Chromium)
@@ -95,7 +95,7 @@ steps:
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
         set -e
-        yarn gulp \
+        npm run gulp \
           compile-extension:configuration-editing \
           compile-extension:css-language-features-server \
           compile-extension:emmet \
@@ -116,13 +116,13 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - script: ./scripts/test-integration-amd.sh --tfs "Integration Tests"
           env:
             DISPLAY: ":10"
-          displayName: Run integration tests (Electron) [ESM]
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: ./scripts/test-integration.sh --tfs "Integration Tests"
           env:
             DISPLAY: ":10"
@@ -138,7 +138,7 @@ steps:
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
         - script: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -148,12 +148,12 @@ steps:
             APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
             INTEGRATION_TEST_APP_NAME="$APP_NAME" \
             INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-            ./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
+            ./scripts/test-integration-amd.sh --build --tfs "Integration Tests"
           env:
             VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
-          displayName: Run integration tests (Electron) [ESM]
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - script: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -198,34 +198,35 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn --cwd test/smoke compile
+      - script: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - script: yarn gulp compile-extension:markdown-language-features compile-extension:ipynb compile-extension-media compile-extension:vscode-test-resolver
+      - script: npm run gulp compile-extension:markdown-language-features compile-extension:ipynb compile-extension-media compile-extension:vscode-test-resolver
         displayName: Build extensions for smoke tests
 
-      - script: yarn gulp node
+      - script: npm run gulp node
         displayName: Download node.js for remote smoke tests
         retryCountOnTaskFailure: 3
 
-      - script: yarn smoketest-no-compile --tracing
+      - script: npm run smoketest-no-compile -- --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
+      - script: npm run smoketest-no-compile -- --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Browser, Chromium)
 
-      - script: yarn smoketest-no-compile --remote --tracing
+      - script: npm run smoketest-no-compile -- --remote --tracing
         timeoutInMinutes: 20
         displayName: Run smoke tests (Remote)
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+      - script: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Electron)
 
-      - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
+      - script: npm run smoketest-no-compile -- --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web
         timeoutInMinutes: 20
@@ -233,10 +234,10 @@ steps:
 
       - script: |
           set -e
-          yarn gulp compile-extension:vscode-test-resolver
+          npm run gulp compile-extension:vscode-test-resolver
           APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
           VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)" \
-          yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
+          npm run smoketest-no-compile -- --tracing --remote --build "$APP_PATH"
         timeoutInMinutes: 20
         displayName: Run smoke tests (Remote)
 

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

@@ -11,7 +11,7 @@ parameters:
     type: boolean
   - name: VSCODE_ARCH
     type: string
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
@@ -30,7 +30,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -49,8 +49,8 @@ steps:
   - script: |
       set -e
       # Start X server
-      sudo apt-get update
-      sudo apt-get install -y pkg-config \
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
+      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get install -y pkg-config \
         dbus \
         xvfb \
         libgtk-3-0 \
@@ -72,12 +72,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -88,18 +88,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -107,23 +106,44 @@ steps:
       set -e
 
       for i in {1..5}; do # try 5 times
-        yarn --cwd build --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
+    workingDirectory: build
+    displayName: Install build dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  # Step will be used by both Install dependencies and building rpm package,
+  # hence avoid adding it behind NODE_MODULES_RESTORED condition.
+  - script: |
+      set -e
+      SYSROOT_ARCH=$VSCODE_ARCH
+      if [ "$SYSROOT_ARCH" == "x64" ]; then
+        SYSROOT_ARCH="amd64"
+      fi
+      export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
+      SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+    env:
+      VSCODE_ARCH: $(VSCODE_ARCH)
+      GITHUB_TOKEN: "$(github-distro-mixin-password)"
+    displayName: Download vscode sysroots
+
+  - script: |
+      set -e
 
       source ./build/azure-pipelines/linux/setup-env.sh
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       npm_config_arch: $(NPM_ARCH)
@@ -170,7 +190,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-linux-$(VSCODE_ARCH)-min-ci
         ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
         echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH"
@@ -203,7 +223,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno
         ARCHIVE_PATH=".build/linux/server/vscode-server-linux-$(VSCODE_ARCH).tar.gz"
         UNARCHIVE_PATH="`pwd`/../vscode-server-linux-$(VSCODE_ARCH)"
@@ -217,7 +237,7 @@ steps:
 
     - script: |
         set -e
-        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+        npm run gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
         mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno
         ARCHIVE_PATH=".build/linux/web/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
@@ -258,7 +278,7 @@ steps:
         displayName: Check GLIBC and GLIBCXX dependencies in server archive
 
   - ${{ else }}:
-    - script: yarn gulp "transpile-client-swc" "transpile-extensions"
+    - script: npm run gulp "transpile-client-swc" "transpile-extensions"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Transpile client and extensions
@@ -270,38 +290,50 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
-        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
+        VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
   - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Prepare deb package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
         echo "##vso[task.setvariable variable=DEB_PATH]$(ls .build/linux/deb/*/deb/*.deb)"
       displayName: Build deb package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm"
+        TRIPLE=""
+        if [ "$VSCODE_ARCH" == "x64" ]; then
+          TRIPLE="x86_64-linux-gnu"
+        elif [ "$VSCODE_ARCH" == "arm64" ]; then
+          TRIPLE="aarch64-linux-gnu"
+        elif [ "$VSCODE_ARCH" == "armhf" ]; then
+          TRIPLE="arm-rpi-linux-gnueabihf"
+        fi
+        export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
+        export STRIP="$VSCODE_SYSROOT_DIR/$TRIPLE/$TRIPLE/bin/strip"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm"
+      env:
+        VSCODE_ARCH: $(VSCODE_ARCH)
       displayName: Prepare rpm package
 
     - script:  |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
         echo "##vso[task.setvariable variable=RPM_PATH]$(ls .build/linux/rpm/*/*.rpm)"
       displayName: Build rpm package
 
     - script: |
         set -e
-        yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+        npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
         ARCHIVE_PATH=".build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
         mkdir -p $(dirname $ARCHIVE_PATH)
         tar -czf $ARCHIVE_PATH -C .build/linux snap

build/azure-pipelines/linux/setup-env.sh

@@ -8,7 +8,12 @@ if [ "$SYSROOT_ARCH" == "x64" ]; then
 fi
 
 export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
-SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+if [ -d "$VSCODE_SYSROOT_DIR" ]; then
+  echo "Using cached sysroot"
+else
+  echo "Downloading sysroot"
+  SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+fi
 
 if [ "$npm_config_arch" == "x64" ]; then
   if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then

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

@@ -5,11 +5,11 @@ steps:
       versionFilePath: .nvmrc
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
-  - task: DownloadPipelineArtifact@0
+  - task: DownloadPipelineArtifact@2
     displayName: "Download Pipeline Artifact"
     inputs:
-      artifactName: snap-$(VSCODE_ARCH)
-      targetPath: .build/linux/snap-tarball
+      artifact: snap-$(VSCODE_ARCH)
+      path: .build/linux/snap-tarball
 
   - script: |
       set -e
@@ -22,17 +22,11 @@ steps:
       sudo apt-get upgrade -y
       sudo apt-get install -y curl apt-transport-https ca-certificates
 
-      # Yarn
-      curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-      echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-      sudo apt-get update
-      sudo apt-get install -y yarn
-
       # Define variables
       SNAP_ROOT="$(pwd)/.build/linux/snap/$(VSCODE_ARCH)"
 
       # Install build dependencies
-      (cd build && yarn)
+      (cd build && npm ci)
 
       # Unpack snap tarball artifact, in order to preserve file perms
       (cd .build/linux && tar -xzf snap-tarball/snap-$(VSCODE_ARCH).tar.gz)

build/azure-pipelines/linux/verify-glibc-requirements.sh

@@ -10,7 +10,7 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
 fi
 
 # Get all files with .node extension from server folder
-files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -o -type f -executable -name "node")
+files=$(find $SEARCH_PATH -name "*.node" -not -path "*prebuilds*" -not -path "*extensions/node_modules/@parcel/watcher*" -o -type f -executable -name "node")
 
 echo "Verifying requirements for files: $files"
 

build/azure-pipelines/oss/product-build-pr-cache-linux.yml

@@ -13,12 +13,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -29,18 +29,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -51,12 +50,12 @@ steps:
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1

build/azure-pipelines/oss/product-build-pr-cache-win32.yml

@@ -15,12 +15,12 @@ steps:
 
   - pwsh: |
       mkdir .build -ea 0
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/yarnlockhash
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -32,18 +32,18 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -53,7 +53,7 @@ steps:
       $ErrorActionPreference = "Stop"
       $env:npm_config_arch="$(VSCODE_ARCH)"
       $env:CHILD_CONCURRENCY="1"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

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

@@ -21,12 +21,14 @@ variables:
     value: oss
   - name: VSCODE_STEP_ON_IT
     value: false
+  - name: VSCODE_BUILD_AMD
+    value: false
 
 jobs:
   - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
     - job: Compile
       displayName: Compile & Hygiene
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -37,7 +39,7 @@ jobs:
 
     - job: Linuxx64UnitTest
       displayName: Linux (Unit Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -48,6 +50,7 @@ jobs:
           parameters:
             VSCODE_ARCH: x64
             VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
             VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
             VSCODE_RUN_UNIT_TESTS: true
             VSCODE_RUN_INTEGRATION_TESTS: false
@@ -55,7 +58,7 @@ jobs:
 
     - job: Linuxx64IntegrationTest
       displayName: Linux (Integration Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -66,6 +69,7 @@ jobs:
           parameters:
             VSCODE_ARCH: x64
             VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
             VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
             VSCODE_RUN_UNIT_TESTS: false
             VSCODE_RUN_INTEGRATION_TESTS: true
@@ -73,7 +77,7 @@ jobs:
 
     - job: Linuxx64SmokeTest
       displayName: Linux (Smoke Tests)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -84,6 +88,7 @@ jobs:
           parameters:
             VSCODE_ARCH: x64
             VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
             VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
             VSCODE_RUN_UNIT_TESTS: false
             VSCODE_RUN_INTEGRATION_TESTS: false
@@ -91,14 +96,14 @@ jobs:
 
     - job: LinuxCLI
       displayName: Linux (CLI)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       steps:
         - template: cli/test.yml@self
 
     - job: Windowsx64UnitTests
       displayName: Windows (Unit Tests)
-      pool: 1es-oss-windows-2019-x64
+      pool: 1es-oss-windows-2022-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -107,6 +112,7 @@ jobs:
         - template: win32/product-build-win32.yml@self
           parameters:
             VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
             VSCODE_ARCH: x64
             VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
             VSCODE_RUN_UNIT_TESTS: true
@@ -115,8 +121,8 @@ jobs:
 
     - job: Windowsx64IntegrationTests
       displayName: Windows (Integration Tests)
-      pool: 1es-oss-windows-2019-x64
-      timeoutInMinutes: 30
+      pool: 1es-oss-windows-2022-x64
+      timeoutInMinutes: 60
       variables:
         VSCODE_ARCH: x64
         NPM_ARCH: x64
@@ -124,6 +130,7 @@ jobs:
         - template: win32/product-build-win32.yml@self
           parameters:
             VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
             VSCODE_ARCH: x64
             VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
             VSCODE_RUN_UNIT_TESTS: false
@@ -132,7 +139,7 @@ jobs:
 
     # - job: Windowsx64SmokeTests
     #   displayName: Windows (Smoke Tests)
-    #   pool: 1es-oss-windows-2019-x64
+    #   pool: 1es-oss-windows-2022-x64
     #   timeoutInMinutes: 30
     #   variables:
     #     VSCODE_ARCH: x64
@@ -149,7 +156,7 @@ jobs:
   - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
     - job: Linuxx64MaintainNodeModulesCache
       displayName: Linux (Maintain node_modules cache)
-      pool: 1es-oss-ubuntu-20.04-x64
+      pool: 1es-oss-ubuntu-22.04-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64
@@ -158,7 +165,7 @@ jobs:
 
     - job: Windowsx64MaintainNodeModulesCache
       displayName: Windows (Maintain node_modules cache)
-      pool: 1es-oss-windows-2019-x64
+      pool: 1es-oss-windows-2022-x64
       timeoutInMinutes: 30
       variables:
         VSCODE_ARCH: x64

build/azure-pipelines/product-build.yml

@@ -100,8 +100,8 @@ parameters:
     displayName: "Skip tests"
     type: boolean
     default: false
-  - name: VSCODE_BUILD_ESM # TODO@bpasero TODO@esm remove me once ESM is shipped
-    displayName: "️❗ Build as ESM (!FOR TESTING ONLY!) ️❗"
+  - name: VSCODE_BUILD_AMD # TODO@bpasero TODO@esm remove me once AMD is removed
+    displayName: "️❗ Build as AMD (!FOR EMERGENCY ONLY!) ️❗"
     type: boolean
     default: false
 
@@ -114,8 +114,8 @@ variables:
     value: ${{ parameters.CARGO_REGISTRY }}
   - name: VSCODE_QUALITY
     value: ${{ parameters.VSCODE_QUALITY }}
-  - name: VSCODE_BUILD_ESM
-    value: ${{ parameters.VSCODE_BUILD_ESM }}
+  - name: VSCODE_BUILD_AMD
+    value: ${{ parameters.VSCODE_BUILD_AMD }}
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
@@ -201,6 +201,7 @@ extends:
         enableExclusions: true
         exclusionsFilePath: $(Build.SourcesDirectory)/.eslintignore
       sourceAnalysisPool: 1es-windows-2022-x64
+      createAdoIssuesForJustificationsForDisablement: false
     containers:
       snapcraft:
         image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64
@@ -216,7 +217,7 @@ extends:
           - job: Compile
             timeoutInMinutes: 90
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             variables:
               VSCODE_ARCH: x64
@@ -224,7 +225,7 @@ extends:
               - template: build/azure-pipelines/product-compile.yml@self
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                  VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                  VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
 
       - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
         - stage: CompileCLI
@@ -233,7 +234,7 @@ extends:
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
               - job: CLILinuxX64
                 pool:
-                  name: 1es-ubuntu-20.04-x64
+                  name: 1es-ubuntu-22.04-x64
                   os: linux
                 steps:
                   - template: build/azure-pipelines/linux/cli-build-linux.yml@self
@@ -245,7 +246,7 @@ extends:
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true))) }}:
               - job: CLILinuxGnuARM
                 pool:
-                  name: 1es-ubuntu-20.04-x64
+                  name: 1es-ubuntu-22.04-x64
                   os: linux
                 steps:
                   - template: build/azure-pipelines/linux/cli-build-linux.yml@self
@@ -257,7 +258,7 @@ extends:
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
               - job: CLIAlpineX64
                 pool:
-                  name: 1es-ubuntu-20.04-x64
+                  name: 1es-ubuntu-22.04-x64
                   os: linux
                 steps:
                   - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
@@ -362,7 +363,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
@@ -377,7 +378,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -392,7 +393,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -408,7 +409,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -432,7 +433,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_ARCH: arm64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -446,7 +447,7 @@ extends:
             - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
@@ -461,7 +462,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -477,7 +478,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
@@ -493,7 +494,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -511,7 +512,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
                       VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -537,7 +538,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: armhf
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -553,7 +554,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: arm64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -578,7 +579,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER, true) }}:
@@ -591,7 +592,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: armhf
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_RUN_INTEGRATION_TESTS: false
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER, true) }}:
@@ -604,7 +605,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: arm64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_RUN_INTEGRATION_TESTS: false
 
       - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}:
@@ -614,7 +615,7 @@ extends:
             - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
@@ -657,7 +658,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -671,7 +672,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
@@ -685,7 +686,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -700,7 +701,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -715,7 +716,7 @@ extends:
                     - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                       parameters:
                         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                        VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                        VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                         VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                         VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
                         VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -747,7 +748,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
+                      VSCODE_BUILD_AMD: ${{ variables.VSCODE_BUILD_AMD }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -787,7 +788,7 @@ extends:
           dependsOn:
             - Compile
           pool:
-            name: 1es-ubuntu-20.04-x64
+            name: 1es-ubuntu-22.04-x64
             os: linux
           jobs:
             - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}:
@@ -817,7 +818,7 @@ extends:
           - stage: ApproveRelease
             dependsOn: [] # run in parallel to compile stage
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             jobs:
               - deployment: ApproveRelease
@@ -838,7 +839,7 @@ extends:
               - ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false)) }}:
                 - ApproveRelease
             pool:
-              name: 1es-ubuntu-20.04-x64
+              name: 1es-ubuntu-22.04-x64
               os: linux
             jobs:
               - job: ReleaseBuild

build/azure-pipelines/product-compile.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: VSCODE_QUALITY
     type: string
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
@@ -15,7 +15,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ./distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -26,12 +26,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -42,18 +42,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -63,15 +62,14 @@ steps:
 
   - script: |
       set -e
-      npm i -g node-gyp@9.4.0
 
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -94,38 +92,47 @@ steps:
     displayName: Create node_modules archive
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: yarn --cwd build compile && ./.github/workflows/check-clean-git-state.sh
+    - script: npm run compile
+      workingDirectory: build
+      displayName: Compile /build/ folder
+
+    - script: .github/workflows/check-clean-git-state.sh
       displayName: Check /build/ folder
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: node build/azure-pipelines/distro/mixin-quality
       displayName: Mixin distro quality
 
-  - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-    - script: node migrate.mjs --disable-watch
-      displayName: Migrate to ESM
+  - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+    - script: node migrate.mjs --disable-watch --enable-esm-to-amd
+      displayName: Migrate ESM -> AMD
 
   - template: common/install-builtin-extensions.yml@self
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: yarn npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       displayName: Compile & Hygiene (OSS)
   - ${{ else }}:
-    - script: yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
-        DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       displayName: Compile & Hygiene (non-OSS)
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
-        yarn --cwd test/smoke compile
-        yarn --cwd test/integration/browser compile
-      displayName: Compile test suites (non-OSS)
+        npm run compile
+      displayName: Compile smoke test suites (non-OSS)
+      workingDirectory: test/smoke
+      condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+    - script: |
+        set -e
+        npm run compile
+      displayName: Compile integration test suites (non-OSS)
+      workingDirectory: test/integration/browser
       condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
     - task: AzureCLI@2
@@ -171,7 +178,7 @@ steps:
         sbomEnabled: false
       displayName: Publish compilation artifact
 
-    - script: yarn download-builtin-extensions-cg
+    - script: npm run download-builtin-extensions-cg
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Download component details of built-in extensions

build/azure-pipelines/product-publish.yml

@@ -8,14 +8,14 @@ steps:
   - task: SFP.build-tasks.esrpclient-tools-task.EsrpClientTool@2
     displayName: "Use EsrpClient"
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password,esrp-aad-username,esrp-aad-password"
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -26,10 +26,8 @@ steps:
   - pwsh: Write-Host "##vso[build.addbuildtag]🚀"
     displayName: Add build tag
 
-  - pwsh: node build/npm/setupBuildYarnrc
-    displayName: Prepare build dependencies
-
-  - pwsh: yarn
+  - pwsh: |
+      npm ci
     workingDirectory: build
     displayName: Install build dependencies
 

build/azure-pipelines/product-release.yml

@@ -23,7 +23,12 @@ steps:
 
   - script: |
       set -e
-      (cd build ; yarn)
+      npm ci
+    workingDirectory: build
+    displayName: Install /build dependencies
+
+  - script: |
+      set -e
       AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
       AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
       AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \

build/azure-pipelines/publish-types/publish-types.yml

@@ -34,7 +34,7 @@ steps:
 
   - bash: |
       # Install build dependencies
-      (cd build && yarn)
+      (cd build && npm ci)
       node build/azure-pipelines/publish-types/check-version.js
     displayName: Check version
 

build/azure-pipelines/upload-sourcemaps.js

@@ -8,6 +8,7 @@ const path = require("path");
 const es = require("event-stream");
 const vfs = require("vinyl-fs");
 const util = require("../lib/util");
+const amd_1 = require("../lib/amd");
 // @ts-ignore
 const deps = require("../lib/dependencies");
 const identity_1 = require("@azure/identity");
@@ -25,13 +26,16 @@ function src(base, maps = `${base}/**/*.map`) {
     }));
 }
 function main() {
+    if ((0, amd_1.isAMD)()) {
+        return Promise.resolve(); // in AMD we run into some issues, but we want to unblock the build for recovery
+    }
     const sources = [];
     // vscode client maps (default)
     if (!base) {
         const vs = src('out-vscode-min'); // client source-maps only
         sources.push(vs);
         const productionDependencies = deps.getProductionDependencies(root);
-        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => `./${d}/**/*.map`);
         const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
             .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
             .pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));

build/azure-pipelines/upload-sourcemaps.ts

@@ -8,6 +8,7 @@ import * as es from 'event-stream';
 import * as Vinyl from 'vinyl';
 import * as vfs from 'vinyl-fs';
 import * as util from '../lib/util';
+import { isAMD } from '../lib/amd';
 // @ts-ignore
 import * as deps from '../lib/dependencies';
 import { ClientSecretCredential } from '@azure/identity';
@@ -29,6 +30,9 @@ function src(base: string, maps = `${base}/**/*.map`) {
 }
 
 function main(): Promise<void> {
+	if (isAMD()) {
+		return Promise.resolve(); // in AMD we run into some issues, but we want to unblock the build for recovery
+	}
 	const sources: any[] = [];
 
 	// vscode client maps (default)
@@ -36,8 +40,8 @@ function main(): Promise<void> {
 		const vs = src('out-vscode-min'); // client source-maps only
 		sources.push(vs);
 
-		const productionDependencies: { name: string; path: string; version: string }[] = deps.getProductionDependencies(root);
-		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+		const productionDependencies = deps.getProductionDependencies(root);
+		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => `./${d}/**/*.map`);
 		const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
 			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`)));

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

@@ -7,7 +7,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -27,12 +27,12 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web > .build/yarnlockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -43,18 +43,17 @@ steps:
 
   - script: |
       set -e
-      npm config set registry "$NPM_REGISTRY" --location=project
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      echo "always-auth=true" >> .npmrc
-      yarn config set registry "$NPM_REGISTRY"
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      npm config set registry "$NPM_REGISTRY"
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -65,12 +64,12 @@ steps:
   - script: |
       set -e
       for i in {1..5}; do # try 5 times
-        yarn --frozen-lockfile --check-files && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
+        npm ci && break
+        if [ $i -eq 5 ]; then
+          echo "Npm install failed too many times" >&2
           exit 1
         fi
-        echo "Yarn failed $i, trying again..."
+        echo "Npm install failed $i, trying again..."
       done
     env:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -98,13 +97,12 @@ steps:
 
   - script: |
       set -e
-      yarn gulp vscode-web-min-ci
+      npm run gulp vscode-web-min-ci
       ARCHIVE_PATH=".build/web/vscode-web.tar.gz"
       mkdir -p $(dirname $ARCHIVE_PATH)
       tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-web
       echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH"
     env:
-      DISABLE_V8_COMPILE_CACHE: 1 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build
 

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

@@ -17,21 +17,20 @@ steps:
     displayName: Setup NPM Registry
 
   - powershell: |
-      . azure-pipelines/win32/exec.ps1
+      . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
-    workingDirectory: build
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: build/.npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -40,7 +39,7 @@ steps:
       . azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
       $env:CHILD_CONCURRENCY="1"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     workingDirectory: build
     displayName: Install build dependencies
 

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

@@ -12,12 +12,12 @@ parameters:
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
 steps:
-  - powershell: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -25,21 +25,21 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - powershell: .\scripts\test-esm.bat --tfs "Unit Tests"
-          displayName: Run unit tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - powershell: .\scripts\test-amd.bat --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - powershell: yarn test-node-esm
-          displayName: Run unit tests (node.js) [ESM]
+        - powershell: npm run test-node-amd
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - powershell: node test/unit/browser/index.esm.js --sequential --browser chromium --tfs "Browser Unit Tests"
-          displayName: Run unit tests (Browser, Chromium) [ESM]
+        - powershell: node test/unit/browser/index.amd.js --sequential --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - powershell: .\scripts\test.bat --tfs "Unit Tests"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - powershell: yarn test-node
+        - powershell: npm run test-node
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
         - powershell: node test/unit/browser/index.js --sequential --browser chromium --tfs "Browser Unit Tests"
@@ -47,24 +47,24 @@ steps:
           timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - powershell: .\scripts\test-esm.bat --build --tfs "Unit Tests"
-          displayName: Run unit tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - powershell: .\scripts\test-amd.bat --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [AMD]
           timeoutInMinutes: 15
-        - script: yarn test-node-esm --build
-          displayName: Run unit tests (node.js) [ESM]
+        - script: npm run test-node-amd -- --build
+          displayName: Run unit tests (node.js) [AMD]
           timeoutInMinutes: 15
-        - powershell: yarn test-browser-esm-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
-          displayName: Run unit tests (Browser, Chromium) [ESM]
+        - powershell: npm run test-browser-amd-no-install -- --sequential --build --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - powershell: .\scripts\test.bat --build --tfs "Unit Tests"
           displayName: Run unit tests (Electron)
           timeoutInMinutes: 15
-        - powershell: yarn test-node --build
+        - powershell: npm run test-node -- --build
           displayName: Run unit tests (node.js)
           timeoutInMinutes: 15
-        - powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
+        - powershell: npm run test-browser-no-install -- --sequential --build --browser chromium --tfs "Browser Unit Tests"
           displayName: Run unit tests (Browser, Chromium)
           timeoutInMinutes: 20
 
@@ -72,7 +72,7 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp `
+        exec { npm run gulp `
           compile-extension:configuration-editing `
           compile-extension:css-language-features-server `
           compile-extension:emmet `
@@ -98,17 +98,17 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
-        - powershell: .\scripts\test-integration-esm.bat --tfs "Integration Tests"
-          displayName: Run integration tests (Electron) [ESM]
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
+        - powershell: .\scripts\test-integration-amd.bat --tfs "Integration Tests"
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - powershell: .\scripts\test-integration.bat --tfs "Integration Tests"
           displayName: Run integration tests (Electron)
           timeoutInMinutes: 20
 
-      - powershell: .\scripts\test-web-integration.bat --browser firefox
-        displayName: Run integration tests (Browser, Firefox)
+      - powershell: .\scripts\test-web-integration.bat --browser chromium
+        displayName: Run integration tests (Browser, Chromium)
         timeoutInMinutes: 20
 
       - powershell: .\scripts\test-remote-integration.bat
@@ -116,7 +116,7 @@ steps:
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, true) }}:
         - powershell: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -128,10 +128,10 @@ steps:
             $AppNameShort = $AppProductJson.nameShort
             $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
             $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)"
-            exec { .\scripts\test-integration-esm.bat --build --tfs "Integration Tests" }
-          displayName: Run integration tests (Electron) [ESM]
+            exec { .\scripts\test-integration-amd.bat --build --tfs "Integration Tests" }
+          displayName: Run integration tests (Electron) [AMD]
           timeoutInMinutes: 20
-      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+      - ${{ if eq(parameters.VSCODE_BUILD_AMD, false) }}:
         - powershell: |
             # Figure out the full absolute path of the product we just built
             # including the remote server and configure the integration tests
@@ -179,32 +179,33 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: yarn --cwd test/smoke compile
+      - powershell: npm run compile
+        workingDirectory: test/smoke
         displayName: Compile smoke tests
 
-      - powershell: yarn gulp compile-extension-media
+      - powershell: npm run gulp compile-extension-media
         displayName: Build extensions for smoke tests
 
-      - powershell: yarn smoketest-no-compile --tracing
+      - powershell: npm run smoketest-no-compile -- --tracing
         displayName: Run smoke tests (Electron)
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      - powershell: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
         displayName: Run smoke tests (Electron)
         timeoutInMinutes: 20
 
-      - powershell: yarn smoketest-no-compile --web --tracing --headless
+      - powershell: npm run smoketest-no-compile -- --web --tracing --headless
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)-web
         displayName: Run smoke tests (Browser, Chromium)
         timeoutInMinutes: 20
 
-      - powershell: yarn gulp compile-extension:vscode-test-resolver
+      - powershell: npm run gulp compile-extension:vscode-test-resolver
         displayName: Compile test resolver extension
         timeoutInMinutes: 20
 
-      - powershell: yarn smoketest-no-compile --tracing --remote --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      - powershell: npm run smoketest-no-compile -- --tracing --remote --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
         env:
           VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)
         displayName: Run smoke tests (Remote)

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

@@ -11,7 +11,7 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
-  - name: VSCODE_BUILD_ESM
+  - name: VSCODE_BUILD_AMD
     type: boolean
     default: false
 
@@ -35,7 +35,7 @@ steps:
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - template: ../distro/download-distro.yml@self
 
-    - task: AzureKeyVault@1
+    - task: AzureKeyVault@2
       displayName: "Azure Key Vault: Get Secrets"
       inputs:
         azureSubscription: "vscode-builds-subscription"
@@ -60,12 +60,12 @@ steps:
 
   - pwsh: |
       mkdir .build -ea 0
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/yarnlockhash
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
     inputs:
-      key: '"node_modules" | .build/yarnlockhash'
+      key: '"node_modules" | .build/packagelockhash'
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -77,18 +77,18 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -96,7 +96,7 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     env:
       npm_config_arch: $(VSCODE_ARCH)
       CHILD_CONCURRENCY: 1
@@ -132,7 +132,7 @@ steps:
       retryCountOnTaskFailure: 3
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - powershell: yarn gulp "transpile-client-swc" "transpile-extensions"
+    - powershell: npm run gulp "transpile-client-swc" "transpile-extensions"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Transpile client and extensions
@@ -145,8 +145,8 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
-        exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+        exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
         echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
         echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
       env:
@@ -156,7 +156,7 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
         mv ..\vscode-reh-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH) # TODO@joaomoreno
         echo "##vso[task.setvariable variable=BUILT_SERVER]true"
         echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)"
@@ -167,7 +167,7 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
+        exec { npm run gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" }
         mv ..\vscode-reh-web-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH)-web # TODO@joaomoreno
         echo "##vso[task.setvariable variable=BUILT_WEB]true"
       env:
@@ -182,7 +182,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
-        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
+        VSCODE_BUILD_AMD: ${{ parameters.VSCODE_BUILD_AMD }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
@@ -275,7 +275,7 @@ steps:
           $env:ESRPPKI = "$(ESRP-PKI)"
           $env:ESRPAADUsername = "$(esrp-aad-username)"
           $env:ESRPAADPassword = "$(esrp-aad-password)"
-          exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
+          exec { npm run -- gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign }
           $SetupPath = ".build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe"
           mv .build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe $SetupPath
           echo "##vso[task.setvariable variable=SYSTEM_SETUP_PATH]$SetupPath"
@@ -287,7 +287,7 @@ steps:
           $env:ESRPPKI = "$(ESRP-PKI)"
           $env:ESRPAADUsername = "$(esrp-aad-username)"
           $env:ESRPAADPassword = "$(esrp-aad-password)"
-          exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
+          exec { npm run -- gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
           $SetupPath = ".build\win32-$(VSCODE_ARCH)\user-setup\VSCodeUserSetup-$(VSCODE_ARCH)-$(VSCODE_VERSION).exe"
           mv .build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe $SetupPath
           echo "##vso[task.setvariable variable=USER_SETUP_PATH]$SetupPath"

build/azure-pipelines/win32/sdl-scan-win32.yml

@@ -18,7 +18,7 @@ steps:
 
   - template: ../distro/download-distro.yml@self
 
-  - task: AzureKeyVault@1
+  - task: AzureKeyVault@2
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
@@ -32,18 +32,18 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
-      # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
-      # following is a workaround for yarn to send authorization header
-      # for GET requests to the registry.
-      exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "$env:NPM_REGISTRY" }
+      # Set the private NPM registry to the global npmrc file
+      # so that authentication works for subfolders like build/, remote/, extensions/ etc
+      # which does not have their own .npmrc file
+      exec { npm config set registry "$env:NPM_REGISTRY" }
+      $NpmrcPath = (npm config get userconfig)
+      echo "##vso[task.setvariable variable=NPMRC_PATH]$NpmrcPath"
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM & Yarn
+    displayName: Setup NPM
 
   - task: npmAuthenticate@0
     inputs:
-      workingFile: .npmrc
+      workingFile: $(NPMRC_PATH)
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
@@ -82,7 +82,7 @@ steps:
       . build/azure-pipelines/win32/exec.ps1
       . build/azure-pipelines/win32/retry.ps1
       $ErrorActionPreference = "Stop"
-      retry { exec { yarn --frozen-lockfile --check-files } }
+      retry { exec { npm ci } }
     env:
       npm_config_arch: ${{ parameters.VSCODE_ARCH }}
       CHILD_CONCURRENCY: 1
@@ -99,7 +99,7 @@ steps:
     env:
       VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
 
-  - powershell: yarn compile
+  - powershell: npm run compile
     displayName: Compile
 
   - powershell: |
@@ -109,7 +109,7 @@ steps:
       Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.pdb"
     displayName: List files
 
-  - powershell: yarn gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
+  - powershell: npm run gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Symbols

build/buildfile.js

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const { isESM } = require('./lib/esm');
+const { isAMD } = require('./lib/amd');
 
 /**
  * @param {string} name
@@ -71,7 +71,7 @@ exports.workerOutputLinks = createEditorWorkerModuleDescription('vs/workbench/co
 exports.workerBackgroundTokenization = createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker');
 
 exports.workbenchDesktop = function () {
-	return isESM() ? [
+	return !isAMD() ? [
 		createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
 		createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
 		createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
@@ -90,12 +90,12 @@ exports.workbenchDesktop = function () {
 };
 
 exports.workbenchWeb = function () {
-	return isESM() ? [
+	return !isAMD() ? [
 		createModuleDescription('vs/workbench/workbench.web.main')
 	] : [
 		...createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
 		...createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
-		createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main'])
+		createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main.internal'])
 	];
 };
 
@@ -109,7 +109,7 @@ exports.code = [
 	createModuleDescription('vs/code/electron-main/main'),
 	createModuleDescription('vs/code/node/cli'),
 	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-	createModuleDescription('vs/code/node/sharedProcess/sharedProcessMain'),
+	createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
 	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
 ];
 

build/checksums/electron.txt

@@ -1,75 +1,75 @@
-3e432bd550279c2d58c6a02b0bda048fa2a9a89aef9752e22c39a518a83fe96f *chromedriver-v30.4.0-darwin-arm64.zip
-4d38f40ec33955dd0aef5cc0053b2b07c4744abb9f2614a44780280c4678aca9 *chromedriver-v30.4.0-darwin-x64.zip
-338f2a361448e78aa8c319cd582f2dd6d891d6c0c66b676c628e50511c27514f *chromedriver-v30.4.0-linux-arm64.zip
-8cffae19618fe5f0eaff40378c40084e18f9747bbbe2d87390203a3012c98367 *chromedriver-v30.4.0-linux-armv7l.zip
-7ff1b75defc522f327c0f1bf6f4d13938b041cf5de1d7417b9dc5d1e7026e93c *chromedriver-v30.4.0-linux-x64.zip
-8e93b0892d7d01c38608fa7907f28da1da27de09bb382f261d81a676f8c2ba64 *chromedriver-v30.4.0-mas-arm64.zip
-d306ef0bc651bef046b21ba2e4745e2768be9df1b6c2fc2e7b1a0368f7e10d76 *chromedriver-v30.4.0-mas-x64.zip
-bb7c5db2a20f437e0b398846ecc8111e7e51e2021b78f60db021262daacf7d7c *chromedriver-v30.4.0-win32-arm64.zip
-df4acaa6684e7db07468c6dc8102cb49746884e8db2b53648431b2b61e8debb2 *chromedriver-v30.4.0-win32-ia32.zip
-7a207b29977e52ba052037f00f4ea6284177fdd93e0774dfc39e83ee5a86513d *chromedriver-v30.4.0-win32-x64.zip
-8c876662fd46c37b2dd9487ea8e62fde3f20a729dc95e42f12f7db4986138edc *electron-api.json
-a36786c7d4e30887a6aa1f2adbc23e721266a31ffe84191bf4caddb731cfb973 *electron-v30.4.0-darwin-arm64-dsym-snapshot.zip
-e5edcad107307e97bdd6f69ccab0368df4c3270213f2f42f259f3723d24ca611 *electron-v30.4.0-darwin-arm64-dsym.zip
-cc522e772a1d80f7ec73ce2077dae93de76cd4f6767c467b6a8e01e4a252f15f *electron-v30.4.0-darwin-arm64-symbols.zip
-2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595 *electron-v30.4.0-darwin-arm64.zip
-48c3197fc36f5ef64eaa913a0a769d2b2d4b79c94e61991ca73e8be2b24bf997 *electron-v30.4.0-darwin-x64-dsym-snapshot.zip
-9b669dc060695e5495573cce7b7916bdadd980d523772fbbf57fd1811bb4feca *electron-v30.4.0-darwin-x64-dsym.zip
-0acd5b74cbb1719a89a310fb42f5ab4282711bb0ccf4e8b242d9c24c8ecc7136 *electron-v30.4.0-darwin-x64-symbols.zip
-6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43 *electron-v30.4.0-darwin-x64.zip
-5bc27ceae706116a14fa24da3cda32f00893dd3f51ae2c2d58c4c08f26ce2ac2 *electron-v30.4.0-linux-arm64-debug.zip
-d13970ef6f4ad30dd8268563ed0b768f703d6e4ea1389ee36b8e7eb407b40523 *electron-v30.4.0-linux-arm64-symbols.zip
-aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4 *electron-v30.4.0-linux-arm64.zip
-5bc27ceae706116a14fa24da3cda32f00893dd3f51ae2c2d58c4c08f26ce2ac2 *electron-v30.4.0-linux-armv7l-debug.zip
-645af6535a3956e263d8ff586bfb45c5d16ec4c07add406e7c2a767eec070e8e *electron-v30.4.0-linux-armv7l-symbols.zip
-3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e *electron-v30.4.0-linux-armv7l.zip
-0f099b597830fd990bac82fbe976720d5610450133dff880b570cbe1ef793742 *electron-v30.4.0-linux-x64-debug.zip
-084566b78797502ad164832e49690d8845c53a8becb28085f271ab1a9fe20942 *electron-v30.4.0-linux-x64-symbols.zip
-b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01 *electron-v30.4.0-linux-x64.zip
-b050b4de0fda4c2fa4ceeb0ecaf452cc426a9b03a9e286686d2167c7ded252f4 *electron-v30.4.0-mas-arm64-dsym-snapshot.zip
-1e9c3f820e809fc2e05434d54862c7309dd04b74406869e06edb1e07faa3e40f *electron-v30.4.0-mas-arm64-dsym.zip
-9b4112c73606d1a0393320178a3d0f172671ec211fe69b2106ad9b04b55b3538 *electron-v30.4.0-mas-arm64-symbols.zip
-10ac65b581c2941fd05b2804055be2eed8d69de4c82b90f7357a3989d8276c9f *electron-v30.4.0-mas-arm64.zip
-9e4cba132474d82894541ab33d02b28894f0452f4c6808e2428878d0b6a55aac *electron-v30.4.0-mas-x64-dsym-snapshot.zip
-33c9c13a8a33ab292db5f14b1d8af1fa7967601badf505a06972fd3cdc9cb6bb *electron-v30.4.0-mas-x64-dsym.zip
-1e8871c34294912bc562861226742dcd2de073ae2dc3fef8065fe86550265bca *electron-v30.4.0-mas-x64-symbols.zip
-055bea26dfd9fa86838e25b77e29fec3967ed21020ce1362ff683be07ac90c45 *electron-v30.4.0-mas-x64.zip
-1fd654358ad895fce4806fcd39be848deeccd20f767e96006ebb5c88ca973d92 *electron-v30.4.0-win32-arm64-pdb.zip
-5cf51db3ece15f155afc066230f844bf7825fe912f0f479b8cf9eb47e46a2278 *electron-v30.4.0-win32-arm64-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-arm64-toolchain-profile.zip
-51bc3a21faefe99ccc8e8670dccf2320249af5c185728a31d907a18092542d73 *electron-v30.4.0-win32-arm64.zip
-b4a539c7dbad3db544d7709faaf357d55d7f3349bfd4d42c884b0608725b526d *electron-v30.4.0-win32-ia32-pdb.zip
-ddb355e3e45978eee33c679c42781587533b934f3e98374057d2b0c212062915 *electron-v30.4.0-win32-ia32-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-ia32-toolchain-profile.zip
-7260c9f533d5fa0c543d34593bb1a8bc4904943ca872afc5246e15da6f00b43a *electron-v30.4.0-win32-ia32.zip
-2d0d5631158971e0fac9bb7c427c5361177c7e967cca41940ad18183d95c3e23 *electron-v30.4.0-win32-x64-pdb.zip
-0ea8c0b8734bd45cb04ae83390bd7efee407ed6bb30dbaa1030e1a1f03a0f025 *electron-v30.4.0-win32-x64-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-x64-toolchain-profile.zip
-9dcf4b5bbdb6c672ba1b3812d4b642999faf4b6f4e2a4e4af314ba61596a62dc *electron-v30.4.0-win32-x64.zip
-c524777653f0b3ba58da6c1e97aa5a3a172caf68d9b24a7d33f733b36c281ce8 *electron.d.ts
-c1586ee3f3960943dfa1c1a3da2ebc327afd95c3c7a160b0646730fbc78731bb *ffmpeg-v30.4.0-darwin-arm64.zip
-7f76a792c8f9ee9611f966956b4b70017253f9357ec73806d35c568808eec470 *ffmpeg-v30.4.0-darwin-x64.zip
-5160348bcae6cb4fce20905338a903475c2eb52511370b44bdfeafef3cbeab6c *ffmpeg-v30.4.0-linux-arm64.zip
-4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.4.0-linux-armv7l.zip
-4f62d246a2ccb904e9f03bdc65fd5806edd69b95099fa2dcba4f148d44ea1bce *ffmpeg-v30.4.0-linux-x64.zip
-c1586ee3f3960943dfa1c1a3da2ebc327afd95c3c7a160b0646730fbc78731bb *ffmpeg-v30.4.0-mas-arm64.zip
-7f76a792c8f9ee9611f966956b4b70017253f9357ec73806d35c568808eec470 *ffmpeg-v30.4.0-mas-x64.zip
-26b82e5943d09eb0765804df27182cd45c45e63e82fe95d60a5a78611d85a926 *ffmpeg-v30.4.0-win32-arm64.zip
-ea688b108cb545bd436621c8d1279696ac6cb0b041d1d3d322dba06f8dd0f295 *ffmpeg-v30.4.0-win32-ia32.zip
-733a522d2095964ff3796f3301591b7aa9cf1ba8dcc545d1928745022ef99e6a *ffmpeg-v30.4.0-win32-x64.zip
-0b82c8db956264c1be4006eff3908b51ae8e48a17176fe61fa86d8ca8c103bf5 *hunspell_dictionaries.zip
-27d5d6d82bd5703342e6a3804ff3c032433cda833ad3881f263035b23193ace9 *libcxx-objects-v30.4.0-linux-arm64.zip
-babe51c929cc77907fdb5af11781938bab4b9f31642a0220b4ce4a35cfb904ff *libcxx-objects-v30.4.0-linux-armv7l.zip
-e6e13dd7c493841c3ab406b147d021b4e5a379e286767c1459d23bd9581c10c9 *libcxx-objects-v30.4.0-linux-x64.zip
-c9ba1b8c0e971cf477f7c0120436cc45a02b72908a41c82cd809ec8014b81e32 *libcxx_headers.zip
-2c4c140bfeb235584f8f7c699d0d95b16ddb959484923aaa59eeb3310dbc161a *libcxxabi_headers.zip
-0cee8848525e0d633d3ccf599d03ac05be6e0bc014b5a77ddce99c3a50941feb *mksnapshot-v30.4.0-darwin-arm64.zip
-0c491f602cfc6fbd81b8b771d3fa28ec1eb77c23c7636479a158265dd7d59977 *mksnapshot-v30.4.0-darwin-x64.zip
-6ea645627b0a0cab88cda80a2fa4d399a491bc5f0d0ff1d007f6dd28728d4592 *mksnapshot-v30.4.0-linux-arm64-x64.zip
-6b33e8bc53281710d9754e3ea88a8c025649f3d7c499e9b8693183bd2b76ea8d *mksnapshot-v30.4.0-linux-armv7l-x64.zip
-092afde6a2ab8ac922524a02b30343cd11f96c01405814019797bf38fa8c634b *mksnapshot-v30.4.0-linux-x64.zip
-dada39480526a46992f2ff0ad8ea72a26565384e9976497867a6c4776705e49f *mksnapshot-v30.4.0-mas-arm64.zip
-4082f5b379b788d300b2a7fc7c84deee80ebc61a34b534c795c1b4594c3f0d1a *mksnapshot-v30.4.0-mas-x64.zip
-01a5e83fe293dd2c52e1d5cc79450fbfc1dfa1e4988146f94bfbf9a9e24cb9d7 *mksnapshot-v30.4.0-win32-arm64-x64.zip
-0bccaa2779f8ce98bd4a2a66be082bcd3c34484aad8000c08de0fed5acb8ad88 *mksnapshot-v30.4.0-win32-ia32.zip
-439c7f5b9fdd0ea19ee95f724773cda42382b27a31494ae8f2aca5c2ec043ec7 *mksnapshot-v30.4.0-win32-x64.zip
+3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e *chromedriver-v30.5.1-darwin-arm64.zip
+d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182 *chromedriver-v30.5.1-darwin-x64.zip
+3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947 *chromedriver-v30.5.1-linux-arm64.zip
+a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe *chromedriver-v30.5.1-linux-armv7l.zip
+688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01 *chromedriver-v30.5.1-linux-x64.zip
+786a7c2659ad97d5a09866b9aafd55edc015cb17a87bd8d72aa5925f2bfcf55a *chromedriver-v30.5.1-mas-arm64.zip
+398759d1dc02fc4928d48ff0f8fbade8811347e1a51d1cedcb2ba9350fbed04d *chromedriver-v30.5.1-mas-x64.zip
+65766f1270d1876e2a81acfb4b1130dc4a41eb7165842afa8f41ea438bf2fecb *chromedriver-v30.5.1-win32-arm64.zip
+ca9fe0abd1032ebd51497049cb1bb2ae1dd9592697b278f6b1ee2a1a25148891 *chromedriver-v30.5.1-win32-ia32.zip
+b6b6ea2202e0139ea436288add736d19078bfb190fc0b22937283927f3024bb9 *chromedriver-v30.5.1-win32-x64.zip
+50e8b2d59916bc180873324fdbeb8227dbb8b2375cc936e58b7c9885fb23376d *electron-api.json
+595db4fa3f755432bf59cbbaf591ee44b576e15952d014d83d3748646b2e338c *electron-v30.5.1-darwin-arm64-dsym-snapshot.zip
+c1beb80553f3c9575e638625ce0ffbfdb87b6f8b23799eb132954b2bb74a9a2f *electron-v30.5.1-darwin-arm64-dsym.zip
+cba315d6d6f607a2ee6cfc437b46f92da88daded86f0130d85129adb4742bc48 *electron-v30.5.1-darwin-arm64-symbols.zip
+d312544ea29844cf328b44b9dbde12f4fdced90cb442dfca6df36c098dbb6e7a *electron-v30.5.1-darwin-arm64.zip
+fd24d585d28909c082d703db3fcc5ffa0b55e1077ff320e25ed510f36e6a3761 *electron-v30.5.1-darwin-x64-dsym-snapshot.zip
+4d1a2adea4b98c4d0b03c6561fca146aab102d636d359e48ce418c465df891ae *electron-v30.5.1-darwin-x64-dsym.zip
+d9065eaf659f4c3e8a75f5453ceb65269763b2e57110bdcc01904b9a1e33a62c *electron-v30.5.1-darwin-x64-symbols.zip
+faf9dcc20d525607ea205f2f6a1dfe3270f6268aa439bb0ba5646c7e4fbbd842 *electron-v30.5.1-darwin-x64.zip
+b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-arm64-debug.zip
+5e97cc105282783d1c20d8e8dd4ca1134342839235288840cb50f314ca7a6ede *electron-v30.5.1-linux-arm64-symbols.zip
+eb31470c0d7cd6e23e7ce0d89cc93a2356c9dac8bcc997e335353b8aa995afa0 *electron-v30.5.1-linux-arm64.zip
+b85dba1cdb49591542dcecff3e710f29b81285569c8c5db8c1181c3ed818ba44 *electron-v30.5.1-linux-armv7l-debug.zip
+137548cd73cd648107f6e01c777e411838173309848a492b42825857cec7d110 *electron-v30.5.1-linux-armv7l-symbols.zip
+224bd46983e503101c756c72d10b195f14712a7a56438718acb126017dd04edf *electron-v30.5.1-linux-armv7l.zip
+1f87fadebc444c9c0de43f52972a3f61af83ca0594c3de368f7579ce613fcb60 *electron-v30.5.1-linux-x64-debug.zip
+aae78654f599a68310bdbdc0e3de8db644320ef44e58a5c6e5c693dff5cd1970 *electron-v30.5.1-linux-x64-symbols.zip
+ec4707783d39e86005f42899e30ae59e50dd5d9c7f28531ed494eb43f2361403 *electron-v30.5.1-linux-x64.zip
+c61f3121e52fd29987814b7805b597ef3fc78b2ce891eba5e3fc6bbe14128f23 *electron-v30.5.1-mas-arm64-dsym-snapshot.zip
+f934e55ef6c986d3ec56626b2605fed16030efc45efcd8b05afa9322d625ec56 *electron-v30.5.1-mas-arm64-dsym.zip
+3cc36e99f2cd59d7cb2f47b52d19609c2a2358f6ddde35fd832872abe241cc8d *electron-v30.5.1-mas-arm64-symbols.zip
+c5085ab1fb74dfa4a4e463dcb688989bc63baf44007419fd96db4e7c974fb6db *electron-v30.5.1-mas-arm64.zip
+47102b6dcd5892de734be2b48e40bbbdbc5e0a228bf5fec33071661d2724d946 *electron-v30.5.1-mas-x64-dsym-snapshot.zip
+607091ddfd313ed27bb5a0acb6fa58b0d65cb87e6c6ce9b373949b4b152476d8 *electron-v30.5.1-mas-x64-dsym.zip
+ac49568635d41e1075bca39c97aca1f2fcede702f721ddce5d80f18cc2dd1067 *electron-v30.5.1-mas-x64-symbols.zip
+3746bc4ba32ab9c11398a393d54ba81733088729ae7cef4e5dccf1e64dc82b0a *electron-v30.5.1-mas-x64.zip
+930ad941c8bc0aa5e4e3457b235f104846939974d71bde5b42a8980de2d4a35d *electron-v30.5.1-win32-arm64-pdb.zip
+11c1252547b381ab6e40cc032ee60c5209dee9ea1102d1b47ad3fcd4da03049f *electron-v30.5.1-win32-arm64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-arm64-toolchain-profile.zip
+f18baa98ba9c04b346fda9f40fc3150a57b539d0cd510971a073983f78e0a20c *electron-v30.5.1-win32-arm64.zip
+b03c7297dc61aa234ab2273c419d9ae064e52c2c0c3dd56f09135f81964630b5 *electron-v30.5.1-win32-ia32-pdb.zip
+8fc570c7f4d97eb6b745fb4af5932311d1da57058da8f39a3d97d6e099cd6982 *electron-v30.5.1-win32-ia32-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-ia32-toolchain-profile.zip
+20845163bf9d5a4ead03c5f0280c9bae71f0ab1fc03362f3406ed12620e4d9cd *electron-v30.5.1-win32-ia32.zip
+019f3ae97a69dc837d89c44d25e0e5dadc88564b74202c5a3524fc6ab59490bc *electron-v30.5.1-win32-x64-pdb.zip
+2eb4889fe275e5ea42cf6f51821bcceb833d5714aa1b45ad7915495afb447e94 *electron-v30.5.1-win32-x64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.5.1-win32-x64-toolchain-profile.zip
+443119bb559fc2ca297a57cf79f2bce532e853ada070c1e71460c9657c13b4b3 *electron-v30.5.1-win32-x64.zip
+deecdc1f3f5ea9548ef73774f412c7af489afeb7dca1c394b5add10e929aff42 *electron.d.ts
+14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-darwin-arm64.zip
+bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-darwin-x64.zip
+44ebf3185fc24404647da0c1f9e496effefd32ff3dbc2499c022164b919d06ed *ffmpeg-v30.5.1-linux-arm64.zip
+4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.5.1-linux-armv7l.zip
+154900e5db5810f63e38fd4551cfff3d88d6eac39226e06e12e1e43558d360a4 *ffmpeg-v30.5.1-linux-x64.zip
+14319b51118a5c94e108731f6b5c4e701c700212e790198ba22242eb9674a334 *ffmpeg-v30.5.1-mas-arm64.zip
+bfd5110457438fa8b113a8806db45f30b8975304d95e5efb1b71b0f5e46757fe *ffmpeg-v30.5.1-mas-x64.zip
+f2169c4b6b9f073c20652953599f2453947936e851ff25c9f2719e7d889faea3 *ffmpeg-v30.5.1-win32-arm64.zip
+90745f1422ae0431b295cb5d27ff03e69c890f3572ef6c4655774b892419e94f *ffmpeg-v30.5.1-win32-ia32.zip
+567fe8952f17b224d4492980af741b470e86b31d58e7c6a9262258eeae490122 *ffmpeg-v30.5.1-win32-x64.zip
+8bbbadb52a19f074d9f8bd533891e2bacbe4813101ae6c344cfc88e28b1429a3 *hunspell_dictionaries.zip
+61137508aee6837c70a2ead2e31dd106d753ec5fac01b49e7e8701be0e09e7aa *libcxx-objects-v30.5.1-linux-arm64.zip
+3c285f012f256f767e777550a1f18054cfcffc4e13ad6fa4e4e90dd58ec22069 *libcxx-objects-v30.5.1-linux-armv7l.zip
+9b96b53c8dfbc70a0f617f78dde89a1e8510ae2261bcddfbf7c12c61eb5a3d73 *libcxx-objects-v30.5.1-linux-x64.zip
+1b5cbe24d6356a388e166bff60d7452583019ea7dec85f593c552eb287346f43 *libcxx_headers.zip
+eae200a0d1fd0d4b881358bdef600111891c75ecc4db679b680b0cbaf87ecfc3 *libcxxabi_headers.zip
+ed1f7463b5869acf57dd388208918652182b049b2846f572d52ed47e7c091d54 *mksnapshot-v30.5.1-darwin-arm64.zip
+bc80de1f29b869cdb2676d2dc08cbb4bd6228a6825b1b0bfc13acee0b070ac3e *mksnapshot-v30.5.1-darwin-x64.zip
+5e526ca4f4250a9b9b040d6eb60f1d2b8db974ab68c27e46198f4bf8dc1ef347 *mksnapshot-v30.5.1-linux-arm64-x64.zip
+c40ca2a45cc9ab4e1668f063860ba243baef8c192a253638e4c93aaccb0ef8da *mksnapshot-v30.5.1-linux-armv7l-x64.zip
+a3134e0b0980547167dd3ca2f17dd2f40a7db697ab563ba6257534f9ad0d256d *mksnapshot-v30.5.1-linux-x64.zip
+82776eafcb3e4d053e275ad50d84151f41a651986baacda20c6ed722854cb8fb *mksnapshot-v30.5.1-mas-arm64.zip
+9d6d95d4cb121a29fd68d64557edd8c9859345ac37d0645de8aff518391755ed *mksnapshot-v30.5.1-mas-x64.zip
+94b9ce6cb40ae001962b77525d12483c3458776066a69a4e714b327bab1decfc *mksnapshot-v30.5.1-win32-arm64-x64.zip
+4d89d06c2e85b25d52bb64f48258ad5d05b98ac21697ae9c49ccd19bad9d7d94 *mksnapshot-v30.5.1-win32-ia32.zip
+ccfd322bafde0485a0ac6b0acc3669c7b08f30003a1c2e044eebc1bf02289de3 *mksnapshot-v30.5.1-win32-x64.zip

build/checksums/nodejs.txt

@@ -1,7 +1,7 @@
-4743bc042f90ba5d9edf09403207290a9cdd2f6061bdccf7caaa0bbfd49f343e  node-v20.15.1-darwin-arm64.tar.gz
-f5379772ffae1404cfd1fcc8cf0c6c5971306b8fb2090d348019047306de39dc  node-v20.15.1-darwin-x64.tar.gz
-8554c91ccd32782351035d3a9b168ad01c6922480800a21870fc5d6d86c2bb70  node-v20.15.1-linux-arm64.tar.gz
-2c16717da7d2d7b00f6af146cdf436a0297cbcee52c85b754e4c9ed7cee34b51  node-v20.15.1-linux-armv7l.tar.gz
-a9db028c0a1c63e3aa0d97de24b0966bc507d8239b3aedc4e752eea6b0580665  node-v20.15.1-linux-x64.tar.gz
-8e3f84e8ec7e41f98a048eb0c1365cfe54426a556ead98c4803df45d29e0335d  win-arm64/node.exe
-229fb64aeb10d3cc18eaaa2f5a4c3f1c81792dd3647c5c4350e142db528d0f89  win-x64/node.exe
+fc7355e778b181575153b7dea4879e8021776eeb376c43c50f65893d2ea70aa3  node-v20.16.0-darwin-arm64.tar.gz
+e18942cd706e4d69a4845ddacee2f1c17a72e853a229e3d2623d2edeb7efde72  node-v20.16.0-darwin-x64.tar.gz
+551588f8f5ca05c04efb53f1b2bb7d9834603327bdc82d60a944d385569866e1  node-v20.16.0-linux-arm64.tar.gz
+1c77c52ab507ddee479012f0b4bf523dd8400df4504447d623632353076e2e27  node-v20.16.0-linux-armv7l.tar.gz
+b3f874ea84e440d69ed02ca92429d0eccd17737fde86db69c1c153d16ec654f2  node-v20.16.0-linux-x64.tar.gz
+7e773fba3a19eac5ccbe85c1f87a05d7b112ecf41440076e6b6de1c7bffa0fdf  win-arm64/node.exe
+ba221658a3b68bd583e3068903eb675b5206d86a883c084ed95502e8f634b82a  win-x64/node.exe

build/darwin/create-universal-app.js

@@ -9,7 +9,6 @@ const fs = require("fs");
 const minimatch = require("minimatch");
 const vscode_universal_bundler_1 = require("vscode-universal-bundler");
 const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
-const esm_1 = require("../lib/esm");
 const root = path.dirname(path.dirname(__dirname));
 async function main(buildDir) {
     const arch = process.env['VSCODE_ARCH'];
@@ -27,14 +26,13 @@ async function main(buildDir) {
         '**/CodeResources',
         '**/Credits.rtf',
     ];
-    const canAsar = !(0, esm_1.isESM)('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM
     await (0, vscode_universal_bundler_1.makeUniversalApp)({
         x64AppPath,
         arm64AppPath,
-        asarPath: canAsar ? asarRelativePath : undefined,
+        asarPath: asarRelativePath,
         outAppPath,
         force: true,
-        mergeASARs: canAsar,
+        mergeASARs: true,
         x64ArchFiles: '*/kerberos.node',
         filesToSkipComparison: (file) => {
             for (const expected of filesToSkip) {

build/darwin/create-universal-app.ts

@@ -8,7 +8,6 @@ import * as fs from 'fs';
 import * as minimatch from 'minimatch';
 import { makeUniversalApp } from 'vscode-universal-bundler';
 import { spawn } from '@malept/cross-spawn-promise';
-import { isESM } from '../lib/esm';
 
 const root = path.dirname(path.dirname(__dirname));
 
@@ -32,15 +31,13 @@ async function main(buildDir?: string) {
 		'**/Credits.rtf',
 	];
 
-	const canAsar = !isESM('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM
-
 	await makeUniversalApp({
 		x64AppPath,
 		arm64AppPath,
-		asarPath: canAsar ? asarRelativePath : undefined,
+		asarPath: asarRelativePath,
 		outAppPath,
 		force: true,
-		mergeASARs: canAsar,
+		mergeASARs: true,
 		x64ArchFiles: '*/kerberos.node',
 		filesToSkipComparison: (file: string) => {
 			for (const expected of filesToSkip) {

build/darwin/sign.js

@@ -10,8 +10,8 @@ const codesign = require("electron-osx-sign");
 const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
 const root = path.dirname(path.dirname(__dirname));
 function getElectronVersion() {
-    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+    const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+    const target = /^target="(.*)"$/m.exec(npmrc)[1];
     return target;
 }
 async function main(buildDir) {

build/darwin/sign.ts

@@ -11,8 +11,8 @@ import { spawn } from '@malept/cross-spawn-promise';
 const root = path.dirname(path.dirname(__dirname));
 
 function getElectronVersion(): string {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
+	const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
+	const target = /^target="(.*)"$/m.exec(npmrc)![1];
 	return target;
 }
 

build/filters.js

@@ -101,8 +101,7 @@ module.exports.indentationFilter = [
 
 	// except multiple specific files
 	'!**/package.json',
-	'!**/yarn.lock',
-	'!**/yarn-error.log',
+	'!**/package-lock.json',
 
 	// except multiple specific folders
 	'!**/codicon/**',

build/gulpfile.compile.js

@@ -9,12 +9,12 @@
 const gulp = require('gulp');
 const util = require('./lib/util');
 const date = require('./lib/date');
-const esm = require('./lib/esm');
+const amd = require('./lib/amd');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 const optimize = require('./lib/optimize');
 
-const isESMBuild = typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true';
+const isAMDBuild = typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true';
 
 /**
  * @param {boolean} disableMangle
@@ -24,9 +24,9 @@ function makeCompileBuildTask(disableMangle) {
 		util.rimraf('out-build'),
 		util.buildWebNodePaths('out-build'),
 		date.writeISODate('out-build'),
-		esm.setESM(isESMBuild),
+		amd.setAMD(isAMDBuild),
 		compilation.compileApiProposalNamesTask,
-		compilation.compileTask(isESMBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }),
+		compilation.compileTask(isAMDBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }),
 		optimize.optimizeLoaderTask('out-build', 'out-build', true)
 	);
 }

build/gulpfile.editor.js

@@ -77,7 +77,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			extrausages
 		],
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /(^vs\/css!)/,
+		importIgnorePattern: /\.css$/,
 		destRoot: path.join(root, 'out-editor-src'),
 		redirects: {
 			'@vscode/tree-sitter-wasm': '../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-web',
@@ -198,49 +198,11 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 			}
 
 			console.log(`Open in VS Code the folder at '${destPath}' and you can analyze the compilation error`);
-			throw new Error('Standalone Editor compilation failed. If this is the build machine, simply launch `yarn run gulp editor-distro` on your machine to further analyze the compilation problem.');
+			throw new Error('Standalone Editor compilation failed. If this is the build machine, simply launch `npm run gulp editor-distro` on your machine to further analyze the compilation problem.');
 		});
 	}
 });
 
-/**
- * Go over all .js files in `/out-monaco-editor-core/esm/` and make sure that all imports
- * use `.js` at the end in order to be ESM compliant.
- */
-const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => {
-	const SRC_DIR = path.join(__dirname, '../out-monaco-editor-core/esm');
-	const files = util.rreddir(SRC_DIR);
-	for (const file of files) {
-		const filePath = path.join(SRC_DIR, file);
-		if (!/\.js$/.test(filePath)) {
-			continue;
-		}
-
-		const contents = fs.readFileSync(filePath).toString();
-		const lines = contents.split(/\r\n|\r|\n/g);
-		const /** @type {string[]} */result = [];
-		for (const line of lines) {
-			if (!/^import/.test(line) && !/^export \* from/.test(line)) {
-				// not an import
-				result.push(line);
-				continue;
-			}
-			if (/^import '[^']+\.css';/.test(line)) {
-				// CSS import
-				result.push(line);
-				continue;
-			}
-			const modifiedLine = (
-				line
-					.replace(/^import(.*)\'([^']+)\'/, `import$1'$2.js'`)
-					.replace(/^export \* from \'([^']+)\'/, `export * from '$1.js'`)
-			);
-			result.push(modifiedLine);
-		}
-		fs.writeFileSync(filePath, result.join('\n'));
-	}
-});
-
 /**
  * @param {string} contents
  */
@@ -413,7 +375,6 @@ gulp.task('editor-distro',
 			task.series(
 				createESMSourcesAndResourcesTask,
 				compileEditorESMTask,
-				appendJSToESMImportsTask
 			)
 		),
 		finalEditorResourcesTask
@@ -430,7 +391,6 @@ gulp.task('editor-esm',
 		extractEditorSrcTask,
 		createESMSourcesAndResourcesTask,
 		compileEditorESMTask,
-		appendJSToESMImportsTask,
 	)
 );
 

build/gulpfile.extensions.js

@@ -68,6 +68,7 @@ const compilations = [
 	'extensions/vscode-test-resolver/tsconfig.json',
 
 	'.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json',
+	'.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json',
 ];
 
 const getBaseUrl = out => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
@@ -100,7 +101,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 	}
 
 	function createPipeline(build, emitError, transpileOnly) {
-		const nlsDev = require('vscode-nls-dev');
 		const tsb = require('./lib/tsb');
 		const sourcemaps = require('gulp-sourcemaps');
 
@@ -125,7 +125,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 				.pipe(tsFilter)
 				.pipe(util.loadSourcemaps())
 				.pipe(compilation())
-				.pipe(build ? nlsDev.rewriteLocalizeCalls() : es.through())
 				.pipe(build ? util.stripSourceMappingURL() : es.through())
 				.pipe(sourcemaps.write('.', {
 					sourceMappingURL: !build ? null : f => `${baseUrl}/${f.relative}.map`,
@@ -135,9 +134,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src/',
 				}))
 				.pipe(tsFilter.restore)
-				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
-				// Filter out *.nls.json file. We needed them only to bundle meta data file.
-				.pipe(filter(['**', '!**/*.nls.json'], { dot: true }))
 				.pipe(reporter.end(emitError));
 
 			return es.duplex(input, output);

build/gulpfile.js

@@ -34,15 +34,15 @@ gulp.task(compileClientTask);
 const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
 gulp.task(watchClientTask);
 
-const watchClientESMTask = task.define('watch-client-esm', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false, 'src2'), watchApiProposalNamesTask)));
-gulp.task(watchClientESMTask);
+const watchClientAMDTask = task.define('watch-client-amd', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false, 'src2'), watchApiProposalNamesTask)));
+gulp.task(watchClientAMDTask);
 
 // All
 const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
 gulp.task(_compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
-gulp.task(task.define('watch-esm', task.parallel(/* monacoTypecheckWatchTask, */ watchClientESMTask, watchExtensionsTask)));
+gulp.task(task.define('watch-amd', task.parallel(/* monacoTypecheckWatchTask, */ watchClientAMDTask, watchExtensionsTask)));
 
 // Default
 gulp.task('default', _compileTask);

build/gulpfile.reh.js

@@ -31,7 +31,7 @@ const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('
 const { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 const cp = require('child_process');
 const log = require('fancy-log');
-const { isESM } = require('./lib/esm');
+const { isAMD } = require('./lib/amd');
 const buildfile = require('./buildfile');
 
 const REPO_ROOT = path.dirname(__dirname);
@@ -65,19 +65,20 @@ const serverResourceIncludes = [
 	'out-build/vs/base/node/ps.sh',
 
 	// Terminal shell integration
-	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/CodeTabExpansion.psm1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1',
-	'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/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-env.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-profile.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
+
 ];
 
 const serverResourceExcludes = [
-	'!out-build/vs/**/{electron-sandbox,electron-main}/**',
+	'!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'
@@ -88,7 +89,7 @@ const serverResources = [
 	...serverResourceExcludes
 ];
 
-const serverWithWebResourceIncludes = isESM() ? [
+const serverWithWebResourceIncludes = !isAMD() ? [
 	...serverResourceIncludes,
 	'out-build/vs/code/browser/workbench/*.html',
 	...vscodeWebResourceIncludes
@@ -131,7 +132,7 @@ const serverEntryPoints = [
 	}
 ];
 
-const webEntryPoints = isESM() ? [
+const webEntryPoints = !isAMD() ? [
 	buildfile.base,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
@@ -142,7 +143,7 @@ const webEntryPoints = isESM() ? [
 	buildfile.keyboardMaps,
 	buildfile.codeWeb
 ].flat() : [
-	buildfile.entrypoint('vs/workbench/workbench.web.main'),
+	buildfile.entrypoint('vs/workbench/workbench.web.main.internal'),
 	buildfile.base,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
@@ -168,9 +169,9 @@ const commonJSEntryPoints = [
 ];
 
 function getNodeVersion() {
-	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
-	const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
-	const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
+	const npmrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.npmrc'), 'utf8');
+	const nodeVersion = /^target="(.*)"$/m.exec(npmrc)[1];
+	const internalNodeVersion = /^ms_build_id="(.*)"$/m.exec(npmrc)[1];
 	return { nodeVersion, internalNodeVersion };
 }
 
@@ -343,7 +344,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 
 		let packageJsonContents;
 		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
-			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(isESM(`Setting 'type: module' in top level package.json`) ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json
+			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json
 			.pipe(es.through(function (file) {
 				packageJsonContents = file.contents.toString();
 				this.emit('data', file);
@@ -362,10 +363,10 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 
 		const productionDependencies = getProductionDependencies(REMOTE_FOLDER);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
 		const deps = gulp.src(dependenciesSrc, { base: 'remote', dot: true })
 			// filter out unnecessary files, no source maps in server build
-			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
+			.pipe(filter(['**', '!**/package-lock.json', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)

build/gulpfile.scan.js

@@ -73,7 +73,7 @@ BUILD_TARGETS.forEach(buildTarget => {
 
 function nodeModules(destinationExe, destinationPdb, platform) {
 	const productionDependencies = deps.getProductionDependencies(root);
-	const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+	const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
 
 	const exe = () => {
 		return gulp.src(dependenciesSrc, { base: '.', dot: true })

build/gulpfile.vscode.js

@@ -33,12 +33,12 @@ const minimist = require('minimist');
 const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
 const { promisify } = require('util');
-const { isESM } = require('./lib/esm');
+const { isAMD } = require('./lib/amd');
 const glob = promisify(require('glob'));
 const rcedit = promisify(require('rcedit'));
 
 // Build
-const vscodeEntryPoints = isESM() ? [
+const vscodeEntryPoints = !isAMD() ? [
 	buildfile.base,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
@@ -61,7 +61,7 @@ const vscodeEntryPoints = isESM() ? [
 	buildfile.code
 ].flat();
 
-const vscodeResourceIncludes = isESM() ? [
+const vscodeResourceIncludes = !isAMD() ? [
 
 	// NLS
 	'out-build/nls.messages.json',
@@ -85,11 +85,11 @@ const vscodeResourceIncludes = isESM() ? [
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
 
 	// Terminal shell integration
-	'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/*.psm1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/*.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.ps1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.sh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.zsh',
 
 	// Accessibility Signals
 	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',
@@ -130,11 +130,11 @@ const vscodeResourceIncludes = isESM() ? [
 	'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_xdg_data/fish/vendor_conf.d/*.fish',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.psm1',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
-	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/*.fish',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.ps1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.psm1',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.sh',
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.zsh',
 	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
 	'!out-build/vs/workbench/contrib/issue/**/*-dev.html',
 	'!out-build/vs/workbench/contrib/issue/**/*-dev.esm.html',
@@ -163,7 +163,7 @@ const vscodeResources = [
 // be inlined into the target window file in this order
 // and they depend on each other in this way.
 const windowBootstrapFiles = [];
-if (!isESM('Skipping loader.js in window bootstrap files')) {
+if (isAMD()) {
 	windowBootstrapFiles.push('out-build/vs/loader.js');
 }
 windowBootstrapFiles.push('out-build/bootstrap-window.js');
@@ -296,7 +296,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/api/node/extensionHostProcess.js',
-			isESM() ? 'vs/code/electron-sandbox/workbench/workbench.esm.html' : 'vs/code/electron-sandbox/workbench/workbench.html',
+			!isAMD() ? 'vs/code/electron-sandbox/workbench/workbench.esm.html' : 'vs/code/electron-sandbox/workbench/workbench.html',
 			'vs/code/electron-sandbox/workbench/workbench.js'
 		]);
 
@@ -325,13 +325,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			version += '-' + quality;
 		}
 
-		if (isESM() && typeof quality === 'string' && quality !== 'exploration') {
-			// TODO@esm remove this safeguard
-			throw new Error('Refuse to build ESM on quality other than exploration');
-		}
-
 		const name = product.nameShort;
-		const packageJsonUpdates = { name, version, ...(isESM(`Setting 'type: module' and 'main: out/main.js' in top level package.json`) ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json
+		const packageJsonUpdates = { name, version, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json
 
 		// for linux url handling
 		if (platform === 'linux') {
@@ -364,18 +359,16 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 		const root = path.resolve(path.join(__dirname, '..'));
 		const productionDependencies = getProductionDependencies(root);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!**/*.mk`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!**/*.mk`]).flat();
 
-		let deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
+		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
 			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)
 			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
-			.pipe(jsFilter.restore);
-
-		if (!isESM('ASAR disabled in VS Code builds')) { // TODO@esm: ASAR disabled in ESM
-			deps = deps.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
+			.pipe(jsFilter.restore)
+			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
 				'**/*.node',
 				'**/@vscode/ripgrep/bin/*',
 				'**/node-pty/build/Release/*',
@@ -384,10 +377,14 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				'**/node-pty/lib/shared/conout.js',
 				'**/*.wasm',
 				'**/@vscode/vsce-sign/bin/*',
-			], [
+			], isAMD() ? [
 				'**/*.mk',
+			] : [
+				'**/*.mk',
+				'!node_modules/vsda/**' // stay compatible with extensions that depend on us shipping `vsda` into ASAR
+			], isAMD() ? [] : [
+				'node_modules/vsda/**' // retain copy of `vsda` in node_modules for internal use
 			], 'node_modules.asar'));
-		}
 
 		let all = es.merge(
 			packageJsonStream,
@@ -505,7 +502,7 @@ function patchWin32DependenciesTask(destinationFolderName) {
 	const cwd = path.join(path.dirname(root), destinationFolderName);
 
 	return async () => {
-		const deps = await glob('**/*.node', { cwd });
+		const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' });
 		const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'package.json'), 'utf8'));
 		const product = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'product.json'), 'utf8'));
 		const baseVersion = packageJson.version.replace(/-.*$/, '');

build/gulpfile.vscode.linux.js

@@ -152,6 +152,7 @@ function getRpmPackageArch(arch) {
 function prepareRpmPackage(arch) {
 	const binaryDir = '../VSCode-linux-' + arch;
 	const rpmArch = getRpmPackageArch(arch);
+	const stripBinary = process.env['STRIP'] ?? '/usr/bin/strip';
 
 	return function () {
 		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
@@ -208,6 +209,7 @@ function prepareRpmPackage(arch) {
 					.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
 					.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 					.pipe(replace('@@DEPENDENCIES@@', dependencies.join(', ')))
+					.pipe(replace('@@STRIP@@', stripBinary))
 					.pipe(rename('SPECS/' + product.applicationName + '.spec'))
 					.pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); }));
 			}));

build/gulpfile.vscode.web.js

@@ -21,7 +21,8 @@ const vfs = require('vinyl-fs');
 const packageJson = require('../package.json');
 const { compileBuildTask } = require('./gulpfile.compile');
 const extensions = require('./lib/extensions');
-const { isESM } = require('./lib/esm');
+const { isAMD } = require('./lib/amd');
+const VinylFile = require('vinyl');
 
 const REPO_ROOT = path.dirname(__dirname);
 const BUILD_ROOT = path.dirname(REPO_ROOT);
@@ -31,7 +32,7 @@ const commit = getVersion(REPO_ROOT);
 const quality = product.quality;
 const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
 
-const vscodeWebResourceIncludes = isESM() ? [
+const vscodeWebResourceIncludes = !isAMD() ? [
 
 	// NLS
 	'out-build/nls.messages.js',
@@ -86,7 +87,7 @@ const vscodeWebResources = [
 	...vscodeWebResourceIncludes,
 
 	// Excludes
-	'!out-build/vs/**/{node,electron-sandbox,electron-main}/**',
+	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!out-build/vs/code/**/*-dev.html',
@@ -96,7 +97,7 @@ const vscodeWebResources = [
 
 const buildfile = require('./buildfile');
 
-const vscodeWebEntryPoints = isESM() ? [
+const vscodeWebEntryPoints = !isAMD() ? [
 	buildfile.base,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
@@ -105,9 +106,10 @@ const vscodeWebEntryPoints = isESM() ? [
 	buildfile.workerOutputLinks,
 	buildfile.workerBackgroundTokenization,
 	buildfile.keyboardMaps,
-	buildfile.workbenchWeb()
+	buildfile.workbenchWeb(),
+	buildfile.entrypoint('vs/workbench/workbench.web.main.internal') // TODO@esm remove line when we stop supporting web-amd-esm-bridge
 ].flat() : [
-	buildfile.entrypoint('vs/workbench/workbench.web.main'),
+	buildfile.entrypoint('vs/workbench/workbench.web.main.internal'),
 	buildfile.base,
 	buildfile.workerExtensionHost,
 	buildfile.workerNotebook,
@@ -229,8 +231,21 @@ function packageTask(sourceFolderName, destinationFolderName) {
 
 		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', dot: true });
 
-		const sources = es.merge(src, extensions)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
+		const loader = gulp.src('build/loader.min', { base: 'build', dot: true }).pipe(rename('out/vs/loader.js')); // TODO@esm remove line when we stop supporting web-amd-esm-bridge
+
+		const sources = es.merge(...(!isAMD() ? [src, extensions, loader] : [src, extensions]))
+			.pipe(filter(['**', '!**/*.js.map'], { dot: true }))
+			// TODO@esm remove me once we stop supporting our web-esm-bridge
+			.pipe(es.through(function (file) {
+				if (file.relative === 'out/vs/workbench/workbench.web.main.internal.css') {
+					this.emit('data', new VinylFile({
+						contents: file.contents,
+						path: file.path.replace('workbench.web.main.internal.css', 'workbench.web.main.css'),
+						base: file.base
+					}));
+				}
+				this.emit('data', file);
+			}));
 
 		const name = product.nameShort;
 		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })
@@ -239,7 +254,7 @@ function packageTask(sourceFolderName, destinationFolderName) {
 		const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true });
 
 		const productionDependencies = getProductionDependencies(WEB_FOLDER);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
 
 		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
 			.pipe(filter(['**', '!**/package-lock.json']))

build/gulpfile.vscode.win32.js

@@ -16,7 +16,6 @@ const pkg = require('../package.json');
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
 const rcedit = require('rcedit');
-const mkdirp = require('mkdirp');
 
 const repoPath = path.dirname(__dirname);
 const buildPath = (/** @type {string} */ arch) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -75,7 +74,7 @@ function buildWin32Setup(arch, target) {
 
 		const sourcePath = buildPath(arch);
 		const outputPath = setupDir(arch, target);
-		mkdirp.sync(outputPath);
+		fs.mkdirSync(outputPath, { recursive: true });
 
 		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
 		const productJsonPath = path.join(outputPath, 'product.json');

build/hygiene.js

@@ -145,11 +145,13 @@ function hygiene(some, linting = true) {
 
 	const productJsonFilter = filter('product.json', { restore: true });
 	const snapshotFilter = filter(['**', '!**/*.snap', '!**/*.snap.actual']);
+	const yarnLockFilter = filter(['**', '!**/yarn.lock']);
 	const unicodeFilterStream = filter(unicodeFilter, { restore: true });
 
 	const result = input
 		.pipe(filter((f) => !f.stat.isDirectory()))
 		.pipe(snapshotFilter)
+		.pipe(yarnLockFilter)
 		.pipe(productJsonFilter)
 		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
 		.pipe(productJsonFilter.restore)
@@ -263,7 +265,6 @@ function createGitIndexVinyls(paths) {
 
 	return pall(fns, { concurrency: 4 }).then((r) => r.filter((p) => !!p));
 }
-
 // NO PRE COMMIT HOOKS!!!! for now... - Void team
 
 // // this allows us to run hygiene as a git pre-commit hook

build/lib/amd.js

@@ -4,33 +4,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setESM = setESM;
-exports.isESM = isESM;
+exports.setAMD = setAMD;
+exports.isAMD = isAMD;
 const path = require("path");
 const fs = require("fs");
 // TODO@esm remove this
 const outDirectory = path.join(__dirname, '..', '..', 'out-build');
-const esmMarkerFile = path.join(outDirectory, 'esm');
-function setESM(enabled) {
+const amdMarkerFile = path.join(outDirectory, 'amd');
+function setAMD(enabled) {
     const result = () => new Promise((resolve, _) => {
         if (enabled) {
             fs.mkdirSync(outDirectory, { recursive: true });
-            fs.writeFileSync(esmMarkerFile, 'true', 'utf8');
-            console.warn(`Setting build to ESM: true`);
+            fs.writeFileSync(amdMarkerFile, 'true', 'utf8');
+            console.warn(`Setting build to AMD: true`);
         }
         else {
-            console.warn(`Setting build to ESM: false`);
+            console.warn(`Setting build to AMD: false`);
         }
         resolve();
     });
-    result.taskName = 'set-esm';
+    result.taskName = 'set-amd';
     return result;
 }
-function isESM(logWarning) {
+function isAMD(logWarning) {
     try {
-        const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true');
+        const res = (typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true') || (fs.readFileSync(amdMarkerFile, 'utf8') === 'true');
         if (res && logWarning) {
-            console.warn(`[esm] ${logWarning}`);
+            console.warn(`[amd] ${logWarning}`);
         }
         return res;
     }
@@ -38,4 +38,4 @@ function isESM(logWarning) {
         return false;
     }
 }
-//# sourceMappingURL=esm.js.map
+//# sourceMappingURL=amd.js.map

build/lib/amd.ts

@@ -9,29 +9,29 @@ import * as fs from 'fs';
 // TODO@esm remove this
 
 const outDirectory = path.join(__dirname, '..', '..', 'out-build');
-const esmMarkerFile = path.join(outDirectory, 'esm');
+const amdMarkerFile = path.join(outDirectory, 'amd');
 
-export function setESM(enabled: boolean) {
+export function setAMD(enabled: boolean) {
 	const result = () => new Promise<void>((resolve, _) => {
 		if (enabled) {
 			fs.mkdirSync(outDirectory, { recursive: true });
-			fs.writeFileSync(esmMarkerFile, 'true', 'utf8');
-			console.warn(`Setting build to ESM: true`);
+			fs.writeFileSync(amdMarkerFile, 'true', 'utf8');
+			console.warn(`Setting build to AMD: true`);
 		} else {
-			console.warn(`Setting build to ESM: false`);
+			console.warn(`Setting build to AMD: false`);
 		}
 
 		resolve();
 	});
-	result.taskName = 'set-esm';
+	result.taskName = 'set-amd';
 	return result;
 }
 
-export function isESM(logWarning?: string): boolean {
+export function isAMD(logWarning?: string): boolean {
 	try {
-		const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true');
+		const res = (typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true') || (fs.readFileSync(amdMarkerFile, 'utf8') === 'true');
 		if (res && logWarning) {
-			console.warn(`[esm] ${logWarning}`);
+			console.warn(`[amd] ${logWarning}`);
 		}
 		return res;
 	} catch (error) {

build/lib/asar.js

@@ -11,7 +11,7 @@ const pickle = require('chromium-pickle-js');
 const Filesystem = require('asar/lib/filesystem');
 const VinylFile = require("vinyl");
 const minimatch = require("minimatch");
-function createAsar(folderPath, unpackGlobs, skipGlobs, destFilename) {
+function createAsar(folderPath, unpackGlobs, skipGlobs, duplicateGlobs, destFilename) {
     const shouldUnpackFile = (file) => {
         for (let i = 0; i < unpackGlobs.length; i++) {
             if (minimatch(file.relative, unpackGlobs[i])) {
@@ -28,6 +28,16 @@ function createAsar(folderPath, unpackGlobs, skipGlobs, destFilename) {
         }
         return false;
     };
+    // Files that should be duplicated between
+    // node_modules.asar and node_modules
+    const shouldDuplicateFile = (file) => {
+        for (const duplicateGlob of duplicateGlobs) {
+            if (minimatch(file.relative, duplicateGlob)) {
+                return true;
+            }
+        }
+        return false;
+    };
     const filesystem = new Filesystem(folderPath);
     const out = [];
     // Keep track of pending inserts
@@ -73,8 +83,22 @@ function createAsar(folderPath, unpackGlobs, skipGlobs, destFilename) {
             throw new Error(`unknown item in stream!`);
         }
         if (shouldSkipFile(file)) {
+            this.queue(new VinylFile({
+                base: '.',
+                path: file.path,
+                stat: file.stat,
+                contents: file.contents
+            }));
             return;
         }
+        if (shouldDuplicateFile(file)) {
+            this.queue(new VinylFile({
+                base: '.',
+                path: file.path,
+                stat: file.stat,
+                contents: file.contents
+            }));
+        }
         const shouldUnpack = shouldUnpackFile(file);
         insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
         if (shouldUnpack) {

build/lib/asar.ts

@@ -17,7 +17,7 @@ declare class AsarFilesystem {
 	insertFile(path: string, shouldUnpack: boolean, file: { stat: { size: number; mode: number } }, options: {}): Promise<void>;
 }
 
-export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs: string[], destFilename: string): NodeJS.ReadWriteStream {
+export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs: string[], duplicateGlobs: string[], destFilename: string): NodeJS.ReadWriteStream {
 
 	const shouldUnpackFile = (file: VinylFile): boolean => {
 		for (let i = 0; i < unpackGlobs.length; i++) {
@@ -37,6 +37,17 @@ export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs:
 		return false;
 	};
 
+	// Files that should be duplicated between
+	// node_modules.asar and node_modules
+	const shouldDuplicateFile = (file: VinylFile): boolean => {
+		for (const duplicateGlob of duplicateGlobs) {
+			if (minimatch(file.relative, duplicateGlob)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
 	const filesystem = new Filesystem(folderPath);
 	const out: Buffer[] = [];
 
@@ -88,8 +99,22 @@ export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs:
 			throw new Error(`unknown item in stream!`);
 		}
 		if (shouldSkipFile(file)) {
+			this.queue(new VinylFile({
+				base: '.',
+				path: file.path,
+				stat: file.stat,
+				contents: file.contents
+			}));
 			return;
 		}
+		if (shouldDuplicateFile(file)) {
+			this.queue(new VinylFile({
+				base: '.',
+				path: file.path,
+				stat: file.stat,
+				contents: file.contents
+			}));
+		}
 		const shouldUnpack = shouldUnpackFile(file);
 		insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
 

build/lib/builtInExtensions.js

@@ -16,7 +16,6 @@ const vfs = require("vinyl-fs");
 const ext = require("./extensions");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const mkdirp = require('mkdirp');
 const root = path.dirname(path.dirname(__dirname));
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
 const builtInExtensions = productjson.builtInExtensions || [];
@@ -107,7 +106,7 @@ function readControlFile() {
     }
 }
 function writeControlFile(control) {
-    mkdirp.sync(path.dirname(controlFilePath));
+    fs.mkdirSync(path.dirname(controlFilePath), { recursive: true });
     fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }
 function getBuiltInExtensions() {

build/lib/builtInExtensions.ts

@@ -15,8 +15,6 @@ import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import { Stream } from 'stream';
 
-const mkdirp = require('mkdirp');
-
 export interface IExtensionDefinition {
 	name: string;
 	version: string;
@@ -147,7 +145,7 @@ function readControlFile(): IControlFile {
 }
 
 function writeControlFile(control: IControlFile): void {
-	mkdirp.sync(path.dirname(controlFilePath));
+	fs.mkdirSync(path.dirname(controlFilePath), { recursive: true });
 	fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
 }