diff --git a/packages/rrreol-ui/package.json b/packages/rrreol-ui/package.json index 7230427..a76b8ac 100644 --- a/packages/rrreol-ui/package.json +++ b/packages/rrreol-ui/package.json @@ -14,7 +14,7 @@ "dependencies": { "@material-ui/core": "^4.0.1", "@material-ui/styles": "^4.4.3", - "@material-ui/system": "^3.0.0-alpha.2", + "@material-ui/system": "^4.12.1", "memoize-one": "^5.0.4", "prop-types": "^15.7.2", "react": "^16.8.6", diff --git a/yarn.lock b/yarn.lock index 8dba06f..b025254 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2686,25 +2686,15 @@ jss-plugin-vendor-prefixer "10.0.0-alpha.25" prop-types "^15.7.2" -"@material-ui/system@^3.0.0-alpha.2": - version "3.0.0-alpha.2" - resolved "https://registry.npm.taobao.org/@material-ui/system/download/@material-ui/system-3.0.0-alpha.2.tgz#096e80c8bb0f70aea435b9e38ea7749ee77b4e46" - integrity sha1-CW6AyLsPcK6kNbnjjqd0nud7TkY= - dependencies: - "@babel/runtime" "^7.2.0" - deepmerge "^3.0.0" - prop-types "^15.6.0" - warning "^4.0.1" - -"@material-ui/system@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.0.1.tgz#d78969f3dd9eb6baf82ded0ef183368d8befb00b" - integrity sha512-NlMF4jZk1xx7taUOT+QhrJw7v7uUi9Ae+G8C8fowGgP5x04whxOuSuSmN9a8u2j7dc8XqahR0OJeA6Xch8ymog== +"@material-ui/system@^4.0.1", "@material-ui/system@^4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c" + integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw== dependencies: - "@babel/runtime" "^7.2.0" - deepmerge "^3.0.0" + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.11.2" + csstype "^2.5.2" prop-types "^15.7.2" - warning "^4.0.1" "@material-ui/types@^4.0.1", "@material-ui/types@^4.1.1": version "4.1.1" @@ -2713,14 +2703,14 @@ dependencies: "@types/react" "*" -"@material-ui/utils@^4.0.1", "@material-ui/utils@^4.1.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.4.0.tgz#9275421e2798a067850d201212d46f12725828ad" - integrity sha512-UXoQVwArQEQWXxf2FPs0iJGT+MePQpKr0Qh0CPoLc1OdF0GSMTmQczcqCzwZkeHxHAOq/NkIKM1Pb/ih1Avicg== +"@material-ui/utils@^4.0.1", "@material-ui/utils@^4.1.0", "@material-ui/utils@^4.11.2": + version "4.11.2" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a" + integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA== dependencies: "@babel/runtime" "^7.4.4" prop-types "^15.7.2" - react-is "^16.8.6" + react-is "^16.8.0 || ^17.0.0" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -12149,6 +12139,11 @@ react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: resolved "https://registry.npm.taobao.org/react-is/download/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha1-W7weLSkUHJ+9/tRWND/ivEMKahY= +"react-is@^16.8.0 || ^17.0.0": + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + react-redux@^7.0.2: version "7.0.3" resolved "https://registry.npm.taobao.org/react-redux/download/react-redux-7.0.3.tgz#983c5a6de81cb1e696bd1c090ba826545f9170f1"