Merge pull request microsoft#259860 from mjbvz/sparkling-otter

mjbvz · web-flow · commit b26e4248823e · 2025-08-05T14:18:12.000-07:00
Bump extensions to target es2024
diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json
@@ -3,7 +3,7 @@
 	"compilerOptions": {
 		"outDir": "./out",
 		"lib": [
-			"ES2020",
+			"ES2024",
 			"WebWorker"
 		],
 		"module": "Node16",
diff --git a/extensions/esbuild-webview-common.js b/extensions/esbuild-webview-common.js
@@ -31,7 +31,7 @@ async function build(options, didBuild) {
 		sourcemap: false,
 		format: 'esm',
 		platform: 'browser',
-		target: ['es2020'],
+		target: ['es2024'],
 		...options,
 	});
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -807,7 +807,7 @@ export class Repository implements Disposable {
 		return this._cherryPickInProgress;
 	}
 
-	private _operations = new OperationManager(this.logger);
+	private readonly _operations: OperationManager;
 	get operations(): OperationManager { return this._operations; }
 
 	private _state = RepositoryState.Idle;
@@ -866,6 +866,8 @@ export class Repository implements Disposable {
 		private readonly logger: LogOutputChannel,
 		private telemetryReporter: TelemetryReporter
 	) {
+		this._operations = new OperationManager(this.logger);
+
 		const repositoryWatcher = workspace.createFileSystemWatcher(new RelativePattern(Uri.file(repository.root), '**'));
 		this.disposables.push(repositoryWatcher);
 
diff --git a/extensions/github/src/branchProtection.ts b/extensions/github/src/branchProtection.ts
@@ -109,7 +109,7 @@ export class GitHubBranchProtectionProvider implements BranchProtectionProvider
 	onDidChangeBranchProtection = this._onDidChangeBranchProtection.event;
 
 	private branchProtection: BranchProtection[];
-	private readonly globalStateKey = `branchProtection:${this.repository.rootUri.toString()}`;
+	private readonly globalStateKey: string;
 
 	private readonly disposables = new DisposableStore();
 
@@ -120,6 +120,8 @@ export class GitHubBranchProtectionProvider implements BranchProtectionProvider
 		private readonly logger: LogOutputChannel,
 		private readonly telemetryReporter: TelemetryReporter
 	) {
+		this.globalStateKey = `branchProtection:${this.repository.rootUri.toString()}`;
+
 		this.disposables.add(this._onDidChangeBranchProtection);
 
 		// Restore branch protection from global state
diff --git a/extensions/html-language-features/server/tsconfig.json b/extensions/html-language-features/server/tsconfig.json
@@ -3,7 +3,7 @@
 	"compilerOptions": {
 		"outDir": "./out",
 		"lib": [
-			"ES2020",
+			"ES2024",
 			"WebWorker"
 		],
 		"module": "Node16",
diff --git a/extensions/json-language-features/server/tsconfig.json b/extensions/json-language-features/server/tsconfig.json
@@ -5,7 +5,7 @@
 		"sourceMap": true,
 		"sourceRoot": "../src",
 		"lib": [
-			"ES2020",
+			"ES2024",
 			"WebWorker"
 		],
 		"module": "Node16",
diff --git a/extensions/markdown-language-features/notebook/tsconfig.json b/extensions/markdown-language-features/notebook/tsconfig.json
@@ -7,7 +7,7 @@
 		"allowSyntheticDefaultImports": true,
 		"module": "es2020",
 		"lib": [
-			"es2018",
+			"ES2024",
 			"DOM",
 			"DOM.Iterable"
 		]
diff --git a/extensions/markdown-language-features/preview-src/tsconfig.json b/extensions/markdown-language-features/preview-src/tsconfig.json
@@ -5,7 +5,7 @@
 		"jsx": "react",
 		"esModuleInterop": true,
 		"lib": [
-			"es2018",
+			"es2024",
 			"DOM",
 			"DOM.Iterable"
 		]
diff --git a/extensions/markdown-math/notebook/tsconfig.json b/extensions/markdown-math/notebook/tsconfig.json
@@ -5,7 +5,7 @@
 		"jsx": "react",
 		"module": "es2020",
 		"lib": [
-			"es2018",
+			"ES2024",
 			"DOM",
 			"DOM.Iterable"
 		]
diff --git a/extensions/microsoft-authentication/src/common/accountAccess.ts b/extensions/microsoft-authentication/src/common/accountAccess.ts
@@ -90,14 +90,16 @@ class AccountAccessSecretStorage implements IAccountAccessSecretStorage, Disposa
 	private readonly _onDidChangeEmitter = new EventEmitter<void>();
 	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
-	private readonly _key = `accounts-${this._cloudName}`;
+	private readonly _key: string;
 
 	private constructor(
 		private readonly _secretStorage: SecretStorage,
 		private readonly _cloudName: string,
 		private readonly _logger: LogOutputChannel,
 		private readonly _migrations?: { clientId: string; authority: string }[],
 	) {
+		this._key = `accounts-${this._cloudName}`;
+
 		this._disposable = Disposable.from(
 			this._onDidChangeEmitter,
 			this._secretStorage.onDidChange(e => {
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -21,11 +21,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	private readonly _disposable: Disposable;
 
 	// Cache properties
-	private readonly _secretStorageCachePlugin = new SecretStorageCachePlugin(
-		this._secretStorage,
-		// Include the prefix as a differentiator to other secrets
-		`pca:${this._clientId}`
-	);
+	private readonly _secretStorageCachePlugin: SecretStorageCachePlugin;
 
 	// Broker properties
 	private readonly _isBrokerAvailable: boolean;
@@ -47,6 +43,12 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 		private readonly _logger: LogOutputChannel,
 		telemetryReporter: MicrosoftAuthenticationTelemetryReporter
 	) {
+		this._secretStorageCachePlugin = new SecretStorageCachePlugin(
+			this._secretStorage,
+			// Include the prefix as a differentiator to other secrets
+			`pca:${this._clientId}`
+		);
+
 		const loggerOptions = new MsalLoggerOptions(_logger, telemetryReporter);
 		const nativeBrokerPlugin = new NativeBrokerPlugin();
 		this._isBrokerAvailable = nativeBrokerPlugin.isBrokerAvailable;
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -231,10 +231,16 @@ class PublicClientApplicationsSecretStorage implements IPublicClientApplicationS
 	private readonly _onDidChangeEmitter = new EventEmitter<void>;
 	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
-	private readonly _oldKey = `publicClientApplications-${this._cloudName}`;
-	private readonly _key = `publicClients-${this._cloudName}`;
+	private readonly _oldKey: string;
+	private readonly _key: string;
+
+	private constructor(
+		private readonly _secretStorage: SecretStorage,
+		private readonly _cloudName: string
+	) {
+		this._oldKey = `publicClientApplications-${this._cloudName}`;
+		this._key = `publicClients-${this._cloudName}`;
 
-	private constructor(private readonly _secretStorage: SecretStorage, private readonly _cloudName: string) {
 		this._disposable = Disposable.from(
 			this._onDidChangeEmitter,
 			this._secretStorage.onDidChange(e => {
diff --git a/extensions/simple-browser/preview-src/tsconfig.json b/extensions/simple-browser/preview-src/tsconfig.json
@@ -4,7 +4,7 @@
 		"outDir": "./dist/",
 		"jsx": "react",
 		"lib": [
-			"es2018",
+			"ES2024",
 			"DOM",
 			"DOM.Iterable"
 		]
diff --git a/extensions/tsconfig.base.json b/extensions/tsconfig.base.json
@@ -1,30 +1,9 @@
 {
 	"compilerOptions": {
 		"esModuleInterop": true,
-		"target": "es2020",
+		"target": "ES2024",
 		"lib": [
-			"ES2016",
-			"ES2017.Object",
-			"ES2017.String",
-			"ES2017.Intl",
-			"ES2017.TypedArrays",
-			"ES2018.AsyncIterable",
-			"ES2018.AsyncGenerator",
-			"ES2018.Promise",
-			"ES2018.Regexp",
-			"ES2018.Intl",
-			"ES2019.Array",
-			"ES2019.Object",
-			"ES2019.String",
-			"ES2019.Symbol",
-			"ES2020.BigInt",
-			"ES2020.Promise",
-			"ES2020.String",
-			"ES2020.Symbol.WellKnown",
-			"ES2020.Intl",
-			"ES2021.Promise",
-			"ES2021.String",
-			"ES2021.WeakRef"
+			"ES2024"
 		],
 		"module": "commonjs",
 		"strict": true,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"allowSyntheticDefaultImports": true,`
`8`	`8`	`"module": "es2020",`
`9`	`9`	`"lib": [`
`10`		`- "es2018",`
	`10`	`+ "ES2024",`
`11`	`11`	`"DOM",`
`12`	`12`	`"DOM.Iterable"`
`13`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"jsx": "react",`
`6`	`6`	`"esModuleInterop": true,`
`7`	`7`	`"lib": [`
`8`		`- "es2018",`
	`8`	`+ "es2024",`
`9`	`9`	`"DOM",`
`10`	`10`	`"DOM.Iterable"`
`11`	`11`	`]`