[pull] main from microsoft:main

build/lib/tsgo.ts

@@ -14,8 +14,8 @@ const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx';
 const ansiRegex = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 
 export function spawnTsgo(projectPath: string, config: { taskName: string; noEmit?: boolean }, onComplete?: () => Promise<void> | void): Promise<void> {
-	function reporter(stdError: string) {
-		const matches = (stdError || '').match(/^error \w+: (.+)?/g);
+	function runReporter(stdError: string) {
+		const matches = (stdError || '').match(/error \w+: (.+)?/g);
 		fancyLog(`Finished ${ansiColors.green(config.taskName)} ${projectPath} with ${matches ? matches.length : 0} errors.`);
 		for (const match of matches || []) {
 			fancyLog.error(match);
@@ -34,41 +34,21 @@ export function spawnTsgo(projectPath: string, config: { taskName: string; noEmi
 		shell: true
 	});
 
-	let buffer = '';
-	const handleLine = (line: string) => {
-		const trimmed = line.replace(ansiRegex, '').trim();
-		if (!trimmed) {
-			return;
-		}
-		if (/Starting compilation|File change detected/i.test(trimmed)) {
-			return;
-		}
-		if (/Compilation complete/i.test(trimmed)) {
-			return;
-		}
-
-		reporter(trimmed);
-	};
-
 	const handleData = (data: Buffer) => {
-		buffer += data.toString('utf8');
-		const lines = buffer.split(/\r?\n/);
-		buffer = lines.pop() ?? '';
-		for (const line of lines) {
-			handleLine(line);
-		}
+		const lines = data.toString()
+			.split(/\r?\n/)
+			.map(line => line.replace(ansiRegex, '').trim())
+			.filter(line => line.length > 0)
+			.filter(line => !/Starting compilation|File change detected|Compilation complete/i.test(line));
+
+		runReporter(lines.join('\n'));
 	};
 
 	child.stdout?.on('data', handleData);
 	child.stderr?.on('data', handleData);
 
 	return new Promise<void>((resolve, reject) => {
 		child.on('exit', code => {
-			if (buffer.trim()) {
-				handleLine(buffer);
-				buffer = '';
-			}
-
 			if (code === 0) {
 				Promise.resolve(onComplete?.()).then(() => resolve(), reject);
 			} else {
@@ -84,12 +64,11 @@ export function spawnTsgo(projectPath: string, config: { taskName: string; noEmi
 
 export function createTsgoStream(projectPath: string, config: { taskName: string; noEmit?: boolean }, onComplete?: () => Promise<void> | void): NodeJS.ReadWriteStream {
 	const stream = es.through();
+
 	spawnTsgo(projectPath, config, onComplete).then(() => {
 		stream.emit('end');
-	}).catch(() => {
-		// Errors are already reported by spawnTsgo via the reporter.
-		// Don't emit 'error' on the stream as that would exit the watch process.
-		stream.emit('end');
+	}).catch(err => {
+		stream.emit('error', err);
 	});
 
 	return stream;

extensions/bat/package.json

@@ -2,7 +2,7 @@
   "name": "bat",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/clojure/package.json

@@ -2,7 +2,7 @@
   "name": "clojure",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/coffeescript/package.json

@@ -2,7 +2,7 @@
   "name": "coffeescript",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/configuration-editing/.vscodeignore

@@ -1,9 +1,8 @@
 test/**
 src/**
-tsconfig.json
+tsconfig*.json
 out/**
-extension.webpack.config.js
-extension-browser.webpack.config.js
+esbuild*
 package-lock.json
 build/**
 schemas/devContainer.codespaces.schema.json

extensions/configuration-editing/esbuild.browser.mts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as path from 'node:path';
+import type { Plugin } from 'esbuild';
+import { run } from '../esbuild-extension-common.mts';
+
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist', 'browser');
+
+/**
+ * Plugin to redirect `./node/net` imports to `./browser/net` for the browser build.
+ */
+const browserNetPlugin: Plugin = {
+	name: 'browser-net-redirect',
+	setup(build) {
+		build.onResolve({ filter: /\/node\/net$/ }, args => {
+			return { path: path.join(path.dirname(args.resolveDir), 'src', 'browser', 'net.ts') };
+		});
+	},
+};
+
+run({
+	platform: 'browser',
+	entryPoints: {
+		'configurationEditingMain': path.join(srcDir, 'configurationEditingMain.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+	additionalOptions: {
+		plugins: [browserNetPlugin],
+		tsconfig: path.join(import.meta.dirname, 'tsconfig.browser.json'),
+	},
+}, process.argv);

extensions/configuration-editing/esbuild.mts

@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as path from 'node:path';
+import { run } from '../esbuild-extension-common.mts';
+
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist');
+
+run({
+	platform: 'node',
+	entryPoints: {
+		'configurationEditingMain': path.join(srcDir, 'configurationEditingMain.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+}, process.argv);

extensions/configuration-editing/package.json

@@ -2,7 +2,7 @@
   "name": "configuration-editing",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {
@@ -22,7 +22,13 @@
   "browser": "./dist/browser/configurationEditingMain",
   "scripts": {
     "compile": "gulp compile-extension:configuration-editing",
-    "watch": "gulp watch-extension:configuration-editing"
+    "watch": "gulp watch-extension:configuration-editing",
+    "compile-web": "npm-run-all2 -lp bundle-web typecheck-web",
+    "bundle-web": "node ./esbuild.browser.mts",
+    "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit",
+    "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web",
+    "watch-bundle-web": "node ./esbuild.browser.mts --watch",
+    "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch"
   },
   "dependencies": {
     "@octokit/rest": "^21.1.1",

extensions/configuration-editing/tsconfig.browser.json

@@ -0,0 +1,10 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {},
+	"exclude": [
+		"./src/test/**"
+	],
+	"files": [
+		"./src/configurationEditingMain.ts"
+	]
+}

extensions/cpp/package.json

@@ -2,7 +2,7 @@
   "name": "cpp",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/csharp/package.json

@@ -2,7 +2,7 @@
   "name": "csharp",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/css-language-features/package.json

@@ -2,7 +2,7 @@
   "name": "css-language-features",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/css-language-features/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vscode-css-languageserver",
   "description": "CSS/LESS/SCSS language server",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "author": "Microsoft Corporation",
   "license": "MIT",
   "engines": {

extensions/css/package.json

@@ -2,7 +2,7 @@
   "name": "css",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/dart/package.json

@@ -2,7 +2,7 @@
 	"name": "dart",
 	"displayName": "%displayName%",
 	"description": "%description%",
-	"version": "1.0.0",
+	"version": "10.0.0",
 	"publisher": "vscode",
 	"license": "MIT",
 	"engines": {

extensions/debug-auto-launch/package.json

@@ -2,7 +2,7 @@
   "name": "debug-auto-launch",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/debug-server-ready/package.json

@@ -2,7 +2,7 @@
   "name": "debug-server-ready",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/diff/package.json

@@ -2,7 +2,7 @@
   "name": "diff",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {

extensions/docker/package.json

@@ -2,7 +2,7 @@
   "name": "docker",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "10.0.0",
   "publisher": "vscode",
   "license": "MIT",
   "engines": {