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

Merge branch 'master' of github.com:babel/babel-eslint

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-02-28 17:07:28 +11:00
parent e4cee14aa6
commit e08a0fab99
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
var acornToEsprima = require("./acorn-to-esprima");
var traverse = require("babel").traverse;
var extend = require("lodash/object/extend");
var assign = require("lodash.assign");
var Module = require("module");
var acorn = require("babel").acorn;
var path = require("path");
@ -33,7 +33,7 @@ function monkeypatch() {
// monkeypatch estraverse
var estraverse = escopeMod.require("estraverse");
extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
assign(estraverse.VisitorKeys, t.VISITOR_KEYS);
// monkeypatch escope
var escope = require(escopeLoc);
@ -73,7 +73,7 @@ exports.parse = function (code) {
// remove trailing "(LINE:COLUMN)" acorn message and add in esprima syntax error message start
err.message = "Line X: " + err.message.replace(/ \((\d+):(\d+)\)$/, "");
}
throw err;
}

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

@ -9,7 +9,7 @@
},
"dependencies": {
"babel": "^4.6.0",
"lodash": "^3.3.1"
"lodash.assign": "^3.0.0"
},
"author": "Sebastian McKenzie <sebmck@gmail.com>",
"license": "MIT",