Skip to content

Commit 9f6dfa8

Browse files
authored
Merge branch 'main' into ban-certain-types-to-be-extended-from
2 parents 571395d + faea3ff commit 9f6dfa8

34 files changed

+664
-711
lines changed

Diff for: CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/typescript-eslint
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818

Diff for: lerna.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
2-
"version": "5.60.0",
2+
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3+
"version": "5.60.1",
34
"npmClient": "yarn",
4-
"stream": true
5+
"stream": true,
6+
"command": {
7+
"version": {
8+
"changelogEntryAdditionalMarkdown": "You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website."
9+
}
10+
}
511
}

Diff for: nx.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"npmScope": "typescript-eslint",
43
"tasksRunnerOptions": {
54
"default": {
65
"runner": "nx-cloud",

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"jest-diff": "^29.0.3",
9797
"jest-snapshot": "^29.0.3",
9898
"jest-specific-snapshot": "^8.0.0",
99-
"lerna": "7.0.0-alpha.7",
99+
"lerna": "7.1.0",
100100
"lint-staged": "^13.0.0",
101101
"make-dir": "^3.1.0",
102102
"markdownlint-cli": "^0.33.0",

Diff for: packages/ast-spec/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/ast-spec
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

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

Diff for: packages/ast-spec/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/ast-spec",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "Complete specification for the TypeScript-ESTree AST",
55
"private": true,
66
"keywords": [

Diff for: packages/eslint-plugin-internal/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/eslint-plugin-internal
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

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

Diff for: packages/eslint-plugin-internal/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/eslint-plugin-internal",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"private": true,
55
"main": "dist/index.js",
66
"scripts": {
@@ -14,9 +14,9 @@
1414
},
1515
"dependencies": {
1616
"@types/prettier": "*",
17-
"@typescript-eslint/scope-manager": "5.60.0",
18-
"@typescript-eslint/type-utils": "5.60.0",
19-
"@typescript-eslint/utils": "5.60.0",
17+
"@typescript-eslint/scope-manager": "5.60.1",
18+
"@typescript-eslint/type-utils": "5.60.1",
19+
"@typescript-eslint/utils": "5.60.1",
2020
"prettier": "*"
2121
}
2222
}

Diff for: packages/eslint-plugin-tslint/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/eslint-plugin-tslint
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

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

Diff for: packages/eslint-plugin-tslint/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/eslint-plugin-tslint",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"main": "dist/index.js",
55
"typings": "src/index.ts",
66
"description": "ESLint plugin that wraps a TSLint configuration and lints the whole source using TSLint",
@@ -38,7 +38,7 @@
3838
"typecheck": "tsc -p tsconfig.json --noEmit"
3939
},
4040
"dependencies": {
41-
"@typescript-eslint/utils": "5.60.0"
41+
"@typescript-eslint/utils": "5.60.1"
4242
},
4343
"peerDependencies": {
4444
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
@@ -47,6 +47,6 @@
4747
},
4848
"devDependencies": {
4949
"@types/lodash": "*",
50-
"@typescript-eslint/parser": "5.60.0"
50+
"@typescript-eslint/parser": "5.60.1"
5151
}
5252
}

Diff for: packages/eslint-plugin/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/eslint-plugin
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818

