Skip to content

Commit

Permalink
Merge commit '6097e82194772847954dc2c2b7559543cc7531cc' into add-page…
Browse files Browse the repository at this point in the history
…-localization

* commit '6097e82194772847954dc2c2b7559543cc7531cc':
  fix: upgrade mime from 2.4.7 to 2.5.0 (parse-community#7166)
  fix: upgrade pg-promise from 10.8.7 to 10.9.0 (parse-community#7168)
  fix: upgrade apollo-server-express from 2.19.1 to 2.19.2 (parse-community#7165)
  Upgrade @node-rs/bcrypt to latest version (parse-community#7159)
  Run Prettier after Definitions (parse-community#7164)

# Conflicts:
#	package-lock.json
  • Loading branch information
mtrezza committed Feb 7, 2021
2 parents 3ba14db + 6097e82 commit 0ac2ec7
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 34 deletions.
137 changes: 108 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@parse/push-adapter": "3.4.0",
"@parse/s3-files-adapter": "1.6.0",
"@parse/simple-mailgun-adapter": "1.2.0",
"apollo-server-express": "2.19.1",
"apollo-server-express": "2.19.2",
"bcryptjs": "2.4.3",
"body-parser": "1.19.0",
"commander": "5.1.0",
Expand All @@ -45,11 +45,11 @@
"ldapjs": "2.2.3",
"lodash": "4.17.20",
"lru-cache": "5.1.1",
"mime": "2.4.7",
"mime": "2.5.0",
"mongodb": "3.6.3",
"mustache": "4.1.0",
"parse": "2.19.0",
"pg-promise": "10.8.7",
"pg-promise": "10.9.0",
"pluralize": "8.0.0",
"redis": "3.0.2",
"semver": "7.3.4",
Expand Down Expand Up @@ -94,7 +94,7 @@
"prettier": "2.0.5"
},
"scripts": {
"definitions": "node ./resources/buildConfigDefinitions.js",
"definitions": "node ./resources/buildConfigDefinitions.js && prettier --write 'src/Options/*.js'",
"docs": "jsdoc -c ./jsdoc-conf.json",
"lint": "flow && eslint --cache ./",
"lint-fix": "eslint --fix --cache ./",
Expand All @@ -117,7 +117,7 @@
"parse-server": "bin/parse-server"
},
"optionalDependencies": {
"@node-rs/bcrypt": "0.4.1"
"@node-rs/bcrypt": "1.1.0"
},
"collective": {
"type": "opencollective",
Expand Down

0 comments on commit 0ac2ec7

Please sign in to comment.