Skip to content

Commit 8363def

Browse files
authored
Merge branch 'master' into ky
2 parents 80e98fb + 9678b57 commit 8363def

File tree

2 files changed

+75
-33
lines changed

2 files changed

+75
-33
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"@lingui/detect-locale": "^3.13.2",
3333
"@lingui/react": "^3.13.2",
3434
"@mui/icons-material": "^5.5.0",
35-
"@mui/material": "^5.4.4",
35+
"@mui/material": "^5.5.0",
3636
"@mui/styles": "^5.5.0",
37-
"@sentry/browser": "^6.18.1",
37+
"@sentry/browser": "^6.18.2",
3838
"@sentry/integrations": "^6.18.1",
3939
"@sentry/node": "^6.18.1",
4040
"@sentry/webpack-plugin": "^1.18.8",
@@ -51,7 +51,7 @@
5151
"@lingui/cli": "^3.13.2",
5252
"@lingui/loader": "^3.13.2",
5353
"@lingui/macro": "^3.13.2",
54-
"@testing-library/react": "^12.1.3",
54+
"@testing-library/react": "^12.1.4",
5555
"@types/jest": "^27.4.1",
5656
"@types/lodash-es": "^4.17.6",
5757
"@types/node": "^17.0.21",

yarn.lock

Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -768,15 +768,15 @@
768768
"@babel/runtime" "^7.11.2"
769769
"@lingui/core" "^3.13.2"
770770

771-
"@mui/base@5.0.0-alpha.70":
772-
version "5.0.0-alpha.70"
773-
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.70.tgz#e280ee3b69d86034f2cff445161747940129d576"
774-
integrity sha512-8UZWhz1JYuQnPkAbC37cl4aL1JyNWZ08wDXlp57W7fYQp5xFpBP/7p56AcWg2qG9CNJP0IlFg2Wp4md1v2l4iA==
771+
"@mui/base@5.0.0-alpha.71":
772+
version "5.0.0-alpha.71"
773+
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.71.tgz#628f5ae10a8c015d61d3d1e6f04d66afc7500b90"
774+
integrity sha512-LinacyjmZOS+roUqCyhrcbNIW7TlRf1U+15ETGwMn6biNXI9YEVgcc1Kak08CRtjM0yczxxzLWetiAjHMCVSjQ==
775775
dependencies:
776776
"@babel/runtime" "^7.17.2"
777777
"@emotion/is-prop-valid" "^1.1.2"
778778
"@mui/utils" "^5.4.4"
779-
"@popperjs/core" "^2.4.4"
779+
"@popperjs/core" "^2.11.2"
780780
clsx "^1.1.1"
781781
prop-types "^15.7.2"
782782
react-is "^17.0.2"
@@ -788,19 +788,19 @@
788788
dependencies:
789789
"@babel/runtime" "^7.17.2"
790790

791-
"@mui/material@^5.4.4":
792-
version "5.4.4"
793-
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.4.tgz#2652a07085bf107da590007286336640f605055e"
794-
integrity sha512-VDJC7GzO1HTFqfMe2zwvaW/sRhABBJXFkKEv5gO3uXx7x9fdwJHQr4udU7NWZCUdOcx9Y0h3BsAILLefYq+WPw==
791+
"@mui/material@^5.5.0":
792+
version "5.5.0"
793+
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.0.tgz#e1a531cdde71019b4375e086c9ce82ca49b389c4"
794+
integrity sha512-E12rxqLaWBrebJCxKxBtyRrzJgpPIQSCt4MUHns2Yl9gxOx4c7vDDKuks7Qc6S36wTQf+FP4aiey72Z2WKdYgQ==
795795
dependencies:
796796
"@babel/runtime" "^7.17.2"
797-
"@mui/base" "5.0.0-alpha.70"
798-
"@mui/system" "^5.4.4"
797+
"@mui/base" "5.0.0-alpha.71"
798+
"@mui/system" "^5.5.0"
799799
"@mui/types" "^7.1.2"
800800
"@mui/utils" "^5.4.4"
801801
"@types/react-transition-group" "^4.4.4"
802802
clsx "^1.1.1"
803-
csstype "^3.0.10"
803+
csstype "^3.0.11"
804804
hoist-non-react-statics "^3.3.2"
805805
prop-types "^15.7.2"
806806
react-is "^17.0.2"
@@ -847,18 +847,18 @@
847847
jss-plugin-vendor-prefixer "^10.8.2"
848848
prop-types "^15.7.2"
849849

