Skip to content

Commit 1fc4e76

Browse files
authored
chore: bump dependencies (#4952)
1 parent c6cb2b5 commit 1fc4e76

File tree

23 files changed

+1412
-1516
lines changed

23 files changed

+1412
-1516
lines changed

Diff for: .github/workflows/ci.yml

+96-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- v5
87
pull_request:
98
branches:
109
- '**'
@@ -155,8 +154,8 @@ jobs:
155154
flags: unittest
156155
name: codecov
157156

158-
linting_and_style:
159-
name: Code style and lint
157+
spellcheck:
158+
name: Spellcheck
160159
runs-on: ubuntu-latest
161160
steps:
162161
- uses: actions/checkout@v3
@@ -182,22 +181,103 @@ jobs:
182181
yarn --ignore-engines --frozen-lockfile --ignore-scripts
183182
yarn check-clean-workspace-after-install
184183
185-
- name: Build
184+
- name: Check spelling
185+
run: yarn check-spelling
186+
187+
check_format:
188+
name: Check Format
189+
runs-on: ubuntu-latest
190+
steps:
191+
- uses: actions/checkout@v3
192+
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
193+
uses: actions/setup-node@v3
194+
with:
195+
node-version: ${{ env.PRIMARY_NODE_VERSION }}
196+
197+
- name: Get yarn cache directory path
198+
id: yarn-cache-dir-path
199+
run: echo "::set-output name=dir::$(yarn cache dir)"
200+
201+
- uses: actions/cache@v3
202+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
203+
with:
204+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
205+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
206+
restore-keys: |
207+
${{ runner.os }}-yarn-
208+
209+
- name: Install dependencies
186210
run: |
187-
# Website will be built by the Netlify GitHub App
188-
yarn build --exclude website
211+
yarn --ignore-engines --frozen-lockfile --ignore-scripts
212+
yarn check-clean-workspace-after-install
213+
214+
- name: Lint markdown
215+
run: yarn lint-markdown
216+
217+
markdownlint:
218+
name: Markdownlint
219+
runs-on: ubuntu-latest
220+
steps:
221+
- uses: actions/checkout@v3
222+
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
223+
uses: actions/setup-node@v3
224+
with:
225+
node-version: ${{ env.PRIMARY_NODE_VERSION }}
226+
227+
- name: Get yarn cache directory path
228+
id: yarn-cache-dir-path
229+
run: echo "::set-output name=dir::$(yarn cache dir)"
230+
231+
- uses: actions/cache@v3
232+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
233+
with:
234+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
235+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
236+
restore-keys: |
237+
${{ runner.os }}-yarn-
238+
239+
- name: Install dependencies
240+
run: |
241+
yarn --ignore-engines --frozen-lockfile --ignore-scripts
242+
yarn check-clean-workspace-after-install
189243
190244
- name: Check code formatting
191245
run: yarn check-format
192246

193-
- name: Lint code
194-
run: yarn lint
247+
eslint:
248+
name: ESLint
249+
runs-on: ubuntu-latest
250+
steps:
251+
- uses: actions/checkout@v3
252+
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
253+
uses: actions/setup-node@v3
254+
with:
255+
node-version: ${{ env.PRIMARY_NODE_VERSION }}
195256

196-
- name: Lint markdown
197-
run: yarn lint-markdown
257+
- name: Get yarn cache directory path
258+
id: yarn-cache-dir-path
259+
run: echo "::set-output name=dir::$(yarn cache dir)"
198260

199-
- name: Check spelling
200-
run: yarn check-spelling
261+
- uses: actions/cache@v3
262+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
263+
with:
264+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
265+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
266+
restore-keys: |
267+
${{ runner.os }}-yarn-
268+
269+
- name: Install dependencies
270+
run: |
271+
yarn --ignore-engines --frozen-lockfile --ignore-scripts
272+
yarn check-clean-workspace-after-install
273+
274+
- name: Build
275+
run: |
276+
# Website will be built by the Netlify GitHub App
277+
yarn build --exclude website
278+
279+
- name: Lint code
280+
run: yarn lint
201281

202282
integration_tests:
203283
name: Run integration tests on primary Node.js version
@@ -366,7 +446,10 @@ jobs:
366446
typecheck,
367447
unit_test_on_primary_node_version,
368448
unit_tests_on_other_node_versions,
369-
linting_and_style,
449+
spellcheck,
450+
check_format,
451+
markdownlint,
452+
eslint,
370453
integration_tests,
371454
]
372455
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/main'

