Merge vscode source through 1.62 release (#19981)

* Build breaks 1 * Build breaks * Build breaks * Build breaks * More build breaks * Build breaks (#2512) * Runtime breaks * Build breaks * Fix dialog location break * Update typescript * Fix ASAR break issue * Unit test breaks * Update distro * Fix breaks in ADO builds (#2513) * Bump to node 16 * Fix hygiene errors * Bump distro * Remove reference to node type * Delete vscode specific extension * Bump to node 16 in CI yaml * Skip integration tests in CI builds (while fixing) * yarn.lock update * Bump moment dependency in remote yarn * Fix drop-down chevron style * Bump to node 16 * Remove playwrite from ci.yaml * Skip building build scripts in hygine check
2026-02-16 18:46:40 -05:00 · 2022-07-11 14:09:32 -07:00
parent fa0fcef303
commit 26455e9113
1876 changed files with 72050 additions and 37997 deletions
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.js
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
@@ -13,8 +13,17 @@ const shasum = crypto.createHash('sha1');
 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 `yarn.lock` files
+// Add `package.json` and `yarn.lock` files
 for (let dir of dirs) {
+    const packageJsonPath = path.join(ROOT, dir, 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
+    const relevantPackageJsonSections = {
+        dependencies: packageJson.dependencies,
+        devDependencies: packageJson.devDependencies,
+        optionalDependencies: packageJson.optionalDependencies,
+        resolutions: packageJson.resolutions
+    };
+    shasum.update(JSON.stringify(relevantPackageJsonSections));
    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
    shasum.update(fs.readFileSync(yarnLockPath));
 }
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
@@ -18,8 +18,18 @@ 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 `yarn.lock` files
+// Add `package.json` and `yarn.lock` files
 for (let dir of dirs) {
+	const packageJsonPath = path.join(ROOT, dir, 'package.json');
+	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
+	const relevantPackageJsonSections = {
+		dependencies: packageJson.dependencies,
+		devDependencies: packageJson.devDependencies,
+		optionalDependencies: packageJson.optionalDependencies,
+		resolutions: packageJson.resolutions
+	};
+	shasum.update(JSON.stringify(relevantPackageJsonSections));
+
 	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
 	shasum.update(fs.readFileSync(yarnLockPath));
 }
--- a/build/azure-pipelines/common/createAsset.js
+++ b/build/azure-pipelines/common/createAsset.js
@@ -30,20 +30,29 @@ function getPlatform(product, os, arch, type) {
                        case 'user-setup':
                            return `${asset}-user`;
                        default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                    }
                case 'server':
                    if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                    }
                    return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
                case 'web':
                    if (arch === 'arm64') {
-                        throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                    }
                    return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+            }
+        case 'alpine':
+            switch (product) {
+                case 'server':
+                    return `server-alpine-${arch}`;
+                case 'web':
+                    return `server-alpine-${arch}-web`;
+                default:
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
            }
        case 'linux':
            switch (type) {
@@ -58,14 +67,14 @@ function getPlatform(product, os, arch, type) {
                        case 'web':
                            return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
                        default:
-                            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                    }
                case 'deb-package':
                    return `linux-deb-${arch}`;
                case 'rpm-package':
                    return `linux-rpm-${arch}`;
                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
            }
        case 'darwin':
            switch (product) {
@@ -78,14 +87,14 @@ function getPlatform(product, os, arch, type) {
                    return 'server-darwin';
                case 'web':
                    if (arch !== 'x64') {
-                        throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+                        throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
                    }
                    return 'server-darwin-web';
                default:
-                    throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
            }
        default:
-            throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
    }
 }
 // Contains all of the logic for mapping types to our actual types in CosmosDB
--- a/build/azure-pipelines/common/createAsset.ts
+++ b/build/azure-pipelines/common/createAsset.ts
@@ -45,20 +45,29 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						case 'user-setup':
 							return `${asset}-user`;
 						default:
-							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 				case 'server':
 					if (arch === 'arm64') {
-						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 					return arch === 'ia32' ? 'server-win32' : `server-win32-${arch}`;
 				case 'web':
 					if (arch === 'arm64') {
-						throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 					return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`;
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
+			}
+		case 'alpine':
+			switch (product) {
+				case 'server':
+					return `server-alpine-${arch}`;
+				case 'web':
+					return `server-alpine-${arch}-web`;
+				default:
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
 		case 'linux':
 			switch (type) {
@@ -73,14 +82,14 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 						case 'web':
 							return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`;
 						default:
-							throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
 				case 'deb-package':
 					return `linux-deb-${arch}`;
 				case 'rpm-package':
 					return `linux-rpm-${arch}`;
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
 		case 'darwin':
 			switch (product) {
@@ -93,14 +102,14 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 					return 'server-darwin';
 				case 'web':
 					if (arch !== 'x64') {
-						throw `What should the platform be?: ${product} ${os} ${arch} ${type}`;
+						throw new Error(`What should the platform be?: ${product} ${os} ${arch} ${type}`);
 					}
 					return 'server-darwin-web';
 				default:
-					throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+					throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 			}
 		default:
-			throw `Unrecognized: ${product} ${os} ${arch} ${type}`;
+			throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 	}
 }

--- a/build/azure-pipelines/common/installPlaywright.js
+++ b/build/azure-pipelines/common/installPlaywright.js
@@ -5,7 +5,7 @@
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const retry_1 = require("./retry");
-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
+const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');
 async function install() {
    await (0, retry_1.retry)(() => installDefaultBrowsersForNpmInstall());
 }
--- a/build/azure-pipelines/common/installPlaywright.ts
+++ b/build/azure-pipelines/common/installPlaywright.ts
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/

 import { retry } from './retry';
-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
+const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');

 async function install() {
 	await retry(() => installDefaultBrowsersForNpmInstall());
--- a/build/azure-pipelines/common/sign.js
+++ b/build/azure-pipelines/common/sign.js
@@ -69,9 +69,17 @@ function main([esrpCliPath, type, cert, username, password, folderPath, pattern]
        '-r', 'true',
        '-e', keyFile,
    ];
-    cp.spawnSync('dotnet', args, { stdio: 'inherit' });
+    try {
+        cp.execFileSync('dotnet', args, { stdio: 'inherit' });
+    }
+    catch (err) {
+        console.error('ESRP failed');
+        console.error(err);
+        process.exit(1);
+    }
 }
 exports.main = main;
 if (require.main === module) {
    main(process.argv.slice(2));
+    process.exit(0);
 }
--- a/build/azure-pipelines/common/sign.ts
+++ b/build/azure-pipelines/common/sign.ts
@@ -76,9 +76,16 @@ export function main([esrpCliPath, type, cert, username, password, folderPath, p
 		'-e', keyFile,
 	];

-	cp.spawnSync('dotnet', args, { stdio: 'inherit' });
+	try {
+		cp.execFileSync('dotnet', args, { stdio: 'inherit' });
+	} catch (err) {
+		console.error('ESRP failed');
+		console.error(err);
+		process.exit(1);
+	}
 }

 if (require.main === module) {
 	main(process.argv.slice(2));
+	process.exit(0);
 }