Skip to content

Commit 0c0eb9f

Browse files
committed
Back to React 16, since Enzyme 15 throws warnings in console
1 parent d6899ff commit 0c0eb9f

2 files changed

Lines changed: 47 additions & 40 deletions

File tree

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"babel-preset-stage-2": "^6.24.1",
7575
"concurrently": "3.5.1",
7676
"enzyme": "^3.1.1",
77-
"enzyme-adapter-react-15": "^1.0.4",
77+
"enzyme-adapter-react-16": "^1.0.4",
7878
"enzyme-to-json": "^3.2.2",
7979
"eslint": "^4.10.0",
8080
"eslint-config-insilico": "^5.0.1",
@@ -86,8 +86,12 @@
8686
"lint-staged": "^6.0.0",
8787
"prettier": "^1.8.1",
8888
"request": "~2.83.0",
89-
"react": "^15.0.0",
90-
"react-dom": "^15.0.0",
91-
"react-test-renderer": "^15.0.0"
89+
"react": "^16.2.0",
90+
"react-dom": "^16.2.0",
91+
"react-test-renderer": "^16.2.0"
92+
},
93+
"resolutions": {
94+
"react": "^16.2.0",
95+
"react-dom": "^16.2.0"
9296
}
9397
}

yarn.lock

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,14 +2068,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
20682068
safe-buffer "^5.0.1"
20692069
sha.js "^2.4.8"
20702070

2071-
create-react-class@^15.6.0:
2072-
version "15.6.2"
2073-
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
2074-
dependencies:
2075-
fbjs "^0.8.9"
2076-
loose-envify "^1.3.1"
2077-
object-assign "^4.1.1"
2078-
20792071
cross-spawn@^5.0.1, cross-spawn@^5.1.0:
20802072
version "5.1.0"
20812073
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2494,23 +2486,25 @@ entities@^1.1.1, entities@~1.1.1:
24942486
version "1.1.1"
24952487
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
24962488

2497-
enzyme-adapter-react-15@^1.0.4:
2498-
version "1.0.5"
2499-
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
2489+
enzyme-adapter-react-16@^1.0.4:
2490+
version "1.1.1"
2491+
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
25002492
dependencies:
2501-
enzyme-adapter-utils "^1.1.0"
2493+
enzyme-adapter-utils "^1.3.0"
25022494
lodash "^4.17.4"
25032495
object.assign "^4.0.4"
25042496
object.values "^1.0.4"
2505-
prop-types "^15.5.10"
2497+
prop-types "^15.6.0"
2498+
react-reconciler "^0.7.0"
2499+
react-test-renderer "^16.0.0-0"
25062500

2507-
enzyme-adapter-utils@^1.1.0:
2508-
version "1.1.1"
2509-
resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.1.1.tgz#689de8853f0751710590d6dfa730ff4056ea36b2"
2501+
enzyme-adapter-utils@^1.3.0:
2502+
version "1.3.0"
2503+
resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
25102504
dependencies:
25112505
lodash "^4.17.4"
25122506
object.assign "^4.0.4"
2513-
prop-types "^15.5.10"
2507+
prop-types "^15.6.0"
25142508

25152509
enzyme-to-json@^3.2.2:
25162510
version "3.2.2"
@@ -2984,7 +2978,7 @@ fb-watchman@^2.0.0:
29842978
dependencies:
29852979
bser "^2.0.0"
29862980

2987-
fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.9:
2981+
fbjs@^0.8.12, fbjs@^0.8.16:
29882982
version "0.8.16"
29892983
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
29902984
dependencies:
@@ -5757,14 +5751,14 @@ react-docgen@^2.15.0:
57575751
node-dir "^0.1.10"
57585752
recast "^0.12.6"
57595753

5760-
react-dom@^15.0.0:
5761-
version "15.6.2"
5762-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
5754+
react-dom@^16.2.0:
5755+
version "16.2.0"
5756+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
57635757
dependencies:
5764-
fbjs "^0.8.9"
5758+
fbjs "^0.8.16"
57655759
loose-envify "^1.1.0"
5766-
object-assign "^4.1.0"
5767-
prop-types "^15.5.10"
5760+
object-assign "^4.1.1"
5761+
prop-types "^15.6.0"
57685762

57695763
react-html-attributes@^1.3.0:
57705764
version "1.4.1"
@@ -5816,6 +5810,15 @@ react-modal@^3.1.2:
58165810
exenv "^1.2.0"
58175811
prop-types "^15.5.10"
58185812

5813+
react-reconciler@^0.7.0:
5814+
version "0.7.0"
5815+
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
5816+
dependencies:
5817+
fbjs "^0.8.16"
5818+
loose-envify "^1.1.0"
5819+
object-assign "^4.1.1"
5820+
prop-types "^15.6.0"
5821+
58195822
react-simple-di@^1.2.0:
58205823
version "1.2.0"
58215824
resolved "https://registry.yarnpkg.com/react-simple-di/-/react-simple-di-1.2.0.tgz#dde0e5bf689f391ef2ab02c9043b213fe239c6d0"
@@ -5845,12 +5848,13 @@ react-style-proptype@^3.0.0:
58455848
dependencies:
58465849
prop-types "^15.5.4"
58475850

5848-
react-test-renderer@^15.0.0:
5849-
version "15.6.2"
5850-
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8"
5851+
react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
5852+
version "16.2.0"
5853+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
58515854
dependencies:
5852-
fbjs "^0.8.9"
5853-
object-assign "^4.1.0"
5855+
fbjs "^0.8.16"
5856+
object-assign "^4.1.1"
5857+
prop-types "^15.6.0"
58545858

58555859
react-transition-group@^1.1.2:
58565860
version "1.2.1"
@@ -5873,15 +5877,14 @@ react-treebeard@^2.0.3:
58735877
shallowequal "^0.2.2"
58745878
velocity-react "^1.3.1"
58755879

5876-
react@^15.0.0:
5877-
version "15.6.2"
5878-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
5880+
react@^16.2.0:
5881+
version "16.2.0"
5882+
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
58795883
dependencies:
5880-
create-react-class "^15.6.0"
5881-
fbjs "^0.8.9"
5884+
fbjs "^0.8.16"
58825885
loose-envify "^1.1.0"
5883-
object-assign "^4.1.0"
5884-
prop-types "^15.5.10"
5886+
object-assign "^4.1.1"
5887+
prop-types "^15.6.0"
58855888

58865889
read-pkg-up@^1.0.1:
58875890
version "1.0.1"

0 commit comments

Comments
 (0)