Fix for eslint 6.3+

copied fix from PR here: babel#794
jharris4 · Sep 10, 2019 · 451bcab · 451bcab
1 parent 7bc3e2f
commit 451bcab
Show file tree

Hide file tree

Showing 4 changed files with 791 additions and 1,135 deletions.
diff --git a/lib/analyze-scope.js b/lib/analyze-scope.js
@@ -1,10 +1,13 @@
 "use strict";
 
 const t = require("@babel/core").types;
-const escope = require("eslint-scope");
-const Definition = require("eslint-scope/lib/definition").Definition;
-const OriginalPatternVisitor = require("eslint-scope/lib/pattern-visitor");
-const OriginalReferencer = require("eslint-scope/lib/referencer");
+const requireFromESLint = require("./require-from-eslint");
+const escope = requireFromESLint("eslint-scope");
+const Definition = requireFromESLint("eslint-scope/lib/definition").Definition;
+const OriginalPatternVisitor = requireFromESLint(
+  "eslint-scope/lib/pattern-visitor"
+);
+const OriginalReferencer = requireFromESLint("eslint-scope/lib/referencer");
 const fallback = require("eslint-visitor-keys").getKeys;
 const childVisitorKeys = require("./visitor-keys");
 

diff --git a/lib/require-from-eslint.js b/lib/require-from-eslint.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const resolve = require("resolve");
+const eslintBase = require.resolve("eslint");
+
+module.exports = function requireFromESLint(id) {
+  const path = resolve.sync(id, { basedir: eslintBase });
+  return require(path);
+};
diff --git a/package.json b/package.json
@@ -33,37 +33,37 @@
     "eslint": ">= 4.12.1"
   },
   "dependencies": {
-    "eslint-scope": "3.7.1",
-    "eslint-visitor-keys": "^1.0.0",
-    "semver": "^5.6.0"
+    "eslint-visitor-keys": "^1.1.0",
+    "resolve": "^1.12.0",
+    "semver": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.0",
-    "@babel/plugin-proposal-class-properties": "^7.1.0",
-    "@babel/plugin-proposal-decorators": "^7.1.2",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-export-default-from": "^7.0.0",
-    "@babel/plugin-syntax-export-namespace-from": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-syntax-numeric-separator": "^7.0.0",
-    "@babel/preset-env": "^7.1.5",
+    "@babel/core": "^7.6.0",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-decorators": "^7.6.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.5.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-syntax-export-default-from": "^7.2.0",
+    "@babel/plugin-syntax-export-namespace-from": "^7.2.0",
+    "@babel/plugin-syntax-import-meta": "^7.2.0",
+    "@babel/plugin-syntax-numeric-separator": "^7.2.0",
+    "@babel/preset-env": "^7.6.0",
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "dedent": "^0.7.0",
-    "eslint": "^6.0.1",
+    "eslint": "^6.3.0",
     "eslint-config-babel": "^9.0.0",
-    "eslint-plugin-flowtype": "^3.11.1",
-    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-flowtype": "^4.3.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
-    "espree": "^3.5.2",
-    "husky": "^1.0.0-rc.13",
-    "lint-staged": "^7.2.2",
-    "mocha": "^6.1.4",
-    "prettier": "^1.4.4"
+    "espree": "^3.5.4",
+    "husky": "^3.0.5",
+    "lint-staged": "^9.2.5",
+    "mocha": "^6.2.0",
+    "prettier": "^1.18.2"
   },
   "lint-staged": {
     "*.js": [