Diff for: .nxignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# see comment in the file
2+
packages/ast-spec/tests/util/parsers/typescript-estree-import.ts

Diff for: package.json

+46-34
Original file line numberDiff line numberDiff line change
@@ -55,67 +55,79 @@
5555
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
5656
},
5757
"devDependencies": {
58-
"@babel/code-frame": "^7.14.5",
59-
"@babel/eslint-parser": "^7.15.4",
60-
"@babel/parser": "^7.15.7",
61-
"@babel/types": "^7.15.6",
62-
"@commitlint/cli": "^16.0.1",
63-
"@commitlint/config-conventional": "^16.0.0",
64-
"@nrwl/cli": "13.8.5",
65-
"@nrwl/nx-cloud": "13.1.6",
66-
"@nrwl/tao": "13.8.5",
67-
"@nrwl/workspace": "13.8.5",
68-
"@swc/core": "^1.2.159",
69-
"@swc/jest": "^0.2.20",
58+
"@babel/code-frame": "^7.16.7",
59+
"@babel/eslint-parser": "^7.17.0",
60+
"@babel/parser": "^7.17.0",
61+
"@babel/types": "^7.17.10",
62+
"@commitlint/cli": "^16.2.4",
63+
"@commitlint/config-conventional": "^16.2.4",
64+
"@nrwl/cli": "14.1.4",
65+
"@nrwl/nx-cloud": "14.0.3",
66+
"@nrwl/tao": "14.1.4",
67+
"@nrwl/workspace": "14.1.4",
68+
"@swc/core": "^1.2.181",
69+
"@swc/jest": "^0.2.21",
7070
"@types/babel__code-frame": "^7.0.3",
7171
"@types/debug": "^4.1.7",
7272
"@types/eslint-visitor-keys": "^1.0.0",
7373
"@types/glob": "^7.2.0",
7474
"@types/is-glob": "^4.0.2",
75-
"@types/jest": "^27.0.2",
75+
"@types/jest": "^27.5.0",
7676
"@types/jest-specific-snapshot": "^0.5.5",
77-
"@types/lodash": "^4.14.176",
78-
"@types/marked": "^3.0.2",
77+
"@types/lodash": "^4.14.182",
78+
"@types/marked": "^4.0.3",
7979
"@types/ncp": "^2.0.5",
80-
"@types/node": "^16.11.4",
81-
"@types/prettier": "^2.4.2",
80+
"@types/node": "^17.0.31",
81+
"@types/prettier": "^2.6.0",
8282
"@types/rimraf": "^3.0.2",
8383
"@types/semver": "^7.3.9",
84-
"@types/tmp": "^0.2.2",
84+
"@types/tmp": "^0.2.3",
8585
"all-contributors-cli": "^6.20.0",
8686
"cross-env": "^7.0.3",
87-
"cross-fetch": "^3.1.4",
88-
"cspell": "^5.12.3",
87+
"cross-fetch": "^3.1.5",
88+
"cspell": "^5.20.0",
8989
"cz-conventional-changelog": "^3.3.0",
9090
"downlevel-dts": "^0.9.0",
91-
"enhanced-resolve": "^5.8.3",
92-
"eslint": "^8.7.0",
91+
"enhanced-resolve": "^5.9.3",
92+
"eslint": "^8.15.0",
9393
"eslint-plugin-eslint-comments": "^3.2.0",
94-
"eslint-plugin-eslint-plugin": "^4.0.1",
95-
"eslint-plugin-import": "^2.25.2",
96-
"eslint-plugin-jest": "^26.0.0",
94+
"eslint-plugin-eslint-plugin": "^4.1.0",
95+
"eslint-plugin-import": "^2.26.0",
96+
"eslint-plugin-jest": "^26.1.5",
9797
"eslint-plugin-simple-import-sort": "^7.0.0",
9898
"glob": "^8.0.1",
9999
"husky": "^8.0.1",
100-
"jest": "^27.3.1",
101-
"jest-diff": "^27.3.1",
102-
"jest-snapshot": "^27.3.1",
100+
"jest": "^28.1.0",
101+
"jest-diff": "^28.1.0",
102+
"jest-snapshot": "^28.1.0",
103103
"jest-specific-snapshot": "^5.0.0",
104104
"lerna": "^4.0.0",
105-
"lint-staged": "^12.0.2",
105+
"lint-staged": "^12.4.1",
106106
"make-dir": "^3.1.0",
107-
"markdownlint-cli": "^0.29.0",
107+
"markdownlint-cli": "^0.31.1",
108108
"ncp": "^2.0.0",
109109
"prettier": "2.5.1",
110-
"pretty-format": "^27.3.1",
110+
"pretty-format": "^28.1.0",
111111
"rimraf": "^3.0.2",
112112
"tmp": "^0.2.1",
113-
"ts-node": "^10.4.0",
113+
"ts-node": "^10.7.0",
114114
"tslint": "^6.1.3",
115115
"typescript": ">=3.3.1 <4.7.0"
116116
},
117117
"resolutions": {
118-
"@types/node": "^16.11.4",
119-
"typescript": "4.6.2"
118+
"typescript": "4.6.4",
119+
"@types/node": "^17.0.31",
120+
"pretty-format": "^28.1.0",
121+
"//": "Pin jest to v28 across the repo",
122+
"@jest/create-cache-key-function": "^28",
123+
"@jest/reporters": "^28",
124+
"@jest/test-result": "^28",
125+
"jest-config": "^28",
126+
"jest-diff": "^28",
127+
"jest-get-type": "^28",
128+
"jest-matcher-utils": "^28",
129+
"jest-resolve": "^28",
130+
"jest-snapshot": "^28",
131+
"jest-util": "^28"
120132
}
121133
}

