[pull] main from microsoft:main

.github/skills/hygiene/SKILL.md

@@ -1,25 +1,38 @@
+---
+name: hygiene
+description: Use when making code changes to ensure they pass VS Code's hygiene checks. Covers the pre-commit hook, unicode restrictions, string quoting rules, copyright headers, indentation, formatting, ESLint, and stylelint. Run the hygiene check before declaring work complete.
+---
+
 # Hygiene Checks
 
 VS Code runs a hygiene check as a git pre-commit hook. Commits will be rejected if hygiene fails.
 
-## What it checks
-
-The hygiene linter scans all staged `.ts` files for issues including (but not limited to):
-
-- **Unicode characters**: Non-ASCII characters (em-dashes, curly quotes, emoji, etc.) are rejected. Use ASCII equivalents in comments and code.
-- **Double-quoted strings**: Only use `"double quotes"` for externalized (localized) strings. Use `'single quotes'` everywhere else.
-- **Copyright headers**: All files must include the Microsoft copyright header.
+## Running the hygiene check
 
-## How it runs
+**Always run the pre-commit hygiene check before declaring work complete.** This catches issues that would block a commit.
 
-The git pre-commit hook (via husky) runs `npm run precommit`, which executes:
+To run the hygiene check on your staged files:
 
 ```bash
-node --experimental-strip-types build/hygiene.ts
+npm run precommit
 ```
 
-This scans only **staged files** (from `git diff --cached`). To run it manually:
+This executes `node --experimental-strip-types build/hygiene.ts`, which scans only **staged files** (from `git diff --cached`).
+
+To check specific files directly (without staging them first):
 
 ```bash
-npm run precommit
+node --experimental-strip-types build/hygiene.ts path/to/file.ts
 ```
+
+## What it checks
+
+The hygiene linter scans staged files for issues including (but not limited to):
+
+- **Unicode characters**: Non-ASCII characters (em-dashes, curly quotes, emoji, etc.) are rejected. Use ASCII equivalents in comments and code. Suppress with `// allow-any-unicode-next-line` or `// allow-any-unicode-comment-file`.
+- **Double-quoted strings**: Only use `"double quotes"` for externalized (localized) strings. Use `'single quotes'` everywhere else.
+- **Copyright headers**: All files must include the Microsoft copyright header.
+- **Indentation**: Tabs only, no spaces for indentation.
+- **Formatting**: TypeScript files must match the formatter output (run `Format Document` to fix).
+- **ESLint**: TypeScript files are linted with ESLint.
+- **Stylelint**: CSS files are linted with stylelint.

.vscode/sessions.json

@@ -1,28 +1,28 @@
 {
 	"scripts": [
 		{
-			"name": "run Windows",
-			"command": "code.bat"
+			"name": "Run (Windows)",
+			"command": ".\\scripts\\code.bat"
 		},
 		{
-			"name": "run macOS",
-			"command": "code.sh"
+			"name": "Run (macOS)",
+			"command": "./scripts/code.sh"
 		},
 		{
-			"name": "run Linux",
-			"command": "code.sh"
+			"name": "Run (Linux)",
+			"command": "./scripts/code.sh"
 		},
 		{
-			"name": "run tests Windows",
-			"command": "test.bat"
+			"name": "Tests (Windows)",
+			"command": ".\\scripts\\test.bat"
 		},
 		{
-			"name": "run tests macOS",
-			"command": "test.sh"
+			"name": "Tests (macOS)",
+			"command": "./scripts/test.sh"
 		},
 		{
-			"name": "run tests Linux",
-			"command": "test.sh"
+			"name": "Tests (Linux)",
+			"command": "./scripts/test.sh"
 		}
 	]
 }

build/lib/policies/policyData.jsonc

@@ -87,8 +87,8 @@
             "minimumVersion": "1.99",
             "localization": {
                 "description": {
-                    "key": "autoApprove2.description",
-                    "value": "Global auto approve also known as \"YOLO mode\" disables manual approval completely for all tools in all workspaces, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like Codespaces and Dev Containers have user keys forwarded into the container that could be compromised.\n\nThis feature disables critical security protections and makes it much easier for an attacker to compromise the machine."
+                    "key": "autoApprove3.description",
+                    "value": "Global auto approve also known as \"YOLO mode\" disables manual approval completely for all tools in all workspaces, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like Codespaces and Dev Containers have user keys forwarded into the container that could be compromised.\n\nThis feature disables critical security protections and makes it much easier for an attacker to compromise the machine.\n\nNote: This setting only controls tool approval and does not prevent the agent from asking questions. To automatically answer agent questions, use the `#chat.autoReply#` setting."
                 }
             },
             "type": "boolean",

eslint.config.js

@@ -2112,6 +2112,29 @@ export default tseslint.config(
 			'comma-dangle': ['warn', 'only-multiline']
 		}
 	},