850-
"@mui/system@^5.4.4":
851-
version "5.4.4"
852-
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.4.tgz#cd5d3d35c75594abd88708e715b5e39a8874ff51"
853-
integrity sha512-Zjbztq2o/VRuRRCWjG44juRrPKYLQMqtQpMHmMttGu5BnvK6PAPW3WOY0r1JCAwLhbd8Kug9nyhGQYKETjo+tQ==
850+
"@mui/system@^5.5.0":
851+
version "5.5.0"
852+
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.0.tgz#df7e540b12218db21a5edb16a6fa1d571d26455b"
853+
integrity sha512-zFOfERv3Y4m5ehwTRR9cGaPuMvlD2qVXmFKC60P0Gte3aD6vYObyNriZv+mDVGlhDxZTZhxBrNPH3ns25xSFtQ==
854854
dependencies:
855855
"@babel/runtime" "^7.17.2"
856856
"@mui/private-theming" "^5.4.4"
857857
"@mui/styled-engine" "^5.4.4"
858858
"@mui/types" "^7.1.2"
859859
"@mui/utils" "^5.4.4"
860860
clsx "^1.1.1"
861-
csstype "^3.0.10"
861+
csstype "^3.0.11"
862862
prop-types "^15.7.2"
863863

864864
"@mui/types@^7.1.2":
@@ -958,19 +958,19 @@
958958
"@nodelib/fs.scandir" "2.1.5"
959959
fastq "^1.6.0"
960960

961-
"@popperjs/core@^2.4.4":
961+
"@popperjs/core@^2.11.2":
962962
version "2.11.2"
963963
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.2.tgz#830beaec4b4091a9e9398ac50f865ddea52186b9"
964964
integrity sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==
965965

966-
"@sentry/browser@^6.18.1":
967-
version "6.18.1"
968-
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.18.1.tgz#7c61d53260a6cd8999a46a0bd3159773b93fd1ea"
969-
integrity sha512-OZmk6RNcdQWxUkC8HBEruqpWUsaX/+pb1J/R5cDfHNeePLbDj9b8KFfs9QkgyZmmEP6l0Nu80TuDsdPF0q4uyw==
966+
"@sentry/browser@^6.18.2":
967+
version "6.18.2"
968+
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.18.2.tgz#f980add635c242420a7f0c4dd3ed5668f1f39513"
969+
integrity sha512-EsqKSNboi2gOiMuEwQranLucxrARi00y2vgUnaPXcqTKTlVlHDetoWHvq8/r29idA1JHGka5tDrwrmWccWIkrg==
970970
dependencies:
971-
"@sentry/core" "6.18.1"
972-
"@sentry/types" "6.18.1"
973-
"@sentry/utils" "6.18.1"
971+
"@sentry/core" "6.18.2"
972+
"@sentry/types" "6.18.2"
973+
"@sentry/utils" "6.18.2"
974974
tslib "^1.9.3"
975975

976976
"@sentry/cli@^1.73.0":
@@ -996,6 +996,17 @@
996996
"@sentry/utils" "6.18.1"
997997
tslib "^1.9.3"
998998

999+
"@sentry/core@6.18.2":
1000+
version "6.18.2"
1001+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.18.2.tgz#d27619b7b4a4b90e2cfdc254d40ee9d630b251b9"
1002+
integrity sha512-r5ad/gq5S/JHc9sd5CUhZQT9ojQ+f+thk/AoGeGawX/8HURZYAgIqD565d6FK0VsZEDkdRMl58z1Qon20h3y1g==
1003+
dependencies:
1004+
"@sentry/hub" "6.18.2"
1005+
"@sentry/minimal" "6.18.2"
1006+
"@sentry/types" "6.18.2"
1007+
"@sentry/utils" "6.18.2"
1008+
tslib "^1.9.3"
1009+
9991010
"@sentry/hub@6.18.1":
10001011
version "6.18.1"
10011012
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.18.1.tgz#fcfb8cb84515efefaf4e48472305ea5a71455abb"
@@ -1005,6 +1016,15 @@
10051016
"@sentry/utils" "6.18.1"
10061017
tslib "^1.9.3"
10071018

