diff --git a/extensions/esbuild-extension-common.mts b/extensions/esbuild-extension-common.mts
index 1c458e4bfe1..cc716f2ca6a 100644
--- a/extensions/esbuild-extension-common.mts
+++ b/extensions/esbuild-extension-common.mts
@@ -33,6 +33,7 @@ async function tryBuild(options: BuildOptions, didBuild?: (outDir: string) => un
 
 interface RunConfig {
 	readonly platform: 'node' | 'browser';
+	readonly format?: 'cjs' | 'esm';
 	readonly srcDir: string;
 	readonly outdir: string;
 	readonly entryPoints: string[] | Record<string, string> | { in: string; out: string }[];
@@ -48,6 +49,7 @@ function resolveOptions(config: RunConfig, outdir: string): BuildOptions {
 		sourcemap: true,
 		target: ['es2024'],
 		external: ['vscode'],
+		format: config.format ?? 'cjs',
 		entryPoints: config.entryPoints,
 		outdir,
 		logOverride: {
@@ -57,10 +59,8 @@ function resolveOptions(config: RunConfig, outdir: string): BuildOptions {
 	};
 
 	if (config.platform === 'node') {
-		options.format = 'cjs';
 		options.mainFields = ['module', 'main'];
 	} else if (config.platform === 'browser') {
-		options.format = 'cjs';
 		options.mainFields = ['browser', 'module', 'main'];
 		options.alias = {
 			'path': 'path-browserify',
diff --git a/extensions/github/.vscodeignore b/extensions/github/.vscodeignore
index 77ec048a6da..a6590bd3934 100644
--- a/extensions/github/.vscodeignore
+++ b/extensions/github/.vscodeignore
@@ -2,7 +2,7 @@ src/**
 !src/common/config.json
 out/**
 build/**
-extension.webpack.config.js
+esbuild*.mts
 tsconfig*.json
 package-lock.json
 testWorkspace/**
diff --git a/extensions/github/extension.webpack.config.js b/extensions/github/esbuild.mts
similarity index 50%
rename from extensions/github/extension.webpack.config.js
rename to extensions/github/esbuild.mts
index 9e2b191a389..f91916e622d 100644
--- a/extensions/github/extension.webpack.config.js
+++ b/extensions/github/esbuild.mts
@@ -2,22 +2,18 @@
  *  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/extension.ts'
+const srcDir = path.join(import.meta.dirname, 'src');
+const outDir = path.join(import.meta.dirname, 'dist');
+
+run({
+	platform: 'node',
+	format: 'esm',
+	entryPoints: {
+		'extension': path.join(srcDir, 'extension.ts'),
 	},
-	output: {
-		libraryTarget: 'module',
-		chunkFormat: 'module',
-	},
-	externals: {
-		'vscode': 'module vscode',
-	},
-	experiments: {
-		outputModule: true
-	}
-});
+	srcDir,
+	outdir: outDir,
+}, process.argv);
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 78577f2192d..cb77091cde0 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -19,8 +19,7 @@
   "extensionDependencies": [
     "vscode.git-base"
   ],
-  "main": "./out/extension.js",
-  "type": "module",
+  "main": "./dist/extension.js",
   "capabilities": {
     "virtualWorkspaces": true,
     "untrustedWorkspaces": {
diff --git a/extensions/github/src/branchProtection.ts b/extensions/github/src/branchProtection.ts
index 040df24942a..0c616d33905 100644
--- a/extensions/github/src/branchProtection.ts
+++ b/extensions/github/src/branchProtection.ts
@@ -6,7 +6,7 @@
 import { EventEmitter, LogOutputChannel, Memento, Uri, workspace } from 'vscode';
 import { Repository as GitHubRepository, RepositoryRuleset } from '@octokit/graphql-schema';
 import { AuthenticationError, OctokitService } from './auth.js';
-import { API, BranchProtection, BranchProtectionProvider, BranchProtectionRule, Repository } from './typings/git.js';
+import type { API, BranchProtection, BranchProtectionProvider, BranchProtectionRule, Repository } from './typings/git.d.ts';
 import { DisposableStore, getRepositoryFromUrl } from './util.js';
 import { TelemetryReporter } from '@vscode/extension-telemetry';
 
diff --git a/extensions/github/src/canonicalUriProvider.ts b/extensions/github/src/canonicalUriProvider.ts
index 0838c7377dd..9218707ed26 100644
--- a/extensions/github/src/canonicalUriProvider.ts
+++ b/extensions/github/src/canonicalUriProvider.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken, CanonicalUriProvider, CanonicalUriRequestOptions, Disposable, ProviderResult, Uri, workspace } from 'vscode';
-import { API } from './typings/git.js';
+import type { API } from './typings/git.d.ts';
 
 const SUPPORTED_SCHEMES = ['ssh', 'https', 'file'];
 
diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts
index 78dd3271588..a8b69f10936 100644
--- a/extensions/github/src/commands.ts
+++ b/extensions/github/src/commands.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { API as GitAPI, RefType, Repository } from './typings/git.js';
+import { RefType } from './typings/git.constants.js';
+import type { API as GitAPI, Repository } from './typings/git.d.ts';
 import { publishRepository } from './publish.js';
 import { DisposableStore, getRepositoryFromUrl } from './util.js';
 import { LinkContext, getCommitLink, getLink, getVscodeDevHost } from './links.js';
diff --git a/extensions/github/src/credentialProvider.ts b/extensions/github/src/credentialProvider.ts
index d184960c23b..4964724eed6 100644
--- a/extensions/github/src/credentialProvider.ts
+++ b/extensions/github/src/credentialProvider.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CredentialsProvider, Credentials, API as GitAPI } from './typings/git.js';
+import type { CredentialsProvider, Credentials, API as GitAPI } from './typings/git.d.ts';
 import { workspace, Uri, Disposable } from 'vscode';
 import { getSession } from './auth.js';
 
diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts
index 17906c57d44..e6a44f516ac 100644
--- a/extensions/github/src/extension.ts
+++ b/extensions/github/src/extension.ts
@@ -6,7 +6,7 @@
 import { commands, Disposable, ExtensionContext, extensions, l10n, LogLevel, LogOutputChannel, window } from 'vscode';
 import { TelemetryReporter } from '@vscode/extension-telemetry';
 import { GithubRemoteSourceProvider } from './remoteSourceProvider.js';
-import { API, GitExtension } from './typings/git.js';
+import type { API, GitExtension } from './typings/git.d.ts';
 import { registerCommands } from './commands.js';
 import { GithubCredentialProviderManager } from './credentialProvider.js';
 import { DisposableStore, repositoryHasGitHubRemote } from './util.js';
diff --git a/extensions/github/src/historyItemDetailsProvider.ts b/extensions/github/src/historyItemDetailsProvider.ts
index 9a267b9e844..d0a145ec9f2 100644
--- a/extensions/github/src/historyItemDetailsProvider.ts
+++ b/extensions/github/src/historyItemDetailsProvider.ts
@@ -5,7 +5,7 @@
 
 import { Command, l10n, LogOutputChannel, workspace } from 'vscode';
 import { Commit, Repository as GitHubRepository, Maybe } from '@octokit/graphql-schema';
-import { API, AvatarQuery, AvatarQueryCommit, Repository, SourceControlHistoryItemDetailsProvider } from './typings/git.js';
+import type { API, AvatarQuery, AvatarQueryCommit, Repository, SourceControlHistoryItemDetailsProvider } from './typings/git.d.ts';
 import { DisposableStore, getRepositoryDefaultRemote, getRepositoryDefaultRemoteUrl, getRepositoryFromUrl, groupBy, sequentialize } from './util.js';
 import { AuthenticationError, OctokitService } from './auth.js';
 import { getAvatarLink } from './links.js';
diff --git a/extensions/github/src/links.ts b/extensions/github/src/links.ts
index b4f8379e5f7..fbdde106149 100644
--- a/extensions/github/src/links.ts
+++ b/extensions/github/src/links.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { API as GitAPI, RefType, Repository } from './typings/git.js';
+import { RefType } from './typings/git.constants.js';
+import type { API as GitAPI, Repository } from './typings/git.d.ts';
 import { getRepositoryFromUrl, repositoryHasGitHubRemote } from './util.js';
 
 export function isFileInRepo(repository: Repository, file: vscode.Uri): boolean {
diff --git a/extensions/github/src/publish.ts b/extensions/github/src/publish.ts
index 618f7527450..dab81037d59 100644
--- a/extensions/github/src/publish.ts
+++ b/extensions/github/src/publish.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { API as GitAPI, Repository } from './typings/git.js';
+import type { API as GitAPI, Repository } from './typings/git.d.ts';
 import { getOctokit } from './auth.js';
 import { TextEncoder } from 'util';
 import { basename } from 'path';
diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts
index f7b0b9ef869..751654515f9 100644
--- a/extensions/github/src/pushErrorHandler.ts
+++ b/extensions/github/src/pushErrorHandler.ts
@@ -6,7 +6,8 @@
 import { TextDecoder } from 'util';
 import { commands, env, ProgressLocation, Uri, window, workspace, QuickPickOptions, FileType, l10n, Disposable, TextDocumentContentProvider } from 'vscode';
 import { getOctokit } from './auth.js';
-import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git.js';
+import { GitErrorCodes } from './typings/git.constants.js';
+import type { PushErrorHandler, Remote, Repository } from './typings/git.d.ts';
 import * as path from 'path';
 import { TelemetryReporter } from '@vscode/extension-telemetry';
 
diff --git a/extensions/github/src/remoteSourcePublisher.ts b/extensions/github/src/remoteSourcePublisher.ts
index 97ce05a835c..67c1e567e36 100644
--- a/extensions/github/src/remoteSourcePublisher.ts
+++ b/extensions/github/src/remoteSourcePublisher.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { publishRepository } from './publish.js';
-import { API as GitAPI, RemoteSourcePublisher, Repository } from './typings/git.js';
+import type { API as GitAPI, RemoteSourcePublisher, Repository } from './typings/git.d.ts';
 
 export class GithubRemoteSourcePublisher implements RemoteSourcePublisher {
 	readonly name = 'GitHub';
diff --git a/extensions/github/src/shareProviders.ts b/extensions/github/src/shareProviders.ts
index d2e94a47147..a52cf84d704 100644
--- a/extensions/github/src/shareProviders.ts
+++ b/extensions/github/src/shareProviders.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { API } from './typings/git.js';
+import type { API } from './typings/git.d.ts';
 import { getRepositoryFromUrl, repositoryHasGitHubRemote } from './util.js';
 import { encodeURIComponentExceptSlashes, ensurePublished, getRepositoryForFile, notebookCellRangeString, rangeString } from './links.js';
 
diff --git a/extensions/github/src/typings/git.constants.ts b/extensions/github/src/typings/git.constants.ts
new file mode 100644
index 00000000000..5847e21d5d0
--- /dev/null
+++ b/extensions/github/src/typings/git.constants.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as git from './git';
+
+export type ForcePushMode = git.ForcePushMode;
+export type RefType = git.RefType;
+export type Status = git.Status;
+export type GitErrorCodes = git.GitErrorCodes;
+
+export const ForcePushMode = Object.freeze({
+	Force: 0,
+	ForceWithLease: 1,
+	ForceWithLeaseIfIncludes: 2,
+}) satisfies typeof git.ForcePushMode;
+
+export const RefType = Object.freeze({
+	Head: 0,
+	RemoteHead: 1,
+	Tag: 2,
+}) satisfies typeof git.RefType;
+
+export const Status = Object.freeze({
+	INDEX_MODIFIED: 0,
+	INDEX_ADDED: 1,
+	INDEX_DELETED: 2,
+	INDEX_RENAMED: 3,
+	INDEX_COPIED: 4,
+
+	MODIFIED: 5,
+	DELETED: 6,
+	UNTRACKED: 7,
+	IGNORED: 8,
+	INTENT_TO_ADD: 9,
+	INTENT_TO_RENAME: 10,
+	TYPE_CHANGED: 11,
+
+	ADDED_BY_US: 12,
+	ADDED_BY_THEM: 13,
+	DELETED_BY_US: 14,
+	DELETED_BY_THEM: 15,
+	BOTH_ADDED: 16,
+	BOTH_DELETED: 17,
+	BOTH_MODIFIED: 18,
+}) satisfies typeof git.Status;
+
+export const GitErrorCodes = Object.freeze({
+	BadConfigFile: 'BadConfigFile',
+	BadRevision: 'BadRevision',
+	AuthenticationFailed: 'AuthenticationFailed',
+	NoUserNameConfigured: 'NoUserNameConfigured',
+	NoUserEmailConfigured: 'NoUserEmailConfigured',
+	NoRemoteRepositorySpecified: 'NoRemoteRepositorySpecified',
+	NotAGitRepository: 'NotAGitRepository',
+	NotASafeGitRepository: 'NotASafeGitRepository',
+	NotAtRepositoryRoot: 'NotAtRepositoryRoot',
+	Conflict: 'Conflict',
+	StashConflict: 'StashConflict',
+	UnmergedChanges: 'UnmergedChanges',
+	PushRejected: 'PushRejected',
+	ForcePushWithLeaseRejected: 'ForcePushWithLeaseRejected',
+	ForcePushWithLeaseIfIncludesRejected: 'ForcePushWithLeaseIfIncludesRejected',
+	RemoteConnectionError: 'RemoteConnectionError',
+	DirtyWorkTree: 'DirtyWorkTree',
+	CantOpenResource: 'CantOpenResource',
+	GitNotFound: 'GitNotFound',
+	CantCreatePipe: 'CantCreatePipe',
+	PermissionDenied: 'PermissionDenied',
+	CantAccessRemote: 'CantAccessRemote',
+	RepositoryNotFound: 'RepositoryNotFound',
+	RepositoryIsLocked: 'RepositoryIsLocked',
+	BranchNotFullyMerged: 'BranchNotFullyMerged',
+	NoRemoteReference: 'NoRemoteReference',
+	InvalidBranchName: 'InvalidBranchName',
+	BranchAlreadyExists: 'BranchAlreadyExists',
+	NoLocalChanges: 'NoLocalChanges',
+	NoStashFound: 'NoStashFound',
+	LocalChangesOverwritten: 'LocalChangesOverwritten',
+	NoUpstreamBranch: 'NoUpstreamBranch',
+	IsInSubmodule: 'IsInSubmodule',
+	WrongCase: 'WrongCase',
+	CantLockRef: 'CantLockRef',
+	CantRebaseMultipleBranches: 'CantRebaseMultipleBranches',
+	PatchDoesNotApply: 'PatchDoesNotApply',
+	NoPathFound: 'NoPathFound',
+	UnknownPath: 'UnknownPath',
+	EmptyCommitMessage: 'EmptyCommitMessage',
+	BranchFastForwardRejected: 'BranchFastForwardRejected',
+	BranchNotYetBorn: 'BranchNotYetBorn',
+	TagConflict: 'TagConflict',
+	CherryPickEmpty: 'CherryPickEmpty',
+	CherryPickConflict: 'CherryPickConflict',
+	WorktreeContainsChanges: 'WorktreeContainsChanges',
+	WorktreeAlreadyExists: 'WorktreeAlreadyExists',
+	WorktreeBranchAlreadyUsed: 'WorktreeBranchAlreadyUsed',
+}) satisfies Record<keyof typeof git.GitErrorCodes, string>;
diff --git a/extensions/github/src/util.ts b/extensions/github/src/util.ts
index 2247292dd93..bcdddaed6e5 100644
--- a/extensions/github/src/util.ts
+++ b/extensions/github/src/util.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Repository } from './typings/git.js';
+import type { Repository } from './typings/git.d.ts';
 
 export class DisposableStore {