Merge branch 'main' into joh/rewrite-privates

Author: jrieken

.eslintignore

@@ -13,6 +13,9 @@
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/typescript-language-features/test-workspace/**
+**/extensions/typescript-language-features/extension.webpack.config.js
+**/extensions/typescript-language-features/extension-browser.webpack.config.js
+**/extensions/typescript-language-features/web/**
 **/extensions/vscode-api-tests/testWorkspace/**
 **/extensions/vscode-api-tests/testWorkspace2/**
 **/fixtures/**

.github/classifier.json

@@ -133,7 +133,7 @@
 		"rename": {"assign": ["jrieken"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["lszomoru"]},
-		"search": {"assign": ["roblourens", "andreamah"]},
+		"search": {"assign": ["andreamah"]},
 		"search-editor": {"assign": ["roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},

build/azure-pipelines/cli/prepare.js

@@ -46,6 +46,9 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_VERSION', packageJson.version],
 		['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
 		['VSCODE_CLI_QUALITY', product.quality],
+		['VSCODE_CLI_NAME_SHORT', product.nameShort],
+		['VSCODE_CLI_NAME_LONG', product.nameLong],
+		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',

build/azure-pipelines/cli/prepare.ts

@@ -64,6 +64,7 @@ const compilations = [
 	'references-view/tsconfig.json',
 	'simple-browser/tsconfig.json',
 	'typescript-language-features/test-workspace/tsconfig.json',
+	'typescript-language-features/web/tsconfig.json',
 	'typescript-language-features/tsconfig.json',
 	'vscode-api-tests/tsconfig.json',
 	'vscode-colorize-tests/tsconfig.json',

build/gulpfile.extensions.js

@@ -506,20 +506,14 @@ export async function webpackExtensions(taskName: string, isWatch: boolean, webp
 
 	for (const { configPath, outputRoot } of webpackConfigLocations) {
 		const configOrFnOrArray = require(configPath);
-		function addConfig(configOrFn: webpack.Configuration | Function) {
-			let config;
-			if (typeof configOrFn === 'function') {
-				config = (configOrFn as Function)({}, {});
+		function addConfig(configOrFnOrArray: webpack.Configuration | ((env: unknown,args: unknown) => webpack.Configuration) | webpack.Configuration[]) {
+			for (const configOrFn of Array.isArray(configOrFnOrArray) ? configOrFnOrArray : [configOrFnOrArray]) {
+				const config = typeof configOrFn === 'function' ? configOrFn({}, {}) : configOrFn;
+				if (outputRoot) {
+					config.output!.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output!.path!));
+				}
 				webpackConfigs.push(config);
-			} else {
-				config = configOrFn;
 			}
-
-			if (outputRoot) {
-				config.output.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output.path));
-			}
-
-			webpackConfigs.push(configOrFn);
 		}
 		addConfig(configOrFnOrArray);
 	}