Skip to content

Commit c02fcc9

Browse files
committed
feat: Merge branch 'LucianBuzzo-update-styled-components'
2 parents c3c0f00 + 1ed59a1 commit c02fcc9

2 files changed

Lines changed: 25 additions & 11 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
"redux": "^3.6.0",
4848
"redux-actions": "^1.2.2",
4949
"redux-logger": "^3.0.6",
50-
"styled-components": "^2.1.1",
5150
"uuid": "^3.1.0"
5251
},
5352
"devDependencies": {
@@ -105,7 +104,8 @@
105104
},
106105
"peerDependencies": {
107106
"react": ">= 0.14.0 < 17.0.0-0",
108-
"react-dom": ">= 0.14.0 < 17.0.0-0"
107+
"react-dom": ">= 0.14.0 < 17.0.0-0",
108+
"styled-components": ">= 2.1.1 < 4.0.0-0"
109109
},
110110
"config": {
111111
"commitizen": {

yarn.lock

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4362,6 +4362,10 @@ hoist-non-react-statics@^2.2.1:
43624362
version "2.3.0"
43634363
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.0.tgz#ede16318c2ff1f9fe3a025396ba06fd4c44608bb"
43644364

4365+
hoist-non-react-statics@^2.5.0:
4366+
version "2.5.0"
4367+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
4368+
43654369
home-or-tmp@^1.0.0:
43664370
version "1.0.0"
43674371
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.0.tgz#4b9f1e40800c3e50c6c27f781676afcce71f3985"
@@ -7143,6 +7147,10 @@ react-inspector@^2.2.0:
71437147
babel-runtime "^6.26.0"
71447148
is-dom "^1.0.9"
71457149

7150+
react-is@^16.3.1:
7151+
version "16.3.2"
7152+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
7153+
71467154
react-komposer@^1.9.0:
71477155
version "1.13.1"
71487156
resolved "https://registry.yarnpkg.com/react-komposer/-/react-komposer-1.13.1.tgz#4b8ac4bcc71323bd7413dcab95c831197f50eed0"
@@ -8277,22 +8285,28 @@ style-loader@^0.18.2:
82778285
loader-utils "^1.0.2"
82788286
schema-utils "^0.3.0"
82798287

8280-
styled-components@^2.1.1:
8281-
version "2.4.0"
8282-
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.4.0.tgz#086d0fd483d54638837fca3ea546a030b94adf75"
8288+
styled-components@^3.2.5:
8289+
version "3.2.6"
8290+
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.2.6.tgz#99e6e75a746bdedd295a17e03dd1493055a1cc3b"
82838291
dependencies:
82848292
buffer "^5.0.3"
82858293
css-to-react-native "^2.0.3"
8286-
fbjs "^0.8.9"
8287-
hoist-non-react-statics "^1.2.0"
8294+
fbjs "^0.8.16"
8295+
hoist-non-react-statics "^2.5.0"
82888296
is-plain-object "^2.0.1"
82898297
prop-types "^15.5.4"
8290-
stylis "^3.4.0"
8298+
react-is "^16.3.1"
8299+
stylis "^3.5.0"
8300+
stylis-rule-sheet "^0.0.10"
82918301
supports-color "^3.2.3"
82928302

8293-
stylis@^3.4.0:
8294-
version "3.4.5"
8295-
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.5.tgz#d7b9595fc18e7b9c8775eca8270a9a1d3e59806e"
8303+
stylis-rule-sheet@^0.0.10:
8304+
version "0.0.10"
8305+
resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
8306+
8307+
stylis@^3.5.0:
8308+
version "3.5.0"
8309+
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
82968310

82978311
supports-color@3.1.2:
82988312
version "3.1.2"

0 commit comments

Comments
 (0)