Skip to content

Commit

Permalink
Merge branch 'master' of github.com:typescript-eslint/typescript-esli…
Browse files Browse the repository at this point in the history
…nt into member-ordering-order-case-insensitive
  • Loading branch information
VincentRoth committed Nov 1, 2021
2 parents 684d7bd + 6af7ca7 commit 9257fee
Show file tree
Hide file tree
Showing 107 changed files with 2,157 additions and 1,259 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.js
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 Down
3 changes: 3 additions & 0 deletions .gitattributes
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
@@ -1,11 +1,3 @@
---
name: 'Standard'
about: Standard Pull Request Template
title: ''
labels: ''
assignees: ''
---

<!--
👋 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.
Expand All @@ -14,6 +6,7 @@ Please fill out all fields below -- otherwise we may not be able to review your
## 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
Expand Down
43 changes: 0 additions & 43 deletions .github/workflows/ci.yml
Expand Up @@ -343,46 +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: 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 }}
2 changes: 1 addition & 1 deletion .prettierrc.json
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
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
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
@@ -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
Expand Up @@ -32,6 +32,5 @@
"projects": "dependencies"
}
]
},
"projects": {}
}
}
41 changes: 21 additions & 20 deletions package.json
Expand Up @@ -35,7 +35,7 @@
"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 @@ -77,56 +77,57 @@
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@commitlint/config-lerna-scopes": "^13.1.0",
"@nrwl/cli": "12.10.0",
"@nrwl/nx-cloud": "12.3.13",
"@nrwl/tao": "12.10.0",
"@nrwl/workspace": "12.10.0",
"@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.4",
"@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.172",
"@types/marked": "^2.0.5",
"@types/node": "^16.10.9",
"@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.8",
"@types/tmp": "^0.2.1",
"@types/semver": "^7.3.9",
"@types/tmp": "^0.2.2",
"all-contributors-cli": "^6.20.0",
"cspell": "^5.12.3",
"cz-conventional-changelog": "^3.3.0",
"downlevel-dts": "^0.7.0",
"enhanced-resolve": "^5.8.3",
"eslint": "^8.0.0",
"eslint": "^8.1.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^3.6.1",
"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.2",
"jest": "^27.1.0",
"husky": "^7.0.4",
"jest": "^27.3.1",
"jest-specific-snapshot": "^5.0.0",
"lerna": "^3.22.1",
"lint-staged": "^11.1.2",
"make-dir": "^3.1.0",
"markdownlint-cli": "^0.29.0",
"ncp": "^2.0.0",
"node-fetch": "^3.0.0",
"prettier": "2.4.1",
"pretty-format": "^27.2.5",
"pretty-format": "^27.3.1",
"rimraf": "^3.0.2",
"tmp": "^0.2.1",
"ts-jest": "^27.0.5",
"ts-node": "^10.2.1",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"typescript": ">=3.3.1 <4.5.0"
},
"resolutions": {
"@types/node": "^16.10.9",
"jest-diff": "^27.0.0",
"pretty-format": "^27.2.5",
"@types/node": "^16.11.4",
"typescript": "4.4.4"
}
}
16 changes: 16 additions & 0 deletions packages/ast-spec/CHANGELOG.md
Expand Up @@ -3,6 +3,22 @@
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)

**Note:** Version bump only for package @typescript-eslint/ast-spec





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

**Note:** Version bump only for package @typescript-eslint/ast-spec





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


Expand Down
2 changes: 1 addition & 1 deletion packages/ast-spec/package.json
@@ -1,6 +1,6 @@
{
"name": "@typescript-eslint/ast-spec",
"version": "5.0.0",
"version": "5.2.0",
"description": "TypeScript-ESTree AST spec",
"private": true,
"keywords": [
Expand Down
16 changes: 16 additions & 0 deletions packages/eslint-plugin-internal/CHANGELOG.md
Expand Up @@ -3,6 +3,22 @@
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)

**Note:** Version bump only for package @typescript-eslint/eslint-plugin-internal





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

**Note:** Version bump only for package @typescript-eslint/eslint-plugin-internal





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


Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-plugin-internal/package.json
@@ -1,6 +1,6 @@
{
"name": "@typescript-eslint/eslint-plugin-internal",
"version": "5.0.0",
"version": "5.2.0",
"private": true,
"main": "dist/index.js",
"scripts": {
Expand All @@ -14,8 +14,8 @@
},
"dependencies": {
"@types/prettier": "*",
"@typescript-eslint/experimental-utils": "5.0.0",
"@typescript-eslint/scope-manager": "5.0.0",
"@typescript-eslint/experimental-utils": "5.2.0",
"@typescript-eslint/scope-manager": "5.2.0",
"prettier": "*"
}
}
16 changes: 16 additions & 0 deletions packages/eslint-plugin-tslint/CHANGELOG.md
Expand Up @@ -3,6 +3,22 @@
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)

**Note:** Version bump only for package @typescript-eslint/eslint-plugin-tslint





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

**Note:** Version bump only for package @typescript-eslint/eslint-plugin-tslint





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


Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-plugin-tslint/package.json
@@ -1,6 +1,6 @@
{
"name": "@typescript-eslint/eslint-plugin-tslint",
"version": "5.0.0",
"version": "5.2.0",
"main": "dist/index.js",
"typings": "src/index.ts",
"description": "TSLint wrapper plugin for ESLint",
Expand Down Expand Up @@ -38,7 +38,7 @@
"typecheck": "tsc -p tsconfig.json --noEmit"
},
"dependencies": {
"@typescript-eslint/experimental-utils": "5.0.0",
"@typescript-eslint/experimental-utils": "5.2.0",
"lodash": "^4.17.21"
},
"peerDependencies": {
Expand All @@ -48,6 +48,6 @@
},
"devDependencies": {
"@types/lodash": "*",
"@typescript-eslint/parser": "5.0.0"
"@typescript-eslint/parser": "5.2.0"
}
}

0 comments on commit 9257fee

Please sign in to comment.