Merge pull request babel/babel-eslint#180 from hzoo/master

update eslint, acorn-to-esprima - ref eslint/eslint#3596
This commit is contained in:
Henry Zhu 2015-08-31 10:22:52 -04:00
parent 61243967ac
commit 2b17528c5d
3 changed files with 14 additions and 6 deletions

View File

@ -8,10 +8,10 @@
"url": "https://github.com/babel/babel-eslint.git" "url": "https://github.com/babel/babel-eslint.git"
}, },
"dependencies": { "dependencies": {
"babel-core": "^5.6.9", "babel-core": "^5.8.23",
"lodash.assign": "^3.0.0", "lodash.assign": "^3.0.0",
"lodash.pick": "^3.1.0", "lodash.pick": "^3.1.0",
"acorn-to-esprima": "^1.0.1" "acorn-to-esprima": "^1.0.2"
}, },
"scripts": { "scripts": {
"bootstrap": "git submodule update --init && cd eslint && npm install", "bootstrap": "git submodule update --init && cd eslint && npm install",
@ -26,7 +26,7 @@
}, },
"homepage": "https://github.com/babel/babel-eslint", "homepage": "https://github.com/babel/babel-eslint",
"devDependencies": { "devDependencies": {
"eslint": "^1.2.1", "eslint": "^1.3.1",
"espree": "^2.2.4", "espree": "^2.2.4",
"mocha": "^2.2.5" "mocha": "^2.2.5"
} }

View File

@ -294,4 +294,12 @@ describe("acorn-to-esprima", function () {
it("regexp in a template string", function () { it("regexp in a template string", function () {
parseAndAssertSame("`${/\\d/.exec(\"1\")[0]}`"); parseAndAssertSame("`${/\\d/.exec(\"1\")[0]}`");
}); });
it("first line is empty", function () {
parseAndAssertSame("\nimport Immutable from \"immutable\";");
});
it("empty", function () {
parseAndAssertSame("");
});
}); });

View File

@ -378,7 +378,7 @@ describe("verify", function () {
"var b: T = 1; b;" "var b: T = 1; b;"
].join("\n"), ].join("\n"),
{ "no-unused-vars": 1, "no-undef": 1 }, { "no-unused-vars": 1, "no-undef": 1 },
[ "1:21 T is defined but never used no-unused-vars", [ "1:21 \"T\" is defined but never used no-unused-vars",
'2:8 "T" is not defined. no-undef' ] '2:8 "T" is not defined. no-undef' ]
); );
}); });
@ -1194,7 +1194,7 @@ describe("verify", function () {
verifyAndAssertMessages( verifyAndAssertMessages(
"var unused;", "var unused;",
{ "no-unused-vars": 1 }, { "no-unused-vars": 1 },
[ "1:5 unused is defined but never used no-unused-vars" ] [ "1:5 \"unused\" is defined but never used no-unused-vars" ]
); );
}); });
@ -1210,7 +1210,7 @@ describe("verify", function () {
verifyAndAssertMessages( verifyAndAssertMessages(
"const {Bacona} = require('baconjs')", "const {Bacona} = require('baconjs')",
{ "no-undef": 1, "no-unused-vars": 1 }, { "no-undef": 1, "no-unused-vars": 1 },
[ "1:8 Bacona is defined but never used no-unused-vars" ] [ "1:8 \"Bacona\" is defined but never used no-unused-vars" ]
); );
}); });