diff --git a/eslint/babel-eslint-parser/index.js b/eslint/babel-eslint-parser/index.js index 3cf0b6537e..4f72a11558 100644 --- a/eslint/babel-eslint-parser/index.js +++ b/eslint/babel-eslint-parser/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/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json index cd3c43dbbb..dc3319204f 100644 --- a/eslint/babel-eslint-parser/package.json +++ b/eslint/babel-eslint-parser/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/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js index 3e749b6ffe..3022560e01 100644 --- a/eslint/babel-eslint-parser/test/non-regression.js +++ b/eslint/babel-eslint-parser/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" ] ) }); });