Merge pull request #56 from mobify/eslint-update

Beef up .eslintrc with rules from JS code style doc

Author: tedtate

CHANGELOG

@@ -0,0 +1,7 @@
+2.1.0
+    - Add new rules to .eslintrc to closer match our JS style
+      guidelines.
+2.0.1
+    - Adds .eslintrc to allow usage of ESLint
+    - Adds Java code style guide
+    - Updates to CSS hybrid project conventions

javascript/.eslintrc

@@ -12,6 +12,9 @@
         "Adaptive": true
     },
     "rules": {
+        // K&R brace style, e.g. `if (x) {` <-- no new line before {
+        "brace-style": [2, "1tbs", { "allowSingleLine": true }],
+
         // Enforce === instead of ==; !== instead of !=
         "eqeqeq": 2,
 
@@ -48,6 +51,9 @@
         // Disallow mixed spaces and tabs for indentation
         "no-mixed-spaces-and-tabs": 2,
 
+        // Enforce 4 spaces indentation
+        "indent": [2, 4, {"indentSwitchCase": true}],
+
         // Disallow use of multiline strings
         "no-multi-str": 2,
 
@@ -67,6 +73,9 @@
         // Enforce spacing before opening brace of block statements
         "space-before-blocks": [2, "always"],
 
+        // Disallow spaces before function parentheses
+        "space-before-function-paren": [2, "never"],
+
         // Enforce spaceing around infix operators: +, -, :, ?
         "space-infix-ops": 2,
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Code style guide and linting tools for Mobify",
   "main": "index.js",
   "scripts": {