Merge pull request #117 from mobify/es6-indent-fix

Minor ES6 fixes

Author: Daniel Brook-Roberge

CHANGELOG

@@ -1,4 +1,7 @@
 2.5.2
+    - Update ES6 indent rule on switch statements
+    - Add ignore patterns for unused vars/args to the React configuration
+    - Ignore non-JS files and node_modules in the ES6 import module
     - Add a new ES5 configuration ported to ESLint 2 and up
 2.5.1
     - Update line length to 200

README.md

@@ -74,6 +74,15 @@ extends:
   - './node_modules/mobify-code-style/es6/mobify-es6-react.yml'
 ```
 
+If using a custom Webpack configuration, add the lines:
+```yaml
+settings:
+  import/resolver:
+    webpack:
+      config: '<path-to-webpack-config>'
+```
+to the `.eslintrc.yml`
+
 Make sure to install the following NPM modules:
  - `eslint` > 3.0
  - `eslint-plugin-import`

es6/mobify-es6-react.yml

@@ -34,3 +34,9 @@ rules:
   react/jsx-indent-props: error
   react/jsx-space-before-closing: error
   react/wrap-multilines: error
+
+  # Ignore common unused vars and args in React projects
+  no-unused-vars:
+    - error
+    - varsIgnorePattern: '^(styles)$'
+      argsIgnorePattern: '^(props|dispatch|state)$'

es6/mobify-es6.yml

@@ -11,6 +11,9 @@ parserOptions:
   sourceType: module
 settings:
   import/resolver: webpack
+  import/ignore:
+    - node_modules
+    - \.(scss|css|html)$
 rules:
   # Allow logging for debug purposes
   no-console: 'off'
@@ -132,7 +135,10 @@ rules:
   dot-notation: error
   eol-last: error
   generator-star-spacing: error
-  indent: error
+  indent:
+    - error
+    - 4
+    - SwitchCase: 1
   jsx-quotes: error
   key-spacing: error
   keyword-spacing: error