From d8c6237173b75364c6605ad8941b7103a16bb1b9 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 25 Jan 2022 15:35:51 -0600 Subject: [PATCH 1/4] Revert "build(deps): bump helmet from 5.0.1 to 5.0.2 (#13787)" This reverts commit 62a7c4bc280fb2b8ab386209d3b538af6db20ddb. --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7945e2617b..3e044c468c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": "5.0.1", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.1.tgz", + "integrity": "sha512-iyYpGYH2nbQVaQtauYDnemWg45S2RyGvJ+iKj+V9jp7Dc1NTtAJHmD+hFOSYS7Xdwe1GeyVEYSydggXLOg6TKQ==" }, "hex2dec": { "version": "1.1.2", diff --git a/package.json b/package.json index b040b8a7a3..3c6c42f96e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "gulp-nodemon": "^2.5.0", "gulp.spritesmith": "^6.12.1", "habitica-markdown": "^3.0.0", - "helmet": "^5.0.2", + "helmet": "^5.0.1", "image-size": "^1.0.1", "in-app-purchase": "^1.11.3", "js2xmlparser": "^4.0.2", From 620801ef6152d96677497da0b49ec6916c948959 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 25 Jan 2022 15:37:09 -0600 Subject: [PATCH 2/4] Revert "build(deps): bump helmet from 4.6.0 to 5.0.1 (#13735)" This reverts commit dcffd8b03216b851fad8254d2614dfc1956fbd11. --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e044c468c..3140b7881d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8020,9 +8020,9 @@ "dev": true }, "helmet": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.1.tgz", - "integrity": "sha512-iyYpGYH2nbQVaQtauYDnemWg45S2RyGvJ+iKj+V9jp7Dc1NTtAJHmD+hFOSYS7Xdwe1GeyVEYSydggXLOg6TKQ==" + "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", diff --git a/package.json b/package.json index 3c6c42f96e..c11a43b13f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "gulp-nodemon": "^2.5.0", "gulp.spritesmith": "^6.12.1", "habitica-markdown": "^3.0.0", - "helmet": "^5.0.1", + "helmet": "^4.6.0", "image-size": "^1.0.1", "in-app-purchase": "^1.11.3", "js2xmlparser": "^4.0.2", From c4d0f826730359bf66396f3ab75396105ac76169 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:20:11 -0500 Subject: [PATCH 3/4] build(deps): bump axios from 0.24.0 to 0.25.0 in /website/client (#13790) Bumps [axios](https://github.com/axios/axios) from 0.24.0 to 0.25.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/client/package-lock.json | 8 ++++---- website/client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/client/package-lock.json b/website/client/package-lock.json index 6e6924ae5f..abc90eaad3 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -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": { diff --git a/website/client/package.json b/website/client/package.json index daca278b7d..669c870f89 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -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", From e687140cfc521c6980579c57adeee4e53379bc5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:20:34 -0500 Subject: [PATCH 4/4] build(deps): bump @storybook/addons in /website/client (#13789) Bumps [@storybook/addons](https://github.com/storybookjs/storybook/tree/HEAD/lib/addons) from 6.4.13 to 6.4.14. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.4.14/lib/addons) --- updated-dependencies: - dependency-name: "@storybook/addons" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/client/package-lock.json | 76 ++++++++++++++++---------------- website/client/package.json | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/website/client/package-lock.json b/website/client/package-lock.json index abc90eaad3..7fce4153a9 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -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": { diff --git a/website/client/package.json b/website/client/package.json index 669c870f89..58b930e91a 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -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",