sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'HabitRPG:develop' into 2022-02-backgrounds-armoire

Browse source
This commit is contained in:
Natalie L 2022-01-27 14:35:49 -05:00 committed by GitHub
commit 84fcb1d4ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -8020,9 +8020,9 @@
"dev": true
},
"helmet": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz",
"integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg=="
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
"integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="
},
"hex2dec": {
"version": "1.1.2",

2
package.json
View file

@ -38,7 +38,7 @@
"gulp-nodemon": "^2.5.0",
"gulp.spritesmith": "^6.12.1",
"habitica-markdown": "^3.0.0",
"helmet": "^5.0.2",
"helmet": "^4.6.0",
"image-size": "^1.0.1",
"in-app-purchase": "^1.11.3",
"js2xmlparser": "^4.0.2",

84
website/client/package-lock.json generated
View file

@ -5881,17 +5881,17 @@
}
},
"@storybook/addons": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.4.13.tgz",
"integrity": "sha512-2oxZ/VOuXUpOvtKGy+fR1FNwyfaTkzKs9I6cZq2zbEGK2q/5x6rtczwNRm5PjK35At+VurMq0E+IHH10JO9vHw==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.4.14.tgz",
"integrity": "sha512-Snu42ejLyBAh6PWdlrdI72HKN1oKY7q0R9qEID2wk953WrqgGu4URakp14YLxghJCyKTSfGPs6LNZRRI6H5xgA==",
"requires": {
"@storybook/api": "6.4.13",
"@storybook/channels": "6.4.13",
"@storybook/client-logger": "6.4.13",
"@storybook/core-events": "6.4.13",
"@storybook/api": "6.4.14",
"@storybook/channels": "6.4.14",
"@storybook/client-logger": "6.4.14",
"@storybook/core-events": "6.4.14",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/router": "6.4.13",
"@storybook/theming": "6.4.13",
"@storybook/router": "6.4.14",
"@storybook/theming": "6.4.14",
"@types/webpack-env": "^1.16.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
@ -6008,17 +6008,17 @@
"integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
},
"@storybook/api": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.4.13.tgz",
"integrity": "sha512-Hr5/dL4tLnQPjrUlVdhsYMSAuJmsZcu3jdfqpjbsDC9S2HNaVtyHGBhQ33jD8+xtXoorsuS7t4SfWzLOgPPflg==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.4.14.tgz",
"integrity": "sha512-GGGwB5+EquoausTXYx4dnLBBk2sOiS1Z58mDj0swBXCZdjfyUfLyxjxvvb/hl65ltufWP3IdmlKKaLiuARXNtw==",
"requires": {
"@storybook/channels": "6.4.13",
"@storybook/client-logger": "6.4.13",
"@storybook/core-events": "6.4.13",
"@storybook/channels": "6.4.14",
"@storybook/client-logger": "6.4.14",
"@storybook/core-events": "6.4.14",
"@storybook/csf": "0.0.2--canary.87bc651.0",
"@storybook/router": "6.4.13",
"@storybook/router": "6.4.14",
"@storybook/semver": "^7.3.2",
"@storybook/theming": "6.4.13",
"@storybook/theming": "6.4.14",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
@ -6032,9 +6032,9 @@
}
},
"@storybook/channels": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.4.13.tgz",
"integrity": "sha512-QWvm2TiqPZVPQLBq7ETcABNi17HIhNaXhJJUyNFBBXFtAHcbzMRFEBi6gkCVXK7QdtFo3Z68TU5htDkwjYVerg==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.4.14.tgz",
"integrity": "sha512-3QOVxFG6ZAxDXCta1ie4SUPQ3s50yHeuZzVg6uPp+DcC1FrXeDFYBcU9t0j/jrSgbeKcnFHWxmRHNy1BRyWv/A==",
"requires": {
"core-js": "^3.8.2",
"ts-dedent": "^2.0.0",
@ -6042,18 +6042,18 @@
}
},
"@storybook/client-logger": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.4.13.tgz",
"integrity": "sha512-VPrrgJRURztXAKTeHOpzKMAHnNupkGApUDNlPIs0Qxyn5gaSiy806q4XPoROno3mVgEe+7Chf86hRiL8pJnlCA==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.4.14.tgz",
"integrity": "sha512-4VmFWZxhpeiG5fDhfqAyQbCfXZSBKS4fNKf35ABWiHStZRDndxml8K5WFtmOmMvVzjrGQx8HesenYMawK6xo/Q==",
"requires": {
"core-js": "^3.8.2",
"global": "^4.4.0"
}
},
"@storybook/core-events": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.4.13.tgz",
"integrity": "sha512-zNlzNv7qVXjLf7yfvY9KfLvDY8nVskxrjmz0+21rIqUefS9+7SWBrtJJURpCaoPf/BmACqh/6c1RnuOY7TESnw==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.4.14.tgz",
"integrity": "sha512-9QFltg2mxTDjMBfmVtFHtrAEPY/i0oVp2kVdTWo6g05cPffYKAjNUnUVjUl7yiqcQmdEcdqUUQ0ut3xgmcYi/A==",
"requires": {
"core-js": "^3.8.2"
}
@ -6067,11 +6067,11 @@
}
},
"@storybook/router": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.4.13.tgz",
"integrity": "sha512-6KbIpSL8QhGglzGb+tWTvAF/2EVpmgwlU5VP6Xs3GANcOc3VeXWl1fcJD6CNPp2DHwjkblW+21dcoHqfljnTmg==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.4.14.tgz",
"integrity": "sha512-5+tePyINtwPYm4izgOBZ2sX2ViWtfmmO2vwOAPlWWEGzsRosVQsGMdZv1R8rk4Jl/TotMjlTmd8I1/BufEeIeQ==",
"requires": {
"@storybook/client-logger": "6.4.13",
"@storybook/client-logger": "6.4.14",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
@ -6085,14 +6085,14 @@
}
},
"@storybook/theming": {
"version": "6.4.13",
"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.4.13.tgz",
"integrity": "sha512-oWRoNnvO4QnRnplZ74DVdU4k91eqw8y0Xqn6lzZBeC8hq6mYWldgfj1LZ24gJhVtEIa7ZKoyujGUygHaH8WXHw==",
"version": "6.4.14",
"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.4.14.tgz",
"integrity": "sha512-kqmXNnIoOSAS4cgr9PitMgVrOps725O99eTsJNxB6J1Ide0CsA5v2tV6AmQn/scnpCQNr8uSjZerNlEcl/ensg==",
"requires": {
"@emotion/core": "^10.1.1",
"@emotion/is-prop-valid": "^0.8.6",
"@emotion/styled": "^10.0.27",
"@storybook/client-logger": "6.4.13",
"@storybook/client-logger": "6.4.14",
"core-js": "^3.8.2",
"deep-object-diff": "^1.1.0",
"emotion-theming": "^10.0.27",
@ -6168,11 +6168,11 @@
"integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="
},
"polished": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz",
"integrity": "sha512-ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==",
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/polished/-/polished-4.1.4.tgz",
"integrity": "sha512-Nq5Mbza+Auo7N3sQb1QMFaQiDO+4UexWuSGR7Cjb4Sw11SZIJcrrFtiZ+L0jT9MBsUsxDboHVASbCLbE1rnECg==",
"requires": {
"@babel/runtime": "^7.14.0"
"@babel/runtime": "^7.16.7"
},
"dependencies": {
"@babel/runtime": {
@ -14312,11 +14312,11 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"axios": {
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"requires": {
"follow-redirects": "^1.14.4"
"follow-redirects": "^1.14.7"
}
},
"axios-progress-bar": {

4
website/client/package.json
View file

@ -13,7 +13,7 @@
"storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
},
"dependencies": {
"@storybook/addons": "6.4.13",
"@storybook/addons": "6.4.14",
"@storybook/addon-actions": "6.4.14",
"@storybook/addon-knobs": "6.2.9",
"@storybook/addon-links": "6.4.14",
@ -26,7 +26,7 @@
"@vue/cli-service": "^4.5.15",
"@vue/test-utils": "1.0.0-beta.29",
"amplitude-js": "^8.16.0",
"axios": "^0.24.0",
"axios": "^0.25.0",
"axios-progress-bar": "^1.2.0",
"babel-eslint": "^10.1.0",
"bootstrap": "^4.6.0",