Merge pull request #109 from mobify/release-2.5.0

Release 2.5.0

Author: Mike Klemarewski

CHANGELOG

@@ -1,3 +1,5 @@
+2.5.0
+    - Add an ES6 and JSX standard with lint rules.
 2.4.4
     - Add a template for code-style PRs
     - Go meta! Add some templates of GitHub templates for contributing, issues, and PRs that can be used on other Mobify repos

README.md

@@ -4,7 +4,7 @@ A repo to document code standards for different languages and provide tools for
 
 [![NPM version](https://badge.fury.io/js/mobify-code-style.svg)](http://badge.fury.io/js/mobify-code-style)
 
-## JavaScript
+## JavaScript (ES5)
 
 Typically, we lint our javascript files using [Grunt](http://gruntjs.com/) and [grunt-eslint](https://github.com/sindresorhus/grunt-eslint). grunt-eslint is a Grunt helper for the [ESLint](http://eslint.org/) linter.
 
@@ -29,6 +29,29 @@ eslint:{
     }
 }
 ```
+
+## ES6/JSX
+
+We use [ESLint](http://eslint.org/) to lint ES6 and React/JSX code. If ESLint is installed in a project, we can use the configuration from this module by creating a file in the project root named `.eslintrc.yml`. If the project does not use JSX, the file contents should be
+
+```yaml
+extends:
+  - './node_modules/mobify-code-style/es6/mobify-es6.yml'
+```  
+
+and for a React/JSX project:
+
+```yaml
+extends:
+  - './node_modules/mobify-code-style/es6/mobify-es6-react.yml'
+```
+
+Make sure to install the following NPM modules:
+ - `eslint` > 3.0
+ - `eslint-plugin-import`
+ - `eslint-import-resolver-webpack`
+ - `eslint-plugin-react` (for React/JSX linting only)
+
 ## CSS
 Our Client Services team's [CSS Style Guide](/css/Readme.md). Written with a lot of tender care by @kpeatt and @jeffkamo.