Skip to content

Commit ffa59f8

Browse files
eamodioeamodio
committed
Updates dependencies
Fixes lint issues
1 parent 23b4e53 commit ffa59f8

File tree

6 files changed

+65
-62
lines changed

6 files changed

+65
-62
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6204,8 +6204,8 @@
62046204
"@types/node": "12.12.51",
62056205
"@types/sortablejs": "1.10.5",
62066206
"@types/vscode": "1.47.0",
6207-
"@typescript-eslint/eslint-plugin": "3.7.0",
6208-
"@typescript-eslint/parser": "3.7.0",
6207+
"@typescript-eslint/eslint-plugin": "4.0.0-alpha.1",
6208+
"@typescript-eslint/parser": "4.0.0-alpha.1",
62096209
"circular-dependency-plugin": "5.2.0",
62106210
"clean-webpack-plugin": "3.0.0",
62116211
"csp-html-webpack-plugin": "4.0.0",
@@ -6223,7 +6223,7 @@
62236223
"node-sass": "4.14.1",
62246224
"prettier": "2.0.5",
62256225
"sass-loader": "9.0.2",
6226-
"terser-webpack-plugin": "3.0.7",
6226+
"terser-webpack-plugin": "3.0.8",
62276227
"ts-loader": "8.0.1",
62286228
"typescript": "3.9.7",
62296229
"vsce": "1.77.0",

‎src/system/decorators/timeout.ts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict';
22
import { Promises } from '../promise';
3-
// import { Logger } from '../../logger';
4-
// import { Strings } from '../string';
5-
// import { GlyphChars } from '../../constants';
63

