From 6d3cf3d45d079251d1bcb75bbf4500871de8e5ca Mon Sep 17 00:00:00 2001
From: Kai Cataldo <kai@kaicataldo.com>
Date: Thu, 30 Jul 2020 18:36:50 +0000
Subject: [PATCH 1/4] update: change babel-eslint-parser version mismatch error
 to log

---
 eslint/babel-eslint-parser/src/index.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/eslint/babel-eslint-parser/src/index.js b/eslint/babel-eslint-parser/src/index.js
index 2da046b0f05f..85c8d79bdf60 100644
--- a/eslint/babel-eslint-parser/src/index.js
+++ b/eslint/babel-eslint-parser/src/index.js
@@ -12,19 +12,22 @@ import convert from "./convert";
 import analyzeScope from "./analyze-scope";
 import visitorKeys from "./visitor-keys";
 
-let isRunningSupportedVersion;
+let isRunningMinSupportedCoreVersion = null;
 
 function baseParse(code, options) {
-  if (typeof isRunningSupportedVersion !== "boolean") {
-    isRunningSupportedVersion = semver.satisfies(
+  const minSupportedCoreVersion = ">=7.0.0";
+
+  if (typeof isRunningMinSupportedCoreVersion !== "boolean") {
+    isRunningMinSupportedCoreVersion = semver.satisfies(
       babelCoreVersion,
-      packageJson.peerDependencies["@babel/core"],
+      minSupportedCoreVersion,
     );
   }
 
-  if (!isRunningSupportedVersion) {
+  // Ensure we're using a version of `@babel/core` that includes the `parse()` API.
+  if (!isRunningMinSupportedCoreVersion) {
     throw new Error(
-      `@babel/eslint-parser@${packageJson.version} does not support @babel/core@${babelCoreVersion}. Please upgrade to @babel/core@${packageJson.peerDependencies["@babel/core"]}`,
+      `@babel/eslint-parser@${packageJson.version} does not support @babel/core@${babelCoreVersion}. Please upgrade to @babel/core@${minSupportedCoreVersion}`,
     );
   }
 

From d682574959352419cf1bc85329a6298a9357b784 Mon Sep 17 00:00:00 2001
From: Kai Cataldo <kai@kaicataldo.com>
Date: Thu, 30 Jul 2020 19:26:16 +0000
Subject: [PATCH 2/4] Bump @babel/core version

---
 eslint/babel-eslint-parser/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
index 2cd150eab58e..a4f1ed1a0c96 100644
--- a/eslint/babel-eslint-parser/package.json
+++ b/eslint/babel-eslint-parser/package.json
@@ -23,7 +23,7 @@
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "@babel/core": ">=7.10.0",
+    "@babel/core": ">=7.11.0",
     "eslint": ">=7.5.0"
   },
   "dependencies": {

From 96ae45effb237198cba119fbf024116c8b649286 Mon Sep 17 00:00:00 2001
From: Kai Cataldo <kai@kaicataldo.com>
Date: Thu, 30 Jul 2020 19:35:02 +0000
Subject: [PATCH 3/4] Change to 7.2.0

---
 eslint/babel-eslint-parser/src/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eslint/babel-eslint-parser/src/index.js b/eslint/babel-eslint-parser/src/index.js
index 85c8d79bdf60..e385fd5fda8f 100644
--- a/eslint/babel-eslint-parser/src/index.js
+++ b/eslint/babel-eslint-parser/src/index.js
@@ -15,7 +15,8 @@ import visitorKeys from "./visitor-keys";
 let isRunningMinSupportedCoreVersion = null;
 
 function baseParse(code, options) {
-  const minSupportedCoreVersion = ">=7.0.0";
+  // Ensure we're using a version of `@babel/core` that includes `parse()` and `tokTypes`.
+  const minSupportedCoreVersion = ">=7.2.0";
 
   if (typeof isRunningMinSupportedCoreVersion !== "boolean") {
     isRunningMinSupportedCoreVersion = semver.satisfies(
@@ -24,7 +25,6 @@ function baseParse(code, options) {
     );
   }
 
-  // Ensure we're using a version of `@babel/core` that includes the `parse()` API.
   if (!isRunningMinSupportedCoreVersion) {
     throw new Error(
       `@babel/eslint-parser@${packageJson.version} does not support @babel/core@${babelCoreVersion}. Please upgrade to @babel/core@${minSupportedCoreVersion}`,

From 7d5e539ae84c479d2bd89cbcb8e971af57cef058 Mon Sep 17 00:00:00 2001
From: Kai Cataldo <kai@kaicataldo.com>
Date: Thu, 30 Jul 2020 19:37:20 +0000
Subject: [PATCH 4/4] Add period to error message

---
 eslint/babel-eslint-parser/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint/babel-eslint-parser/src/index.js b/eslint/babel-eslint-parser/src/index.js
index e385fd5fda8f..e4be37d822ff 100644
--- a/eslint/babel-eslint-parser/src/index.js
+++ b/eslint/babel-eslint-parser/src/index.js
@@ -27,7 +27,7 @@ function baseParse(code, options) {
 
   if (!isRunningMinSupportedCoreVersion) {
     throw new Error(
-      `@babel/eslint-parser@${packageJson.version} does not support @babel/core@${babelCoreVersion}. Please upgrade to @babel/core@${minSupportedCoreVersion}`,
+      `@babel/eslint-parser@${packageJson.version} does not support @babel/core@${babelCoreVersion}. Please upgrade to @babel/core@${minSupportedCoreVersion}.`,
     );
   }