Merge branch 'master' into master

Author: dplewis

.prettierrc

@@ -1,3 +1,4 @@
 semi: true
 trailingComma: "es5"
 singleQuote: true
+arrowParens: "avoid"

package-lock.json

@@ -20,42 +20,42 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@apollographql/graphql-playground-html": "1.6.26",
-    "@graphql-tools/stitch": "^6.0.1",
-    "@graphql-tools/utils": "^6.0.1",
+    "@graphql-tools/stitch": "6.0.10",
+    "@graphql-tools/utils": "6.0.10",
     "@parse/fs-files-adapter": "1.0.1",
     "@parse/push-adapter": "3.2.0",
     "@parse/s3-files-adapter": "1.4.0",
     "@parse/simple-mailgun-adapter": "1.1.0",
-    "apollo-server-express": "2.14.1",
+    "apollo-server-express": "2.15.0",
     "bcryptjs": "2.4.3",
     "body-parser": "1.19.0",
     "commander": "5.1.0",
     "cors": "2.8.5",
     "deepcopy": "2.0.0",
     "express": "4.17.1",
-    "follow-redirects": "1.11.0",
+    "follow-redirects": "1.12.1",
     "graphql": "15.1.0",
     "graphql-list-fields": "2.0.2",
-    "graphql-relay": "^0.6.0",
+    "graphql-relay": "0.6.0",
     "graphql-upload": "11.0.0",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
-    "jwks-rsa": "1.8.0",
+    "jwks-rsa": "1.8.1",
     "ldapjs": "2.0.0",
     "lodash": "4.17.16",
     "lru-cache": "5.1.1",
     "mime": "2.4.6",
     "mongodb": "3.5.9",
     "parse": "2.14.0",
-    "pg-promise": "10.5.6",
-    "pluralize": "^8.0.0",
+    "pg-promise": "10.5.7",
+    "pluralize": "8.0.0",
     "redis": "3.0.2",
     "semver": "7.3.2",
     "subscriptions-transport-ws": "0.9.16",
     "tv4": "1.3.0",
     "uuid": "8.1.0",
     "winston": "3.2.1",
-    "winston-daily-rotate-file": "4.4.2",
+    "winston-daily-rotate-file": "4.5.0",
     "ws": "7.3.0"
   },
   "devDependencies": {
@@ -80,7 +80,7 @@
     "eslint-plugin-flowtype": "5.1.3",
     "flow-bin": "0.119.1",
     "form-data": "3.0.0",
-    "graphql-tag": "^2.10.1",
+    "graphql-tag": "2.10.1",
     "husky": "4.2.5",
     "jasmine": "3.5.0",
     "jsdoc": "3.6.3",
@@ -114,7 +114,7 @@
     "parse-server": "./bin/parse-server"
   },
   "optionalDependencies": {
-    "bcrypt": "4.0.1"
+    "@node-rs/bcrypt": "0.3.0"
   },
   "collective": {
     "type": "opencollective",

package.json

@@ -1,8 +1,8 @@
 module.exports = {
-  validateAppId: function() {
+  validateAppId: function () {
     return Promise.resolve();
   },
-  validateAuthData: function(authData) {
+  validateAuthData: function (authData) {
     if (authData.token == 'my-token') {
       return Promise.resolve();
     }

spec/support/CustomAuth.js

@@ -1,9 +1,9 @@
-module.exports = function(validAuthData) {
+module.exports = function (validAuthData) {
   return {
-    validateAppId: function() {
+    validateAppId: function () {
       return Promise.resolve();
     },
-    validateAuthData: function(authData) {
+    validateAuthData: function (authData) {
       if (authData.token == validAuthData.token) {
         return Promise.resolve();
       }

spec/support/CustomAuthFunction.js

@@ -1,4 +1,4 @@
-module.exports = function(req, res, next) {
+module.exports = function (req, res, next) {
   res.set('X-Yolo', '1');
   next();
 };