From bd926d940edea814e4ac42db376b1b9ed514f2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Tue, 23 Aug 2022 10:52:26 -0400
Subject: [PATCH] breaking: bump eslint-parser deps

---
 eslint/babel-eslint-parser/package.json       |  4 +-
 .../babel-eslint-parser/src/analyze-scope.cjs | 12 ++-
 yarn.lock                                     | 80 ++++++++++++-------
 3 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
index bb1b3a5cae88..0bc0acbea62d 100644
--- a/eslint/babel-eslint-parser/package.json
+++ b/eslint/babel-eslint-parser/package.json
@@ -31,8 +31,8 @@
     "eslint": "^7.5.0 || ^8.0.0"
   },
   "dependencies": {
-    "eslint-scope": "^5.1.1",
-    "eslint-visitor-keys": "^2.1.0",
+    "eslint-scope": "condition:BABEL_8_BREAKING ? ^7.1.1 : ^5.1.1",
+    "eslint-visitor-keys": "condition:BABEL_8_BREAKING ? ^3.3.0 : ^2.1.0",
     "semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.0"
   },
   "devDependencies": {
diff --git a/eslint/babel-eslint-parser/src/analyze-scope.cjs b/eslint/babel-eslint-parser/src/analyze-scope.cjs
index e61e17af9d57..934680a3795a 100644
--- a/eslint/babel-eslint-parser/src/analyze-scope.cjs
+++ b/eslint/babel-eslint-parser/src/analyze-scope.cjs
@@ -1,7 +1,13 @@
 const escope = require("eslint-scope");
-const { Definition } = require("eslint-scope/lib/definition");
-const OriginalPatternVisitor = require("eslint-scope/lib/pattern-visitor");
-const OriginalReferencer = require("eslint-scope/lib/referencer");
+const { Definition } = process.env.BABEL_8_BREAKING
+  ? escope
+  : require("eslint-scope/lib/definition");
+const OriginalPatternVisitor = process.env.BABEL_8_BREAKING
+  ? escope.PatternVisitor
+  : require("eslint-scope/lib/pattern-visitor");
+const OriginalReferencer = process.env.BABEL_8_BREAKING
+  ? escope.Referencer
+  : require("eslint-scope/lib/referencer");
 const { getKeys: fallback } = require("eslint-visitor-keys");
 
 let visitorKeysMap;
diff --git a/yarn.lock b/yarn.lock
index 836f6a6201a5..97fffb5d981e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -371,8 +371,8 @@ __metadata:
     dedent: ^0.7.0
     eslint: ^7.27.0
     eslint-8: "npm:eslint@^8.0.0"
-    eslint-scope: ^5.1.1
-    eslint-visitor-keys: ^2.1.0
+    eslint-scope: "condition:BABEL_8_BREAKING ? ^7.1.1 : ^5.1.1"
+    eslint-visitor-keys: "condition:BABEL_8_BREAKING ? ^3.3.0 : ^2.1.0"
     semver: "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.0"
   peerDependencies:
     "@babel/core": ">=7.11.0"
@@ -7911,17 +7911,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "eslint-scope@npm:4.0.3"
-  dependencies:
-    esrecurse: ^4.1.0
-    estraverse: ^4.1.1
-  checksum: c5f835f681884469991fe58d76a554688d9c9e50811299ccd4a8f79993a039f5bcb0ee6e8de2b0017d97c794b5832ef3b21c9aac66228e3aa0f7a0485bcfb65b
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:^5.1.1":
+"eslint-scope-BABEL_8_BREAKING-false@npm:eslint-scope@^5.1.1, eslint-scope@npm:^5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
   dependencies:
@@ -7931,23 +7921,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "eslint-scope@npm:6.0.0"
+"eslint-scope-BABEL_8_BREAKING-true@npm:eslint-scope@^7.1.1, eslint-scope@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "eslint-scope@npm:7.1.1"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 3f1b3578f288c3820f68ad2aae102300e546be8a98a958f515405dc20cc2fe64fda583d364977628bb14fe3d4f96f37de5e9bc5d6eb26bc310da33ba2a677dc3
+  checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "eslint-scope@npm:7.1.1"
+"eslint-scope@condition:BABEL_8_BREAKING ? ^7.1.1 : ^5.1.1":
+  version: 0.0.0-condition-8f021b
+  resolution: "eslint-scope@condition:BABEL_8_BREAKING?^7.1.1:^5.1.1#8f021b"
+  dependencies:
+    eslint-scope-BABEL_8_BREAKING-false: "npm:eslint-scope@^5.1.1"
+    eslint-scope-BABEL_8_BREAKING-true: "npm:eslint-scope@^7.1.1"
+  checksum: 600efff5322843a5c87c44b7a2854799a0b451f9dc03d0b7f463d3d774e0a173c0d98e37d9f34086003707f2014f2f6fb70ef63bd2b97b87aeacef668dfff21e
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "eslint-scope@npm:4.0.3"
+  dependencies:
+    esrecurse: ^4.1.0
+    estraverse: ^4.1.1
+  checksum: c5f835f681884469991fe58d76a554688d9c9e50811299ccd4a8f79993a039f5bcb0ee6e8de2b0017d97c794b5832ef3b21c9aac66228e3aa0f7a0485bcfb65b
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "eslint-scope@npm:6.0.0"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e
+  checksum: 3f1b3578f288c3820f68ad2aae102300e546be8a98a958f515405dc20cc2fe64fda583d364977628bb14fe3d4f96f37de5e9bc5d6eb26bc310da33ba2a677dc3
   languageName: node
   linkType: hard
 
@@ -7971,27 +7981,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "eslint-visitor-keys@npm:1.3.0"
-  checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^2.0.0, eslint-visitor-keys@npm:^2.1.0":
+"eslint-visitor-keys-BABEL_8_BREAKING-false@npm:eslint-visitor-keys@^2.1.0, eslint-visitor-keys@npm:^2.0.0":
   version: 2.1.0
   resolution: "eslint-visitor-keys@npm:2.1.0"
   checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0":
+"eslint-visitor-keys-BABEL_8_BREAKING-true@npm:eslint-visitor-keys@^3.3.0, eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0":
   version: 3.3.0
   resolution: "eslint-visitor-keys@npm:3.3.0"
   checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@condition:BABEL_8_BREAKING ? ^3.3.0 : ^2.1.0":
+  version: 0.0.0-condition-f0c342
+  resolution: "eslint-visitor-keys@condition:BABEL_8_BREAKING?^3.3.0:^2.1.0#f0c342"
+  dependencies:
+    eslint-visitor-keys-BABEL_8_BREAKING-false: "npm:eslint-visitor-keys@^2.1.0"
+    eslint-visitor-keys-BABEL_8_BREAKING-true: "npm:eslint-visitor-keys@^3.3.0"
+  checksum: a7191f76d5f69e2ff4b01c7cd319cd07432e0e1d29b9b3cdc63ae0d3f8619cfaf211c65cd0ed68a7a91b23eb80483a898a80a55661277b72d1c95c8de631e51a
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "eslint-visitor-keys@npm:1.3.0"
+  checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a
+  languageName: node
+  linkType: hard
+
 "eslint@npm:^7.27.0":
   version: 7.32.0
   resolution: "eslint@npm:7.32.0"