+	// Extension main sources (excluding tests)
+	{
+		files: [
+			'extensions/**/*.ts',
+		],
+		ignores: [
+			'extensions/**/*.test.ts',
+		],
+		rules: {
+			// Ban dynamic require() and import() calls in extensions to ensure tree-shaking works
+			'no-restricted-syntax': [
+				'warn',
+				{
+					'selector': `CallExpression[callee.name='require'][arguments.0.type!='Literal']`,
+					'message': 'Use static imports instead of dynamic require() calls to enable tree-shaking.'
+				},
+				{
+					'selector': `ImportExpression[source.type!='Literal']`,
+					'message': 'Use static imports instead of dynamic import() calls to enable tree-shaking.'
+				},
+			],
+		}
+	},
 	// markdown-language-features
 	{
 		files: [

extensions/esbuild-extension-common.mts

@@ -44,6 +44,7 @@ function resolveOptions(config: RunConfig, outdir: string): BuildOptions {
 		platform: config.platform,
 		bundle: true,
 		minify: true,
+		treeShaking: true,
 		sourcemap: true,
 		target: ['es2024'],
 		external: ['vscode'],

extensions/html-language-features/.vscodeignore

@@ -15,9 +15,6 @@ server/lib/cgmanifest.json
 server/package-lock.json
 server/.npmignore
 package-lock.json
-server/extension.webpack.config.js
-extension.webpack.config.js
-server/extension-browser.webpack.config.js
-extension-browser.webpack.config.js
+**/esbuild*.mts
 CONTRIBUTING.md
 cgmanifest.json

extensions/html-language-features/client/tsconfig.browser.json

@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": [
+		"./src/node/**",
+		"./src/test/**"
+	]
+}

extensions/html-language-features/esbuild.browser.mts

@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import type * as esbuild from 'esbuild';
+import { run } from '../esbuild-extension-common.mts';
+
+const extensionRoot = import.meta.dirname;
+
+/**
+ * An esbuild plugin that replaces the `javascriptLibs` module with inlined TypeScript
+ * library definitions for the browser build. This is the esbuild equivalent of the
+ * webpack `javaScriptLibraryLoader.js`.
+ */
+function javaScriptLibsPlugin(): esbuild.Plugin {
+	return {
+		name: 'javascript-libs',
+		setup(build) {
+			build.onLoad({ filter: /javascriptLibs\.ts$/ }, () => {
+				const TYPESCRIPT_LIB_SOURCE = path.dirname(import.meta.resolve('typescript').replace('file://', ''));
+				const JQUERY_DTS = path.join(extensionRoot, 'server', 'lib', 'jquery.d.ts');
+
+				function getFileName(name: string): string {
+					return name === '' ? 'lib.d.ts' : `lib.${name}.d.ts`;
+				}
+
+				function readLibFile(name: string): string {
+					return fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, getFileName(name)), 'utf8');
+				}
+
+				const queue: string[] = [];
+				const inQueue: Record<string, boolean> = {};
+
+				function enqueue(name: string): void {
+					if (inQueue[name]) {
+						return;
+					}
+					inQueue[name] = true;
+					queue.push(name);
+				}
+
+				enqueue('es2020.full');
+
+				const result: { name: string; content: string }[] = [];
+				while (queue.length > 0) {
+					const name = queue.shift()!;
+					const contents = readLibFile(name);
+					const lines = contents.split(/\r\n|\r|\n/);
+
+					const outputLines: string[] = [];
+					for (const line of lines) {
+						const m = line.match(/\/\/\/\s*<reference\s*lib="([^"]+)"/);
+						if (m) {
+							enqueue(m[1]);
+						}
+						outputLines.push(line);
+					}
+
+					result.push({
+						name: getFileName(name),
+						content: outputLines.join('\n'),
+					});
+				}
+
+				const jquerySource = fs.readFileSync(JQUERY_DTS, 'utf8');
+				result.push({
+					name: 'jquery',
+					content: jquerySource,
+				});
+
+				let code = `const libs = {};\n`;
+				for (const entry of result) {
+					code += `libs[${JSON.stringify(entry.name)}] = ${JSON.stringify(entry.content)};\n`;
+				}
+				code += `export function loadLibrary(name) { return libs[name] || ''; }\n`;
+
+				return { contents: code, loader: 'js' };
+			});
+		},
+	};
+}
+
+await Promise.all([
+	// Build client
+	run({
+		platform: 'browser',
+		entryPoints: {
+			'htmlClientMain': path.join(extensionRoot, 'client', 'src', 'browser', 'htmlClientMain.ts'),
+		},
+		srcDir: path.join(extensionRoot, 'client', 'src'),
+		outdir: path.join(extensionRoot, 'client', 'dist', 'browser'),
+		additionalOptions: {
+			tsconfig: path.join(extensionRoot, 'client', 'tsconfig.browser.json'),
+		},
+	}, process.argv),
+
+	// Build server
+	run({
+		platform: 'browser',
+		entryPoints: {
+			'htmlServerMain': path.join(extensionRoot, 'server', 'src', 'browser', 'htmlServerWorkerMain.ts'),
+		},
+		srcDir: path.join(extensionRoot, 'server', 'src'),
+		outdir: path.join(extensionRoot, 'server', 'dist', 'browser'),
+		additionalOptions: {
+			tsconfig: path.join(extensionRoot, 'server', 'tsconfig.browser.json'),
+			plugins: [javaScriptLibsPlugin()],
+		},
+	}, process.argv),
+]);

extensions/html-language-features/esbuild.mts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 extensionRoot = import.meta.dirname;
+
+await Promise.all([
+	// Build client
+	run({
+		platform: 'node',
+		entryPoints: {
+			'htmlClientMain': path.join(extensionRoot, 'client', 'src', 'node', 'htmlClientMain.ts'),
+		},
+		srcDir: path.join(extensionRoot, 'client', 'src'),
+		outdir: path.join(extensionRoot, 'client', 'dist', 'node'),
+		additionalOptions: {
+			tsconfig: path.join(extensionRoot, 'client', 'tsconfig.json'),
+		},
+	}, process.argv),
+
+	// Build server
+	run({
+		platform: 'node',
+		entryPoints: {
+			'htmlServerMain': path.join(extensionRoot, 'server', 'src', 'node', 'htmlServerNodeMain.ts'),
+		},
+		srcDir: path.join(extensionRoot, 'server', 'src'),
+		outdir: path.join(extensionRoot, 'server', 'dist', 'node'),
+		additionalOptions: {
+			tsconfig: path.join(extensionRoot, 'server', 'tsconfig.json'),
+			external: ['vscode', 'typescript'],
+		},
+	}, process.argv),
+]);