Skip to content

Commit b439d52

Browse files
committed
update materialui
1 parent a0148ef commit b439d52

File tree

2 files changed

+133
-23
lines changed

2 files changed

+133
-23
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "^4.11.0",
6+
"@material-ui/core": "^4.11.2",
77
"@material-ui/icons": "^4.9.1",
88
"@material-ui/styles": "^4.10.0",
99
"@reduxjs/toolkit": "^1.2.5",
@@ -23,7 +23,7 @@
2323
"lodash": "^4.17.19",
2424
"material-ui-chip-input": "^2.0.0-beta.2",
2525
"rc-slider": "9.2.4",
26-
"react": "^16.13.1",
26+
"react": "^17.0.0",
2727
"react-dom": "^16.13.1",
2828
"react-files": "^2.4.8",
2929
"react-hotkeys-hook": "^2.2.1",

yarn.lock

Lines changed: 131 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,22 +1541,22 @@
15411541
"@types/yargs" "^15.0.0"
15421542
chalk "^3.0.0"
15431543

1544-
"@material-ui/core@^4.11.0":
1545-
version "4.11.0"
1546-
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
1547-
integrity sha512-bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g==
1544+
"@material-ui/core@^4.11.2":
1545+
version "4.12.4"
1546+
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
1547+
integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
15481548
dependencies:
15491549
"@babel/runtime" "^7.4.4"
1550-
"@material-ui/styles" "^4.10.0"
1551-
"@material-ui/system" "^4.9.14"
1552-
"@material-ui/types" "^5.1.0"
1553-
"@material-ui/utils" "^4.10.2"
1550+
"@material-ui/styles" "^4.11.5"
1551+
"@material-ui/system" "^4.12.2"
1552+
"@material-ui/types" "5.1.0"
1553+
"@material-ui/utils" "^4.11.3"
15541554
"@types/react-transition-group" "^4.2.0"
15551555
clsx "^1.0.4"
15561556
hoist-non-react-statics "^3.3.2"
15571557
popper.js "1.16.1-lts"
15581558
prop-types "^15.7.2"
1559-
react-is "^16.8.0"
1559+
react-is "^16.8.0 || ^17.0.0"
15601560
react-transition-group "^4.4.0"
15611561

15621562
"@material-ui/icons@^4.9.1":
@@ -1588,22 +1588,53 @@
15881588
jss-plugin-vendor-prefixer "^10.0.3"
15891589
prop-types "^15.7.2"
15901590

1591-
"@material-ui/system@^4.9.14":
1592-
version "4.9.14"
1593-
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
1594-
integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
1591+
"@material-ui/styles@^4.11.5":
1592+
version "4.11.5"
1593+
resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb"
1594+
integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
15951595
dependencies:
15961596
"@babel/runtime" "^7.4.4"
1597-
"@material-ui/utils" "^4.9.6"
1597+
"@emotion/hash" "^0.8.0"
1598+
"@material-ui/types" "5.1.0"
1599+
"@material-ui/utils" "^4.11.3"
1600+
clsx "^1.0.4"
15981601
csstype "^2.5.2"
1602+
hoist-non-react-statics "^3.3.2"
1603+
jss "^10.5.1"
1604+
jss-plugin-camel-case "^10.5.1"
1605+
jss-plugin-default-unit "^10.5.1"
1606+
jss-plugin-global "^10.5.1"
1607+
jss-plugin-nested "^10.5.1"
1608+
jss-plugin-props-sort "^10.5.1"
1609+
jss-plugin-rule-value-function "^10.5.1"
1610+
jss-plugin-vendor-prefixer "^10.5.1"
15991611
prop-types "^15.7.2"
16001612

1601-
"@material-ui/types@^5.1.0":
1613+
"@material-ui/system@^4.12.2":
1614+
version "4.12.2"
1615+
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b"
1616+
integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
1617+
dependencies:
1618+
"@babel/runtime" "^7.4.4"
1619+
"@material-ui/utils" "^4.11.3"
1620+
csstype "^2.5.2"
1621+
prop-types "^15.7.2"
1622+
1623+
"@material-ui/types@5.1.0", "@material-ui/types@^5.1.0":
16021624
version "5.1.0"
16031625
resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
16041626
integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
16051627

