From e72e79694f58a5718b5b5bf9d17229639dc5a836 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 26 Jun 2015 15:06:18 +0100 Subject: [PATCH] attempt to resolve estraverse relative to esrecurse if found - this is necessary because of the tree flattening in npm 3 --- eslint/babel-eslint-parser/index.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eslint/babel-eslint-parser/index.js b/eslint/babel-eslint-parser/index.js index f6eafd46f2..7d09ca5043 100644 --- a/eslint/babel-eslint-parser/index.js +++ b/eslint/babel-eslint-parser/index.js @@ -38,8 +38,15 @@ function monkeypatch() { var escopeLoc = Module._resolveFilename("escope", eslintMod); var escopeMod = createModule(escopeLoc); + // npm 3: monkeypatch estraverse if it's in escope + var estraverseRelative = escopeMod; + try { + var esrecurseLoc = Module._resolveFilename("esrecurse", eslintMod); + estraverseRelative = createModule(esrecurseLoc); + } catch (err) {} + // monkeypatch estraverse - estraverse = escopeMod.require("estraverse"); + estraverse = estraverseRelative.require("estraverse"); assign(estraverse.VisitorKeys, t.VISITOR_KEYS); // monkeypatch estraverse-fb