Merge pull request #18 from AfterShip/5.x

⬆️ upgraded the dependencies for #16
AfterShip · Jul 4, 2018 · 09a9305 · 09a9305
2 parents 679c6c0 + b6702d1
commit 09a9305
Show file tree

Hide file tree

Showing 3 changed files with 280 additions and 291 deletions.
diff --git a/package.json b/package.json
@@ -24,20 +24,20 @@
     "prepush": "npm run lint"
   },
   "optionalDependencies": {
-    "babel-eslint": "^8.2.3",
-    "eslint-import-resolver-webpack": "^0.9.0",
-    "eslint-plugin-html": "^4.0.3",
-    "eslint-plugin-import": "^2.11.0",
+    "babel-eslint": "^8.2.5",
+    "eslint-import-resolver-webpack": "^0.10.1",
+    "eslint-plugin-html": "^4.0.5",
+    "eslint-plugin-import": "^2.13.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-react": "^7.7.0",
+    "eslint-plugin-react": "^7.10.0",
     "eslint-plugin-vue": "^4.5.0",
-    "vue-eslint-parser": "2.0.3"
+    "vue-eslint-parser": "3.0.0"
   },
   "peerDependencies": {
     "eslint": "^4.11.0"
   },
   "devDependencies": {
-    "eslint": "^4.19.1",
+    "eslint": "^5.0.1",
     "husky": "^0.14.3"
   },
   "dependencies": {

diff --git a/rules/react.js b/rules/react.js
@@ -30,7 +30,9 @@ module.exports = {
 				'shouldComponentUpdate',
 				'componentWillUpdate',
 				'componentDidUpdate',
-				'componentWillUnmount'
+				'componentWillUnmount',
+				'componentDidCatch',
+				'getSnapshotBeforeUpdate'
 			]
 		}],
 
@@ -210,13 +212,43 @@ module.exports = {
 		'react/sort-comp': ['error', {
 			order: [
 				'static-methods',
+				'instance-variables',
 				'lifecycle',
 				'/^on.+$/',
+				'getters',
+				'setters',
 				'/^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/',
+				'instance-methods',
 				'everything-else',
-				'/^render.+$/',
-				'render'
-			]
+				'rendering'
+			],
+			groups: {
+				lifecycle: [
+					'displayName',
+					'propTypes',
+					'contextTypes',
+					'childContextTypes',
+					'mixins',
+					'statics',
+					'defaultProps',
+					'constructor',
+					'getDefaultProps',
+					'getInitialState',
+					'state',
+					'getChildContext',
+					'componentWillMount',
+					'componentDidMount',
+					'componentWillReceiveProps',
+					'shouldComponentUpdate',
+					'componentWillUpdate',
+					'componentDidUpdate',
+					'componentWillUnmount'
+				],
+				rendering: [
+					'/^render.+$/',
+					'render'
+				]
+			}
 		}],
 
 		// Prevent missing parentheses around multilines JSX
@@ -347,7 +379,7 @@ module.exports = {
 		},
 		react: {
 			pragma: 'React',
-			version: '15.0'
+			version: '16.0'
 		}
 	}
 };