1606-
"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.9.6":
1628+
"@material-ui/utils@^4.11.3":
1629+
version "4.11.3"
1630+
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942"
1631+
integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
1632+
dependencies:
1633+
"@babel/runtime" "^7.4.4"
1634+
prop-types "^15.7.2"
1635+
react-is "^16.8.0 || ^17.0.0"
1636+
1637+
"@material-ui/utils@^4.9.6":
16071638
version "4.10.2"
16081639
resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz#3fd5470ca61b7341f1e0468ac8f29a70bf6df321"
16091640
integrity sha512-eg29v74P7W5r6a4tWWDAAfZldXIzfyO1am2fIsC39hdUUHm/33k6pGOKPbgDjg/U/4ifmgAePy/1OjkKN6rFRw==
@@ -4267,6 +4298,11 @@ csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7:
42674298
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5"
42684299
integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==
42694300

4301+
csstype@^3.0.2:
4302+
version "3.1.1"
4303+
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
4304+
integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
4305+
42704306
cyclist@^1.0.1:
42714307
version "1.0.1"
42724308
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -7547,6 +7583,15 @@ jss-plugin-camel-case@^10.0.3:
75477583
hyphenate-style-name "^1.0.3"
75487584
jss "^10.3.0"
75497585

7586+
jss-plugin-camel-case@^10.5.1:
7587+
version "10.9.2"
7588+
resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.2.tgz#76dddfa32f9e62d17daa4e3504991fd0933b89e1"
7589+
integrity sha512-wgBPlL3WS0WDJ1lPJcgjux/SHnDuu7opmgQKSraKs4z8dCCyYMx9IDPFKBXQ8Q5dVYij1FFV0WdxyhuOOAXuTg==
7590+
dependencies:
7591+
"@babel/runtime" "^7.3.1"
7592+
hyphenate-style-name "^1.0.3"
7593+
jss "10.9.2"
7594+
75507595
jss-plugin-default-unit@^10.0.3:
75517596
version "10.3.0"
75527597
resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.3.0.tgz#cd74cf5088542620a82591f76c62c6b43a7e50a6"
@@ -7555,6 +7600,14 @@ jss-plugin-default-unit@^10.0.3:
75557600
"@babel/runtime" "^7.3.1"
75567601
jss "^10.3.0"
75577602

7603+
jss-plugin-default-unit@^10.5.1:
7604+
version "10.9.2"
7605+
resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.2.tgz#3e7f4a1506b18d8fe231554fd982439feb2a9c53"
7606+
integrity sha512-pYg0QX3bBEFtTnmeSI3l7ad1vtHU42YEEpgW7pmIh+9pkWNWb5dwS/4onSfAaI0kq+dOZHzz4dWe+8vWnanoSg==
7607+
dependencies:
7608+
"@babel/runtime" "^7.3.1"
7609+
jss "10.9.2"
7610+
75587611
jss-plugin-global@^10.0.3:
75597612
version "10.3.0"
75607613
resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.3.0.tgz#6b883e74900bb71f65ac2b19bea78f7d1e85af3f"
@@ -7563,6 +7616,14 @@ jss-plugin-global@^10.0.3:
75637616
"@babel/runtime" "^7.3.1"
75647617
jss "^10.3.0"
75657618

7619+
jss-plugin-global@^10.5.1:
7620+
version "10.9.2"
7621+
resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.2.tgz#e7f2ad4a5e8e674fb703b04b57a570b8c3e5c2c2"
7622+
integrity sha512-GcX0aE8Ef6AtlasVrafg1DItlL/tWHoC4cGir4r3gegbWwF5ZOBYhx04gurPvWHC8F873aEGqge7C17xpwmp2g==
7623+
dependencies:
7624+
"@babel/runtime" "^7.3.1"
7625+
jss "10.9.2"
7626+
75667627
jss-plugin-nested@^10.0.3:
75677628
version "10.3.0"
75687629
resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.3.0.tgz#ae8aceac95e09c3d40c991ea32403fb647d9e0a8"
@@ -7572,6 +7633,15 @@ jss-plugin-nested@^10.0.3:
75727633
jss "^10.3.0"
75737634
tiny-warning "^1.0.2"
75747635

7636+
jss-plugin-nested@^10.5.1:
7637+
version "10.9.2"
7638+
resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.2.tgz#3aa2502816089ecf3981e1a07c49b276d67dca63"
7639+
integrity sha512-VgiOWIC6bvgDaAL97XCxGD0BxOKM0K0zeB/ECyNaVF6FqvdGB9KBBWRdy2STYAss4VVA7i5TbxFZN+WSX1kfQA==
7640+
dependencies:
7641+
"@babel/runtime" "^7.3.1"
7642+
jss "10.9.2"
7643+
tiny-warning "^1.0.2"
7644+
75757645
jss-plugin-props-sort@^10.0.3:
75767646
version "10.3.0"
75777647
resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.3.0.tgz#5b0625f87b6431a7969c56b0d8c696525969bfe4"
@@ -7580,6 +7650,14 @@ jss-plugin-props-sort@^10.0.3:
75807650
"@babel/runtime" "^7.3.1"
75817651
jss "^10.3.0"
75827652

