Skip to content

Commit

Permalink
rollback @types/styled-components to 4.0 as 4.1 introduced incompatib…
Browse files Browse the repository at this point in the history
…ility with material ui. More explained in mui/material-ui#14191
  • Loading branch information
BenGamma committed Feb 25, 2019
1 parent f710d4a commit b8b0e8a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@svgr/webpack": "4.1.0",
"@tinymce/tinymce-react": "^3.0.1",
"@types/rebass": "^3.0.3",
"@types/styled-components": "4.0",
"@types/styled-system": "^3.2.2",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
Expand Down Expand Up @@ -74,7 +75,7 @@
"resolve": "1.10.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"styled-components": "^4.1.3",
"styled-components": "4.1.3",
"styled-system": "^4.0.0",
"terser-webpack-plugin": "1.2.2",
"typescript": "3.3.3",
Expand Down
10 changes: 9 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,14 @@
"@types/react-native" "*"
csstype "^2.2.0"

"@types/styled-components@4.0":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.0.3.tgz#8287e54e446302369eecc521243a2f32cf9122ee"
integrity sha512-LzntHlOKEOxUxMkVmQPNG88TsldeHO2NlwNkzHnw4wL8qhHQgd7u+u3yw84hZgoFh4ugsLCbFtjYcbP7v5WC5Q==
dependencies:
"@types/node" "*"
"@types/react" "*"

"@types/styled-system@*", "@types/styled-system@^3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-3.2.2.tgz#a40b30baf20a8d9820808688a370a973cb778e7c"
Expand Down Expand Up @@ -10565,7 +10573,7 @@ style-loader@0.23.1:
loader-utils "^1.1.0"
schema-utils "^1.0.0"

styled-components@^4.1.3:
styled-components@4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.1.3.tgz#4472447208e618b57e84deaaeb6acd34a5e0fe9b"
integrity sha512-0quV4KnSfvq5iMtT0RzpMGl/Dg3XIxIxOl9eJpiqiq4SrAmR1l1DLzNpMzoy3DyzdXVDMJS2HzROnXscWA3SEw==
Expand Down

0 comments on commit b8b0e8a

Please sign in to comment.