Skip to content

Commit 80e98fb

Browse files
authored
Merge branch 'master' into ky
2 parents 54b8c90 + 42b0cbb commit 80e98fb

File tree

2 files changed

+74
-74
lines changed

2 files changed

+74
-74
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"@emotion/styled": "^11.8.1",
3232
"@lingui/detect-locale": "^3.13.2",
3333
"@lingui/react": "^3.13.2",
34-
"@mui/icons-material": "^5.4.4",
34+
"@mui/icons-material": "^5.5.0",
3535
"@mui/material": "^5.4.4",
36-
"@mui/styles": "^5.4.4",
36+
"@mui/styles": "^5.5.0",
3737
"@sentry/browser": "^6.18.1",
3838
"@sentry/integrations": "^6.18.1",
3939
"@sentry/node": "^6.18.1",
@@ -57,19 +57,19 @@
5757
"@types/node": "^17.0.21",
5858
"@types/nprogress": "^0.2.0",
5959
"@types/react": "^17.0.39",
60-
"@typescript-eslint/eslint-plugin": "^5.13.0",
61-
"@typescript-eslint/parser": "^5.13.0",
60+
"@typescript-eslint/eslint-plugin": "^5.14.0",
61+
"@typescript-eslint/parser": "^5.14.0",
6262
"babel-jest": "^27.5.1",
6363
"eslint": "^8.10.0",
6464
"eslint-config-prettier": "^8.5.0",
6565
"eslint-plugin-jsx-a11y": "^6.5.1",
66-
"eslint-plugin-react": "^7.29.2",
66+
"eslint-plugin-react": "^7.29.3",
6767
"eslint-plugin-react-hooks": "^4.3.0",
6868
"husky": "^7.0.4",
6969
"identity-obj-proxy": "^3.0.0",
7070
"jest": "^27.5.1",
7171
"jest-watch-typeahead": "^1.0.0",
72-
"lint-staged": "^12.3.4",
72+
"lint-staged": "^12.3.5",
7373
"lodash-es": "^4.17.21",
7474
"prettier": "^2.5.1",
7575
"typescript": "^4.6.2"

yarn.lock

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,10 @@
781781
prop-types "^15.7.2"
782782
react-is "^17.0.2"
783783

784-
"@mui/icons-material@^5.4.4":
785-
version "5.4.4"
786-
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.4.tgz#0dc7b4e68cbbdfc675f09f0763be1100aad910af"
787-
integrity sha512-7zoRpjO8vsd+bPvXq6rtXu0V8Saj70X09dtTQogZmxQKabrYW3g7+Yym7SCRA7IYVF3ysz2AvdQrGD1P/sGepg==
784+
"@mui/icons-material@^5.5.0":
785+
version "5.5.0"
786+
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.0.tgz#23d5f13c62c19a75b184374a6ea6ed0f8019531d"
787+
integrity sha512-rMs5flT3INyd/m1A/x8DDlNTfHmCartX8stCuSDDMmaMV123oSwg8werJ/Hg4j1FWuVk5rE5HRY45gBf12BCGw==
788788
dependencies:
789789
"@babel/runtime" "^7.17.2"
790790

@@ -824,18 +824,18 @@
824824
"@emotion/cache" "^11.7.1"
825825
prop-types "^15.7.2"
826826

827-
"@mui/styles@^5.4.4":
828-
version "5.4.4"
829-
resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.4.4.tgz#e6a18f3528a494d782fd80e7feb01bd75a3570dd"
830-
integrity sha512-w+9VIC1+JiPfF7osomX1j+aX7yyNNw8BnMYo6niK+zbwIxSYX/wcq4Jh7rlt6FSiaKL4Qi1uf7MPlNAhIxXq3g==
827+
"@mui/styles@^5.5.0":
828+
version "5.5.0"
829+
resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.5.0.tgz#10a9e013181d40b96dc5ee6b3a981f1876d3c623"
830+
integrity sha512-elRM9/1t8jJJc2X/T/Yau40sQ3+IxM8sdxA9CbHas/EU4DJ2LjkdmmmnSv2lXG32SWUIPU1Pjr6Jy3KPt2NoUw==
831831
dependencies:
832832
"@babel/runtime" "^7.17.2"
833833
"@emotion/hash" "^0.8.0"
834834
"@mui/private-theming" "^5.4.4"
835835
"@mui/types" "^7.1.2"
836836
"@mui/utils" "^5.4.4"
837837
clsx "^1.1.1"
838-
csstype "^3.0.10"
838+
csstype "^3.0.11"
839839
hoist-non-react-statics "^3.3.2"
840840
jss "^10.8.2"
841841
jss-plugin-camel-case "^10.8.2"
@@ -1285,84 +1285,84 @@
12851285
dependencies:
12861286
"@types/yargs-parser" "*"
12871287

