Skip to content

Commit

Permalink
chore: bump dependencies (#4952)
Browse files Browse the repository at this point in the history
  • Loading branch information
bradzacher authored May 10, 2022
1 parent c6cb2b5 commit 1fc4e76
Show file tree
Hide file tree
Showing 23 changed files with 1,412 additions and 1,516 deletions.
109 changes: 96 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- v5
pull_request:
branches:
- '**'
Expand Down Expand Up @@ -155,8 +154,8 @@ jobs:
flags: unittest
name: codecov

linting_and_style:
name: Code style and lint
spellcheck:
name: Spellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -182,22 +181,103 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Build
- name: Check spelling
run: yarn check-spelling

check_format:
name: Check Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: |
# Website will be built by the Netlify GitHub App
yarn build --exclude website
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Lint markdown
run: yarn lint-markdown

markdownlint:
name: Markdownlint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: |
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Check code formatting
run: yarn check-format

- name: Lint code
run: yarn lint
eslint:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
uses: actions/setup-node@v3
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}

- name: Lint markdown
run: yarn lint-markdown
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Check spelling
run: yarn check-spelling
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: |
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Build
run: |
# Website will be built by the Netlify GitHub App
yarn build --exclude website
- name: Lint code
run: yarn lint

integration_tests:
name: Run integration tests on primary Node.js version
Expand Down Expand Up @@ -366,7 +446,10 @@ jobs:
typecheck,
unit_test_on_primary_node_version,
unit_tests_on_other_node_versions,
linting_and_style,
spellcheck,
check_format,
markdownlint,
eslint,
integration_tests,
]
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/main'
Expand Down
2 changes: 2 additions & 0 deletions .nxignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# see comment in the file
packages/ast-spec/tests/util/parsers/typescript-estree-import.ts
80 changes: 46 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,67 +55,79 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"devDependencies": {
"@babel/code-frame": "^7.14.5",
"@babel/eslint-parser": "^7.15.4",
"@babel/parser": "^7.15.7",
"@babel/types": "^7.15.6",
"@commitlint/cli": "^16.0.1",
"@commitlint/config-conventional": "^16.0.0",
"@nrwl/cli": "13.8.5",
"@nrwl/nx-cloud": "13.1.6",
"@nrwl/tao": "13.8.5",
"@nrwl/workspace": "13.8.5",
"@swc/core": "^1.2.159",
"@swc/jest": "^0.2.20",
"@babel/code-frame": "^7.16.7",
"@babel/eslint-parser": "^7.17.0",
"@babel/parser": "^7.17.0",
"@babel/types": "^7.17.10",
"@commitlint/cli": "^16.2.4",
"@commitlint/config-conventional": "^16.2.4",
"@nrwl/cli": "14.1.4",
"@nrwl/nx-cloud": "14.0.3",
"@nrwl/tao": "14.1.4",
"@nrwl/workspace": "14.1.4",
"@swc/core": "^1.2.181",
"@swc/jest": "^0.2.21",
"@types/babel__code-frame": "^7.0.3",
"@types/debug": "^4.1.7",
"@types/eslint-visitor-keys": "^1.0.0",
"@types/glob": "^7.2.0",
"@types/is-glob": "^4.0.2",
"@types/jest": "^27.0.2",
"@types/jest": "^27.5.0",
"@types/jest-specific-snapshot": "^0.5.5",
"@types/lodash": "^4.14.176",
"@types/marked": "^3.0.2",
"@types/lodash": "^4.14.182",
"@types/marked": "^4.0.3",
"@types/ncp": "^2.0.5",
"@types/node": "^16.11.4",
"@types/prettier": "^2.4.2",
"@types/node": "^17.0.31",
"@types/prettier": "^2.6.0",
"@types/rimraf": "^3.0.2",
"@types/semver": "^7.3.9",
"@types/tmp": "^0.2.2",
"@types/tmp": "^0.2.3",
"all-contributors-cli": "^6.20.0",
"cross-env": "^7.0.3",
"cross-fetch": "^3.1.4",
"cspell": "^5.12.3",
"cross-fetch": "^3.1.5",
"cspell": "^5.20.0",
"cz-conventional-changelog": "^3.3.0",
"downlevel-dts": "^0.9.0",
"enhanced-resolve": "^5.8.3",
"eslint": "^8.7.0",
"enhanced-resolve": "^5.9.3",
"eslint": "^8.15.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^4.0.1",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-eslint-plugin": "^4.1.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-simple-import-sort": "^7.0.0",
"glob": "^8.0.1",
"husky": "^8.0.1",
"jest": "^27.3.1",
"jest-diff": "^27.3.1",
"jest-snapshot": "^27.3.1",
"jest": "^28.1.0",
"jest-diff": "^28.1.0",
"jest-snapshot": "^28.1.0",
"jest-specific-snapshot": "^5.0.0",
"lerna": "^4.0.0",
"lint-staged": "^12.0.2",
"lint-staged": "^12.4.1",
"make-dir": "^3.1.0",
"markdownlint-cli": "^0.29.0",
"markdownlint-cli": "^0.31.1",
"ncp": "^2.0.0",
"prettier": "2.5.1",
"pretty-format": "^27.3.1",
"pretty-format": "^28.1.0",
"rimraf": "^3.0.2",
"tmp": "^0.2.1",
"ts-node": "^10.4.0",
"ts-node": "^10.7.0",
"tslint": "^6.1.3",
"typescript": ">=3.3.1 <4.7.0"
},
"resolutions": {
"@types/node": "^16.11.4",
"typescript": "4.6.2"
"typescript": "4.6.4",
"@types/node": "^17.0.31",
"pretty-format": "^28.1.0",
"//": "Pin jest to v28 across the repo",
"@jest/create-cache-key-function": "^28",
"@jest/reporters": "^28",
"@jest/test-result": "^28",
"jest-config": "^28",
"jest-diff": "^28",
"jest-get-type": "^28",
"jest-matcher-utils": "^28",
"jest-resolve": "^28",
"jest-snapshot": "^28",
"jest-util": "^28"
}
}
2 changes: 1 addition & 1 deletion packages/ast-spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@babel/core": "*",
"@babel/eslint-parser": "*",
"@babel/parser": "*",
"@microsoft/api-extractor": "^7.18.16",
"@microsoft/api-extractor": "^7.23.2",
"@types/babel__core": "*",
"glob": "*",
"jest-diff": "*",
Expand Down
18 changes: 18 additions & 0 deletions packages/ast-spec/tests/util/parsers/typescript-estree-import.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Nx is picking up on the fact that we technically have a circular dependency between ast-spec
* and typescript-estree.
*
* This circular dependency only occurs in the tests/ for ast-spec and not in the main package source.
*
* We could therefore solve this by separating the ast-spec tests out into their own package, but the
* other option is to get Nx to turn a blind eye to the circular dependency by removing
* @typescript-eslint/typescript-estree as an explicit devDependency in the package.json and just doing an import here.
*
* This file is ignored via a root `.nxignore`
*
* This should be the only place in the package that we import from typescript-estree.
*/

