Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork2.8k
chore: bump dependencies#4952
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
6 commits Select commitHold shift + click to select a range
28decd9 chore: bump dependencies (except jest)
bradzacher5eaf66b chore: bump nx
bradzacher99a6058 fix: marked import
bradzacheraf15c73 chore: bump jest packages
bradzacher5db85b3 test: update itegration snaps
bradzacherd43f7d5 chore: pin jest to v28
bradzacherFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,7 +4,6 @@ on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| branches: | ||
| - '**' | ||
| @@ -155,8 +154,8 @@ jobs: | ||
| flags: unittest | ||
| name: codecov | ||
| spellcheck: | ||
MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Split this out just because i was annoyed when one failed and it killed the entire lint job. Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. +1 from me on the splitup! ...and continued irk at GHA for not making it easy to reuse steps copypasta... | ||
| name:Spellcheck | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| @@ -182,22 +181,103 @@ jobs: | ||
| yarn --ignore-engines --frozen-lockfile --ignore-scripts | ||
| yarn check-clean-workspace-after-install | ||
| - 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: | | ||
| 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 | ||
| 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: 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: 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 | ||
| @@ -366,7 +446,10 @@ jobs: | ||
| typecheck, | ||
| unit_test_on_primary_node_version, | ||
| unit_tests_on_other_node_versions, | ||
| spellcheck, | ||
| check_format, | ||
| markdownlint, | ||
| eslint, | ||
| integration_tests, | ||
| ] | ||
| if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/main' | ||
2 changes: 2 additions & 0 deletions.nxignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| 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 | ||
MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. @JamesHenry - the new version of nx started reporting circular deps, so I had to add this hack back in. | ||
80 changes: 46 additions & 34 deletionspackage.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -55,67 +55,79 @@ | ||
| "node": "^12.22.0 || ^14.17.0 || >=16.0.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@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.5.0", | ||
| "@types/jest-specific-snapshot": "^0.5.5", | ||
| "@types/lodash": "^4.14.182", | ||
| "@types/marked": "^4.0.3", | ||
| "@types/ncp": "^2.0.5", | ||
| "@types/node": "^17.0.31", | ||
| "@types/prettier": "^2.6.0", | ||
| "@types/rimraf": "^3.0.2", | ||
| "@types/semver": "^7.3.9", | ||
| "@types/tmp": "^0.2.3", | ||
| "all-contributors-cli": "^6.20.0", | ||
| "cross-env": "^7.0.3", | ||
| "cross-fetch": "^3.1.5", | ||
| "cspell": "^5.20.0", | ||
| "cz-conventional-changelog": "^3.3.0", | ||
| "downlevel-dts": "^0.9.0", | ||
| "enhanced-resolve": "^5.9.3", | ||
| "eslint": "^8.15.0", | ||
| "eslint-plugin-eslint-comments": "^3.2.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": "^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.4.1", | ||
| "make-dir": "^3.1.0", | ||
| "markdownlint-cli": "^0.31.1", | ||
| "ncp": "^2.0.0", | ||
| "prettier": "2.5.1", | ||
| "pretty-format": "^28.1.0", | ||
| "rimraf": "^3.0.2", | ||
| "tmp": "^0.2.1", | ||
| "ts-node": "^10.7.0", | ||
| "tslint": "^6.1.3", | ||
| "typescript": ">=3.3.1 <4.7.0" | ||
| }, | ||
| "resolutions": { | ||
| "typescript": "4.6.4", | ||
| "@types/node": "^17.0.31", | ||
| "pretty-format": "^28.1.0", | ||
MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. one of the jest packages depends on the old pretty-format version which was breaking the types. | ||
| "//": "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 deletionpackages/ast-spec/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletionspackages/ast-spec/tests/util/parsers/typescript-estree-import.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| 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 deletionspackages/ast-spec/tests/util/parsers/typescript-estree.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletionspackages/eslint-plugin/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/eslint-plugin/src/rules/naming-convention-utils/format.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/eslint-plugin/tests/docs.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/eslint-plugin/tests/rules/no-unused-vars/no-unused-vars-eslint.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/parser/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/scope-manager/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionpackages/type-utils/package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.