Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

upgrade eslint to 1.2.1 w/ config & Makefile fixes

Christopher Hiller5054feeef901
diff --git a/.eslintrc b/.eslintrc
index a89b22b2..57574b4f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -20,7 +20,7 @@ rules:
func-style: [2, declaration]
guard-for-in: 2 # TODO: Change to error
handle-callback-err: [2, ^(err|error)$]
- indent: [2, 2]
+ indent: [2, 2, { SwitchCase: 1 }]
key-spacing: [2, { beforeColon: false, afterColon: true }]
max-len: [0, 80, 2] # TODO: Change to error
max-params: [1, 4]
@@ -83,7 +83,6 @@ rules:
no-proto: 1 # TODO: Change to error
no-redeclare: 2
no-regex-spaces: 2
- no-reserved-keys: 2
no-return-assign: 2
no-script-url: 2
no-self-compare: 2
@@ -120,7 +119,7 @@ rules:
space-infix-ops: 2
space-return-throw-case: 2
space-unary-ops: [2, { words: true, nonwords: false }]
- spaced-line-comment: 2
+ spaced-comment: [2, always, { exceptions: ['!'] }]
strict: [0, global] # TODO: Change to error
use-isnan: 2
valid-jsdoc: [0, { requireReturn: false }] # TODO: Change to warning
diff --git a/Makefile b/Makefile
index 53cb5657..24bc89a2 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ lib-cov:
@jscoverage lib $@
lint:
- @$(ESLINT) --reset $(SRC)
+ @$(ESLINT) $(SRC)
test: lint test-unit
diff --git a/package.json b/package.json
index 9dfa57f0..a645794e 100644
--- a/package.json
+++ b/package.json
@@ -289,7 +289,7 @@
"browser-stdout": "^1.2.0",
"browserify": "10.2.4",
"coffee-script": "~1.8.0",
- "eslint": "~0.23.0",
+ "eslint": "^1.2.1",
"should": "~4.0.0",
"through2": "~0.6.5"
},