// We need to ignore this lint error regarding it being missing from the package.json, see above.
// eslint-disable-next-line import/no-extraneous-dependencies
export { parse } from '@typescript-eslint/typescript-estree';
17 changes: 1 addition & 16 deletions packages/ast-spec/tests/util/parsers/typescript-estree.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
/**
* Nx is picking up on the fact that we technically have a circular dependency between ast-spec
* and typescript-estree.
*
* This circular dependency only occurs in the tests/ for ast-spec and not in the main package source.
*
* We could therefore solve this by separating the ast-spec tests out into their own package, but the
* other option is to get Nx to turn a blind eye to the circular dependency by removing
* @typescript-eslint/typescript-estree as an explicit devDependency in the package.json and just doing an import here.
*
* This should be the only place in the package that we import from typescript-estree.
*/

// We need to ignore this lint error regarding it being missing from the package.json, see above.
// eslint-disable-next-line import/no-extraneous-dependencies
import { parse } from '@typescript-eslint/typescript-estree';
import { parse } from './typescript-estree-import';
import { ParserResponseType, Fixture, ParserResponse } from './parser-types';

export function parseTSESTree(
Expand Down
10 changes: 5 additions & 5 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@
"@typescript-eslint/scope-manager": "5.23.0",
"@typescript-eslint/type-utils": "5.23.0",
"@typescript-eslint/utils": "5.23.0",
"debug": "^4.3.2",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.1.8",
"ignore": "^5.2.0",
"regexpp": "^3.2.0",
"semver": "^7.3.5",
"semver": "^7.3.7",
"tsutils": "^3.21.0"
},
"devDependencies": {
"@types/debug": "*",
"@types/json-schema": "*",
"@types/marked": "*",
"@types/prettier": "*",
"chalk": "^4.1.2",
"chalk": "^5.0.1",
"json-schema": "*",
"marked": "^3.0.7",
"marked": "^4.0.15",
"prettier": "*",
"title-case": "^3.0.3",
"typescript": "*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PredefinedFormats } from './enums';
These format functions are taken from `tslint-consistent-codestyle/naming-convention`:
https://github.com/ajafff/tslint-consistent-codestyle/blob/ab156cc8881bcc401236d999f4ce034b59039e81/rules/namingConventionRule.ts#L603-L645
The licence for the code can be viewed here:
The license for the code can be viewed here:
https://github.com/ajafff/tslint-consistent-codestyle/blob/ab156cc8881bcc401236d999f4ce034b59039e81/LICENSE
*/

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/tests/docs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from 'fs';
import { JSONSchema4 } from 'json-schema';
import path from 'path';

import marked from 'marked';
import { marked } from 'marked';
import rules from '../src/rules';
import { titleCase } from 'title-case';

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

'use strict';

Expand Down
2 changes: 1 addition & 1 deletion packages/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@typescript-eslint/scope-manager": "5.23.0",
"@typescript-eslint/types": "5.23.0",
"@typescript-eslint/typescript-estree": "5.23.0",
"debug": "^4.3.2"
"debug": "^4.3.4"
},
"devDependencies": {
"@types/glob": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/scope-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</p>

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

This package is consumed automatically by [`@typescript-eslint/parser`](../parser).
You probably don't want to use it directly.
Expand Down
2 changes: 1 addition & 1 deletion packages/type-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"@typescript-eslint/utils": "5.23.0",
"debug": "^4.3.2",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 1fc4e76

Please sign in to comment.