Diff for: packages/ast-spec/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@babel/core": "*",
4747
"@babel/eslint-parser": "*",
4848
"@babel/parser": "*",
49-
"@microsoft/api-extractor": "^7.18.16",
49+
"@microsoft/api-extractor": "^7.23.2",
5050
"@types/babel__core": "*",
5151
"glob": "*",
5252
"jest-diff": "*",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/**
2+
* Nx is picking up on the fact that we technically have a circular dependency between ast-spec
3+
* and typescript-estree.
4+
*
5+
* This circular dependency only occurs in the tests/ for ast-spec and not in the main package source.
6+
*
7+
* We could therefore solve this by separating the ast-spec tests out into their own package, but the
8+
* other option is to get Nx to turn a blind eye to the circular dependency by removing
9+
* @typescript-eslint/typescript-estree as an explicit devDependency in the package.json and just doing an import here.
10+
*
11+
* This file is ignored via a root `.nxignore`
12+
*
13+
* This should be the only place in the package that we import from typescript-estree.
14+
*/
15+
16+
// We need to ignore this lint error regarding it being missing from the package.json, see above.
17+
// eslint-disable-next-line import/no-extraneous-dependencies
18+
export { parse } from '@typescript-eslint/typescript-estree';

Diff for: packages/ast-spec/tests/util/parsers/typescript-estree.ts

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
1-
/**
2-
* Nx is picking up on the fact that we technically have a circular dependency between ast-spec
3-
* and typescript-estree.
4-
*
5-
* This circular dependency only occurs in the tests/ for ast-spec and not in the main package source.
6-
*
7-
* We could therefore solve this by separating the ast-spec tests out into their own package, but the
8-
* other option is to get Nx to turn a blind eye to the circular dependency by removing
9-
* @typescript-eslint/typescript-estree as an explicit devDependency in the package.json and just doing an import here.
10-
*
11-
* This should be the only place in the package that we import from typescript-estree.
12-
*/
13-
14-
// We need to ignore this lint error regarding it being missing from the package.json, see above.
15-
// eslint-disable-next-line import/no-extraneous-dependencies
16-
import { parse } from '@typescript-eslint/typescript-estree';
1+
import { parse } from './typescript-estree-import';
172
import { ParserResponseType, Fixture, ParserResponse } from './parser-types';
183