1019+
"@sentry/hub@6.18.2":
1020+
version "6.18.2"
1021+
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.18.2.tgz#fdb8536f61899fd48f3d1b49a6957348ad729ec5"
1022+
integrity sha512-d0AugekMkbnN12b4EXMjseJxtLPc9S20DGobCPUb4oAQT6S2oDQEj1jwP6PQ5vtgyy+GMYWxBMgqAQ4pjVYISQ==
1023+
dependencies:
1024+
"@sentry/types" "6.18.2"
1025+
"@sentry/utils" "6.18.2"
1026+
tslib "^1.9.3"
1027+
10081028
"@sentry/integrations@^6.18.1":
10091029
version "6.18.1"
10101030
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.18.1.tgz#c815eb9d104739805401b69d5559adec14876e33"
@@ -1024,6 +1044,15 @@
10241044
"@sentry/types" "6.18.1"
10251045
tslib "^1.9.3"
10261046

1047+
"@sentry/minimal@6.18.2":
1048+
version "6.18.2"
1049+
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.18.2.tgz#581c2fc030b9c89f1fcdc3e4855b91ce6c95db56"
1050+
integrity sha512-n7KYuo34W2LxE+3dnZ47of7XHuORINCnXq66XH72eoj67tf0XeWbIhEJrYGmoLRyRfoCYYrBLWiDl/uTjLzrzQ==
1051+
dependencies:
1052+
"@sentry/hub" "6.18.2"
1053+
"@sentry/types" "6.18.2"
1054+
tslib "^1.9.3"
1055+
10271056
"@sentry/node@^6.18.1":
10281057
version "6.18.1"
10291058
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.18.1.tgz#8eddc80226bda77dd91100eb522e1e7d88963461"
@@ -1055,6 +1084,11 @@
10551084
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.18.1.tgz#e2de38dd0da8096a5d22f8effc6756c919266ede"
10561085
integrity sha512-wp741NoBKnXE/4T9L723sWJ8EcNMxeTIT1smgNJOfbPwrsDICoYmGEt6JFa05XHpWBGI66WuNvnDjoHVeh6zhA==
10571086

1087+
"@sentry/types@6.18.2":
1088+
version "6.18.2"
1089+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.18.2.tgz#f528fec8b75c19d5a6976004e71703184c6cf7be"
1090+
integrity sha512-WzpJf/Q5aORTzrSwer/As1NlO90dBAQpaHV2ikDDKqOyMWEgjKb5/4gh59p9gH8JMMnLetP1AvQel0fOj5UnUw==
1091+
10581092
"@sentry/utils@6.18.1":
10591093
version "6.18.1"
10601094
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.18.1.tgz#1aa819502b042540612f4db7bcb86c7b176f5a6b"
@@ -1063,6 +1097,14 @@
10631097
"@sentry/types" "6.18.1"
10641098
tslib "^1.9.3"
10651099

1100+
"@sentry/utils@6.18.2":
1101+
version "6.18.2"
1102+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.18.2.tgz#c572a3ff49113e7dc4c97db1a18d117f199b9fff"
1103+
integrity sha512-EC619jesknyu4xpwud5WC/5odYLz6JUy7OSFy5405PpdGeh/m8XUvuJAx4zDx0Iz/Mlk0S1Md+ZcQwqkv39dkw==
1104+
dependencies:
1105+
"@sentry/types" "6.18.2"
1106+
tslib "^1.9.3"
1107+
10661108
"@sentry/webpack-plugin@^1.18.8":
10671109
version "1.18.8"
10681110
resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.18.8.tgz#247a73a0aa9e28099a736bbe89ca0d35cbac7636"
@@ -1098,10 +1140,10 @@
10981140
lz-string "^1.4.4"
10991141
pretty-format "^27.0.2"
11001142

1101-
"@testing-library/react@^12.1.3":
1102-
version "12.1.3"
1103-
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.3.tgz#ef26c5f122661ea9b6f672b23dc6b328cadbbf26"
1104-
integrity sha512-oCULRXWRrBtC9m6G/WohPo1GLcLesH7T4fuKzRAKn1CWVu9BzXtqLXDDTA6KhFNNtRwLtfSMr20HFl+Qrdrvmg==
1143+
"@testing-library/react@^12.1.4":
1144+
version "12.1.4"
1145+
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0"
1146+
integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA==
11051147
dependencies:
11061148
"@babel/runtime" "^7.12.5"
11071149
"@testing-library/dom" "^8.0.0"
@@ -2056,7 +2098,7 @@ cssstyle@^2.3.0:
20562098
dependencies:
20572099
cssom "~0.3.6"
20582100

2059-
csstype@^3.0.10, csstype@^3.0.11, csstype@^3.0.2:
2101+
csstype@^3.0.11, csstype@^3.0.2:
20602102
version "3.0.11"
20612103
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
20622104
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==

0 commit comments

Comments
 (0)