Merge pull request #6 in FFE/eslint-config-ffe from feature/eslint2-p…

…luginreact6-pluginimport2 to master

* commit '77fa767dfc9628c76d4d837f4722deb1bfa15fb1':
  Update eslint to v3 and plugin-react to v6

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v.5.0.0 (04.10.2016)
+* (patch) Add eslint@3.0.0 to peerDependencies
+* (patch) Update eslint-plugin-import to 1.10.1 to get updated peerDependencies
+* (breaking) Add elinst-plugin-react@6.0.0 to peerDependencies
+
 ## v.4.0.0 (20.09.2016)
 * (breaking) Enforce line brake after first prop in components if multiline props
 * (breaking) Enforce closing tag of components to be on new line if multiline props

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-ffe",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,9 +13,9 @@
   "author": "Sparebank 1",
   "license": "",
   "peerDependencies": {
-    "eslint": "^2.9.0",
-    "eslint-plugin-import": "^1.6.1",
-    "eslint-plugin-react": "^5.0.1"
+    "eslint": "^2.0.0 || ^3.0.0",
+    "eslint-plugin-import": "^1.10.1",
+    "eslint-plugin-react": "^6.0.0"
   },
   "files": [
     "rules",
@@ -25,7 +25,7 @@
     "registry": "***REMOVED***"
   },
   "devDependencies": {
-    "eslint": "^2.9.0"
+    "eslint": "^3.0.0"
   },
   "dependencies": {
     "eslint-config-ffe-base": "^2.0.0"

rules/jsx.js

@@ -42,11 +42,11 @@ module.exports = {
 
         // Prevent usage of setState in componentDidMount, except when inside a function
         // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-did-mount-set-state.md
-        'react/no-did-mount-set-state': [2, 'allow-in-func'],
+        'react/no-did-mount-set-state': 2,
 
         // Prevent usage of setState in componentDidUpdate
         // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-did-update-set-state.md
-        'react/no-did-update-set-state': [2, 'allow-in-func'],
+        'react/no-did-update-set-state': 2,
 
         // Prevent direct mutation of this.state
         // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-direct-mutation-state.md