Merge remote-tracking branch 'origin/develop' into negue/ui/setting

This commit is contained in:
negue
2023-01-07 22:10:53 +01:00
97 changed files with 6499 additions and 5059 deletions
+9 -9
View File
@@ -1,10 +1,10 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.251.0",
"version": "4.255.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.19.6",
"@babel/core": "^7.20.5",
"@babel/preset-env": "^7.20.2",
"@babel/register": "^7.18.9",
"@google-cloud/trace-agent": "^7.1.2",
@@ -55,7 +55,7 @@
"nconf": "^0.12.0",
"node-gcm": "^1.0.5",
"on-headers": "^1.0.2",
"passport": "^0.6.0",
"passport": "^0.5.0",
"passport-facebook": "^3.0.0",
"passport-google-oauth2": "^0.2.0",
"passport-google-oauth20": "2.0.0",
@@ -68,11 +68,11 @@
"remove-markdown": "^0.5.0",
"rimraf": "^3.0.2",
"short-uuid": "^4.2.2",
"stripe": "^10.13.0",
"superagent": "^8.0.5",
"stripe": "^11.4.0",
"superagent": "^8.0.6",
"universal-analytics": "^0.5.3",
"useragent": "^2.1.9",
"uuid": "^8.3.2",
"uuid": "^9.0.0",
"validator": "^13.7.0",
"vinyl-buffer": "^1.0.1",
"winston": "^3.8.2",
@@ -111,11 +111,11 @@
"apidoc": "gulp apidoc"
},
"devDependencies": {
"axios": "^0.27.2",
"axios": "^1.2.1",
"chai": "^4.3.7",
"chai-as-promised": "^7.1.1",
"chai-moment": "^0.1.0",
"chalk": "^5.1.2",
"chalk": "^5.2.0",
"cross-spawn": "^7.0.3",
"expect.js": "^0.3.1",
"istanbul": "^1.1.0-alpha.1",
@@ -123,7 +123,7 @@
"monk": "^7.3.4",
"require-again": "^2.0.0",
"run-rs": "^0.7.7",
"sinon": "^14.0.2",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"sinon-stub-promise": "^4.0.0"
},