Merge pull request #36 from lydell/eslint-3.17.0

feat: add rules from eslint 3.17.0
keithamus · Mar 4, 2017 · d3397b5 · d3397b5
2 parents b8ec3e4 + 3a8dd2a
commit d3397b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/es5.js b/es5.js
@@ -16,6 +16,8 @@ module.exports = {
     // # Possible Errors
     // The following rules point out areas where you might have made mistakes.
 
+    // disallow comparing against -0
+    'no-compare-neg-zero': 2,
     // disallow assignment in conditional expressions
     'no-cond-assign': 2,
     // disallow use of console
@@ -663,6 +665,8 @@ module.exports = {
     'no-unneeded-ternary': 2,
     // disallow whitespace before properties
     'no-whitespace-before-property': 2,
+    // enforce the location of single-line statements
+    'nonblock-statement-body-position': 0,
     // enforce consistent line breaks inside braces
     'object-curly-newline': 0,
     // require or disallow padding inside curly braces

diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     }
   },
   "dependencies": {
-    "eslint": "^3.15.0",
+    "eslint": "^3.17.0",
     "eslint-plugin-filenames": "^1.1.0"
   },
   "devDependencies": {