1288-
"@typescript-eslint/eslint-plugin@^5.13.0":
1289-
version "5.13.0"
1290-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.13.0.tgz#2809052b85911ced9c54a60dac10e515e9114497"
1291-
integrity sha512-vLktb2Uec81fxm/cfz2Hd6QaWOs8qdmVAZXLdOBX6JFJDhf6oDZpMzZ4/LZ6SFM/5DgDcxIMIvy3F+O9yZBuiQ==
1288+
"@typescript-eslint/eslint-plugin@^5.14.0":
1289+
version "5.14.0"
1290+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.14.0.tgz#5119b67152356231a0e24b998035288a9cd21335"
1291+
integrity sha512-ir0wYI4FfFUDfLcuwKzIH7sMVA+db7WYen47iRSaCGl+HMAZI9fpBwfDo45ZALD3A45ZGyHWDNLhbg8tZrMX4w==
12921292
dependencies:
1293-
"@typescript-eslint/scope-manager" "5.13.0"
1294-
"@typescript-eslint/type-utils" "5.13.0"
1295-
"@typescript-eslint/utils" "5.13.0"
1293+
"@typescript-eslint/scope-manager" "5.14.0"
1294+
"@typescript-eslint/type-utils" "5.14.0"
1295+
"@typescript-eslint/utils" "5.14.0"
12961296
debug "^4.3.2"
12971297
functional-red-black-tree "^1.0.1"
12981298
ignore "^5.1.8"
12991299
regexpp "^3.2.0"
13001300
semver "^7.3.5"
13011301
tsutils "^3.21.0"
13021302

1303-
"@typescript-eslint/parser@^5.13.0":
1304-
version "5.13.0"
1305-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.13.0.tgz#0394ed8f2f849273c0bf4b811994d177112ced5c"
1306-
integrity sha512-GdrU4GvBE29tm2RqWOM0P5QfCtgCyN4hXICj/X9ibKED16136l9ZpoJvCL5pSKtmJzA+NRDzQ312wWMejCVVfg==
1303+
"@typescript-eslint/parser@^5.14.0":
1304+
version "5.14.0"
1305+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.14.0.tgz#7c79f898aa3cff0ceee6f1d34eeed0f034fb9ef3"
1306+
integrity sha512-aHJN8/FuIy1Zvqk4U/gcO/fxeMKyoSv/rS46UXMXOJKVsLQ+iYPuXNbpbH7cBLcpSbmyyFbwrniLx5+kutu1pw==
13071307
dependencies:
1308-
"@typescript-eslint/scope-manager" "5.13.0"
1309-
"@typescript-eslint/types" "5.13.0"
1310-
"@typescript-eslint/typescript-estree" "5.13.0"
1308+
"@typescript-eslint/scope-manager" "5.14.0"
1309+
"@typescript-eslint/types" "5.14.0"
1310+
"@typescript-eslint/typescript-estree" "5.14.0"
13111311
debug "^4.3.2"
13121312

1313-
"@typescript-eslint/scope-manager@5.13.0":
1314-
version "5.13.0"
1315-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.13.0.tgz#cf6aff61ca497cb19f0397eea8444a58f46156b6"
1316-
integrity sha512-T4N8UvKYDSfVYdmJq7g2IPJYCRzwtp74KyDZytkR4OL3NRupvswvmJQJ4CX5tDSurW2cvCc1Ia1qM7d0jpa7IA==
1313+
"@typescript-eslint/scope-manager@5.14.0":
1314+
version "5.14.0"
1315+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.14.0.tgz#ea518962b42db8ed0a55152ea959c218cb53ca7b"
1316+
integrity sha512-LazdcMlGnv+xUc5R4qIlqH0OWARyl2kaP8pVCS39qSL3Pd1F7mI10DbdXeARcE62sVQE4fHNvEqMWsypWO+yEw==
13171317
dependencies:
1318-
"@typescript-eslint/types" "5.13.0"
1319-
"@typescript-eslint/visitor-keys" "5.13.0"
1318+
"@typescript-eslint/types" "5.14.0"
1319+
"@typescript-eslint/visitor-keys" "5.14.0"
13201320

