Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
bradzacher committed Nov 1, 2021
2 parents 02b1fbd + 475caa4 commit f4526a7
Show file tree
Hide file tree
Showing 257 changed files with 5,020 additions and 3,393 deletions.
9 changes: 6 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ module.exports = {
sourceType: 'module',
project: [
'./tsconfig.eslint.json',
'./tests/integration/utils/jsconfig.json',
'./packages/*/tsconfig.json',
'./tests/integration/tsconfig.json',
],
allowAutomaticSingleRunInference: true,
tsconfigRootDir: __dirname,
Expand Down Expand Up @@ -175,12 +175,16 @@ module.exports = {
'packages/*/tests/**/spec.ts',
'packages/*/tests/**/test.ts',
'packages/parser/tests/**/*.ts',
'tests/integration/**/*.test.ts',
'tests/integration/integration-test-base.ts',
'tests/integration/pack-packages.ts',
],
env: {
'jest/globals': true,
},
rules: {
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-unsafe-call': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-return': 'off',
'eslint-plugin/no-identical-tests': 'error',
Expand All @@ -193,8 +197,7 @@ module.exports = {
'jest/no-test-prefixes': 'error',
'jest/no-done-callback': 'error',
'jest/no-test-return-statement': 'error',
'jest/prefer-to-be-null': 'warn',
'jest/prefer-to-be-undefined': 'warn',
'jest/prefer-to-be': 'warn',
'jest/prefer-to-contain': 'warn',
'jest/prefer-to-have-length': 'warn',
'jest/prefer-spy-on': 'error',
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
*.ts eol=lf
*.tsx eol=lf
*.yml eol=lf

# force github to treat out custom jest snapshot extension as normal jest snapshots
*.shot linguist-language=Jest-Snapshot
9 changes: 0 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE/standard.md

This file was deleted.

14 changes: 14 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!--
👋 Hi, thanks for sending a PR to typescript-eslint! 💖
Please fill out all fields below -- otherwise we may not be able to review your PR.
-->

## PR Checklist

- [ ] Addresses an existing issue: fixes #000
- [ ] That issue was marked as [accepting prs](https://github.com/typescript-eslint/typescript-eslint/issues?q=is%3Aopen+is%3Aissue+label%3A%22accepting+prs%22)
- [ ] Steps in [CONTRIBUTING.md](https://github.com/typescript-eslint/typescript-eslint/blob/master/CONTRIBUTING.md) were taken

## Overview

<!-- Description of what is changed and how the code change does that. -->
71 changes: 0 additions & 71 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand Down Expand Up @@ -94,10 +90,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand Down Expand Up @@ -176,10 +168,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand Down Expand Up @@ -223,10 +211,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand Down Expand Up @@ -269,10 +253,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand Down Expand Up @@ -355,10 +335,6 @@ jobs:
yarn --ignore-engines --frozen-lockfile --ignore-scripts
yarn check-clean-workspace-after-install
- name: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
Expand All @@ -367,50 +343,3 @@ jobs:
run: npx lerna publish --loglevel=verbose --canary --exact --force-publish --yes
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

publish_canary_version_v5:
name: Publish the latest code as a canary version
runs-on: ubuntu-latest
needs: [typecheck, test_on_primary_node_version, unit_tests_on_other_node_versions, linting_and_style, integration_tests]
if: github.repository == 'typescript-eslint/typescript-eslint' && github.ref == 'refs/heads/v5'
steps:
- uses: actions/checkout@v2
# Fetch all history for all tags and branches in this job because lerna needs it
- run: |
git fetch --prune --unshallow
- name: Use Node.js ${{ env.PRIMARY_NODE_VERSION }}
uses: actions/setup-node@v1
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}
registry-url: https://registry.npmjs.org/

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

- uses: actions/cache@v2
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: Patch Dependencies
run: |
yarn patch-package
- name: Build
run: |
yarn build
- name: Publish all packages to npm
run: npx lerna publish premajor --loglevel=verbose --canary --exact --force-publish --yes --dist-tag rc-v5
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
8 changes: 7 additions & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@
"MD043": false,
// MD044/proper-names - Proper names should have the correct capitalization
"MD044": {
"names": ["JavaScript", "TypeScript", "TSLint", "ESLint"],
"names": [
"JavaScript",
"TypeScript",
"TSLint",
"ESLint",
"typescript-eslint"
],
"code_blocks": false
},
// MD045/no-alt-text - Images should have alternate text (alt text)
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"arrowParens": "avoid",
"bracketSpacing": true,
"endOfLine": "lf",
"jsxBracketSameLine": false,
"bracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 80,
"proseWrap": "preserve",
Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,40 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [5.2.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.1.0...v5.2.0) (2021-10-25)


### Bug Fixes

* **eslint-plugin:** [typedef] fix regression with class properties ([#4034](https://github.com/typescript-eslint/typescript-eslint/issues/4034)) ([fe53d22](https://github.com/typescript-eslint/typescript-eslint/commit/fe53d22f57ad418397fb31fa89c97db0ab4cd6c0)), closes [#4033](https://github.com/typescript-eslint/typescript-eslint/issues/4033)


### Features

* **eslint-plugin:** adding `consistent-type-exports` rule ([#3936](https://github.com/typescript-eslint/typescript-eslint/issues/3936)) ([1971a3f](https://github.com/typescript-eslint/typescript-eslint/commit/1971a3f8027416cd1fb33b1d50faa035599917de))





# [5.1.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.0.0...v5.1.0) (2021-10-18)


### Bug Fixes

* **eslint-plugin:** [no-restricted-imports]: report type-only imports properly ([#3996](https://github.com/typescript-eslint/typescript-eslint/issues/3996)) ([283cdf2](https://github.com/typescript-eslint/typescript-eslint/commit/283cdf26e6b32985531ff6416cd13ef4cb0a3c8c))
* **eslint-plugin:** [strict-bool-expr] treat unconstrained generic as any ([#3981](https://github.com/typescript-eslint/typescript-eslint/issues/3981)) ([9b29ca7](https://github.com/typescript-eslint/typescript-eslint/commit/9b29ca751f496c25240c0c14b8fa432bf4443d39))
* **typescript-estree:** support private optional property definition ([#3997](https://github.com/typescript-eslint/typescript-eslint/issues/3997)) ([8605e08](https://github.com/typescript-eslint/typescript-eslint/commit/8605e080a4dac4a277e6108cd9ed1e5a707302fa))


### Features

* **experimental-utils:** extract `ast-utils`' `predicates`' helpers ([#3976](https://github.com/typescript-eslint/typescript-eslint/issues/3976)) ([154ec9a](https://github.com/typescript-eslint/typescript-eslint/commit/154ec9aea8e81732cafe36af97c4822f1591b077))





# [5.0.0](https://github.com/typescript-eslint/typescript-eslint/compare/v4.33.0...v5.0.0) (2021-10-11)


Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Please refrain from commenting on `master` commits. Commit comments are not sear

## Pull Requests

> With the exception of extremely minor documentation typos, **only send pull requests that resolve open issues**.
Anyone is free to help us build and maintain this project. If you see an issue that needs working on because it's important to you, comment on the issue to help make sure that nobody else works on it at the same time, and then start working.

Developing in this repo is easy:
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "5.0.0",
"version": "5.2.0",
"npmClient": "yarn",
"useWorkspaces": true,
"stream": true
Expand Down
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
"projects": "dependencies"
}
]
},
"projects": {}
}
}
81 changes: 40 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"lint-markdown-fix": "yarn lint-markdown --fix",
"lint-markdown": "markdownlint \"**/*.md\" --config=.markdownlint.json --ignore-path=.markdownlintignore",
"lint": "eslint . --ext .js,.ts",
"postinstall": "patch-package && yarn husky install && yarn build",
"postinstall": "yarn husky install && yarn build",
"pre-commit": "yarn lint-staged",
"pre-push": "yarn check-format",
"test": "nx run-many --target=test --all --parallel",
"test-integration": "./tests/integration/run-all-tests.sh",
"test-integration": "yarn jest -c ./tests/integration/jest.config.js",
"test-kill-integration-containers": "docker-compose -f tests/integration/docker-compose.yml down -v --rmi local",
"typecheck": "nx run-many --target=typecheck --all --parallel"
},
Expand Down Expand Up @@ -71,64 +71,63 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
"devDependencies": {
"@babel/code-frame": "^7.12.13",
"@babel/parser": "^7.15.6",
"@babel/types": "^7.14.4",
"@babel/code-frame": "^7.14.5",
"@babel/parser": "^7.15.7",
"@babel/types": "^7.15.6",
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@commitlint/config-lerna-scopes": "^13.1.0",
"@nrwl/cli": "12.9.0",
"@nrwl/nx-cloud": "12.3.13",
"@nrwl/tao": "12.9.0",
"@nrwl/workspace": "12.9.0",
"@types/babel__code-frame": "^7.0.2",
"@types/debug": "^4.1.5",
"@nrwl/cli": "13.0.2",
"@nrwl/nx-cloud": "12.5.1",
"@nrwl/tao": "13.0.2",
"@nrwl/workspace": "13.0.2",
"@types/babel__code-frame": "^7.0.3",
"@types/debug": "^4.1.7",
"@types/eslint-visitor-keys": "^1.0.0",
"@types/glob": "^7.1.3",
"@types/is-glob": "^4.0.1",
"@types/jest": "^27.0.1",
"@types/glob": "^7.2.0",
"@types/is-glob": "^4.0.2",
"@types/jest": "^27.0.2",
"@types/jest-specific-snapshot": "^0.5.5",
"@types/lodash": "^4.14.170",
"@types/marked": "^2.0.3",
"@types/node": "^15.6.1",
"@types/node-fetch": "^3.0.3",
"@types/prettier": "^2.2.3",
"@types/rimraf": "^3.0.0",
"@types/semver": "^7.3.6",
"@types/tmp": "^0.2.0",
"@types/lodash": "^4.14.176",
"@types/marked": "^3.0.2",
"@types/ncp": "^2.0.5",
"@types/node": "^16.11.4",
"@types/prettier": "^2.3.2",
"@types/rimraf": "^3.0.2",
"@types/semver": "^7.3.9",
"@types/tmp": "^0.2.2",
"all-contributors-cli": "^6.20.0",
"cspell": "^5.5.2",
"cspell": "^5.12.3",
"cz-conventional-changelog": "^3.3.0",
"downlevel-dts": "^0.7.0",
"enhanced-resolve": "^5.8.2",
"eslint": "^8.0.0",
"enhanced-resolve": "^5.8.3",
"eslint": "^8.1.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^3.0.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-eslint-plugin": "^4.0.1",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^25.0.5",
"eslint-plugin-simple-import-sort": "^7.0.0",
"glob": "^7.1.7",
"husky": "^7.0.1",
"jest": "^27.0.3",
"husky": "^7.0.4",
"jest": "^27.3.1",
"jest-specific-snapshot": "^5.0.0",
"lerna": "^3.22.1",
"lint-staged": "^11.0.0",
"lint-staged": "^11.1.2",
"make-dir": "^3.1.0",
"markdownlint-cli": "^0.28.1",
"markdownlint-cli": "^0.29.0",
"ncp": "^2.0.0",
"node-fetch": "^3.0.0",
"patch-package": "^6.4.7",
"prettier": "2.3.2",
"pretty-format": "^27.0.2",
"prettier": "2.4.1",
"pretty-format": "^27.3.1",
"rimraf": "^3.0.2",
"ts-jest": "^27.0.1",
"ts-node": "^10.0.0",
"tmp": "^0.2.1",
"ts-jest": "^27.0.5",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"typescript": ">=3.3.1 <4.5.0"
},
"resolutions": {
"@types/node": "^15.6.1",
"jest-diff": "^27.0.0",
"pretty-format": "^27.0.0",
"typescript": "4.4.2"
"@types/node": "^16.11.4",
"typescript": "4.4.4"
}
}

0 comments on commit f4526a7

Please sign in to comment.