Merge branch 'feature/integration' into 'master'

removed package lock

See merge request theappsmith/internal-tools-client!11

app/client/package.json

@@ -13,7 +13,7 @@
     "@blueprintjs/table": "^3.4.0",
     "@sentry/browser": "^5.6.3",
     "@types/axios": "^0.14.0",
-    "@types/jest": "^23.3.13",
+    "@types/jest": "^24.0.18",
     "@types/lodash": "^4.14.120",
     "@types/moment-timezone": "^0.5.10",
     "@types/netlify-identity-widget": "^1.4.1",
@@ -39,7 +39,7 @@
     "react-redux": "^6.0.0",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
-    "react-scripts": "2.1.3",
+    "react-scripts": "3.1.1",
     "redux": "^4.0.1",
     "redux-saga": "^1.0.0",
     "styled-components": "^4.1.3",
@@ -52,6 +52,9 @@
     "eject": "react-scripts eject",
     "flow": "flow"
   },
+  "resolutions": {
+    "jest": "24.8.0"
+  },
   "eslintConfig": {
     "extends": "react-app"
   },