194
export function parseTSESTree(

Diff for: packages/eslint-plugin/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@
4747
"@typescript-eslint/scope-manager": "5.23.0",
4848
"@typescript-eslint/type-utils": "5.23.0",
4949
"@typescript-eslint/utils": "5.23.0",
50-
"debug": "^4.3.2",
50+
"debug": "^4.3.4",
5151
"functional-red-black-tree": "^1.0.1",
52-
"ignore": "^5.1.8",
52+
"ignore": "^5.2.0",
5353
"regexpp": "^3.2.0",
54-
"semver": "^7.3.5",
54+
"semver": "^7.3.7",
5555
"tsutils": "^3.21.0"
5656
},
5757
"devDependencies": {
5858
"@types/debug": "*",
5959
"@types/json-schema": "*",
6060
"@types/marked": "*",
6161
"@types/prettier": "*",
62-
"chalk": "^4.1.2",
62+
"chalk": "^5.0.1",
6363
"json-schema": "*",
64-
"marked": "^3.0.7",
64+
"marked": "^4.0.15",
6565
"prettier": "*",
6666
"title-case": "^3.0.3",
6767
"typescript": "*"

Diff for: packages/eslint-plugin/src/rules/naming-convention-utils/format.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PredefinedFormats } from './enums';
44
These format functions are taken from `tslint-consistent-codestyle/naming-convention`:
55
https://github.com/ajafff/tslint-consistent-codestyle/blob/ab156cc8881bcc401236d999f4ce034b59039e81/rules/namingConventionRule.ts#L603-L645
66
7-
The licence for the code can be viewed here:
7+
The license for the code can be viewed here:
88
https://github.com/ajafff/tslint-consistent-codestyle/blob/ab156cc8881bcc401236d999f4ce034b59039e81/LICENSE
99
*/
1010

Diff for: packages/eslint-plugin/tests/docs.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import fs from 'fs';
22
import { JSONSchema4 } from 'json-schema';
33
import path from 'path';
44

5-
import marked from 'marked';
5+
import { marked } from 'marked';
66
import rules from '../src/rules';
77
import { titleCase } from 'title-case';
88

Diff for: packages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The following tests are adapted from the tests in eslint.
22
// Original Code: https://github.com/eslint/eslint/blob/0cb81a9b90dd6b92bac383022f886e501bd2cb31/tests/lib/rules/no-unused-vars.js
3-
// Licence : https://github.com/eslint/eslint/blob/0cb81a9b90dd6b92bac383022f886e501bd2cb31/LICENSE
3+
// License : https://github.com/eslint/eslint/blob/0cb81a9b90dd6b92bac383022f886e501bd2cb31/LICENSE
44

55
'use strict';
66

Diff for: packages/parser/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@typescript-eslint/scope-manager": "5.23.0",
4848
"@typescript-eslint/types": "5.23.0",
4949
"@typescript-eslint/typescript-estree": "5.23.0",
50-
"debug": "^4.3.2"
50+
"debug": "^4.3.4"
5151
},
5252
"devDependencies": {
5353
"@types/glob": "*",

Diff for: packages/scope-manager/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</p>
88

99
This is a fork of [`eslint-scope`](https://github.com/eslint/eslint-scope), enhanced to support TypeScript functionality.
10-
[You can view the original licence for the code here](https://github.com/eslint/eslint-scope/blob/dbddf14d5771b21b5da704213e4508c660ca1c64/LICENSE).
10+
[You can view the original license for the code here](https://github.com/eslint/eslint-scope/blob/dbddf14d5771b21b5da704213e4508c660ca1c64/LICENSE).
1111

1212
This package is consumed automatically by [`@typescript-eslint/parser`](../parser).
1313
You probably don't want to use it directly.

Diff for: packages/type-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"dependencies": {
4242
"@typescript-eslint/utils": "5.23.0",
43-
"debug": "^4.3.2",
43+
"debug": "^4.3.4",
4444
"tsutils": "^3.21.0"
4545
},
4646
"devDependencies": {

0 commit comments

Comments
 (0)