Merge branch 'main' into v6

typescript-eslint · Jun 24, 2023 · 371fc26 · 371fc26
2 parents 36b65eb + c09b1c0
commit 371fc26
Show file tree

Hide file tree

Showing 31 changed files with 181 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
+
+
+### Features
+
+* **eslint-plugin:** [restrict-plus-operands] add allow* options ([#6161](https://github.com/typescript-eslint/typescript-eslint/issues/6161)) ([def09f8](https://github.com/typescript-eslint/typescript-eslint/commit/def09f88cdb4a85cebb8619b45931f7e2c88dfc0))
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **Note:** Version bump only for package @typescript-eslint/typescript-eslint

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.59.11",
+  "version": "5.60.0",
   "npmClient": "yarn",
   "stream": true
 }
diff --git a/packages/ast-spec/CHANGELOG.md b/packages/ast-spec/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "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,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "private": true,
   "main": "dist/index.js",
   "scripts": {
@@ -14,10 +14,10 @@
   },
   "dependencies": {
     "@types/prettier": "*",
-    "@typescript-eslint/rule-tester": "5.59.11",
-    "@typescript-eslint/scope-manager": "5.59.11",
-    "@typescript-eslint/type-utils": "5.59.11",
-    "@typescript-eslint/utils": "5.59.11",
+    "@typescript-eslint/rule-tester": "5.60.0",
+    "@typescript-eslint/scope-manager": "5.60.0",
+    "@typescript-eslint/type-utils": "5.60.0",
+    "@typescript-eslint/utils": "5.60.0",
     "prettier": "*"
   }
 }
diff --git a/packages/eslint-plugin-tslint/CHANGELOG.md b/packages/eslint-plugin-tslint/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "main": "dist/index.js",
   "typings": "src/index.ts",
   "description": "ESLint plugin that wraps a TSLint configuration and lints the whole source using TSLint",