1321-
"@typescript-eslint/type-utils@5.13.0":
1322-
version "5.13.0"
1323-
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.13.0.tgz#b0efd45c85b7bab1125c97b752cab3a86c7b615d"
1324-
integrity sha512-/nz7qFizaBM1SuqAKb7GLkcNn2buRdDgZraXlkhz+vUGiN1NZ9LzkA595tHHeduAiS2MsHqMNhE2zNzGdw43Yg==
1321+
"@typescript-eslint/type-utils@5.14.0":
1322+
version "5.14.0"
1323+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.14.0.tgz#711f08105860b12988454e91df433567205a8f0b"
1324+
integrity sha512-d4PTJxsqaUpv8iERTDSQBKUCV7Q5yyXjqXUl3XF7Sd9ogNLuKLkxz82qxokqQ4jXdTPZudWpmNtr/JjbbvUixw==
13251325
dependencies:
1326-
"@typescript-eslint/utils" "5.13.0"
1326+
"@typescript-eslint/utils" "5.14.0"
13271327
debug "^4.3.2"
13281328
tsutils "^3.21.0"
13291329

1330-
"@typescript-eslint/types@5.13.0":
1331-
version "5.13.0"
1332-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.13.0.tgz#da1de4ae905b1b9ff682cab0bed6b2e3be9c04e5"
1333-
integrity sha512-LmE/KO6DUy0nFY/OoQU0XelnmDt+V8lPQhh8MOVa7Y5k2gGRd6U9Kp3wAjhB4OHg57tUO0nOnwYQhRRyEAyOyg==
1330+
"@typescript-eslint/types@5.14.0":
1331+
version "5.14.0"
1332+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.14.0.tgz#96317cf116cea4befabc0defef371a1013f8ab11"
1333+
integrity sha512-BR6Y9eE9360LNnW3eEUqAg6HxS9Q35kSIs4rp4vNHRdfg0s+/PgHgskvu5DFTM7G5VKAVjuyaN476LCPrdA7Mw==
13341334

1335-
"@typescript-eslint/typescript-estree@5.13.0":
1336-
version "5.13.0"
1337-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.13.0.tgz#b37c07b748ff030a3e93d87c842714e020b78141"
1338-
integrity sha512-Q9cQow0DeLjnp5DuEDjLZ6JIkwGx3oYZe+BfcNuw/POhtpcxMTy18Icl6BJqTSd+3ftsrfuVb7mNHRZf7xiaNA==
1335+
"@typescript-eslint/typescript-estree@5.14.0":
1336+
version "5.14.0"
1337+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.14.0.tgz#78b7f7385d5b6f2748aacea5c9b7f6ae62058314"
1338+
integrity sha512-QGnxvROrCVtLQ1724GLTHBTR0lZVu13izOp9njRvMkCBgWX26PKvmMP8k82nmXBRD3DQcFFq2oj3cKDwr0FaUA==
13391339
dependencies:
1340-
"@typescript-eslint/types" "5.13.0"
1341-
"@typescript-eslint/visitor-keys" "5.13.0"
1340+
"@typescript-eslint/types" "5.14.0"
1341+
"@typescript-eslint/visitor-keys" "5.14.0"
13421342
debug "^4.3.2"
13431343
globby "^11.0.4"
13441344
is-glob "^4.0.3"
13451345
semver "^7.3.5"
13461346
tsutils "^3.21.0"
13471347

1348-
"@typescript-eslint/utils@5.13.0":
1349-
version "5.13.0"
1350-
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.13.0.tgz#2328feca700eb02837298339a2e49c46b41bd0af"
1351-
integrity sha512-+9oHlPWYNl6AwwoEt5TQryEHwiKRVjz7Vk6kaBeD3/kwHE5YqTGHtm/JZY8Bo9ITOeKutFaXnBlMgSATMJALUQ==
1348+
"@typescript-eslint/utils@5.14.0":
1349+
version "5.14.0"
1350+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.14.0.tgz#6c8bc4f384298cbbb32b3629ba7415f9f80dc8c4"
1351+
integrity sha512-EHwlII5mvUA0UsKYnVzySb/5EE/t03duUTweVy8Zqt3UQXBrpEVY144OTceFKaOe4xQXZJrkptCf7PjEBeGK4w==
13521352
dependencies:
13531353
"@types/json-schema" "^7.0.9"
1354-
"@typescript-eslint/scope-manager" "5.13.0"
1355-
"@typescript-eslint/types" "5.13.0"
1356-
"@typescript-eslint/typescript-estree" "5.13.0"
1354+
"@typescript-eslint/scope-manager" "5.14.0"
1355+
"@typescript-eslint/types" "5.14.0"
1356+
"@typescript-eslint/typescript-estree" "5.14.0"
13571357
eslint-scope "^5.1.1"
13581358
eslint-utils "^3.0.0"
13591359

