From e1833580adafbed7f3de1d469269a44ce4bfd9a4 Mon Sep 17 00:00:00 2001
From: Chris Bobbe <cbobbe@zulip.com>
Date: Thu, 2 Jun 2022 18:03:53 -0400
Subject: [PATCH] eslint: Take babel-eslint's move to @babel/eslint-parser

Fixes: #4254
---
 .eslintrc.yaml                 |  2 +-
 package.json                   |  2 +-
 tools/formatting.eslintrc.yaml |  2 +-
 yarn.lock                      | 13 +++++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index ee0fe1d5d7c..9b0dc129195 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -20,7 +20,7 @@
 #     $ git diff --no-index /tmp/{foo,bar}.json
 
 
-parser: babel-eslint
+parser: "@babel/eslint-parser"
 
 extends:
   - airbnb
diff --git a/package.json b/package.json
index cad9bb8cdd4..73d670d2eb2 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
+    "@babel/eslint-parser": "^7.18.2",
     "@babel/plugin-proposal-numeric-separator": "^7.14.5",
     "@babel/preset-env": "^7.11.0",
     "@babel/runtime": "^7.12.5",
@@ -87,7 +88,6 @@
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@types/react-native": "^0.67.7",
     "@vusion/webfonts-generator": "^0.8.0",
-    "babel-eslint": "^10.0.3",
     "core-js": "^3.1.4",
     "deep-freeze": "^0.0.1",
     "eslint": "^7.28.0",
diff --git a/tools/formatting.eslintrc.yaml b/tools/formatting.eslintrc.yaml
index f750032245f..1f10128070f 100644
--- a/tools/formatting.eslintrc.yaml
+++ b/tools/formatting.eslintrc.yaml
@@ -2,7 +2,7 @@
 # we can follow each Prettier run with a streamlined (and faster) ESLint run
 # that uses only these rules.
 
-parser: babel-eslint
+parser: "@babel/eslint-parser"
 
 plugins:
   - flowtype
diff --git a/yarn.lock b/yarn.lock
index 1b9b204188c..b7f728a2b18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,6 +56,15 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
+"@babel/eslint-parser@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz#e14dee36c010edfb0153cf900c2b0815e82e3245"
+  integrity sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==
+  dependencies:
+    eslint-scope "^5.1.1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.0"
+
 "@babel/generator@^7.14.0", "@babel/generator@^7.17.10":
   version "7.17.10"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189"
@@ -3125,7 +3134,7 @@ babel-core@^7.0.0-bridge.0:
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-eslint@^10.0.1, babel-eslint@^10.0.3:
+babel-eslint@^10.0.1:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
   integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
@@ -4811,7 +4820,7 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==