7653+
jss-plugin-props-sort@^10.5.1:
7654+
version "10.9.2"
7655+
resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.2.tgz#645f6c8f179309667b3e6212f66b59a32fb3f01f"
7656+
integrity sha512-AP1AyUTbi2szylgr+O0OB7gkIxEGzySLITZ2GpsaoX72YMCGI2jYAc+WUhPfvUnZYiauF4zTnN4V4TGuvFjJlw==
7657+
dependencies:
7658+
"@babel/runtime" "^7.3.1"
7659+
jss "10.9.2"
7660+
75837661
jss-plugin-rule-value-function@^10.0.3:
75847662
version "10.3.0"
75857663
resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.3.0.tgz#498b0e2bae16cb316a6bdb73fd783cf9604ba747"
@@ -7589,6 +7667,15 @@ jss-plugin-rule-value-function@^10.0.3:
75897667
jss "^10.3.0"
75907668
tiny-warning "^1.0.2"
75917669

7670+
jss-plugin-rule-value-function@^10.5.1:
7671+
version "10.9.2"
7672+
resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.2.tgz#9afe07596e477123cbf11120776be6a64494541f"
7673+
integrity sha512-vf5ms8zvLFMub6swbNxvzsurHfUZ5Shy5aJB2gIpY6WNA3uLinEcxYyraQXItRHi5ivXGqYciFDRM2ZoVoRZ4Q==
7674+
dependencies:
7675+
"@babel/runtime" "^7.3.1"
7676+
jss "10.9.2"
7677+
tiny-warning "^1.0.2"
7678+
75927679
jss-plugin-vendor-prefixer@^10.0.3:
75937680
version "10.3.0"
75947681
resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.3.0.tgz#b09c13a4d05a055429d8a24e19cc01ce049f0ed4"
@@ -7598,6 +7685,25 @@ jss-plugin-vendor-prefixer@^10.0.3:
75987685
css-vendor "^2.0.8"
75997686
jss "^10.3.0"
76007687

7688+
jss-plugin-vendor-prefixer@^10.5.1:
7689+
version "10.9.2"
7690+
resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.2.tgz#410a0f3b9f8dbbfba58f4d329134df4849aa1237"
7691+
integrity sha512-SxcEoH+Rttf9fEv6KkiPzLdXRmI6waOTcMkbbEFgdZLDYNIP9UKNHFy6thhbRKqv0XMQZdrEsbDyV464zE/dUA==
7692+
dependencies:
7693+
"@babel/runtime" "^7.3.1"
7694+
css-vendor "^2.0.8"
7695+
jss "10.9.2"
7696+
7697+
jss@10.9.2, jss@^10.5.1:
7698+
version "10.9.2"
7699+
resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.2.tgz#9379be1f195ef98011dfd31f9448251bd61b95a9"
7700+
integrity sha512-b8G6rWpYLR4teTUbGd4I4EsnWjg7MN0Q5bSsjKhVkJVjhQDy2KzkbD2AW3TuT0RYZVmZZHKIrXDn6kjU14qkUg==
7701+
dependencies:
7702+
"@babel/runtime" "^7.3.1"
7703+
csstype "^3.0.2"
7704+
is-in-browser "^1.1.3"
7705+
tiny-warning "^1.0.2"
7706+
76017707
jss@^10.0.3, jss@^10.3.0:
76027708
version "10.3.0"
76037709
resolved "https://registry.yarnpkg.com/jss/-/jss-10.3.0.tgz#2cf7be265f72b59c1764d816fdabff1c5dd18326"
@@ -10473,6 +10579,11 @@ react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-i
1047310579
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
1047410580
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
1047510581

10582+
"react-is@^16.8.0 || ^17.0.0":
10583+
version "17.0.2"
10584+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
10585+
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
10586+
1047610587
react-lifecycles-compat@^3.0.4:
1047710588
version "3.0.4"
1047810589
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -10570,14 +10681,13 @@ react-transition-group@^4.4.0:
1057010681
loose-envify "^1.4.0"
1057110682
prop-types "^15.6.2"
1057210683

10573-
react@^16.13.1:
10574-
version "16.13.1"
10575-
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
10576-
integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
10684+
react@^17.0.0:
10685+
version "17.0.2"
10686+
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
10687+
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
1057710688
dependencies:
1057810689
loose-envify "^1.1.0"
1057910690
object-assign "^4.1.1"
10580-
prop-types "^15.6.2"
1058110691

1058210692
read-pkg-up@^2.0.0:
1058310693
version "2.0.0"

0 commit comments

Comments
 (0)