Skip to content

Commit 5c20bb9

Browse files
authored
Merge pull request #396 from code-dot-org/sl-31
Update React to v16
2 parents d6328f9 + 3c371fd commit 5c20bb9

File tree

3 files changed

+416
-494
lines changed

3 files changed

+416
-494
lines changed

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"peerDependencies": {
3636
"lodash": "^4.17.5",
3737
"radium": "^0.25.2",
38-
"react": "~15.4.0",
39-
"react-dom": "~15.4.0"
38+
"react": "~16.14.0",
39+
"react-dom": "~16.14.0"
4040
},
4141
"devDependencies": {
4242
"@code-dot-org/redactable-markdown": "^0.4.0",
@@ -63,7 +63,7 @@
6363
"copy-webpack-plugin": "^5.0.5",
6464
"css-loader": "^3.2.0",
6565
"enzyme": "^3.9.0",
66-
"enzyme-adapter-react-15.4": "^1.3.1",
66+
"enzyme-adapter-react-16": "^1.15.7",
6767
"eslint": ">=4.18.2",
6868
"eslint-plugin-react": "^7.11.0",
6969
"file-loader": "^4.2.0",
@@ -77,10 +77,9 @@
7777
"prettier": "1.16.1",
7878
"query-string": "4.1.0",
7979
"radium": "^0.25.2",
80-
"react": "~15.4.0",
81-
"react-addons-test-utils": "~15.4.0",
82-
"react-dom": "~15.4.0",
83-
"react-test-renderer": "~15.4.0",
80+
"react": "~16.14.0",
81+
"react-dom": "~16.14.0",
82+
"react-test-renderer": "~16.14.0",
8483
"rehype-react": "^4.0.1",
8584
"remark-parse": "^7.0.2",
8685
"remark-rehype": "^5.0.0",

test/setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Adapter from 'enzyme-adapter-react-15.4';
1+
import Adapter from 'enzyme-adapter-react-16';
22
import enzyme from 'enzyme';
33

44
enzyme.configure({adapter: new Adapter()});

0 commit comments

Comments
 (0)