Merge branch 'main' into isidorn/wicked-carp

Author: isidorn

build/lib/extensions.js

@@ -63,11 +63,9 @@ function updateExtensionPackageJSON(input: Stream, update: (data: any) => any):
 
 function fromLocal(extensionPath: string, forWeb: boolean, disableMangle: boolean): Stream {
 
-	const esm = JSON.parse(fs.readFileSync(path.join(extensionPath, 'package.json'), 'utf8')).type === 'module';
-
 	const webpackConfigFileName = forWeb
-		? `extension-browser.webpack.config.${!esm ? 'js' : 'cjs'}`
-		: `extension.webpack.config.${!esm ? 'js' : 'cjs'}`;
+		? `extension-browser.webpack.config.js`
+		: `extension.webpack.config.js`;
 
 	const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
 	let input = isWebPacked

build/lib/extensions.ts

@@ -81,18 +81,22 @@ export function activate(context: vscode.ExtensionContext) {
 	}));
 
 	// Listener to prompt for reload when the fetch implementation setting changes
+	const beforeFetchSetting = vscode.workspace.getConfiguration().get<boolean>('github-authentication.useElectronFetch', true);
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
 		if (e.affectsConfiguration('github-authentication.useElectronFetch')) {
-			const selection = await vscode.window.showInformationMessage(
-				vscode.l10n.t('GitHub Authentication - Reload required'),
-				{
-					modal: true,
-					detail: vscode.l10n.t('A reload is required for the fetch setting change to take effect.')
-				},
-				vscode.l10n.t('Reload Window')
-			);
-			if (selection) {
-				await vscode.commands.executeCommand('workbench.action.reloadWindow');
+			const afterFetchSetting = vscode.workspace.getConfiguration().get<boolean>('github-authentication.useElectronFetch', true);
+			if (beforeFetchSetting !== afterFetchSetting) {
+				const selection = await vscode.window.showInformationMessage(
+					vscode.l10n.t('GitHub Authentication - Reload required'),
+					{
+						modal: true,
+						detail: vscode.l10n.t('A reload is required for the fetch setting change to take effect.')
+					},
+					vscode.l10n.t('Reload Window')
+				);
+				if (selection) {
+					await vscode.commands.executeCommand('workbench.action.reloadWindow');
+				}
 			}
 		}
 	}));

extensions/github-authentication/src/extension.ts

@@ -520,7 +520,7 @@ export function sanitizeProcessEnvironment(env: Record<string, string>, ...prese
 	}, {});
 	const keysToRemove = [
 		/^ELECTRON_.$/,
-		/^VSCODE_(?!(PORTABLE|SHELL_LOGIN|ENV_REPLACE|ENV_APPEND|ENV_PREPEND)).$/,
+		/^VSCODE_(?!(PORTABLE|SHELL_LOGIN|ENV_REPLACE|ENV_APPEND|ENV_PREPEND)).+$/,
 		/^SNAP(|_.*)$/,
 		/^GDK_PIXBUF_.$/,
 	];

extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -11,6 +11,7 @@ export const untitled = 'untitled';
 export const git = 'git';
 export const github = 'github';
 export const azurerepos = 'azurerepos';
+export const chatEditingTextModel = 'chat-editing-text-model';
 
 /** Live share scheme */
 export const vsls = 'vsls';
@@ -50,6 +51,7 @@ export const disabledSchemes = new Set([
 	vsls,
 	github,
 	azurerepos,
+	chatEditingTextModel,
 ]);
 
 export function isOfScheme(uri: vscode.Uri, ...schemes: string[]): boolean {

extensions/typescript-language-features/src/configuration/fileSchemes.ts

@@ -139,7 +139,7 @@
     "@types/yauzl": "^2.10.0",
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/utils": "^8.36.0",
-    "@typescript/native-preview": "^7.0.0-dev.20250707.2",
+    "@typescript/native-preview": "^7.0.0-dev.20250812.1",
     "@vscode/gulp-electron": "^1.38.1",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.10.2",
@@ -211,7 +211,7 @@
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "typescript": "^6.0.0-dev.20250806",
+    "typescript": "^6.0.0-dev.20250812",
     "typescript-eslint": "^8.39.0",
     "util": "^0.12.4",
     "webpack": "^5.94.0",