fix(react-v16): additional updates for the react v16 upgrade

travi-org · Oct 15, 2017 · efefe0f · efefe0f
1 parent 80a8e88
commit efefe0f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.storybook/mocha-config.js b/.storybook/mocha-config.js
@@ -1,10 +1,14 @@
 import {JSDOM} from 'jsdom';
+import {configure} from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
 import {storiesOf, specs} from './storybook-stub';
 import * as storybookFacade from './facade-storybook';
 
 storybookFacade.storiesOf = storiesOf;
 storybookFacade.specs = specs;
 
+configure({adapter: new Adapter()});
+
 function setupDom() {
   const jsdom = new JSDOM('<!doctype html><html><body></body></html>');
   const {window} = jsdom;

diff --git a/package.json b/package.json
@@ -68,7 +68,8 @@
     "cpy-cli": "1.0.1",
     "css-loader": "0.28.7",
     "cz-conventional-changelog": "2.0.0",
-    "enzyme": "2.9.1",
+    "enzyme": "3.1.0",
+    "enzyme-adapter-react-16": "1.0.1",
     "file-loader": "1.0.0",
     "gh-pages": "1.0.0",
     "glob": "7.1.2",
@@ -83,8 +84,9 @@
     "prop-types": "15.5.10",
     "react": "16.0.0",
     "react-addons-test-utils": "15.6.0",
+    "react-dom": "16.0.0",
     "react-helmet": "5.2.0",
-    "react-test-renderer": "15.6.1",
+    "react-test-renderer": "16.0.0",
     "rimraf": "2.6.2",
     "rollup": "0.49.3",
     "rollup-plugin-babel": "3.0.2",
@@ -103,14 +105,14 @@
     "material-ui": "0.19.1",
     "microformat-node": "2.0.1",
     "react-bootstrap": "0.31.2",
-    "react-dom": "15.6.1",
     "react-router": "3.0.5",
     "react-router-bootstrap": "0.23.2",
     "react-tap-event-plugin": "2.0.1"
   },
   "peerDependencies": {
     "prop-types": "^15.5.10",
-    "react": "^15.6.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "react-helmet": "^5.1.3"
   },
   "config": {

diff --git a/test/helpers/mocha-setup.js b/test/helpers/mocha-setup.js
@@ -1,5 +1,9 @@
+import {configure} from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
 import styles from './style-fakes';
 
+configure({adapter: new Adapter()});
+
 require.extensions['.scss'] = module => {
   module.exports = styles;    // eslint-disable-line no-param-reassign