Diff for: packages/eslint-plugin/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/eslint-plugin",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "TypeScript plugin for ESLint",
55
"keywords": [
66
"eslint",
@@ -45,11 +45,11 @@
4545
},
4646
"dependencies": {
4747
"@eslint-community/regexpp": "^4.4.0",
48-
"@typescript-eslint/scope-manager": "5.60.0",
49-
"@typescript-eslint/type-utils": "5.60.0",
50-
"@typescript-eslint/utils": "5.60.0",
48+
"@typescript-eslint/scope-manager": "5.60.1",
49+
"@typescript-eslint/type-utils": "5.60.1",
50+
"@typescript-eslint/utils": "5.60.1",
5151
"debug": "^4.3.4",
52-
"grapheme-splitter": "^1.0.4",
52+
"graphemer": "^1.4.0",
5353
"ignore": "^5.2.0",
5454
"natural-compare-lite": "^1.4.0",
5555
"semver": "^7.3.7",
@@ -63,7 +63,6 @@
6363
"@types/prettier": "*",
6464
"chalk": "^5.0.1",
6565
"cross-fetch": "^3.1.5",
66-
"grapheme-splitter": "^1.0.4",
6766
"json-schema": "*",
6867
"markdown-table": "^3.0.2",
6968
"marked": "^4.0.15",

Diff for: packages/eslint-plugin/src/util/getStringLength.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import GraphemeSplitter from 'grapheme-splitter';
1+
import Graphemer from 'graphemer';
22

3-
let splitter: GraphemeSplitter;
3+
let splitter: Graphemer;
44

55
function isASCII(value: string): boolean {
66
return /^[\u0020-\u007f]*$/u.test(value);
@@ -11,7 +11,7 @@ export function getStringLength(value: string): number {
1111
return value.length;
1212
}
1313

14-
splitter ??= new GraphemeSplitter();
14+
splitter ??= new Graphemer();
1515

1616
return splitter.countGraphemes(value);
1717
}

Diff for: packages/experimental-utils/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/experimental-utils
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818
**Note:** Version bump only for package @typescript-eslint/experimental-utils

Diff for: packages/experimental-utils/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/experimental-utils",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "(Experimental) Utilities for working with TypeScript + ESLint together",
55
"keywords": [
66
"eslint",
@@ -38,7 +38,7 @@
3838
"typecheck": "tsc -p tsconfig.json --noEmit"
3939
},
4040
"dependencies": {
41-
"@typescript-eslint/utils": "5.60.0"
41+
"@typescript-eslint/utils": "5.60.1"
4242
},
4343
"peerDependencies": {
4444
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"

Diff for: packages/parser/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/parser
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818
**Note:** Version bump only for package @typescript-eslint/parser

Diff for: packages/parser/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/parser",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "An ESLint custom parser which leverages TypeScript ESTree",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -45,9 +45,9 @@
4545
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
4646
},
4747
"dependencies": {
48-
"@typescript-eslint/scope-manager": "5.60.0",
49-
"@typescript-eslint/types": "5.60.0",
50-
"@typescript-eslint/typescript-estree": "5.60.0",
48+
"@typescript-eslint/scope-manager": "5.60.1",
49+
"@typescript-eslint/types": "5.60.1",
50+
"@typescript-eslint/typescript-estree": "5.60.1",
5151
"debug": "^4.3.4"
5252
},
5353
"devDependencies": {

Diff for: packages/scope-manager/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/scope-manager
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818
**Note:** Version bump only for package @typescript-eslint/scope-manager

Diff for: packages/scope-manager/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/scope-manager",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "TypeScript scope analyser for ESLint",
55
"keywords": [
66
"eslint",
@@ -38,12 +38,12 @@
3838
"typecheck": "nx typecheck"
3939
},
4040
"dependencies": {
41-
"@typescript-eslint/types": "5.60.0",
42-
"@typescript-eslint/visitor-keys": "5.60.0"
41+
"@typescript-eslint/types": "5.60.1",
42+
"@typescript-eslint/visitor-keys": "5.60.1"
4343
},
4444
"devDependencies": {
4545
"@types/glob": "*",
46-
"@typescript-eslint/typescript-estree": "5.60.0",
46+
"@typescript-eslint/typescript-estree": "5.60.1",
4747
"glob": "*",
4848
"jest-specific-snapshot": "*",
4949
"make-dir": "*",

Diff for: packages/type-utils/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/type-utils
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818
**Note:** Version bump only for package @typescript-eslint/type-utils

Diff for: packages/type-utils/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/type-utils",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "Type utilities for working with TypeScript + ESLint together",
55
"keywords": [
66
"eslint",
@@ -39,13 +39,13 @@
3939
"typecheck": "tsc -p tsconfig.json --noEmit"
4040
},
4141
"dependencies": {
42-
"@typescript-eslint/typescript-estree": "5.60.0",
43-
"@typescript-eslint/utils": "5.60.0",
42+
"@typescript-eslint/typescript-estree": "5.60.1",
43+
"@typescript-eslint/utils": "5.60.1",
4444
"debug": "^4.3.4",
4545
"tsutils": "^3.21.0"
4646
},
4747
"devDependencies": {
48-
"@typescript-eslint/parser": "5.60.0",
48+
"@typescript-eslint/parser": "5.60.1",
4949
"typescript": "*"
5050
},
5151
"peerDependencies": {

Diff for: packages/types/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
7+
8+
**Note:** Version bump only for package @typescript-eslint/types
9+
10+
You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.
11+
12+
13+
14+
15+
616
# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
717

818
**Note:** Version bump only for package @typescript-eslint/types

Diff for: packages/types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@typescript-eslint/types",
3-
"version": "5.60.0",
3+
"version": "5.60.1",
44
"description": "Types for the TypeScript-ESTree AST spec",
55
"keywords": [
66
"eslint",

0 commit comments

Comments
 (0)