[pull] main from microsoft:main

.github/agents/data.md

@@ -1,8 +1,7 @@
 ---
 name: Data
 description: Answer telemetry questions with data queries using Kusto Query Language (KQL)
-tools:
-  ['vscode/extensions', 'execute/runInTerminal', 'read/readFile', 'search', 'web/githubRepo', 'azure-mcp/kusto_query', 'todo']
+tools: [vscode/extensions, execute/runInTerminal, read/readFile, search, azure-mcp/kusto_query, todo, ms-vscode.kusto-client/kusto, ms-vscode.kusto-client/kustoQueryExecution]
 ---
 
 # Role and Objective
@@ -14,7 +13,9 @@ You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query
 1. Read `vscode-telemetry-docs/.github/copilot-instructions.md` to understand how to access VS Code's telemetry
 	- If the `vscode-telemetry-docs` folder doesn't exist (just check your workspace_info, no extra tool call needed), run `npm run mixin-telemetry-docs` to clone the telemetry documentation.
 2. Analyze data using kusto queries: Don't just describe what could be queried - actually execute Kusto queries to provide real data and insights:
-   - If the `kusto_query` tool doesn't exist (just check your provided tools, no need to run it!), install the `ms-azuretools.vscode-azure-mcp-server` VS Code extension
+   - You need either the **Kusto Explorer** extension (`ms-vscode.kusto-client`) or the **Azure MCP** extension (`ms-azuretools.vscode-azure-mcp-server`) installed to run queries.
+   - **Prefer Kusto Explorer** (`kusto_runQuery` / `kusto_checkQueryExecution` tools) over Azure MCP (`kusto_query` tool) when both are available.
+   - If neither tool is available (just check your provided tools, no need to run them!), install the Kusto Explorer extension (`ms-vscode.kusto-client`). If that is not an option, fall back to installing the Azure MCP extension (`ms-azuretools.vscode-azure-mcp-server`).
 	- Use the appropriate Kusto cluster and database for the data type
    - Always include proper time filtering to limit data volume
    - Default to a rolling 28-day window if no specific timeframe is requested

.vscode/settings.json

@@ -93,7 +93,6 @@
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
 		"build/loader.min": true,
 		"**/*.snap": true,
-		"src/vs/sessions/**": true
 	},
 	// --- TypeScript ---
 	"typescript.experimental.useTsgo": true,

extensions/media-preview/tsconfig.browser.json

@@ -1,3 +1,3 @@
 {
-	"extends": "./tsconfig"
+	"extends": "./tsconfig.json"
 }

extensions/merge-conflict/.vscodeignore

