Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
danez committed Feb 20, 2018
1 parent f958995 commit 7928722
Show file tree
Hide file tree
Showing 6 changed files with 404 additions and 358 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
rules: {
"no-var": 0,
"max-len": 0,
"prettier/prettier": ["error", { "trailingComma": "es5" }],
"prettier/prettier": "error",
},
env: {
node: true,
Expand Down
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"trailingComma": "es5"
}
4 changes: 2 additions & 2 deletions lib/analyze-scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ module.exports = function(ast, parserOptions) {
directive: false,
nodejsScope:
ast.sourceType === "script" &&
(parserOptions.ecmaFeatures &&
parserOptions.ecmaFeatures.globalReturn) === true,
(parserOptions.ecmaFeatures &&
parserOptions.ecmaFeatures.globalReturn) === true,
impliedStrict: false,
sourceType: ast.sourceType,
ecmaVersion: parserOptions.ecmaVersion || 2018,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"babel-eslint": "^8.0.0",
"dedent": "^0.7.0",
"eslint": "^4.14.0",
"eslint": "npm:eslint@4.13.1",
"eslint-config-babel": "^7.0.1",
"eslint-old": "npm:eslint@4.13.1",
"eslint-plugin-flowtype": "^2.30.3",
Expand Down
14 changes: 6 additions & 8 deletions test/non-regression.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,16 @@ function verifyAndAssertMessagesWithSpecificESLint(

if (messages.length !== expectedMessages.length) {
throw new Error(
`Expected ${expectedMessages.length} message(s), got ${messages.length}\n${JSON.stringify(
messages,
null,
2
)}`
`Expected ${expectedMessages.length} message(s), got ${
messages.length
}\n${JSON.stringify(messages, null, 2)}`
);
}

messages.forEach((message, i) => {
var formatedMessage = `${message.line}:${message.column} ${message.message}${message.ruleId
? ` ${message.ruleId}`
: ""}`;
var formatedMessage = `${message.line}:${message.column} ${
message.message
}${message.ruleId ? ` ${message.ruleId}` : ""}`;
if (formatedMessage !== expectedMessages[i]) {
throw new Error(
unpad(`
Expand Down
Loading

0 comments on commit 7928722

Please sign in to comment.