Updates dependencies & fixes lint issues

eamodio · eamodio · commit 12ea8700ef5f · 2024-01-16T02:04:21.000-05:00
diff --git a/package.json b/package.json
@@ -16113,54 +16113,54 @@
 	},
 	"devDependencies": {
 		"@eamodio/eslint-lite-webpack-plugin": "0.0.8",
-		"@swc/core": "1.3.100",
-		"@twbs/fantasticon": "2.7.1",
+		"@swc/core": "1.3.103",
+		"@twbs/fantasticon": "2.7.2",
 		"@types/mocha": "10.0.6",
 		"@types/node": "18.15.0",
 		"@types/react": "17.0.71",
 		"@types/react-dom": "17.0.21",
 		"@types/sortablejs": "1.15.7",
 		"@types/vscode": "1.82.0",
-		"@typescript-eslint/eslint-plugin": "6.13.2",
-		"@typescript-eslint/parser": "6.13.2",
+		"@typescript-eslint/eslint-plugin": "6.19.0",
+		"@typescript-eslint/parser": "6.19.0",
 		"@vscode/test-electron": "2.3.8",
-		"@vscode/test-web": "0.0.49",
+		"@vscode/test-web": "0.0.50",
 		"@vscode/vsce": "2.22.0",
 		"circular-dependency-plugin": "5.2.2",
 		"clean-webpack-plugin": "4.0.0",
 		"concurrently": "8.2.2",
-		"copy-webpack-plugin": "11.0.0",
+		"copy-webpack-plugin": "12.0.1",
 		"csp-html-webpack-plugin": "5.1.0",
-		"css-loader": "6.8.1",
+		"css-loader": "6.9.0",
 		"css-minimizer-webpack-plugin": "5.0.1",
-		"cssnano-preset-advanced": "6.0.1",
-		"esbuild": "0.19.9",
+		"cssnano-preset-advanced": "6.0.3",
+		"esbuild": "0.19.11",
 		"esbuild-loader": "4.0.2",
-		"esbuild-sass-plugin": "2.16.0",
-		"eslint": "8.55.0",
+		"esbuild-sass-plugin": "2.16.1",
+		"eslint": "8.56.0",
 		"eslint-cli": "1.1.1",
 		"eslint-config-prettier": "9.1.0",
 		"eslint-import-resolver-typescript": "3.6.1",
 		"eslint-plugin-anti-trojan-source": "1.1.1",
-		"eslint-plugin-import": "2.29.0",
-		"eslint-plugin-lit": "1.10.1",
+		"eslint-plugin-import": "2.29.1",
+		"eslint-plugin-lit": "1.11.0",
 		"eslint-plugin-wc": "2.0.4",
 		"fork-ts-checker-webpack-plugin": "6.5.3",
 		"glob": "10.3.10",
 		"html-loader": "4.2.0",
-		"html-webpack-plugin": "5.5.4",
+		"html-webpack-plugin": "5.6.0",
 		"image-minimizer-webpack-plugin": "3.8.3",
-		"license-checker-rseidelsohn": "4.2.11",
+		"license-checker-rseidelsohn": "4.3.0",
 		"lz-string": "1.5.0",
-		"mini-css-extract-plugin": "2.7.6",
+		"mini-css-extract-plugin": "2.7.7",
 		"mocha": "10.2.0",
 		"prettier": "3.1.0",
-		"sass": "1.69.5",
-		"sass-loader": "13.3.2",
+		"sass": "1.69.7",
+		"sass-loader": "14.0.0",
 		"schema-utils": "4.2.0",
 		"sharp": "0.32.6",
-		"svgo": "3.1.0",
-		"terser-webpack-plugin": "5.3.9",
+		"svgo": "3.2.0",
+		"terser-webpack-plugin": "5.3.10",
 		"ts-loader": "9.5.1",
 		"tsc-alias": "1.8.8",
 		"typescript": "5.3.3",
diff --git a/src/codelens/codeLensProvider.ts b/src/codelens/codeLensProvider.ts
@@ -451,7 +451,7 @@ export class GitCodeLensProvider implements CodeLensProvider {
 	resolveCodeLens(lens: CodeLens, token: CancellationToken): CodeLens | Promise<CodeLens> {
 		if (lens instanceof GitRecentChangeCodeLens) return this.resolveGitRecentChangeCodeLens(lens, token);
 		if (lens instanceof GitAuthorsCodeLens) return this.resolveGitAuthorsCodeLens(lens, token);
-		// eslint-disable-next-line prefer-promise-reject-errors
+		// eslint-disable-next-line prefer-promise-reject-errors, @typescript-eslint/prefer-promise-reject-errors
 		return Promise.reject<CodeLens>(undefined);
 	}
 
diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts
@@ -561,7 +561,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 					canSelectMany: false,
 					defaultUri: context.pickedUri ?? state.uri ?? context.defaultUri,
 					openLabel: 'Select Worktree Location',
-					title: `${appendReposToTitle(`Choose a Worktree Location${options.titleContext}`, state, context)}`,
+					title: appendReposToTitle(`Choose a Worktree Location${options.titleContext}`, state, context),
 				});
 
 				if (uris == null || uris.length === 0) return Directive.Back;
diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts
@@ -2362,7 +2362,7 @@ export function* showRepositoryStatusStep<
 	const working = context.status.getFormattedDiffStatus({ expand: true, separator: ', ' });
 	const step: QuickPickStep<CommandQuickPickItem> = createPickStep<CommandQuickPickItem>({
 		title: appendReposToTitle(context.title, state, context),
-		placeholder: `${upstream ? `${upstream}, ${working}` : working}`, //'Changes to be committed',
+		placeholder: upstream ? `${upstream}, ${working}` : working, //'Changes to be committed',
 		ignoreFocusOut: true,
 		items: getShowRepositoryStatusStepItems(state, context),
 		keys: ['right', 'alt+right', 'ctrl+right'],
diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts
@@ -363,7 +363,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 			const { previousLineComparisonUris: diffUris } = this._options;
 			if (diffUris?.previous != null) {
 				commands = `[\`${this._padOrTruncate(
-					shortenRevision(isUncommittedStaged(diffUris.current.sha) ? diffUris.current.sha : uncommitted)!,
+					shortenRevision(isUncommittedStaged(diffUris.current.sha) ? diffUris.current.sha : uncommitted),
 					this._options.tokenOptions.commands,
 				)}\`](${ShowCommitsInViewCommand.getMarkdownCommandArgs(
 					this._item.sha,
@@ -390,7 +390,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 				)} "Open Blame Prior to this Change")`;
 			} else {
 				commands = `[\`${this._padOrTruncate(
-					shortenRevision(this._item.isUncommittedStaged ? uncommittedStaged : uncommitted)!,
+					shortenRevision(this._item.isUncommittedStaged ? uncommittedStaged : uncommitted),
 					this._options.tokenOptions.commands,
 				)}\`](${ShowCommitsInViewCommand.getMarkdownCommandArgs(
 					this._item.sha,
diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts
@@ -1410,7 +1410,7 @@ export class GitProviderService implements Disposable {
 		return provider.push(path, options);
 	}
 
-	@gate<GitProviderService['pushAll']>(repos => `${repos == null ? '' : repos.map(r => r.id).join(',')}`)
+	@gate<GitProviderService['pushAll']>(repos => (repos == null ? '' : repos.map(r => r.id).join(',')))
 	@log<GitProviderService['pushAll']>({ args: { 0: repos => repos?.map(r => r.name).join(', ') } })
 	async pushAll(
 		repositories?: Repository[],
diff --git a/src/git/models/reference.ts b/src/git/models/reference.ts
@@ -346,7 +346,7 @@ export function getReferenceLabel(
 					result = `${options.label ? 'stash ' : ''}${
 						options.icon
 							? `$(archive)${GlyphChars.Space}${message ?? ref.name}`
-							: `${message ?? (ref.number ? `#${ref.number}` : ref.name)}`
+							: message ?? (ref.number ? `#${ref.number}` : ref.name)
 					}`;
 				} else if (isRevisionRange(ref.ref)) {
 					result = refName;
diff --git a/src/plus/gk/account/authenticationConnection.ts b/src/plus/gk/account/authenticationConnection.ts
@@ -107,7 +107,7 @@ export class AuthenticationConnection implements Disposable {
 				),
 				new Promise<string>(
 					(_, reject) =>
-						// eslint-disable-next-line prefer-promise-reject-errors
+						// eslint-disable-next-line prefer-promise-reject-errors, @typescript-eslint/prefer-promise-reject-errors
 						this._cancellationSource?.token.onCancellationRequested(() => reject('Cancelled')),
 				),
 				new Promise<string>((_, reject) => setTimeout(reject, 120000, 'Cancelled')),
diff --git a/src/plus/integrations/providers/github/githubGitProvider.ts b/src/plus/integrations/providers/github/githubGitProvider.ts
@@ -1249,7 +1249,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		}
 
 		const ids = new Set<string>();
-		const remote = getSettledValue(remotesResult)![0]!;
+		const remote = getSettledValue(remotesResult)![0];
 		const remoteMap = remote != null ? new Map([[remote.name, remote]]) : new Map<string, GitRemote>();
 
 		const tagTips = new Map<string, string[]>();
diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts
@@ -774,7 +774,7 @@ export class PatchDetailsWebviewProvider
 	}
 
 	private async updateDraftPermissions() {
-		const draft = (this._context.draft as Draft)!;
+		const draft = this._context.draft as Draft;
 		const draftId = draft.id;
 		const changes = [];
 
diff --git a/src/quickpicks/items/gitCommands.ts b/src/quickpicks/items/gitCommands.ts
@@ -102,7 +102,7 @@ export async function createBranchQuickPickItem(
 		const status = `${branch.getTrackingStatus({ suffix: `${GlyphChars.Space} ` })}${arrows}${GlyphChars.Space} ${
 			branch.upstream.name
 		}`;
-		description = `${description ? `${description}${GlyphChars.Space.repeat(2)}${status}` : status}`;
+		description = description ? `${description}${GlyphChars.Space.repeat(2)}${status}` : status;
 	}
 
 	if (options?.ref) {
@@ -388,15 +388,15 @@ export async function createRepositoryQuickPickItem(
 
 		const status = `${upstreamStatus}${workingStatus}`;
 		if (status) {
-			description = `${description ? `${description}${status}` : status}`;
+			description = description ? `${description}${status}` : status;
 		}
 	}
 
 	if (options?.fetched) {
 		const lastFetched = await repository.getLastFetched();
 		if (lastFetched !== 0) {
 			const fetched = `Last fetched ${fromNow(new Date(lastFetched))}`;
-			description = `${description ? `${description}${pad(GlyphChars.Dot, 2, 2)}${fetched}` : fetched}`;
+			description = description ? `${description}${pad(GlyphChars.Dot, 2, 2)}${fetched}` : fetched;
 		}
 	}
 
diff --git a/src/system/event.ts b/src/system/event.ts
@@ -65,6 +65,7 @@ export function promisifyDeferred<T, U>(
 		cancel = () => {
 			pending = false;
 			cancel = undefined;
+			// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
 			reject();
 		};
 
@@ -74,6 +75,7 @@ export function promisifyDeferred<T, U>(
 				pending = false;
 			} catch (ex) {
 				pending = false;
+				// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
 				reject(ex);
 			}
 		});
diff --git a/src/system/promise.ts b/src/system/promise.ts
@@ -128,6 +128,7 @@ export function cancellable<T>(
 				disposeCancellation?.dispose();
 				disposeTimeout?.dispose();
 
+				// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
 				reject(ex);
 			},
 		);
@@ -155,6 +156,7 @@ export function defer<T>(): Deferred<T> {
 		};
 		deferred.cancel = function () {
 			deferred.pending = false;
+			// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
 			reject();
 		};
 	});
diff --git a/src/views/nodes/abstract/repositoryFolderNode.ts b/src/views/nodes/abstract/repositoryFolderNode.ts
@@ -139,9 +139,9 @@ export abstract class RepositoryFolderNode<
 				true,
 			);
 		} else {
-			item.tooltip = `${
-				this.repo.formattedName ? `${this.repo.formattedName}\n${this.uri.repoPath}` : this.uri.repoPath ?? ''
-			}`;
+			item.tooltip = this.repo.formattedName
+				? `${this.repo.formattedName}\n${this.uri.repoPath}`
+				: this.uri.repoPath ?? '';
 		}
 
 		return item;
diff --git a/src/views/nodes/draftNode.ts b/src/views/nodes/draftNode.ts
@@ -40,7 +40,7 @@ export class DraftNode extends ViewNode<'draft', DraftsView> {
 		const showUpdated = this.draft.updatedAt.getTime() - this.draft.createdAt.getTime() >= 1000;
 
 		item.id = this.id;
-		let contextValue = `${ContextValues.Draft}`;
+		let contextValue: string = ContextValues.Draft;
 		if (this.draft.isMine) {
 			contextValue += '+mine';
 		}
diff --git a/src/views/nodes/rebaseStatusNode.ts b/src/views/nodes/rebaseStatusNode.ts
@@ -61,7 +61,7 @@ export class RebaseStatusNode extends ViewNode<'rebase-status', ViewsWithCommits
 		const item = new TreeItem(
 			`${hasConflicts ? 'Resolve conflicts to continue rebasing' : started ? 'Rebasing' : 'Pending rebase of'} ${
 				this.rebaseStatus.incoming != null
-					? `${getReferenceLabel(this.rebaseStatus.incoming, { expand: false, icon: false })}`
+					? getReferenceLabel(this.rebaseStatus.incoming, { expand: false, icon: false })
 					: ''
 			} onto ${getReferenceLabel(this.rebaseStatus.current ?? this.rebaseStatus.onto, {
 				expand: false,
diff --git a/src/views/nodes/workspaceNode.ts b/src/views/nodes/workspaceNode.ts
@@ -98,7 +98,7 @@ export class WorkspaceNode extends SubscribeableViewNode<
 
 		const cloud = this.workspace.type === 'cloud';
 
-		let contextValue = `${ContextValues.Workspace}`;
+		let contextValue: string = ContextValues.Workspace;
 		item.resourceUri = undefined;
 		const descriptionItems = [];
 		if (cloud) {
diff --git a/src/views/searchAndCompareView.ts b/src/views/searchAndCompareView.ts
@@ -246,8 +246,8 @@ export class SearchAndCompareViewNode extends ViewNode<'search-compare', SearchA
 
 	private getRefName(ref: string | StoredNamedRef): string {
 		return typeof ref === 'string'
-			? shortenRevision(ref, { strings: { working: 'Working Tree' } })!
-			: ref.label ?? shortenRevision(ref.ref)!;
+			? shortenRevision(ref, { strings: { working: 'Working Tree' } })
+			: ref.label ?? shortenRevision(ref.ref);
 	}
 
 	private removeComparePicker(silent: boolean = false) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ export class GitCodeLensProvider implements CodeLensProvider {`
`451`	`451`	`resolveCodeLens(lens: CodeLens, token: CancellationToken): CodeLens \| Promise<CodeLens> {`
`452`	`452`	`if (lens instanceof GitRecentChangeCodeLens) return this.resolveGitRecentChangeCodeLens(lens, token);`
`453`	`453`	`if (lens instanceof GitAuthorsCodeLens) return this.resolveGitAuthorsCodeLens(lens, token);`
`454`		`- // eslint-disable-next-line prefer-promise-reject-errors`
	`454`	`+ // eslint-disable-next-line prefer-promise-reject-errors, @typescript-eslint/prefer-promise-reject-errors`
`455`	`455`	`return Promise.reject<CodeLens>(undefined);`
`456`	`456`	`}`
`457`	`457`
Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,7 @@ export class GitProviderService implements Disposable {`
`1410`	`1410`	`return provider.push(path, options);`
`1411`	`1411`	`}`
`1412`	`1412`
`1413`		- @gate<GitProviderService['pushAll']>(repos => `${repos == null ? '' : repos.map(r => r.id).join(',')}`)
	`1413`	`+ @gate<GitProviderService['pushAll']>(repos => (repos == null ? '' : repos.map(r => r.id).join(',')))`
`1414`	`1414`	`@log<GitProviderService['pushAll']>({ args: { 0: repos => repos?.map(r => r.name).join(', ') } })`
`1415`	`1415`	`async pushAll(`
`1416`	`1416`	`repositories?: Repository[],`
Original file line number	Diff line number	Diff line change
`@@ -1249,7 +1249,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {`
`1249`	`1249`	`}`
`1250`	`1250`
`1251`	`1251`	`const ids = new Set<string>();`
`1252`		`- const remote = getSettledValue(remotesResult)![0]!;`
	`1252`	`+ const remote = getSettledValue(remotesResult)![0];`
`1253`	`1253`	`const remoteMap = remote != null ? new Map([[remote.name, remote]]) : new Map<string, GitRemote>();`
`1254`	`1254`
`1255`	`1255`	`const tagTips = new Map<string, string[]>();`
Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ export class PatchDetailsWebviewProvider`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`private async updateDraftPermissions() {`
`777`		`- const draft = (this._context.draft as Draft)!;`
	`777`	`+ const draft = this._context.draft as Draft;`
`778`	`778`	`const draftId = draft.id;`
`779`	`779`	`const changes = [];`
`780`	`780`