cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fix for ESLint@1.9 and npm@3
This commit is contained in:
Henry Zhu 2015-11-09 21:04:45 -05:00
parent d08053d483
commit a294ab4545
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eslint/babel-eslint-parser/index.js
View File

@ -55,6 +55,12 @@ function monkeypatch() {
var estraverseFb = eslintMod.require("estraverse-fb"); var estraverseFb = eslintMod.require("estraverse-fb");
assign(estraverseFb.VisitorKeys, t.VISITOR_KEYS); 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 // monkeypatch escope
var escope = require(escopeLoc); var escope = require(escopeLoc);
var analyze = escope.analyze; var analyze = escope.analyze;

2
eslint/babel-eslint-parser/package.json
View File

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

2
eslint/babel-eslint-parser/test/non-regression.js
View File

@ -1365,7 +1365,7 @@ describe("verify", function () {
"var x = 1;" "var x = 1;"
].join("\n"), ].join("\n"),
{ "no-use-before-define": 1 }, { "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" ]
) )
}); });
}); });