Merge pull request babel/babel-eslint#244 from christophehurpeau/patch-1

fix babel/babel-eslint#243
This commit is contained in:
Henry Zhu 2016-02-01 14:40:01 -05:00
parent e2464f462e
commit a55236d383

View File

@ -80,6 +80,9 @@ function monkeypatch() {
} }
var referencerMod = createModule(referencerLoc); var referencerMod = createModule(referencerLoc);
var referencer = require(referencerLoc); var referencer = require(referencerLoc);
if (typeof referencer === 'object' && referencer.default) {
referencer = referencer.default;
}
// monkeypatch escope/pattern-visitor // monkeypatch escope/pattern-visitor
var patternVisitorLoc; var patternVisitorLoc;
@ -89,6 +92,9 @@ function monkeypatch() {
patternVisitorLoc = Module._resolveFilename("./pattern-visitor", escopeMod); patternVisitorLoc = Module._resolveFilename("./pattern-visitor", escopeMod);
patternVisitorMod = createModule(patternVisitorLoc); patternVisitorMod = createModule(patternVisitorLoc);
patternVisitor = require(patternVisitorLoc); patternVisitor = require(patternVisitorLoc);
if (typeof patternVisitor === 'object' && patternVisitor.default) {
patternVisitor = patternVisitor.default;
}
} catch (err) { } catch (err) {
// When eslint uses old escope, we cannot find pattern visitor. // When eslint uses old escope, we cannot find pattern visitor.
// Fallback to the old way. // Fallback to the old way.