Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-impo…

…rt-2.22.1

package.json

@@ -12,27 +12,27 @@
   },
   "dependencies": {
     "@types/csv-parse": "^1.2.2",
-    "csv-parse": "^4.8.8",
+    "csv-parse": "^4.15.3",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "express-async-errors": "^3.1.1",
     "multer": "^1.4.2",
-    "pg": "^8.0.0",
+    "pg": "^8.5.1",
     "reflect-metadata": "^0.1.13",
     "typeorm": "^0.2.24"
   },
   "devDependencies": {
     "@types/express": "4.17.11",
     "@types/express-serve-static-core": "4.17.2",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^26.0.21",
     "@types/multer": "^1.4.2",
     "@types/supertest": "^2.0.10",
     "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.27.0",
+    "@typescript-eslint/parser": "^2.34.0",
     "cross-env": "^7.0.2",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-import-resolver-typescript": "^2.4.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.1.2",

yarn.lock

@@ -5878,4 +5878,4 @@ yn@3.1.1:
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
-  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=