@@ -1,6 +1,5 @@
 src/**
-tsconfig.json
+tsconfig*.json
 out/**
-extension.webpack.config.js
-extension-browser.webpack.config.js
+esbuild*.mts
 package-lock.json

extensions/merge-conflict/esbuild.browser.mts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  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', 'browser');
+
+run({
+	platform: 'browser',
+	entryPoints: {
+		'mergeConflictMain': path.join(srcDir, 'mergeConflictMain.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+	additionalOptions: {
+		tsconfig: path.join(import.meta.dirname, 'tsconfig.browser.json'),
+	}
+}, process.argv);

extensions/references-view/extension.webpack.config.js → extensions/merge-conflict/esbuild.mts

@@ -2,15 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// @ts-check
-import withDefaults from '../shared.webpack.config.mjs';
+import * as path from 'node:path';
+import { run } from '../esbuild-extension-common.mts';
 
-export default withDefaults({
-	context: import.meta.dirname,
-	resolve: {
-		mainFields: ['module', 'main']
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist');
+
+run({
+	platform: 'node',
+	entryPoints: {
+		'mergeConflictMain': path.join(srcDir, 'mergeConflictMain.ts'),
 	},
-	entry: {
-		extension: './src/extension.ts',
-	}
-});
+	srcDir,
+	outdir: outDir,
+}, process.argv);

extensions/merge-conflict/package.json

@@ -26,7 +26,13 @@
   "browser": "./dist/browser/mergeConflictMain",
   "scripts": {
     "compile": "gulp compile-extension:merge-conflict",
-    "watch": "gulp watch-extension:merge-conflict"
+    "watch": "gulp watch-extension:merge-conflict",
+    "compile-web": "npm-run-all2 -lp bundle-web typecheck-web",
+    "bundle-web": "node ./esbuild.browser.mts",
+    "typecheck-web": "tsgo --project ./tsconfig.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.json --noEmit --watch"
   },
   "contributes": {
     "commands": [

extensions/merge-conflict/tsconfig.browser.json

@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}

extensions/mermaid-chat-features/tsconfig.browser.json

@@ -1,3 +1,3 @@
 {
-	"extends": "./tsconfig"
+	"extends": "./tsconfig.json"
 }

extensions/references-view/.vscodeignore

@@ -1,6 +1,6 @@
 .vscode/**
 src/**
 out/**
-tsconfig.json
-*.webpack.config.js
+tsconfig*.json
+esbuild*.mts
 package-lock.json

extensions/references-view/esbuild.browser.mts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  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', 'browser');
+
+run({
+	platform: 'browser',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+	additionalOptions: {
+		tsconfig: path.join(import.meta.dirname, 'tsconfig.browser.json'),
+	},
+}, process.argv);

extensions/merge-conflict/extension-browser.webpack.config.js → extensions/references-view/esbuild.mts

@@ -2,15 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// @ts-check
-import { browser as withBrowserDefaults } from '../shared.webpack.config.mjs';
+import * as path from 'node:path';
+import { run } from '../esbuild-extension-common.mts';
 
-export default withBrowserDefaults({
-	context: import.meta.dirname,
-	entry: {
-		extension: './src/mergeConflictMain.ts'
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist');
+
+run({
+	platform: 'node',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
 	},
-	output: {
-		filename: 'mergeConflictMain.js'
-	}
-});
+	srcDir,
+	outdir: outDir,
+}, process.argv);

extensions/references-view/package.json

@@ -27,7 +27,7 @@
     "onCommand:editor.action.showReferences"
   ],
   "main": "./out/extension",
-  "browser": "./dist/extension.js",
+  "browser": "./dist/browser/extension",
   "contributes": {
     "configuration": {
       "properties": {
@@ -396,7 +396,13 @@
   },
   "scripts": {
     "compile": "npx gulp compile-extension:references-view",
-    "watch": "npx gulp watch-extension:references-view"
+    "watch": "npx gulp watch-extension:references-view",
+    "compile-web": "npm-run-all2 -lp bundle-web typecheck-web",
+    "bundle-web": "node ./esbuild.browser.mts",
+    "typecheck-web": "tsgo --project ./tsconfig.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.json --noEmit --watch"
   },
   "devDependencies": {
     "@types/node": "22.x"

extensions/references-view/tsconfig.browser.json

@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}

extensions/search-result/.vscodeignore

@@ -1,7 +1,6 @@
 src/**
 out/**
-tsconfig.json
-extension.webpack.config.js
-extension-browser.webpack.config.js
+tsconfig*.json
+esbuild*.mts
 package-lock.json
 syntaxes/generateTMLanguage.js

extensions/search-result/esbuild.browser.mts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  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', 'browser');
+
+run({
+	platform: 'browser',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+	additionalOptions: {
+		tsconfig: path.join(import.meta.dirname, 'tsconfig.browser.json'),
+	},
+}, process.argv);

extensions/merge-conflict/extension.webpack.config.js → extensions/search-result/esbuild.mts

@@ -2,15 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// @ts-check
-import withDefaults from '../shared.webpack.config.mjs';
+import * as path from 'node:path';
+import { run } from '../esbuild-extension-common.mts';
 
-export default withDefaults({
-	context: import.meta.dirname,
-	entry: {
-		extension: './src/mergeConflictMain.ts'
-	},
-	output: {
-		filename: 'mergeConflictMain.js'
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist');
+
+run({
+	platform: 'node',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
 	},
-});
+	srcDir,
+	outdir: outDir,
+}, process.argv);

extensions/search-result/package.json

@@ -10,13 +10,19 @@
     "vscode": "^1.39.0"
   },
   "main": "./out/extension.js",
-  "browser": "./dist/extension.js",
+  "browser": "./dist/browser/extension",
   "activationEvents": [
     "onLanguage:search-result"
   ],
   "scripts": {
     "generate-grammar": "node ./syntaxes/generateTMLanguage.js",
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:search-result ./tsconfig.json"
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:search-result ./tsconfig.json",
+    "compile-web": "npm-run-all2 -lp bundle-web typecheck-web",
+    "bundle-web": "node ./esbuild.browser.mts",
+    "typecheck-web": "tsgo --project ./tsconfig.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.json --noEmit --watch"
   },
   "capabilities": {
     "virtualWorkspaces": true,

extensions/search-result/tsconfig.browser.json

@@ -0,0 +1,3 @@
+{
+	"extends": "./tsconfig.json"
+}

extensions/simple-browser/.vscodeignore

@@ -1,14 +1,11 @@
 test/**
 test-workspace/**
 src/**
-tsconfig.json
+tsconfig*.json
 out/test/**
 out/**
-extension.webpack.config.js
-extension-browser.webpack.config.js
+esbuild*.mts
 cgmanifest.json
 .gitignore
 package-lock.json
 preview-src/**
-webpack.config.js
-esbuild-*

extensions/simple-browser/esbuild.browser.mts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  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', 'browser');
+
+run({
+	platform: 'browser',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
+	},
+	srcDir,
+	outdir: outDir,
+	additionalOptions: {
+		tsconfig: path.join(import.meta.dirname, 'tsconfig.browser.json'),
+	},
+}, process.argv);