Skip to content

Commit

Permalink
Merge branch 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Mar 13, 2023
2 parents 79c058d + cea05c8 commit bd273dd
Show file tree
Hide file tree
Showing 2,543 changed files with 29,486 additions and 10,732 deletions.
2 changes: 2 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"Airbnb",
"Airbnb's",
"ambiently",
"Armano",
"astexplorer",
"ASTs",
"autofix",
Expand Down Expand Up @@ -72,6 +73,7 @@
"esquery",
"esrecurse",
"estree",
"falsiness",
"globby",
"IDE's",
"IIFE",
Expand Down
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
'import',
'jest',
'simple-import-sort',
'unicorn',
],
env: {
es2020: true,
Expand Down Expand Up @@ -203,6 +204,8 @@ module.exports = {
'simple-import-sort/imports': 'error',

'one-var': ['error', 'never'],

'unicorn/no-typeof-undefined': 'error',
},
overrides: [
{
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@

# force github to treat out custom jest snapshot extension as normal jest snapshots
*.shot linguist-language=Jest-Snapshot
*.shot linguist-generated
90 changes: 46 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,50 +177,52 @@ jobs:
# Sadly 1 day is the minimum
retention-days: 1

website_tests:
permissions:
contents: read # to fetch code (actions/checkout)

name: Website tests
# We technically do not need to wait for build within the pipeline any more because the build we care about is happening within Netlify, however,
# it is highly likely that if the CI one fails, the Netlify one will as well, so in order to not waste unncessary Github Actions minutes/resources,
# we do still keep this requirement here.
needs: [build]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Install
uses: ./.github/actions/prepare-install
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}

- name: Install Playwright Browsers
run: npx playwright install --with-deps

- name: Wait for Netlify deployment
uses: probablyup/wait-for-netlify-action@v3.4.0
id: waitForDeployment
with:
site_id: '128d21c7-b2fe-45ad-b141-9878fcf5de3a'
max_timeout: 300 # 5 minutes
env:
NETLIFY_TOKEN: ${{ secrets.NETLIFY_TOKEN }}

- name: Run Playwright tests against the Netlify deployment
run: yarn playwright test --reporter=list
working-directory: packages/website
env:
PLAYWRIGHT_TEST_BASE_URL: ${{ steps.waitForDeployment.outputs.url }}

- if: always()
uses: actions/upload-artifact@v3
with:
name: playwright-report
path: packages/website/playwright-report
## TODO - re-enable once we fix them
# https://github.com/typescript-eslint/typescript-eslint/issues/6508
# website_tests:
# permissions:
# contents: read # to fetch code (actions/checkout)

# name: Website tests
# # We technically do not need to wait for build within the pipeline any more because the build we care about is happening within Netlify, however,
# # it is highly likely that if the CI one fails, the Netlify one will as well, so in order to not waste unncessary Github Actions minutes/resources,
# # we do still keep this requirement here.
# needs: [build]
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v3
# with:
# fetch-depth: 2

# - name: Install
# uses: ./.github/actions/prepare-install
# with:
# node-version: ${{ env.PRIMARY_NODE_VERSION }}

# - name: Install Playwright Browsers
# run: npx playwright install --with-deps

# - name: Wait for Netlify deployment
# uses: probablyup/wait-for-netlify-action@v3.4.0
# id: waitForDeployment
# with:
# site_id: '128d21c7-b2fe-45ad-b141-9878fcf5de3a'
# max_timeout: 300 # 5 minutes
# env:
# NETLIFY_TOKEN: ${{ secrets.NETLIFY_TOKEN }}

# - name: Run Playwright tests against the Netlify deployment
# run: yarn playwright test --reporter=list
# working-directory: packages/website
# env:
# PLAYWRIGHT_TEST_BASE_URL: ${{ steps.waitForDeployment.outputs.url }}

# - if: always()
# uses: actions/upload-artifact@v3
# with:
# name: playwright-report
# path: packages/website/playwright-report

upload_coverage:
name: Upload Codecov Coverage
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,15 @@
// MD044/proper-names - Proper names should have the correct capitalization
"MD044": {
"names": [
"eslint-scope",
"eslint-plugin",
"eslint-recommended",
"ESLint",
"JavaScript",
"TSLint",
"typescript-eslint",
"typescript-estree",
"TypeScript-ESTree",
"TypeScript"
],
"code_blocks": false
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ packages/eslint-plugin/tests/fixtures/indent/
# prettier errors on this case because it's semantically valid
packages/ast-spec/src/element/AccessorProperty/fixtures/modifier-abstract-with-value/fixture.ts

# prettier doesn't yet support `const` modifiers for type parameters
packages/ast-spec/src/special/TSTypeParameter/fixtures

# Ignore CHANGELOG.md files to avoid issues with automated release job
CHANGELOG.md

Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [5.55.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.54.1...v5.55.0) (2023-03-13)


### Bug Fixes

* **eslint-plugin:** [no-confusing-void-expression] check sequence expressions for void is in last position ([#6597](https://github.com/typescript-eslint/typescript-eslint/issues/6597)) ([d73d7d3](https://github.com/typescript-eslint/typescript-eslint/commit/d73d7d3904a088e2bf7127240dd1f1cefe325e69))
* **eslint-plugin:** [no-unnecessary-boolean-literal-compare] fixer should handle parentheses ([#6569](https://github.com/typescript-eslint/typescript-eslint/issues/6569)) ([2d8c196](https://github.com/typescript-eslint/typescript-eslint/commit/2d8c196294bcbe4989e310ec056a1a9000967600))


### Features

* **eslint-plugin:** [lines-around-comment] add extension rule ([#5327](https://github.com/typescript-eslint/typescript-eslint/issues/5327)) ([d55211c](https://github.com/typescript-eslint/typescript-eslint/commit/d55211caf63e4731f103e94237b3449e88322bb9))
* **eslint-plugin:** [member-ordering] add support for grouping readonly fields ([#6349](https://github.com/typescript-eslint/typescript-eslint/issues/6349)) ([9d3bdfc](https://github.com/typescript-eslint/typescript-eslint/commit/9d3bdfcb2fe3d2b2c0b82d9587d52f0e2ef4e344))
* **eslint-plugin:** [no-unnecessary-cond] check logical assignments ([#6594](https://github.com/typescript-eslint/typescript-eslint/issues/6594)) ([dbc203a](https://github.com/typescript-eslint/typescript-eslint/commit/dbc203aeb64833a4d67bc62a578aa5533083af3d))
* **parser:** add exported meta object ([#6586](https://github.com/typescript-eslint/typescript-eslint/issues/6586)) ([d05c3d8](https://github.com/typescript-eslint/typescript-eslint/commit/d05c3d8aa4093e88ffdfc2dbcff522eafbd455fb))
* **typescript-estree:** support `const` modifiers for type parameters ([#6600](https://github.com/typescript-eslint/typescript-eslint/issues/6600)) ([f3c6373](https://github.com/typescript-eslint/typescript-eslint/commit/f3c637328b1a3923b9ecdfaeea86ccf73cbdda06))
* update TypeScript to 5.0 RC ([#6570](https://github.com/typescript-eslint/typescript-eslint/issues/6570)) ([36ef0e1](https://github.com/typescript-eslint/typescript-eslint/commit/36ef0e16f31810c27dda299e739d1610b689d3ad))
* use [@eslint-community](https://github.com/eslint-community) dependencies ([#6603](https://github.com/typescript-eslint/typescript-eslint/issues/6603)) ([5f6ed73](https://github.com/typescript-eslint/typescript-eslint/commit/5f6ed738a2b8c08878999e24477e3c206a0ade1b))





## [5.54.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.54.0...v5.54.1) (2023-03-06)


Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
</small>
</p>
<p align="center">
<small>
See <strong><a href="https://v6--typescript-eslint.netlify.app">v6--typescript-eslint.netlify.app</a></strong> for documentation on <a href="https://main--typescript-eslint.netlify.app/blog/announcing-typescript-eslint-v6-beta">upcoming v6 release</a>.
</small>
</p>
<p align="center">
👆
</p>
<!-- markdownlint-enable MD033 -->
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/Utils.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Any custom rules you write generally will be as well.
| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `AST_NODE_TYPES` | An enum with the names of every single _node_ found in `TSESTree`. |
| `AST_TOKEN_TYPES` | An enum with the names of every single _token_ found in `TSESTree`. |
| `ASTUtils` | Tools for operating on the ESTree AST. Also includes the [`eslint-utils`](https://www.npmjs.com/package/eslint-utils) package, correctly typed to work with the types found in `TSESTree` |
| `ASTUtils` | Tools for operating on the ESTree AST. Also includes the [`@eslint-community/eslint-utils`](https://www.npmjs.com/package/@eslint-community/eslint-utils) package, correctly typed to work with the types found in `TSESTree` |
| `ESLintUtils` | Tools for creating ESLint rules with TypeScript. |
| `JSONSchema` | Types from the [`@types/json-schema`](https://www.npmjs.com/package/@types/json-schema) package, re-exported to save you having to manually import them. Also ensures you're using the same version of the types as this package. |
| `ParserServices` | Typing for the parser services provided when parsing a file using `@typescript-eslint/typescript-estree`. |
Expand Down
2 changes: 1 addition & 1 deletion docs/linting/troubleshooting/TSLint.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ TSLint had to reimplement everything from editor extensions to auto-fixing to ru
TSLint's backers announced in 2019 that **they would be deprecating TSLint in favor of supporting `typescript-eslint`** in order to benefit the community.
You can read more about that here: https://medium.com/palantir/tslint-in-2019-1a144c2317a9.

The TypeScript team also migrated move the TypeScript codebase from TSLint to `typescript-eslint`, and they have been supporters of this project.
The TypeScript team also migrated the TypeScript codebase from TSLint to `typescript-eslint`, and they have been supporters of this project.
See more details at https://github.com/microsoft/TypeScript/issues/30553.
2 changes: 1 addition & 1 deletion docs/maintenance/Versioning.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Support for specific Current status releases are considered periodically.

### TypeScript

> The version range of TypeScript currently supported is `>=4.2.0 <5.0.0`.
> The version range of TypeScript currently supported is `>=4.2.0 <5.1.0`.
Note that we mirror [DefinitelyTyped's version support window](https://github.com/DefinitelyTyped/DefinitelyTyped/#support-window) - meaning we only support versions of TypeScript less than 2 years old.

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.54.1",
"version": "5.55.0",
"npmClient": "yarn",
"useWorkspaces": true,
"stream": true
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@babel/code-frame": "^7.18.6",
"@babel/core": "^7.20.2",
"@babel/eslint-parser": "^7.19.1",
"@babel/parser": "^7.20.7",
"@babel/parser": "^7.21.2",
"@babel/types": "^7.20.2",
"@nrwl/jest": "15.7.2",
"@nrwl/nx-cloud": "15.0.3",
Expand All @@ -80,9 +80,9 @@
"cross-env": "^7.0.3",
"cross-fetch": "^3.1.5",
"cspell": "^6.0.0",
"downlevel-dts": "^0.11.0",
"eslint": "^8.34.0",
"downlevel-dts": ">=0.11.0",
"eslint-plugin-deprecation": "^1.3.3",
"eslint": "^8.34.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^5.0.8",
"eslint-plugin-import": "^2.27.5",
Expand All @@ -91,12 +91,14 @@
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-unicorn": "^46.0.0",
"execa": "5.1.1",
"glob": "^8.0.1",
"husky": "^8.0.1",
"jest": "^29.0.3",
"jest-diff": "^29.0.3",
"jest-snapshot": "^29.0.3",
"jest-specific-snapshot": "^7.0.0",
"jest-specific-snapshot": "^8.0.0",
"lerna": "6.5.1",
"lint-staged": "^13.0.0",
"make-dir": "^3.1.0",
Expand All @@ -111,11 +113,10 @@
"ts-node": "10.7.0",
"tslint": "^6.1.3",
"tsx": "^3.12.1",
"typescript": ">=4.2.4 <5.0.0"
"typescript": "~5.0.1-rc"
},
"resolutions": {
"@typescript-eslint/experimental-utils": "link:./packages/utils",
"typescript": "~4.9.5",
"typescript": "~5.0.1-rc",
"@types/node": "^18.11.9",
"@jest/reporters": "^29",
"@jest/test-result": "^29",
Expand Down
12 changes: 12 additions & 0 deletions packages/ast-spec/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [5.55.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.54.1...v5.55.0) (2023-03-13)


### Features

* **typescript-estree:** support `const` modifiers for type parameters ([#6600](https://github.com/typescript-eslint/typescript-eslint/issues/6600)) ([f3c6373](https://github.com/typescript-eslint/typescript-eslint/commit/f3c637328b1a3923b9ecdfaeea86ccf73cbdda06))
* update TypeScript to 5.0 RC ([#6570](https://github.com/typescript-eslint/typescript-eslint/issues/6570)) ([36ef0e1](https://github.com/typescript-eslint/typescript-eslint/commit/36ef0e16f31810c27dda299e739d1610b689d3ad))





## [5.54.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.54.0...v5.54.1) (2023-03-06)

**Note:** Version bump only for package @typescript-eslint/ast-spec
Expand Down
4 changes: 2 additions & 2 deletions packages/ast-spec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typescript-eslint/ast-spec",
"version": "5.54.1",
"version": "5.55.0",
"description": "Complete specification for the TypeScript-ESTree AST",
"private": true,
"keywords": [
Expand Down Expand Up @@ -47,7 +47,7 @@
"@babel/eslint-parser": "*",
"@babel/parser": "*",
"@babel/code-frame": "*",
"@microsoft/api-extractor": "^7.23.2",
"@microsoft/api-extractor": "^7.34.4",
"@types/babel__core": "*",
"glob": "*",
"jest-diff": "*",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bd273dd

Please sign in to comment.