Skip to content

Commit

Permalink
Merge pull request OpenAPITools#62 from OpenAPITools/renovate/major-t…
Browse files Browse the repository at this point in the history
…ypescript-eslint-monorepo

chore(deps): update typescript-eslint monorepo to v4 (major)
  • Loading branch information
kay-schecker committed Oct 9, 2020
2 parents ced9407 + ab17605 commit 1d1ca15
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 51 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@typescript-eslint/explicit-member-accessibility": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-parameter-properties": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ describe('VersionManagerController', () => {

describe('the selection is installed and in use', () => {

let choices: Array<{ name: {}, value: () => unknown }>
let choices: Array<{ name: Record<string, unknown>, value: () => unknown }>

beforeEach(async () => {
whatsNextSpy.mockReset()
Expand All @@ -210,7 +210,7 @@ describe('VersionManagerController', () => {

describe('the selection is installed but not in use', () => {

let choices: Array<{ name: {}, value: () => unknown }>
let choices: Array<{ name: Record<string, unknown>, value: () => unknown }>

beforeEach(async () => {
whatsNextSpy.mockReset()
Expand Down Expand Up @@ -238,7 +238,7 @@ describe('VersionManagerController', () => {

describe('the selection is not installed and not in use', () => {

let choices: Array<{ name: {}, value: () => unknown }>
let choices: Array<{ name: Record<string, unknown>, value: () => unknown }>

beforeEach(async () => {
whatsNextSpy.mockReset()
Expand Down
2 changes: 1 addition & 1 deletion apps/generator-cli/src/app/services/generator.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class GeneratorService {
}).join('\n'))
}

private buildCommand(cwd: string, specFile: string, params: {}) {
private buildCommand(cwd: string, specFile: string, params: Record<string, unknown>) {
const absoluteSpecPath = path.resolve(cwd, specFile)

const command = Object.entries({
Expand Down
7 changes: 4 additions & 3 deletions apps/generator-cli/src/app/services/ui.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// import ora from 'ora'
import {Injectable} from '@nestjs/common';
import {prompt, Separator} from 'inquirer';
import {getTable} from 'console.table'

@Injectable()
export class UIService {
Expand All @@ -9,11 +10,11 @@ export class UIService {
name: string,
message: string,
printColNum?: boolean,
rows: Array<{ row: {}, short: string, value: T }>,
rows: Array<{ row: Record<string, unknown>, short: string, value: T }>,
}): Promise<T> {


const table = require('console.table').getTable(config.rows.map(({row}, index: number) => {
const table = getTable(config.rows.map(({row}, index: number) => {
return config.printColNum === false ? row : ({'#': index + 1, ...row});
}))

Expand All @@ -38,7 +39,7 @@ export class UIService {
public async list<T>(config: {
name: string,
message: string,
choices: Array<{ name: {}, short?: string, value: T }>,
choices: Array<{ name: Record<string, unknown>, short?: string, value: T }>,
}): Promise<T> {

const separatorCount = config
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
"@types/jsonpath": "0.2.0",
"@types/lodash": "4.14.161",
"@types/node": "8.10.64",
"@typescript-eslint/eslint-plugin": "2.34.0",
"@typescript-eslint/parser": "2.34.0",
"@typescript-eslint/eslint-plugin": "4.4.0",
"@typescript-eslint/parser": "4.4.0",
"dotenv": "8.2.0",
"eslint": "7.10.0",
"eslint-config-prettier": "6.12.0",
Expand Down
59 changes: 17 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1149,11 +1149,6 @@
dependencies:
"@types/node" "*"

"@types/eslint-visitor-keys@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==

"@types/[email protected]":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
Expand Down Expand Up @@ -1317,27 +1312,20 @@
dependencies:
"@types/yargs-parser" "*"

"@typescript-eslint/eslint-plugin@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
"@typescript-eslint/eslint-plugin@4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.4.0.tgz#0321684dd2b902c89128405cf0385e9fe8561934"
integrity sha512-RVt5wU9H/2H+N/ZrCasTXdGbUTkbf7Hfi9eLiA8vPQkzUJ/bLDCC3CsoZioPrNcnoyN8r0gT153dC++A4hKBQQ==
dependencies:
"@typescript-eslint/experimental-utils" "2.34.0"
"@typescript-eslint/experimental-utils" "4.4.0"
"@typescript-eslint/scope-manager" "4.4.0"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.0.0"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
dependencies:
"@types/json-schema" "^7.0.3"
"@typescript-eslint/typescript-estree" "2.34.0"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"

"@typescript-eslint/experimental-utils@^4.3.0":
"@typescript-eslint/[email protected]", "@typescript-eslint/experimental-utils@^4.3.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.4.0.tgz#62a05d3f543b8fc5dec4982830618ea4d030e1a9"
integrity sha512-01+OtK/oWeSJTjQcyzDztfLF1YjvKpLFo+JZmurK/qjSRcyObpIecJ4rckDoRCSh5Etw+jKfdSzVEHevh9gJ1w==
Expand All @@ -1349,15 +1337,15 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"

"@typescript-eslint/parser@2.34.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
"@typescript-eslint/parser@4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.4.0.tgz#65974db9a75f23b036f17b37e959b5f99b659ec0"
integrity sha512-yc14iEItCxoGb7W4Nx30FlTyGpU9r+j+n1LUK/exlq2eJeFxczrz/xFRZUk2f6yzWfK+pr1DOTyQnmDkcC4TnA==
dependencies:
"@types/eslint-visitor-keys" "^1.0.0"
"@typescript-eslint/experimental-utils" "2.34.0"
"@typescript-eslint/typescript-estree" "2.34.0"
eslint-visitor-keys "^1.1.0"
"@typescript-eslint/scope-manager" "4.4.0"
"@typescript-eslint/types" "4.4.0"
"@typescript-eslint/typescript-estree" "4.4.0"
debug "^4.1.1"

"@typescript-eslint/[email protected]":
version "4.4.0"
Expand All @@ -1372,19 +1360,6 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.4.0.tgz#63440ef87a54da7399a13bdd4b82060776e9e621"
integrity sha512-nU0VUpzanFw3jjX+50OTQy6MehVvf8pkqFcURPAE06xFNFenMj1GPEI6IESvp7UOHAnq+n/brMirZdR+7rCrlA==

"@typescript-eslint/[email protected]":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
dependencies:
debug "^4.1.1"
eslint-visitor-keys "^1.1.0"
glob "^7.1.6"
is-glob "^4.0.1"
lodash "^4.17.15"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.4.0.tgz#16a2df7c16710ddd5406b32b86b9c1124b1ca526"
Expand Down

0 comments on commit 1d1ca15

Please sign in to comment.