Merge pull request #206 from mysticatea/fix-for-eslint-1.9

Fix for ESLint@1.9 and npm@3
babel · Nov 10, 2015 · 6a4a80e · 6a4a80e
2 parents 9295bba + 8c45795
commit 6a4a80e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -55,6 +55,12 @@ function monkeypatch() {
   var estraverseFb = eslintMod.require("estraverse-fb");
   assign(estraverseFb.VisitorKeys, t.VISITOR_KEYS);
 
+  // ESLint v1.9.0 uses estraverse directly to work around https://github.com/npm/npm/issues/9663
+  var estraverseOfEslint = eslintMod.require("estraverse");
+  if (estraverseOfEslint !== estraverseFb) {
+    assign(estraverseOfEslint.VisitorKeys, t.VISITOR_KEYS);
+  }
+
   // monkeypatch escope
   var escope  = require(escopeLoc);
   var analyze = escope.analyze;

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/babel/babel-eslint",
   "devDependencies": {
-    "eslint": "^1.8.0",
+    "eslint": "^1.9.0",
     "espree": "^2.2.5",
     "mocha": "^2.3.3"
   }

diff --git a/test/non-regression.js b/test/non-regression.js
@@ -1365,7 +1365,7 @@ describe("verify", function () {
         "var x = 1;"
       ].join("\n"),
       { "no-use-before-define": 1 },
-      [ "1:13 x was used before it was defined no-use-before-define" ]
+      [ "1:13 \"x\" was used before it was defined no-use-before-define" ]
     )
   });
 });