From 9e52bfede05ca624e32e2b9d1172d083bb757209 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 27 May 2024 16:21:16 -0400
Subject: [PATCH] Move @typescript-eslint packages to typescript-eslint

---
 .github/renovate.json5 |  4 ++--
 package.json           |  3 +--
 yarn.lock              | 23 +++++++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2cf7bec8eeb..fdec94dfcf4 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -95,8 +95,8 @@
     {
       // Group all eslint-related packages with `eslint` in the same PR
       matchManagers: ['npm'],
-      matchPackageNames: ['eslint'],
-      matchPackagePrefixes: ['eslint-', '@typescript-eslint/'],
+      matchPackageNames: ['eslint', 'typescript-eslint'],
+      matchPackagePrefixes: ['eslint-'],
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'eslint (non-major)',
     },
diff --git a/package.json b/package.json
index 18983b43e34..5b2ee510096 100644
--- a/package.json
+++ b/package.json
@@ -170,8 +170,6 @@
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
     "@types/webpack-env": "^1.18.4",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
     "eslint-define-config": "^2.0.0",
@@ -192,6 +190,7 @@
     "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
+    "typescript-eslint": "^7.17.0",
     "webpack-dev-server": "^3.11.3"
   },
   "resolutions": {
diff --git a/yarn.lock b/yarn.lock
index f050110cd63..baee4e11759 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2810,8 +2810,6 @@ __metadata:
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
     "@types/webpack-env": "npm:^1.18.4"
-    "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
-    "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.5.0"
     autoprefixer: "npm:^10.4.14"
@@ -2907,6 +2905,7 @@ __metadata:
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:^5.0.4"
+    typescript-eslint: "npm:^7.17.0"
     use-debounce: "npm:^10.0.0"
     webpack: "npm:^4.47.0"
     webpack-assets-manifest: "npm:^4.0.6"
@@ -4121,7 +4120,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^7.0.0":
+"@typescript-eslint/eslint-plugin@npm:7.17.0":
   version: 7.17.0
   resolution: "@typescript-eslint/eslint-plugin@npm:7.17.0"
   dependencies:
@@ -4144,7 +4143,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^7.0.0":
+"@typescript-eslint/parser@npm:7.17.0":
   version: 7.17.0
   resolution: "@typescript-eslint/parser@npm:7.17.0"
   dependencies:
@@ -17264,6 +17263,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript-eslint@npm:^7.17.0":
+  version: 7.17.0
+  resolution: "typescript-eslint@npm:7.17.0"
+  dependencies:
+    "@typescript-eslint/eslint-plugin": "npm:7.17.0"
+    "@typescript-eslint/parser": "npm:7.17.0"
+    "@typescript-eslint/utils": "npm:7.17.0"
+  peerDependencies:
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/5d9a5430b139129474cd65655ef05efeddfbd890a3ff28c1dd3b747cf48c938cf18e95b3cbbb4a7f8bf991c6c2de5e82f685768c2e7d691629a404a178672a13
+  languageName: node
+  linkType: hard
+
 "typescript@npm:5, typescript@npm:^5.0.4":
   version: 5.5.4
   resolution: "typescript@npm:5.5.4"