1360-
"@typescript-eslint/visitor-keys@5.13.0":
1361-
version "5.13.0"
1362-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.13.0.tgz#f45ff55bcce16403b221ac9240fbeeae4764f0fd"
1363-
integrity sha512-HLKEAS/qA1V7d9EzcpLFykTePmOQqOFim8oCvhY3pZgQ8Hi38hYpHd9e5GN6nQBFQNecNhws5wkS9Y5XIO0s/g==
1360+
"@typescript-eslint/visitor-keys@5.14.0":
1361+
version "5.14.0"
1362+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.14.0.tgz#1927005b3434ccd0d3ae1b2ecf60e65943c36986"
1363+
integrity sha512-yL0XxfzR94UEkjBqyymMLgCBdojzEuy/eim7N9/RIcTNxpJudAcqsU8eRyfzBbcEzGoPWfdM3AGak3cN08WOIw==
13641364
dependencies:
1365-
"@typescript-eslint/types" "5.13.0"
1365+
"@typescript-eslint/types" "5.14.0"
13661366
eslint-visitor-keys "^3.0.0"
13671367

13681368
abab@^2.0.3, abab@^2.0.5:
@@ -2056,10 +2056,10 @@ cssstyle@^2.3.0:
20562056
dependencies:
20572057
cssom "~0.3.6"
20582058

2059-
csstype@^3.0.10, csstype@^3.0.2:
2060-
version "3.0.10"
2061-
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
2062-
integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
2059+
csstype@^3.0.10, csstype@^3.0.11, csstype@^3.0.2:
2060+
version "3.0.11"
2061+
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
2062+
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
20632063

20642064
damerau-levenshtein@^1.0.7:
20652065
version "1.0.8"
@@ -2324,10 +2324,10 @@ eslint-plugin-react-hooks@^4.3.0:
23242324
resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172"
23252325
integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==
23262326

2327-
eslint-plugin-react@^7.29.2:
2328-
version "7.29.2"
2329-
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.2.tgz#2d4da69d30d0a736efd30890dc6826f3e91f3f7c"
2330-
integrity sha512-ypEBTKOy5liFQXZWMchJ3LN0JX1uPI6n7MN7OPHKacqXAxq5gYC30TdO7wqGYQyxD1OrzpobdHC3hDmlRWDg9w==
2327+
eslint-plugin-react@^7.29.3:
2328+
version "7.29.3"
2329+
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.3.tgz#f4eab757f2756d25d6d4c2a58a9e20b004791f05"
2330+
integrity sha512-MzW6TuCnDOcta67CkpDyRfRsEVx9FNMDV8wZsDqe1luHPdGTrQIUaUXD27Ja3gHsdOIs/cXzNchWGlqm+qRVRg==
23312331
dependencies:
23322332
array-includes "^3.1.4"
23332333
array.prototype.flatmap "^1.2.5"
@@ -3878,10 +3878,10 @@ lines-and-columns@^1.1.6:
38783878
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
38793879
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
38803880

3881-
lint-staged@^12.3.4:
3882-
version "12.3.4"
3883-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.4.tgz#4b1ff8c394c3e6da436aaec5afd4db18b5dac360"
3884-
integrity sha512-yv/iK4WwZ7/v0GtVkNb3R82pdL9M+ScpIbJLJNyCXkJ1FGaXvRCOg/SeL59SZtPpqZhE7BD6kPKFLIDUhDx2/w==
3881+
lint-staged@^12.3.5:
3882+
version "12.3.5"
3883+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.5.tgz#8048ce048c3cac12f57200a06344a54dc91c8fa9"
3884+
integrity sha512-oOH36RUs1It7b9U/C7Nl/a0sLfoIBcMB8ramiB3nuJ6brBqzsWiUAFSR5DQ3yyP/OR7XKMpijtgKl2DV1lQ3lA==
38853885
dependencies:
38863886
cli-truncate "^3.1.0"
38873887
colorette "^2.0.16"

0 commit comments

Comments
 (0)