Merge branch 'master' into feature/upgrade-babel-and-fix-tsconfig

Author: huafu

package.json

@@ -91,7 +91,7 @@
     "@types/jest": "^23.3.0",
     "@types/lodash": "^4.14.109",
     "@types/node": "10.5.2",
-    "@types/react": "16.4.6",
+    "@types/react": "16.4.7",
     "@types/yargs": "^11.0.0",
     "babel-jest": "^23.4.0",
     "babel-preset-jest": "^23.2.0",