Updates dependencies & TypeScript

Works around microsoft/TypeScript#41428
gitkraken · Jan 14, 2021 · eb9e7c3 · eb9e7c3
1 parent 20b1920
commit eb9e7c3
Show file tree

Hide file tree

Showing 16 changed files with 161 additions and 133 deletions.
diff --git a/package.json b/package.json
@@ -9010,12 +9010,12 @@
 		"@types/node": "12.12.70",
 		"@types/sortablejs": "1.10.6",
 		"@types/vscode": "1.52.0",
-		"@typescript-eslint/eslint-plugin": "4.12.0",
-		"@typescript-eslint/parser": "4.12.0",
+		"@typescript-eslint/eslint-plugin": "4.13.0",
+		"@typescript-eslint/parser": "4.13.0",
 		"circular-dependency-plugin": "5.2.2",
 		"clean-webpack-plugin": "3.0.0",
 		"copy-webpack-plugin": "7.0.0",
-		"csp-html-webpack-plugin": "5.0.1",
+		"csp-html-webpack-plugin": "5.1.0",
 		"css-loader": "5.0.1",
 		"eslint": "7.17.0",
 		"eslint-cli": "1.1.1",
@@ -9027,15 +9027,15 @@
 		"html-webpack-skip-assets-plugin": "0.0.2",
 		"image-minimizer-webpack-plugin": "2.2.0",
 		"imagemin-webp": "6.0.0",
-		"mini-css-extract-plugin": "1.3.3",
+		"mini-css-extract-plugin": "1.3.4",
 		"node-sass": "5.0.0",
 		"prettier": "2.2.1",
-		"sass-loader": "10.1.0",
+		"sass-loader": "10.1.1",
 		"terser-webpack-plugin": "5.1.1",
 		"ts-loader": "8.0.14",
-		"typescript": "4.0.5",
+		"typescript": "4.2.0-beta",
 		"vsce": "1.83.0",
-		"webpack": "5.12.3",
+		"webpack": "5.14.0",
 		"webpack-bundle-analyzer": "4.3.0",
 		"webpack-cli": "4.2.0"
 	}

