Skip to content

Commit ea24ff3

Browse files
renovate[bot]renovate-botardatan
authored
Update typescript-eslint monorepo to v3 (major) (dotansimha#4061)
* Update typescript-eslint monorepo to v3 * Fix lint errors * Use Node 14 Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Arda TANRIKULU <[email protected]>
1 parent be380e8 commit ea24ff3

File tree

6 files changed

+37
-36
lines changed

6 files changed

+37
-36
lines changed

.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"@typescript-eslint/no-explicit-any": "off",
2323
"@typescript-eslint/no-non-null-assertion": "off",
2424
"@typescript-eslint/explicit-function-return-type": "off",
25-
"@typescript-eslint/ban-ts-ignore": "off"
25+
"@typescript-eslint/ban-ts-ignore": "off",
26+
"@typescript-eslint/ban-types": "off"
2627
},
2728
"env": {
2829
"es6": true,

.github/workflows/main.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
os: [ubuntu-latest, windows-latest]
19-
node_version: [10, 13]
19+
node_version: [10, 14]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v1
@@ -31,16 +31,16 @@ jobs:
3131
uses: actions/cache@v1
3232
with:
3333
path: ${{ steps.yarn-cache.outputs.dir }}
34-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
34+
key: ${{ runner.os }}-${{matrix.node_version}}-yarn-${{ hashFiles('yarn.lock') }}
3535
restore-keys: |
36-
${{ runner.os }}-yarn-
36+
${{ runner.os }}-${{matrix.node_version}}-yarn-
3737
- name: Cache Jest
3838
uses: actions/cache@v1
3939
with:
4040
path: .cache/jest
41-
key: ${{ runner.os }}-jest-${{ hashFiles('yarn.lock') }}
41+
key: ${{ runner.os }}-${{matrix.node_version}}-jest-${{ hashFiles('yarn.lock') }}
4242
restore-keys: |
43-
${{ runner.os }}-jest-
43+
${{ runner.os }}-${{matrix.node_version}}-jest-
4444
- name: Install Dependencies using Yarn
4545
run: yarn install
4646
- name: Lint
@@ -67,17 +67,17 @@ jobs:
6767
- name: Use Node
6868
uses: actions/setup-node@master
6969
with:
70-
node-version: '13.x'
70+
node-version: 14
7171
- name: Get yarn cache
7272
id: yarn-cache
7373
run: echo "::set-output name=dir::$(yarn cache dir)"
7474
- name: Cache Yarn
7575
uses: actions/cache@v1
7676
with:
7777
path: ${{ steps.yarn-cache.outputs.dir }}
78-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
78+
key: ${{ runner.os }}-14-yarn-${{ hashFiles('yarn.lock') }}
7979
restore-keys: |
80-
${{ runner.os }}-yarn-
80+
${{ runner.os }}-14-yarn-
8181
- name: Install Dependencies using Yarn
8282
run: yarn install && git checkout yarn.lock
8383
- name: Build

.github/workflows/website.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v1
19-
- name: Use Node 13
19+
- name: Use Node 14
2020
uses: actions/setup-node@master
2121
with:
22-
node-version: 13
22+
node-version: 14
2323
- name: Install Dependencies
2424
run: yarn install
2525
- name: Build Plugins

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"apollo-link": "1.2.14",
7676
"apollo-server": "2.13.1",
7777
"apollo-utilities": "1.3.4",
78-
"@typescript-eslint/eslint-plugin": "2.34.0",
79-
"@typescript-eslint/parser": "2.34.0",
78+
"@typescript-eslint/eslint-plugin": "3.0.1",
79+
"@typescript-eslint/parser": "3.0.1",
8080
"eslint": "7.1.0",
8181
"eslint-config-prettier": "6.11.0",
8282
"eslint-config-standard": "14.1.1",

packages/plugins/typescript/oclif/src/visitor.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor<Config, ClientS
8787
if (directive) {
8888
directiveValues.examples = [];
8989
directive.arguments.forEach(arg => {
90-
// @ts-ignore ts doesn't like arg.value.value, there's a mis-typing in there to address
91-
const { value } = arg.value;
90+
const value = 'value' in arg.value ? arg.value.value.toString() : null;
9291
const { value: name } = arg.name;
9392
if (name === 'description') {
94-
directiveValues[name] = value;
93+
directiveValues.description = value;
9594
} else if (name === 'example') {
9695
directiveValues.examples.push(value);
9796
} else {

yarn.lock

+21-20
Original file line numberDiff line numberDiff line change
@@ -3497,40 +3497,41 @@
34973497
resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
34983498
integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
34993499

3500-
"@typescript-eslint/eslint-plugin@2.34.0":
3501-
version "2.34.0"
3502-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
3503-
integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
3500+
"@typescript-eslint/eslint-plugin@3.0.1":
3501+
version "3.0.1"
3502+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.0.1.tgz#368fe7d4c3d927e9fd27b7ba150b4b7e83ddfabe"
3503+
integrity sha512-RxGldRQD3hgOK2xtBfNfA5MMV3rn5gVChe+MIf14hKm51jO2urqF64xOyVrGtzThkrd4rS1Kihqx2nkSxkXHvA==
35043504
dependencies:
3505-
"@typescript-eslint/experimental-utils" "2.34.0"
3505+
"@typescript-eslint/experimental-utils" "3.0.1"
35063506
functional-red-black-tree "^1.0.1"
35073507
regexpp "^3.0.0"
3508+
semver "^7.3.2"
35083509
tsutils "^3.17.1"
35093510

3510-
"@typescript-eslint/experimental-utils@2.34.0":
3511-
version "2.34.0"
3512-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
3513-
integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
3511+
"@typescript-eslint/experimental-utils@3.0.1":
3512+
version "3.0.1"
3513+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.0.1.tgz#e2721c970068fabd6621709234809c98cd3343ad"
3514+
integrity sha512-GdwOVz80MOWxbc/br1DC30eeqlxfpVzexHgHtf3L0hcbOu1xAs1wSCNcaBTLMOMZbh1gj/cKZt0eB207FxWfFA==
35143515
dependencies:
35153516
"@types/json-schema" "^7.0.3"
3516-
"@typescript-eslint/typescript-estree" "2.34.0"
3517+
"@typescript-eslint/typescript-estree" "3.0.1"
35173518
eslint-scope "^5.0.0"
35183519
eslint-utils "^2.0.0"
35193520

3520-
"@typescript-eslint/parser@2.34.0":
3521-
version "2.34.0"
3522-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
3523-
integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
3521+
"@typescript-eslint/parser@3.0.1":
3522+
version "3.0.1"
3523+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.0.1.tgz#f5163e3a789422f5c62f4daf822bfa03b7e4472d"
3524+
integrity sha512-Pn2tDmOc4Ri93VQnT70W0pqQr6i/pEZqIPXfWXm4RuiIprL0t6SG13ViVXHgfScknL2Fm2G4IqXhUzxSRCWXCw==
35243525
dependencies:
35253526
"@types/eslint-visitor-keys" "^1.0.0"
3526-
"@typescript-eslint/experimental-utils" "2.34.0"
3527-
"@typescript-eslint/typescript-estree" "2.34.0"
3527+
"@typescript-eslint/experimental-utils" "3.0.1"
3528+
"@typescript-eslint/typescript-estree" "3.0.1"
35283529
eslint-visitor-keys "^1.1.0"
35293530

3530-
"@typescript-eslint/typescript-estree@2.34.0":
3531-
version "2.34.0"
3532-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
3533-
integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
3531+
"@typescript-eslint/typescript-estree@3.0.1":
3532+
version "3.0.1"
3533+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.0.1.tgz#8c0cfb7cda64bd6f54185a7b7d1923d25d36b2a8"
3534+
integrity sha512-FrbMdgVCeIGHKaP9OYTttFTlF8Ds7AkjMca2GzYCE7pVch10PAJc1mmAFt+DfQPgu/2TrLAprg2vI0PK/WTdcg==
35343535
dependencies:
35353536
debug "^4.1.1"
35363537
eslint-visitor-keys "^1.1.0"

0 commit comments

Comments
 (0)