Merge branch 'main' into ban-certain-types-to-be-extended-from

typescript-eslint · Jun 28, 2023 · 9f6dfa8 · 9f6dfa8
2 parents 571395d + faea3ff
commit 9f6dfa8
Show file tree

Hide file tree

Showing 34 changed files with 664 additions and 711 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/typescript-eslint
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,11 @@
 {
-  "version": "5.60.0",
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
+  "version": "5.60.1",
   "npmClient": "yarn",
-  "stream": true
+  "stream": true,
+  "command": {
+    "version": {
+      "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."
+    }
+  }
 }
diff --git a/nx.json b/nx.json
@@ -1,6 +1,5 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "npmScope": "typescript-eslint",
   "tasksRunnerOptions": {
     "default": {
       "runner": "nx-cloud",

diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "jest-diff": "^29.0.3",
     "jest-snapshot": "^29.0.3",
     "jest-specific-snapshot": "^8.0.0",
-    "lerna": "7.0.0-alpha.7",
+    "lerna": "7.1.0",
     "lint-staged": "^13.0.0",
     "make-dir": "^3.1.0",
     "markdownlint-cli": "^0.33.0",

diff --git a/packages/ast-spec/CHANGELOG.md b/packages/ast-spec/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/ast-spec
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/ast-spec

diff --git a/packages/ast-spec/package.json b/packages/ast-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/ast-spec",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "Complete specification for the TypeScript-ESTree AST",
   "private": true,
   "keywords": [

diff --git a/packages/eslint-plugin-internal/CHANGELOG.md b/packages/eslint-plugin-internal/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/eslint-plugin-internal
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/eslint-plugin-internal

diff --git a/packages/eslint-plugin-internal/package.json b/packages/eslint-plugin-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin-internal",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "private": true,
   "main": "dist/index.js",
   "scripts": {
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@types/prettier": "*",
-    "@typescript-eslint/scope-manager": "5.60.0",
-    "@typescript-eslint/type-utils": "5.60.0",
-    "@typescript-eslint/utils": "5.60.0",
+    "@typescript-eslint/scope-manager": "5.60.1",
+    "@typescript-eslint/type-utils": "5.60.1",
+    "@typescript-eslint/utils": "5.60.1",
     "prettier": "*"
   }
 }
diff --git a/packages/eslint-plugin-tslint/CHANGELOG.md b/packages/eslint-plugin-tslint/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/eslint-plugin-tslint
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/eslint-plugin-tslint

diff --git a/packages/eslint-plugin-tslint/package.json b/packages/eslint-plugin-tslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin-tslint",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "main": "dist/index.js",
   "typings": "src/index.ts",
   "description": "ESLint plugin that wraps a TSLint configuration and lints the whole source using TSLint",
@@ -38,7 +38,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "5.60.0"
+    "@typescript-eslint/utils": "5.60.1"
   },
   "peerDependencies": {
     "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
@@ -47,6 +47,6 @@
   },
   "devDependencies": {
     "@types/lodash": "*",
-    "@typescript-eslint/parser": "5.60.0"
+    "@typescript-eslint/parser": "5.60.1"
   }
 }
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/eslint-plugin
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/eslint-plugin",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "TypeScript plugin for ESLint",
   "keywords": [
     "eslint",
@@ -45,11 +45,11 @@
   },
   "dependencies": {
     "@eslint-community/regexpp": "^4.4.0",
-    "@typescript-eslint/scope-manager": "5.60.0",
-    "@typescript-eslint/type-utils": "5.60.0",
-    "@typescript-eslint/utils": "5.60.0",
+    "@typescript-eslint/scope-manager": "5.60.1",
+    "@typescript-eslint/type-utils": "5.60.1",
+    "@typescript-eslint/utils": "5.60.1",
     "debug": "^4.3.4",
-    "grapheme-splitter": "^1.0.4",
+    "graphemer": "^1.4.0",
     "ignore": "^5.2.0",
     "natural-compare-lite": "^1.4.0",
     "semver": "^7.3.7",
@@ -63,7 +63,6 @@
     "@types/prettier": "*",
     "chalk": "^5.0.1",
     "cross-fetch": "^3.1.5",
-    "grapheme-splitter": "^1.0.4",
     "json-schema": "*",
     "markdown-table": "^3.0.2",
     "marked": "^4.0.15",

diff --git a/packages/eslint-plugin/src/util/getStringLength.ts b/packages/eslint-plugin/src/util/getStringLength.ts
@@ -1,6 +1,6 @@
-import GraphemeSplitter from 'grapheme-splitter';
+import Graphemer from 'graphemer';
 
-let splitter: GraphemeSplitter;
+let splitter: Graphemer;
 
 function isASCII(value: string): boolean {
   return /^[\u0020-\u007f]*$/u.test(value);
@@ -11,7 +11,7 @@ export function getStringLength(value: string): number {
     return value.length;
   }
 
-  splitter ??= new GraphemeSplitter();
+  splitter ??= new Graphemer();
 
   return splitter.countGraphemes(value);
 }
diff --git a/packages/experimental-utils/CHANGELOG.md b/packages/experimental-utils/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/experimental-utils
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/experimental-utils

diff --git a/packages/experimental-utils/package.json b/packages/experimental-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/experimental-utils",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "(Experimental) Utilities for working with TypeScript + ESLint together",
   "keywords": [
     "eslint",
@@ -38,7 +38,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "5.60.0"
+    "@typescript-eslint/utils": "5.60.1"
   },
   "peerDependencies": {
     "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"

diff --git a/packages/parser/CHANGELOG.md b/packages/parser/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/parser
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/parser

diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/parser",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "An ESLint custom parser which leverages TypeScript ESTree",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,9 +45,9 @@
     "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@typescript-eslint/scope-manager": "5.60.0",
-    "@typescript-eslint/types": "5.60.0",
-    "@typescript-eslint/typescript-estree": "5.60.0",
+    "@typescript-eslint/scope-manager": "5.60.1",
+    "@typescript-eslint/types": "5.60.1",
+    "@typescript-eslint/typescript-estree": "5.60.1",
     "debug": "^4.3.4"
   },
   "devDependencies": {

diff --git a/packages/scope-manager/CHANGELOG.md b/packages/scope-manager/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/scope-manager
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/scope-manager

diff --git a/packages/scope-manager/package.json b/packages/scope-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/scope-manager",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "TypeScript scope analyser for ESLint",
   "keywords": [
     "eslint",
@@ -38,12 +38,12 @@
     "typecheck": "nx typecheck"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.60.0",
-    "@typescript-eslint/visitor-keys": "5.60.0"
+    "@typescript-eslint/types": "5.60.1",
+    "@typescript-eslint/visitor-keys": "5.60.1"
   },
   "devDependencies": {
     "@types/glob": "*",
-    "@typescript-eslint/typescript-estree": "5.60.0",
+    "@typescript-eslint/typescript-estree": "5.60.1",
     "glob": "*",
     "jest-specific-snapshot": "*",
     "make-dir": "*",

diff --git a/packages/type-utils/CHANGELOG.md b/packages/type-utils/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/type-utils
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/type-utils

diff --git a/packages/type-utils/package.json b/packages/type-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/type-utils",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "Type utilities for working with TypeScript + ESLint together",
   "keywords": [
     "eslint",
@@ -39,13 +39,13 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/typescript-estree": "5.60.0",
-    "@typescript-eslint/utils": "5.60.0",
+    "@typescript-eslint/typescript-estree": "5.60.1",
+    "@typescript-eslint/utils": "5.60.1",
     "debug": "^4.3.4",
     "tsutils": "^3.21.0"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "5.60.0",
+    "@typescript-eslint/parser": "5.60.1",
     "typescript": "*"
   },
   "peerDependencies": {

diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.60.1](https://github.com/typescript-eslint/typescript-eslint/compare/v5.60.0...v5.60.1) (2023-06-26)
+
+**Note:** Version bump only for package @typescript-eslint/types
+
+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.
+
+
+
+
+
 # [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
 
 **Note:** Version bump only for package @typescript-eslint/types

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/types",
-  "version": "5.60.0",
+  "version": "5.60.1",
   "description": "Types for the TypeScript-ESTree AST spec",
   "keywords": [
     "eslint",