diff --git a/src/commands/git/branch.ts b/src/commands/git/branch.ts
@@ -4,6 +4,7 @@ import { Container } from '../../container';
 import { GitBranchReference, GitReference, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	inputBranchNameStep,
 	PartialStepState,
 	pickBranchesStep,
@@ -244,7 +245,7 @@ export class BranchGitCommand extends QuickCommand<State> {
 		return QuickCommand.canPickStepContinue(step, state, selection) ? selection[0].item : StepResult.Break;
 	}
 
-	private async *createCommandSteps(state: CreateStepState, context: Context): StepResultGenerator<void> {
+	private async *createCommandSteps(state: CreateStepState, context: Context): AsyncStepResultGenerator<void> {
 		if (state.flags == null) {
 			state.flags = [];
 		}
@@ -317,8 +318,7 @@ export class BranchGitCommand extends QuickCommand<State> {
 		return QuickCommand.canPickStepContinue(step, state, selection) ? selection[0].item : StepResult.Break;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/require-await
-	private async *deleteCommandSteps(state: DeleteStepState, context: Context): StepResultGenerator<void> {
+	private async *deleteCommandSteps(state: DeleteStepState, context: Context): AsyncStepResultGenerator<void> {
 		if (state.flags == null) {
 			state.flags = [];
 		}
@@ -422,8 +422,7 @@ export class BranchGitCommand extends QuickCommand<State> {
 		return QuickCommand.canPickStepContinue(step, state, selection) ? selection[0].item : StepResult.Break;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/require-await
-	private async *renameCommandSteps(state: RenameStepState, context: Context): StepResultGenerator<void> {
+	private async *renameCommandSteps(state: RenameStepState, context: Context): AsyncStepResultGenerator<void> {
 		if (state.flags == null) {
 			state.flags = [];
 		}

diff --git a/src/commands/git/fetch.ts b/src/commands/git/fetch.ts
@@ -4,13 +4,13 @@ import { Container } from '../../container';
 import { GitBranchReference, GitReference, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickRepositoriesStep,
 	QuickCommand,
 	QuickPickStep,
 	StepGenerator,
 	StepResult,
-	StepResultGenerator,
 	StepSelection,
 	StepState,
 } from '../quickCommand';
@@ -130,7 +130,7 @@ export class FetchGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResult.Break : undefined;
 	}
 
-	private async *confirmStep(state: FetchStepState, context: Context): StepResultGenerator<Flags[]> {
+	private async *confirmStep(state: FetchStepState, context: Context): AsyncStepResultGenerator<Flags[]> {
 		let lastFetchedOn = '';
 		if (state.repos.length === 1) {
 			const lastFetched = await state.repos[0].getLastFetched();

diff --git a/src/commands/git/merge.ts b/src/commands/git/merge.ts
@@ -3,6 +3,7 @@ import { Container } from '../../container';
 import { GitBranch, GitLog, GitReference, GitRevision, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickBranchOrTagStep,
 	pickCommitStep,
@@ -12,7 +13,6 @@ import {
 	QuickPickStep,
 	StepGenerator,
 	StepResult,
-	StepResultGenerator,
 	StepSelection,
 	StepState,
 } from '../quickCommand';
@@ -194,7 +194,7 @@ export class MergeGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResult.Break : undefined;
 	}
 
-	private async *confirmStep(state: MergeStepState, context: Context): StepResultGenerator<Flags[]> {
+	private async *confirmStep(state: MergeStepState, context: Context): AsyncStepResultGenerator<Flags[]> {
 		const aheadBehind = await Container.git.getAheadBehindCommitCount(state.repo.path, [
 			GitRevision.createRange(context.destination.name, state.reference.name),
 		]);

diff --git a/src/commands/git/pull.ts b/src/commands/git/pull.ts
@@ -3,14 +3,14 @@ import { Container } from '../../container';
 import { GitBranch, GitBranchReference, GitReference, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickRepositoriesStep,
 	QuickCommand,
 	QuickCommandButtons,
 	QuickPickStep,
 	StepGenerator,
 	StepResult,
-	StepResultGenerator,
 	StepSelection,
 	StepState,
 } from '../quickCommand';
@@ -136,7 +136,7 @@ export class PullGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResult.Break : undefined;
 	}
 
-	private async *confirmStep(state: PullStepState, context: Context): StepResultGenerator<Flags[]> {
+	private async *confirmStep(state: PullStepState, context: Context): AsyncStepResultGenerator<Flags[]> {
 		let step: QuickPickStep<FlagsQuickPickItem<Flags>>;
 
 		if (state.repos.length > 1) {

diff --git a/src/commands/git/push.ts b/src/commands/git/push.ts
@@ -5,6 +5,7 @@ import { Container } from '../../container';
 import { GitBranch, GitBranchReference, GitReference, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickRepositoriesStep,
 	pickRepositoryStep,
@@ -13,7 +14,6 @@ import {
 	QuickPickStep,
 	StepGenerator,
 	StepResult,
-	StepResultGenerator,
 	StepSelection,
 	StepState,
 } from '../quickCommand';
@@ -151,7 +151,7 @@ export class PushGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResult.Break : undefined;
 	}
 
-	private async *confirmStep(state: PushStepState, context: Context): StepResultGenerator<Flags[]> {
+	private async *confirmStep(state: PushStepState, context: Context): AsyncStepResultGenerator<Flags[]> {
 		const useForceWithLease = configuration.getAny<boolean>('git.useForcePushWithLease') ?? false;
 
 		let step: QuickPickStep<FlagsQuickPickItem<Flags>>;

diff --git a/src/commands/git/rebase.ts b/src/commands/git/rebase.ts
@@ -4,6 +4,7 @@ import { Container } from '../../container';
 import { GitBranch, GitLog, GitReference, GitRevision, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickBranchOrTagStep,
 	pickCommitStep,
@@ -13,7 +14,6 @@ import {
 	QuickPickStep,
 	StepGenerator,
 	StepResult,
-	StepResultGenerator,
 	StepSelection,
 	StepState,
 } from '../quickCommand';
@@ -226,7 +226,7 @@ export class RebaseGitCommand extends QuickCommand<State> {
 		return state.counter < 0 ? StepResult.Break : undefined;
 	}
 
-	private async *confirmStep(state: RebaseStepState, context: Context): StepResultGenerator<Flags[]> {
+	private async *confirmStep(state: RebaseStepState, context: Context): AsyncStepResultGenerator<Flags[]> {
 		const aheadBehind = await Container.git.getAheadBehindCommitCount(state.repo.path, [
 			state.reference.refType === 'revision'
 				? GitRevision.createRange(state.reference.ref, context.destination.ref)

diff --git a/src/commands/git/stash.ts b/src/commands/git/stash.ts
@@ -7,6 +7,7 @@ import { GitUri } from '../../git/gitUri';
 import { GitActions, GitCommandsCommand } from '../gitCommands';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	PartialStepState,
 	pickRepositoryStep,
 	pickStashStep,
@@ -510,7 +511,10 @@ export class StashGitCommand extends QuickCommand<State> {
 		}
 	}
 
-	private async *pushCommandInputMessageStep(state: PushStepState, context: Context): StepResultGenerator<string> {
+	private async *pushCommandInputMessageStep(
+		state: PushStepState,
+		context: Context,
+	): AsyncStepResultGenerator<string> {
 		const step = QuickCommand.createInputStep({
 			title: appendReposToTitle(
 				context.title,

diff --git a/src/commands/git/tag.ts b/src/commands/git/tag.ts
@@ -4,6 +4,7 @@ import { Container } from '../../container';
 import { GitReference, GitTagReference, Repository } from '../../git/git';
 import {
 	appendReposToTitle,
+	AsyncStepResultGenerator,
 	inputTagNameStep,
 	PartialStepState,
 	pickBranchOrTagStep,
@@ -213,7 +214,7 @@ export class TagGitCommand extends QuickCommand<State> {
 		return QuickCommand.canPickStepContinue(step, state, selection) ? selection[0].item : StepResult.Break;
 	}
 
-	private async *createCommandSteps(state: CreateStepState, context: Context): StepResultGenerator<void> {
+	private async *createCommandSteps(state: CreateStepState, context: Context): AsyncStepResultGenerator<void> {
 		if (state.flags == null) {
 			state.flags = [];
 		}
@@ -270,7 +271,7 @@ export class TagGitCommand extends QuickCommand<State> {
 	private async *createCommandInputMessageStep(
 		state: CreateStepState,
 		context: Context,
-	): StepResultGenerator<string> {
+	): AsyncStepResultGenerator<string> {
 		const step = QuickCommand.createInputStep({
 			title: appendReposToTitle(
 				`${context.title} at ${GitReference.toString(state.reference, { capitalize: true, icon: false })}`,
@@ -324,7 +325,6 @@ export class TagGitCommand extends QuickCommand<State> {
 		return QuickCommand.canPickStepContinue(step, state, selection) ? selection[0].item : StepResult.Break;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/require-await
 	private async *deleteCommandSteps(state: DeleteStepState, context: Context): StepGenerator {
 		while (this.canStepsContinue(state)) {
 			if (state.references != null && !Array.isArray(state.references)) {

diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts
@@ -26,6 +26,7 @@ import {
 } from '../git/git';
 import { GitService } from '../git/gitService';
 import {
+	AsyncStepResultGenerator,
 	PartialStepState,
 	QuickCommand,
 	QuickCommandButtons,
@@ -313,7 +314,7 @@ export async function* inputBranchNameStep<
 	state: State,
 	context: Context,
 	options: { placeholder: string; titleContext?: string; value?: string },
-): StepResultGenerator<string> {
+): AsyncStepResultGenerator<string> {
 	const step = QuickCommand.createInputStep({
 		title: appendReposToTitle(`${context.title}${options.titleContext ?? ''}`, state, context),
 		placeholder: options.placeholder,
@@ -348,7 +349,7 @@ export async function* inputTagNameStep<
 	state: State,
 	context: Context,
 	options: { placeholder: string; titleContext?: string; value?: string },
-): StepResultGenerator<string> {
+): AsyncStepResultGenerator<string> {
 	const step = QuickCommand.createInputStep({
 		title: appendReposToTitle(`${context.title}${options.titleContext ?? ''}`, state, context),
 		placeholder: options.placeholder,
@@ -393,7 +394,7 @@ export async function* pickBranchStep<
 		placeholder: string;
 		titleContext?: string;
 	},
-): StepResultGenerator<GitBranchReference> {
+): AsyncStepResultGenerator<GitBranchReference> {
 	const branches = await getBranches(state.repo, {
 		filterBranches: filterBranches,
 		picked: picked,
@@ -457,7 +458,7 @@ export async function* pickBranchesStep<
 		placeholder: string;
 		titleContext?: string;
 	},
-): StepResultGenerator<GitBranchReference[]> {
+): AsyncStepResultGenerator<GitBranchReference[]> {
 	const branches = await getBranches(state.repo, {
 		filterBranches: filterBranches,
 		picked: picked,
@@ -528,7 +529,7 @@ export async function* pickBranchOrTagStep<
 		additionalButtons?: QuickInputButton[];
 		ranges?: boolean;
 	},
-): StepResultGenerator<GitReference> {
+): AsyncStepResultGenerator<GitReference> {
 	context.showTags = true;
 
 	const showTagsButton = new QuickCommandButtons.ShowTagsToggle(context.showTags);
@@ -641,7 +642,7 @@ export async function* pickBranchOrTagStepMultiRepo<
 		titleContext?: string;
 		value?: string;
 	},
-): StepResultGenerator<GitReference> {
+): AsyncStepResultGenerator<GitReference> {
 	context.showTags = state.repos.length === 1;
 
 	const showTagsButton = new QuickCommandButtons.ShowTagsToggle(context.showTags);
@@ -765,7 +766,7 @@ export async function* pickCommitStep<
 		};
 		titleContext?: string;
 	},
-): StepResultGenerator<GitLogCommit> {
+): AsyncStepResultGenerator<GitLogCommit> {
 	function getItems(log: GitLog | undefined) {
 		return log == null
 			? [DirectiveQuickPickItem.create(Directive.Back, true), DirectiveQuickPickItem.create(Directive.Cancel)]
@@ -1011,7 +1012,11 @@ export function* pickCommitsStep<
 export async function* pickContributorsStep<
 	State extends PartialStepState & { repo: Repository },
 	Context extends { repos: Repository[]; title: string }
->(state: State, context: Context, placeholder: string = 'Choose contributors'): StepResultGenerator<GitContributor[]> {
+>(
+	state: State,
+	context: Context,
+	placeholder: string = 'Choose contributors',
+): AsyncStepResultGenerator<GitContributor[]> {
 	const message = (await GitService.getBuiltInGitRepository(state.repo.path))?.inputBox.value;
 
 	const step = QuickCommand.createPickStep<ContributorQuickPickItem>({
@@ -1031,7 +1036,7 @@ export async function* pickContributorsStep<
 export async function* pickRepositoryStep<
 	State extends PartialStepState & { repo?: string | Repository },
 	Context extends { repos: Repository[]; title: string }
->(state: State, context: Context, placeholder: string = 'Choose a repository'): StepResultGenerator<Repository> {
+>(state: State, context: Context, placeholder: string = 'Choose a repository'): AsyncStepResultGenerator<Repository> {
 	if (typeof state.repo === 'string') {
 		state.repo = await Container.git.getRepository(state.repo);
 		if (state.repo != null) return state.repo;
@@ -1086,7 +1091,7 @@ export async function* pickRepositoriesStep<
 	state: State,
 	context: Context,
 	options?: { placeholder?: string; skipIfPossible?: boolean },
-): StepResultGenerator<Repository[]> {
+): AsyncStepResultGenerator<Repository[]> {
 	options = { placeholder: 'Choose repositories', skipIfPossible: false, ...options };
 
 	let actives: Repository[];
@@ -1259,7 +1264,7 @@ export async function* pickTagsStep<
 		placeholder: string;
 		titleContext?: string;
 	},
-): StepResultGenerator<GitTagReference[]> {
+): AsyncStepResultGenerator<GitTagReference[]> {
 	const tags = await getTags(state.repo, {
 		filterTags: filterTags,
 		picked: picked,
@@ -1313,7 +1318,7 @@ export async function* showCommitOrStashStep<
 >(
 	state: State,
 	context: Context,
-): StepResultGenerator<CommitFilesQuickPickItem | GitCommandQuickPickItem | CommandQuickPickItem> {
+): AsyncStepResultGenerator<CommitFilesQuickPickItem | GitCommandQuickPickItem | CommandQuickPickItem> {
 	const step: QuickPickStep<
 		CommitFilesQuickPickItem | GitCommandQuickPickItem | CommandQuickPickItem
 	> = QuickCommand.createPickStep({
@@ -1638,7 +1643,7 @@ export async function* showCommitOrStashFileStep<
 		fileName: string;
 	},
 	Context extends { repos: Repository[]; title: string }
->(state: State, context: Context): StepResultGenerator<CommandQuickPickItem> {
+>(state: State, context: Context): AsyncStepResultGenerator<CommandQuickPickItem> {
 	const step: QuickPickStep<CommandQuickPickItem> = QuickCommand.createPickStep<CommandQuickPickItem>({
 		title: appendReposToTitle(
 			GitReference.toString(state.reference, {

diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts
@@ -66,9 +66,16 @@ export namespace StepResult {
 	export const Break = Symbol('BreakStep');
 }
 export type StepResult<T> = typeof StepResult.Break | T;
-export type StepResultGenerator<T> =
-	| Generator<QuickPickStep | QuickInputStep, StepResult<T>, any | undefined>
-	| AsyncGenerator<QuickPickStep | QuickInputStep, StepResult<T>, any | undefined>;
+export type StepResultGenerator<T> = Generator<QuickPickStep | QuickInputStep, StepResult<T>, any | undefined>;
+export type AsyncStepResultGenerator<T> = AsyncGenerator<
+	QuickPickStep | QuickInputStep,
+	StepResult<T>,
+	any | undefined
+>;
+// Can't use this union type because of https://github.com/microsoft/TypeScript/issues/41428
+// export type StepResultGenerator<T> =
+// 	| Generator<QuickPickStep | QuickInputStep, StepResult<T>, any | undefined>
+// 	| AsyncGenerator<QuickPickStep | QuickInputStep, StepResult<T>, any | undefined>;
 export type StepSelection<T> = T extends QuickPickStep<infer U>
 	? U[] | Directive
 	: T extends QuickInputStep