Skip to content

Commit 3e32c00

Browse files
authored
Merge pull request #305 from rvsia/fixDemoStyles
Limit material core to fix demo's styles
2 parents 1fc6b9b + 825a9a2 commit 3e32c00

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

packages/mui-component-mapper/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@babel/preset-env": "^7.1.6",
1919
"@babel/preset-react": "^7.0.0",
2020
"@data-driven-forms/react-form-renderer": "*",
21-
"@material-ui/core": "^4.9.1",
21+
"@material-ui/core": "4.6.0",
2222
"@material-ui/icons": "^4.9.1",
2323
"@material-ui/styles": "^4.9.0",
2424
"@semantic-release/git": "^7.0.5",
@@ -60,7 +60,7 @@
6060
},
6161
"peerDependencies": {
6262
"@data-driven-forms/react-form-renderer": "^1.9.3",
63-
"@material-ui/core": "^4.9.1",
63+
"@material-ui/core": "4.6.0",
6464
"@material-ui/icons": "^4.9.1",
6565
"@material-ui/styles": "^4.9.0",
6666
"material-ui-pickers": "^2.2.4",

yarn.lock

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,7 +2141,7 @@
21412141
npmlog "^4.1.2"
21422142
write-file-atomic "^2.3.0"
21432143

2144-
"@material-ui/core@^4.5.2":
2144+
"@material-ui/core@4.6.0", "@material-ui/core@^4.5.2":
21452145
version "4.6.0"
21462146
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.6.0.tgz#098a61d2af1778433d2d9a76de95be5f6aa87922"
21472147
dependencies:
@@ -2159,26 +2159,6 @@
21592159
prop-types "^15.7.2"
21602160
react-transition-group "^4.3.0"
21612161

2162-
"@material-ui/core@^4.9.1":
2163-
version "4.9.1"
2164-
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.1.tgz#8e57382b12a01b35a3fa2a45424528915aef2115"
2165-
integrity sha512-wehQI0ahHDsZjK+uA8Q5Cs1K1/1HXYe2icwTqARaRCt7d9bTp0bJN/C9TLe/+sRWfRIkx6OIk7ABSJT1jBqxRg==
2166-
dependencies:
2167-
"@babel/runtime" "^7.4.4"
2168-
"@material-ui/styles" "^4.9.0"
2169-
"@material-ui/system" "^4.9.1"
2170-
"@material-ui/types" "^5.0.0"
2171-
"@material-ui/utils" "^4.7.1"
2172-
"@types/react-transition-group" "^4.2.0"
2173-
clsx "^1.0.2"
2174-
convert-css-length "^2.0.1"
2175-
hoist-non-react-statics "^3.3.2"
2176-
normalize-scroll-left "^0.2.0"
2177-
popper.js "^1.14.1"
2178-
prop-types "^15.7.2"
2179-
react-is "^16.8.0"
2180-
react-transition-group "^4.3.0"
2181-
21822162
"@material-ui/icons@^4.5.1":
21832163
version "4.5.1"
21842164
resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz#6963bad139e938702ece85ca43067688018f04f8"
@@ -2243,15 +2223,6 @@
22432223
"@material-ui/utils" "^4.5.2"
22442224
prop-types "^15.7.2"
22452225

2246-
"@material-ui/system@^4.9.1":
2247-
version "4.9.1"
2248-
resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.1.tgz#beb6595e1b164317340bdc5a629a6798fc35f82d"
2249-
integrity sha512-CLrJK2aKNWNwruGVTRf+rLz96P4jmozpY2UaCE6hBTa1oGsQ396YXOQQABQ4c0igawmdyf5iQb0zs9j5zsAf1w==
2250-
dependencies:
2251-
"@babel/runtime" "^7.4.4"
2252-
"@material-ui/utils" "^4.7.1"
2253-
prop-types "^15.7.2"
2254-
22552226
"@material-ui/types@^4.1.1":
22562227
version "4.1.1"
22572228
resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz#b65e002d926089970a3271213a3ad7a21b17f02b"
@@ -9082,13 +9053,6 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1:
90829053
dependencies:
90839054
react-is "^16.7.0"
90849055

9085-
hoist-non-react-statics@^3.3.2:
9086-
version "3.3.2"
9087-
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
9088-
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
9089-
dependencies:
9090-
react-is "^16.7.0"
9091-
90929056
home-dir@^1.0.0:
90939057
version "1.0.0"
90949058
resolved "https://registry.yarnpkg.com/home-dir/-/home-dir-1.0.0.tgz#2917eb44bdc9072ceda942579543847e3017fe4e"

0 commit comments

Comments
 (0)