Skip to content

Commit 0ac2ec7

Browse files
committed
Merge commit '6097e82194772847954dc2c2b7559543cc7531cc' into add-page-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
2 parents 3ba14db + 6097e82 commit 0ac2ec7

File tree

2 files changed

+113
-34
lines changed

2 files changed

+113
-34
lines changed

package-lock.json

Lines changed: 108 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@parse/push-adapter": "3.4.0",
2828
"@parse/s3-files-adapter": "1.6.0",
2929
"@parse/simple-mailgun-adapter": "1.2.0",
30-
"apollo-server-express": "2.19.1",
30+
"apollo-server-express": "2.19.2",
3131
"bcryptjs": "2.4.3",
3232
"body-parser": "1.19.0",
3333
"commander": "5.1.0",
@@ -45,11 +45,11 @@
4545
"ldapjs": "2.2.3",
4646
"lodash": "4.17.20",
4747
"lru-cache": "5.1.1",
48-
"mime": "2.4.7",
48+
"mime": "2.5.0",
4949
"mongodb": "3.6.3",
5050
"mustache": "4.1.0",
5151
"parse": "2.19.0",
52-
"pg-promise": "10.8.7",
52+
"pg-promise": "10.9.0",
5353
"pluralize": "8.0.0",
5454
"redis": "3.0.2",
5555
"semver": "7.3.4",
@@ -94,7 +94,7 @@
9494
"prettier": "2.0.5"
9595
},
9696
"scripts": {
97-
"definitions": "node ./resources/buildConfigDefinitions.js",
97+
"definitions": "node ./resources/buildConfigDefinitions.js && prettier --write 'src/Options/*.js'",
9898
"docs": "jsdoc -c ./jsdoc-conf.json",
9999
"lint": "flow && eslint --cache ./",
100100
"lint-fix": "eslint --fix --cache ./",
@@ -117,7 +117,7 @@
117117
"parse-server": "bin/parse-server"
118118
},
119119
"optionalDependencies": {
120-
"@node-rs/bcrypt": "0.4.1"
120+
"@node-rs/bcrypt": "1.1.0"
121121
},
122122
"collective": {
123123
"type": "opencollective",

0 commit comments

Comments
 (0)