Updates dependencies

Switches to use new context.extension

package.json

@@ -9679,7 +9679,7 @@
 		"build:extension": "webpack --mode development --config-name extension",
 		"build:webviews": "webpack --mode development --config-name webviews",
 		"bundle": "webpack --mode production",
-		"clean": "git clean -Xdf -e !node_modules -e !node_modules/**/*",
+		"clean": "npx rimraf .eslintcache* tsconfig*.tsbuildinfo",
 		"lint": "eslint src/**/*.ts --fix",
 		"pack": "vsce package --yarn",
 		"pack-insiders": "yarn run patch-insiders && yarn run pack",
@@ -9708,38 +9708,38 @@
 	},
 	"devDependencies": {
 		"@types/chroma-js": "2.1.3",
-		"@types/lodash-es": "4.17.4",
+		"@types/lodash-es": "4.17.5",
 		"@types/node": "14.17.4",
 		"@types/sortablejs": "1.10.6",
 		"@types/vscode": "1.57.0",
-		"@typescript-eslint/eslint-plugin": "4.28.3",
-		"@typescript-eslint/parser": "4.28.3",
+		"@typescript-eslint/eslint-plugin": "4.32.0",
+		"@typescript-eslint/parser": "4.32.0",
 		"circular-dependency-plugin": "5.2.2",
-		"clean-webpack-plugin": "3.0.0",
+		"clean-webpack-plugin": "4.0.0",
 		"copy-webpack-plugin": "9.0.1",
 		"cross-env": "7.0.3",
 		"csp-html-webpack-plugin": "5.1.0",
-		"css-loader": "5.2.6",
-		"esbuild": "0.12.15",
-		"esbuild-loader": "2.13.1",
-		"eslint": "7.30.0",
+		"css-loader": "6.3.0",
+		"esbuild": "0.13.3",
+		"esbuild-loader": "2.15.1",
+		"eslint": "7.32.0",
 		"eslint-cli": "1.1.1",
 		"eslint-config-prettier": "8.3.0",
-		"eslint-plugin-import": "2.23.4",
-		"fork-ts-checker-webpack-plugin": "6.2.12",
+		"eslint-plugin-import": "2.24.2",
+		"fork-ts-checker-webpack-plugin": "6.3.3",
 		"html-loader": "2.1.2",
 		"html-webpack-plugin": "5.3.2",
 		"image-minimizer-webpack-plugin": "2.2.0",
 		"imagemin-webp": "6.0.0",
-		"mini-css-extract-plugin": "2.1.0",
-		"prettier": "2.3.2",
-		"sass": "1.35.2",
+		"mini-css-extract-plugin": "2.3.0",
+		"prettier": "2.4.1",
+		"sass": "1.42.1",
 		"sass-loader": "12.1.0",
-		"terser-webpack-plugin": "5.1.4",
-		"ts-loader": "9.2.3",
-		"typescript": "4.4.0-beta",
-		"vsce": "1.95.1",
-		"webpack": "5.44.0",
+		"terser-webpack-plugin": "5.2.4",
+		"ts-loader": "9.2.6",
+		"typescript": "4.4.3",
+		"vsce": "1.100.1",
+		"webpack": "5.56.0",
 		"webpack-bundle-analyzer": "4.4.2",
 		"webpack-cli": "4.2.0"
 	},

src/container.ts

@@ -49,8 +49,7 @@ export class Container {
 
 	private static _terminalLinks: GitTerminalLinkProvider | undefined;
 
-	static initialize(extensionId: string, context: ExtensionContext, config: Config) {
-		this._extensionId = extensionId;
+	static initialize(context: ExtensionContext, config: Config) {
 		this._context = context;
 		this._config = Container.applyMode(config);
 
@@ -190,11 +189,6 @@ export class Container {
 		return this._contributorsView;
 	}
 
-	private static _extensionId: string;
-	static get extensionId() {
-		return this._extensionId;
-	}
-
 	private static _fileAnnotationController: FileAnnotationController;
 	static get fileAnnotations() {
 		return this._fileAnnotationController;
@@ -234,7 +228,7 @@ export class Container {
 
 	@memoize()
 	static get insiders() {
-		return this._extensionId.endsWith('-insiders');
+		return this._context.extension.id.endsWith('-insiders');
 	}
 
 	private static _keyboard: Keyboard;

src/extension.ts

@@ -1,5 +1,4 @@
 'use strict';
-import * as paths from 'path';
 import { commands, ExtensionContext, extensions, window, workspace } from 'vscode';
 import { CreatePullRequestActionContext, GitLensApi, OpenPullRequestActionContext } from '../src/api/gitlens';
 import { Api } from './api/api';
@@ -25,16 +24,14 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 
 	_context = context;
 
-	let extensionId = 'eamodio.gitlens';
-	if (paths.basename(context.globalStorageUri.fsPath) === 'eamodio.gitlens-insiders') {
-		extensionId = 'eamodio.gitlens-insiders';
-
+	if (context.extension.id === 'eamodio.gitlens-insiders') {
 		// Ensure that stable isn't also installed
 		const stable = extensions.getExtension('eamodio.gitlens');
 		if (stable != null) {
-			Logger.log('GitLens (Insiders) was NOT activated because GitLens is also installed');
+			Logger.log('GitLens (Insiders) was NOT activated because GitLens is also enabled');
 
-			void Messages.showInsidersErrorMessage();
+			// If we don't use a setTimeout here this notification will get lost for some reason
+			setTimeout(() => void Messages.showInsidersErrorMessage(), 0);
 
 			return undefined;
 		}
@@ -70,8 +67,7 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 		return undefined;
 	});
 
-	const gitlens = extensions.getExtension(extensionId)!;
-	const gitlensVersion = gitlens.packageJSON.version;
+	const gitlensVersion = context.extension.packageJSON.version;
 
 	const syncedVersion = context.globalState.get<string>(SyncedState.Version);
 	const localVersion =
@@ -154,7 +150,7 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 		return undefined;
 	}
 
-	Container.initialize(extensionId, context, cfg);
+	Container.initialize(context, cfg);
 
 	registerCommands(context);
 	registerBuiltInActionRunners(context);

src/messages.ts

@@ -134,7 +134,7 @@ export class Messages {
 	static showInsidersErrorMessage() {
 		return Messages.showMessage(
 			'error',
-			'GitLens (Insiders) cannot be used while GitLens is also installed. Please ensure that only one version of GitLens is installed.',
+			'GitLens (Insiders) cannot be used while GitLens is also enabled. Please ensure that only one version is enabled.',
 			SuppressedMessages.GitDisabledWarning,
 		);
 	}

webpack.config.js

@@ -141,10 +141,10 @@ function getExtensionConfig(mode, env) {
 		},
 		optimization: {
 			minimizer: [
-				// @ts-ignore
 				env.esbuild
 					? new ESBuildMinifyPlugin({
 							format: 'cjs',
+							// @ts-ignore
 							implementation: esbuild,
 							minify: true,
 							treeShaking: true,