7-
export function timeout<T extends (...arg: any) => any>(timeout: number): any;
8-
export function timeout<T extends (...arg: any) => any>(timeoutFromLastArg: true, defaultTimeout?: number): any;
9-
export function timeout<T extends (...arg: any) => any>(
10-
timeoutOrTimeoutFromLastArg: number | boolean,
11-
defaultTimeout?: number,
12-
): any {
4+
export function timeout(timeout: number): any;
5+
export function timeout(timeoutFromLastArg: true, defaultTimeout?: number): any;
6+
export function timeout(timeoutOrTimeoutFromLastArg: number | boolean, defaultTimeout?: number): any {
137
let timeout: number | undefined;
148
let timeoutFromLastArg = false;
159
if (typeof timeoutOrTimeoutFromLastArg === 'boolean') {
@@ -52,7 +46,7 @@ export function timeout<T extends (...arg: any) => any>(
5246
// );
5347
// return r;
5448
// }),
55-
new Promise((resolve, reject) => {
49+
new Promise((_, reject) => {
5650
const id = setTimeout(() => {
5751
clearTimeout(id);
5852
reject(new Promises.CancellationError(result, `Timed out after ${timeout} ms`));

‎src/vsls/protocol.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'use strict';
22
import { GitCommandOptions } from '../git/git';
33

4-
export class RequestType<TRequest, TResponse> {
4+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
5+
export class RequestType<Request, Response> {
56
constructor(public readonly name: string) {}
67
}
78

‎src/webviews/apps/shared/events.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export interface Disposable {
88
}
99

1010
export interface Event<T> {
11+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1112
(listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]): Disposable;
1213
}
1314

@@ -22,7 +23,7 @@ export interface EmitterOptions {
2223
}
2324

2425
export class Emitter<T> {
25-
// eslint-disable-next-line @typescript-eslint/no-empty-function
26+
// eslint-disable-next-line @typescript-eslint/no-empty-function
2627
private static readonly _noop = function () {};
2728

2829
private readonly _options?: EmitterOptions;

‎src/webviews/protocol.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ export interface IpcMessage {
88
}
99

1010
export type IpcNotificationParamsOf<NT> = NT extends IpcNotificationType<infer P> ? P : never;
11+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1112
export class IpcNotificationType<P = any> {
1213
constructor(public readonly method: string) {}
1314
}
1415

1516
export type IpcCommandParamsOf<CT> = CT extends IpcCommandType<infer P> ? P : never;
17+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1618
export class IpcCommandType<P = any> {
1719
constructor(public readonly method: string) {}
1820
}

‎yarn.lock‎

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,6 @@
122122
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
123123
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
124124

125-
"@types/eslint-visitor-keys@^1.0.0":
126-
version "1.0.0"
127-
resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
128-
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
129-
130125
"@types/glob@^7.1.1":
131126
version "7.1.3"
132127
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
@@ -283,65 +278,75 @@
283278
"@types/webpack-sources" "*"
284279
source-map "^0.6.0"
285280

286-
"@typescript-eslint/eslint-plugin@3.7.0":
287-
version "3.7.0"
288-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz#0f91aa3c83d019591719e597fbdb73a59595a263"
289-
integrity sha512-4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg==
281+
"@typescript-eslint/eslint-plugin@4.0.0-alpha.1":
282+
version "4.0.0-alpha.1"
283+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.0.0-alpha.1.tgz#7b8861c64c1cc47e821766a04e7c2a0c414488e4"
284+
integrity sha512-AIhYZPAgCogvEoYJVG5ySIAVda16eZyJWsJKhbSV3gd3CcVnHfCLhaEgw/Sc7aMwEb6Z9LzURF6+eu43up0d3A==
290285
dependencies:
291-
"@typescript-eslint/experimental-utils" "3.7.0"
286+
"@typescript-eslint/experimental-utils" "4.0.0-alpha.1+abb0617e"
287+
"@typescript-eslint/scope-manager" "4.0.0-alpha.1+abb0617e"
292288
debug "^4.1.1"
293289
functional-red-black-tree "^1.0.1"
294290
regexpp "^3.0.0"
295291
semver "^7.3.2"
296292
tsutils "^3.17.1"
297293

298-
"@typescript-eslint/experimental-utils@3.7.0":
299-
version "3.7.0"
300-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz#0ee21f6c48b2b30c63211da23827725078d5169a"
301-
integrity sha512-xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ==
294+
"@typescript-eslint/experimental-utils@4.0.0-alpha.1+abb0617e":
295+
version "4.0.0-alpha.1"
296+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.0.0-alpha.1.tgz#a463cb2c749e91c6aa2ef5ca26ca571018927ea4"
297+
integrity sha512-qHgb+EjYbL2zXC8h23sf9tbS6wfg9FlvWAER99I5fLmeF0t85fOkHOKYUQUaB1YI+4oTRgSSeYO1I7dgLC9TTQ==
302298
dependencies:
303299
"@types/json-schema" "^7.0.3"
304-
"@typescript-eslint/types" "3.7.0"
305-
"@typescript-eslint/typescript-estree" "3.7.0"
300+
"@typescript-eslint/scope-manager" "4.0.0-alpha.1+abb0617e"
301+
"@typescript-eslint/types" "4.0.0-alpha.1+abb0617e"
302+
"@typescript-eslint/typescript-estree" "4.0.0-alpha.1+abb0617e"
306303
eslint-scope "^5.0.0"
307304
eslint-utils "^2.0.0"
308305

309-
"@typescript-eslint/parser@3.7.0":
310-
version "3.7.0"
311-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz#3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"
312-
integrity sha512-2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ==
306+
"@typescript-eslint/parser@4.0.0-alpha.1":
307+
version "4.0.0-alpha.1"
308+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.0.0-alpha.1.tgz#5ba44145e91d258a72c7e9da9804e6a7e1202a57"
309+
integrity sha512-VY+VZ9mi9E2+HWWyOWJ1fn2Rad5eMvyPZ9wHoEyweiTcMTOgh+djs0Urv8mAtExRPHft6Yp8CYrP9XINzbDRlQ==
313310
dependencies:
314-
"@types/eslint-visitor-keys" "^1.0.0"
315-
"@typescript-eslint/experimental-utils" "3.7.0"
316-
"@typescript-eslint/types" "3.7.0"
317-
"@typescript-eslint/typescript-estree" "3.7.0"
318-
eslint-visitor-keys "^1.1.0"
311+
"@typescript-eslint/scope-manager" "4.0.0-alpha.1+abb0617e"
312+
"@typescript-eslint/types" "4.0.0-alpha.1+abb0617e"
313+
"@typescript-eslint/typescript-estree" "4.0.0-alpha.1+abb0617e"
314+
debug "^4.1.1"
319315

320-
"@typescript-eslint/[email protected]":
321-
version "3.7.0"
322-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz#09897fab0cb95479c01166b10b2c03c224821077"
323-
integrity sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg==
316+
"@typescript-eslint/[email protected]+abb0617e":
317+
version "4.0.0-alpha.1"
318+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.0.0-alpha.1.tgz#cafef39f7ff840205c5f7229a2ac9dcef4c38ef3"
319+
integrity sha512-eUtDTEkicYdv4rDeh9FSL6+xALaKW29fvFwRPVmvWveVUlTvu1Ppx7s2lFePSsLf2tlMoC4rBnvW53LvpcdPrA==
320+
dependencies:
321+
"@typescript-eslint/types" "4.0.0-alpha.1+abb0617e"
322+
"@typescript-eslint/visitor-keys" "4.0.0-alpha.1+abb0617e"
324323

325-
"@typescript-eslint/[email protected]":
326-
version "3.7.0"
327-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz#66872e6da120caa4b64e6b4ca5c8702afc74738d"
328-
integrity sha512-xr5oobkYRebejlACGr1TJ0Z/r0a2/HUf0SXqPvlgUMwiMqOCu/J+/Dr9U3T0IxpE5oLFSkqMx1FE/dKaZ8KsOQ==
324+
"@typescript-eslint/[email protected]+abb0617e":
325+
version "4.0.0-alpha.1"
326+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.0-alpha.1.tgz#994b8bd02f6cddc9a2740c36cf6d4e1b878a1fad"
327+
integrity sha512-/4lCdgi9L0D6RqVPqOLGo9n/Eq1F2kibIBRSypztqaMOYhBUxinNeeXPNVnhZCqkA8oIrh6BqtCMgnqOUmjCHg==
328+
329+
"@typescript-eslint/[email protected]+abb0617e":
330+
version "4.0.0-alpha.1"
331+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.0-alpha.1.tgz#fe40b3ab6a92a3f32aab769c59257738ad652011"
332+
integrity sha512-fqdfS2yaFI0XqEib1T167PAnT5IKm42eDDJCM7lTL4o6VLpfpi37hWRqVh7LkapeiBzwnBcBRxONsBRZjqUeLw==
329333
dependencies:
330-
"@typescript-eslint/types" "3.7.0"
331-
"@typescript-eslint/visitor-keys" "3.7.0"
334+
"@typescript-eslint/types" "4.0.0-alpha.1+abb0617e"
335+
"@typescript-eslint/visitor-keys" "4.0.0-alpha.1+abb0617e"
332336
debug "^4.1.1"
333337
glob "^7.1.6"
334338
is-glob "^4.0.1"
335339
lodash "^4.17.15"
336340
semver "^7.3.2"
337341
tsutils "^3.17.1"
338342

339-
"@typescript-eslint/visitor-keys@3.7.0":
340-
version "3.7.0"
341-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz#ac0417d382a136e4571a0b0dcfe52088cb628177"
342-
integrity sha512-k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw==
343+
"@typescript-eslint/visitor-keys@4.0.0-alpha.1+abb0617e":
344+
version "4.0.0-alpha.1"
345+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.0.0-alpha.1.tgz#b50235981901023491faa4eb9c622d5c56f53ee8"
346+
integrity sha512-XWHCO6NP0DkQft110plumAU1UBi6XG4Q3cI97opmtYtV7aQ3H/2HnPT/Xq1DT4JjHOWJDZl50DtjSoCD4kjz+g==
343347
dependencies:
344-
eslint-visitor-keys "^1.1.0"
348+
"@typescript-eslint/types" "4.0.0-alpha.1+abb0617e"
349+
eslint-visitor-keys "^1.3.0"
345350

346351
"@webassemblyjs/[email protected]":
347352
version "1.9.0"
@@ -545,9 +550,9 @@ ajv-errors@^1.0.0:
545550
integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
546551

547552
ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
548-
version "3.5.1"
549-
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.1.tgz#b83ca89c5d42d69031f424cad49aada0236c6957"
550-
integrity sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==
553+
version "3.5.2"
554+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
555+
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
551556

552557
ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
553558
version "6.12.3"
@@ -6881,10 +6886,10 @@ tempfile@^2.0.0:
68816886
temp-dir "^1.0.0"
68826887
uuid "^3.0.1"
68836888

6884-
[email protected].7:
6885-
version "3.0.7"
6886-
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.7.tgz#db23b946dcca8954da3ebda3675360bceebdc78e"
6887-
integrity sha512-5JqibUOctE6Ou4T00IVGYTQJBOhu24jz0PpqYeitQJJ3hlZY2ZKSwzzuqjmBH8MzbdWMgIefpmHwTkvwm6Q4CQ==
6889+
[email protected].8:
6890+
version "3.0.8"
6891+
resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.8.tgz#d1a53442a143e09e00c880e8d77c1e79cb05318b"
6892+
integrity sha512-ygwK8TYMRTYtSyLB2Mhnt90guQh989CIq/mL/2apwi6rA15Xys4ydNUiH4ah6EZCfQxSk26ZFQilZ4IQ6IZw6A==
68886893
dependencies:
68896894
cacache "^15.0.5"
68906895
find-cache-dir "^3.3.1"

0 commit comments

Comments
 (0)