Merge branch 'master' into dependabot/npm_and_yarn/jest-24.5.0

Author: nimjetushar

README.md

@@ -2,7 +2,7 @@
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9ef9fd1b6102481597e7e3b5c9e0a3dd)](https://www.codacy.com/app/tushar/angularjs-react?utm_source=github.com&utm_medium=referral&utm_content=nimjetushar/angularjs-react&utm_campaign=Badge_Grade)
 [![StackShare](https://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/nimjetushar/angularjs-react)
-[![Greenkeeper badge](https://badges.greenkeeper.io/nimjetushar/angularjs-react.svg)](https://greenkeeper.io/)
+[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=nimjetushar/angularjs-react)](https://dependabot.com)
 [![Build Status](https://semaphoreci.com/api/v1/nimjetushar/angularjs-react/branches/master/shields_badge.svg)](https://semaphoreci.com/nimjetushar/angularjs-react)
 
 Angularjs integration with react

package.json

@@ -42,22 +42,22 @@
     "angularjs-template-loader": "0.1.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
-    "babel-jest": "23.6.0",
+    "babel-jest": "24.5.0",
     "babel-loader": "8.0.5",
     "babel-plugin-angularjs-annotate": "0.10.0",
     "clean-webpack-plugin": "2.0.1",
     "copy-webpack-plugin": "5.0.1",
     "css-loader": "2.1.1",
     "enzyme": "3.9.0",
-    "enzyme-adapter-react-16": "1.11.0",
+    "enzyme-adapter-react-16": "1.11.2",
     "enzyme-to-json": "3.3.5",
     "eslint": "5.15.2",
     "eslint-plugin-react": "7.12.4",
     "file-loader": "3.0.1",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",
     "jest": "24.5.0",
-    "jest-cli": "23.6.0",
+    "jest-cli": "24.5.0",
     "mini-css-extract-plugin": "0.5.0",
     "node-sass": "4.11.0",
     "optimize-css-assets-webpack-plugin": "5.0.1",