Merge branch 'master' into master

.gitignore

 .idea
 dist
 node_modules
-yarn.lock
\ No newline at end of file

package.json

@@ -27,29 +27,35 @@
   },
   "homepage": "https://github.com/echoulen/react-js-pull-to-refesh#readme",
   "dependencies": {
-    "core-decorators": "^0.20.0",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
-    "styled-components": "^2.4.0"
+    "core-decorators": "^0.20.0"
   },
   "devDependencies": {
     "@types/core-decorators": "^0.10.32",
-    "@types/jest": "^22.0.0",
-    "@types/react": "^16.0.31",
-    "@types/react-dom": "^16.0.3",
-    "@types/react-test-renderer": "^16.0.0",
-    "awesome-typescript-loader": "^3.4.1",
-    "jest": "^22.0.4",
+    "@types/jest": "^23.3.5",
+    "@types/react": "^16.4.16",
+    "@types/react-dom": "^16.0.9",
+    "@types/react-test-renderer": "^16.0.3",
+    "awesome-typescript-loader": "^5.2.1",
+    "jest": "^23.6.0",
     "path": "^0.12.7",
-    "react-hot-loader": "^3.1.3",
-    "react-test-renderer": "^16.2.0",
+    "react": "^16.5.2",
+    "react-dom": "^16.5.2",
+    "react-hot-loader": "^4.3.11",
+    "react-test-renderer": "^16.5.2",
     "rimraf": "^2.6.2",
     "source-map-loader": "^0.2.3",
-    "ts-jest": "^22.0.0",
+    "styled-components": "^3.4.10",
+    "ts-jest": "^23.10.4",
     "tslint": "^5.8.0",
     "tslint-react": "^3.2.0",
-    "typescript": "^2.6.2",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.9.7"
+    "typescript": "^3.1.2",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.9"
+  },
+  "peerDependencies": {
+    "react": "^16.5.2",
+    "react-dom": "^16.5.2",
+    "styled-components": "^3.4.10"
   }
 }