@@ -46,7 +46,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "5.59.11"
+    "@typescript-eslint/utils": "5.60.0"
   },
   "peerDependencies": {
     "eslint": "^7.0.0 || ^8.0.0",
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@types/lodash": "*",
-    "@typescript-eslint/parser": "5.59.11"
+    "@typescript-eslint/parser": "5.60.0"
   },
   "funding": {
     "type": "opencollective",

diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.60.0](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.11...v5.60.0) (2023-06-19)
+
+
+### Features
+
+* **eslint-plugin:** [restrict-plus-operands] add allow* options ([#6161](https://github.com/typescript-eslint/typescript-eslint/issues/6161)) ([def09f8](https://github.com/typescript-eslint/typescript-eslint/commit/def09f88cdb4a85cebb8619b45931f7e2c88dfc0))
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **Note:** Version bump only for package @typescript-eslint/eslint-plugin

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.59.11",
+  "version": "5.60.0",
   "description": "TypeScript plugin for ESLint",
   "files": [
     "dist",
@@ -55,9 +55,9 @@
   },
   "dependencies": {
     "@eslint-community/regexpp": "^4.5.0",
-    "@typescript-eslint/scope-manager": "5.59.11",
-    "@typescript-eslint/type-utils": "5.59.11",
-    "@typescript-eslint/utils": "5.59.11",
+    "@typescript-eslint/scope-manager": "5.60.0",
+    "@typescript-eslint/type-utils": "5.60.0",
+    "@typescript-eslint/utils": "5.60.0",
     "debug": "^4.3.4",
     "grapheme-splitter": "^1.0.4",
     "ignore": "^5.2.4",
@@ -70,8 +70,8 @@
     "@types/marked": "*",
     "@types/natural-compare": "*",
     "@types/prettier": "*",
-    "@typescript-eslint/rule-schema-to-typescript-types": "5.59.11",
-    "@typescript-eslint/rule-tester": "5.59.11",
+    "@typescript-eslint/rule-schema-to-typescript-types": "5.60.0",
+    "@typescript-eslint/rule-tester": "5.60.0",
     "cross-fetch": "*",
     "jest-specific-snapshot": "*",
     "json-schema": "*",

diff --git a/packages/parser/CHANGELOG.md b/packages/parser/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "description": "An ESLint custom parser which leverages TypeScript ESTree",
   "files": [
     "dist",
@@ -51,10 +51,10 @@
     "eslint": "^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@typescript-eslint/scope-manager": "5.59.11",
-    "@typescript-eslint/types": "5.59.11",
-    "@typescript-eslint/typescript-estree": "5.59.11",
-    "@typescript-eslint/visitor-keys": "5.59.11",
+    "@typescript-eslint/scope-manager": "5.60.0",
+    "@typescript-eslint/types": "5.60.0",
+    "@typescript-eslint/typescript-estree": "5.60.0",
+    "@typescript-eslint/visitor-keys": "5.60.0",
     "debug": "^4.3.4"
   },
   "devDependencies": {

diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/repo-tools",
-  "version": "5.59.11",
+  "version": "5.60.0",
   "private": true,
   "scripts": {
     "build": "tsc -b tsconfig.build.json",

diff --git a/packages/rule-schema-to-typescript-types/package.json b/packages/rule-schema-to-typescript-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/rule-schema-to-typescript-types",
-  "version": "5.59.11",
+  "version": "5.60.0",
   "private": true,
   "type": "commonjs",
   "exports": {
@@ -33,7 +33,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/type-utils": "5.59.11",
+    "@typescript-eslint/type-utils": "5.60.0",
     "natural-compare": "^1.4.0",
     "prettier": "*"
   },

diff --git a/packages/rule-tester/package.json b/packages/rule-tester/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typescript-eslint/rule-tester",
-  "version": "5.59.11",
+  "version": "5.60.0",
   "description": "Tooling to test ESLint rules",
   "files": [
     "dist",
@@ -47,8 +47,8 @@
   },
   "//": "NOTE - AJV is out-of-date, but it's intentionally synced with ESLint - https://github.com/eslint/eslint/blob/ad9dd6a933fd098a0d99c6a9aa059850535c23ee/package.json#L70",
   "dependencies": {
-    "@typescript-eslint/typescript-estree": "5.59.11",
-    "@typescript-eslint/utils": "5.59.11",
+    "@typescript-eslint/typescript-estree": "5.60.0",
+    "@typescript-eslint/utils": "5.60.0",
     "lodash.merge": "4.6.2",
     "semver": "^7.3.7",
     "ajv": "^6.10.0"
@@ -58,7 +58,7 @@
     "eslint": ">=8"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "5.59.11",
+    "@typescript-eslint/parser": "5.60.0",
     "@types/lodash.merge": "4.6.7",
     "chai": "^4.0.1",
     "mocha": "^8.3.2",

diff --git a/packages/scope-manager/CHANGELOG.md b/packages/scope-manager/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "description": "TypeScript scope analyser for ESLint",
   "files": [
     "dist",
@@ -44,12 +44,12 @@
     "typecheck": "nx typecheck"
   },
   "dependencies": {
-    "@typescript-eslint/types": "5.59.11",
-    "@typescript-eslint/visitor-keys": "5.59.11"
+    "@typescript-eslint/types": "5.60.0",
+    "@typescript-eslint/visitor-keys": "5.60.0"
   },
   "devDependencies": {
     "@types/glob": "*",
-    "@typescript-eslint/typescript-estree": "5.59.11",
+    "@typescript-eslint/typescript-estree": "5.60.0",
     "glob": "*",
     "jest-specific-snapshot": "*",
     "make-dir": "*",

diff --git a/packages/type-utils/CHANGELOG.md b/packages/type-utils/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "description": "Type utilities for working with TypeScript + ESLint together",
   "files": [
     "dist",
@@ -45,13 +45,13 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@typescript-eslint/typescript-estree": "5.59.11",
-    "@typescript-eslint/utils": "5.59.11",
+    "@typescript-eslint/typescript-estree": "5.60.0",
+    "@typescript-eslint/utils": "5.60.0",
     "debug": "^4.3.4",
     "ts-api-utils": "^1.0.0"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "5.59.11",
+    "@typescript-eslint/parser": "5.60.0",
     "ajv": "^8.12.0",
     "typescript": "*"
   },

diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
 ## [5.59.11](https://github.com/typescript-eslint/typescript-eslint/compare/v5.59.10...v5.59.11) (2023-06-12)
 
 **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.59.11",
+  "version": "5.60.0",
   "description": "Types for the TypeScript-ESTree AST spec",
   "files": [
     "dist",

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