Merge pull request #41 from ngs/update-react

Update React

Author: sugarshin

.gitignore

@@ -40,5 +40,3 @@ lib
 demo/public
 .deploy
 test-results.xml
-
-yarn.lock

.mocha.opts

@@ -1,4 +1,5 @@
 --compilers js:babel-core/register
 --recursive
+--require raf/polyfill
 --require testHelper.js
 --reporter mocha-multi-reporters --reporter-options configFile=.mocha-multi-reporters.json

.node-version

@@ -0,0 +1 @@
+8.9.4

circle.yml

@@ -1,14 +1,19 @@
 machine:
   timezone: UTC
   node:
-    version: 4.2.6
+    version: 8.9.4
   pre:
     - "git config --global user.name 'Circle CI'"
     - "git config --global user.email 'a+circleci@ngs.io'"
 general:
   branches:
     ignore:
       - gh-pages
+dependencies:
+  override:
+    - yarn
+  cache_directories:
+    - ~/.cache/yarn
 test:
   override:
     - npm test

package.json

@@ -55,15 +55,16 @@
     "babel-preset-react-hmre": "^1.1.1",
     "babel-preset-stage-0": "^6.16.0",
     "chai": "^3.5.0",
-    "chai-enzyme": "^0.6.1",
+    "chai-enzyme": "^1.0.0-beta.0",
     "cheerio": "^0.22.0",
     "coveralls": "^2.11.15",
     "css-loader": "^0.26.0",
     "css-modules-require-hook": "^4.0.5",
     "dirty-chai": "^1.2.2",
-    "draft-js-plugins-editor": "2.0.0-rc2",
-    "draft-js-prism": "ngs/draft-js-prism#6edb31c3805dd1de3fb897cc27fced6bac1bafbb",
-    "enzyme": "^2.6.0",
+    "draft-js-plugins-editor": "2.0.4",
+    "draft-js-prism": "^1.0.5",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
     "eslint": "^3.11.1",
     "eslint-config-airbnb": "^13.0.0",
     "eslint-plugin-import": "^2.2.0",
@@ -83,11 +84,12 @@
     "nyc": "^10.0.0",
     "postcss-loader": "^1.1.1",
     "prismjs": "^1.6.0",
-    "react": "^15.4.1",
+    "raf": "^3.4.0",
+    "react": "^16.2.0",
     "react-addons-pure-render-mixin": "^15.4.1",
     "react-addons-test-utils": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-github-fork-ribbon": "^0.4.4",
+    "react-dom": "^16.2.0",
+    "react-github-fork-ribbon": "^0.5.1",
     "rimraf": "^2.5.4",
     "sinon": "^1.17.6",
     "sinon-chai": "^2.8.0",
@@ -99,17 +101,17 @@
     "webpack-hot-middleware": "^2.13.2"
   },
   "peerDependencies": {
-    "draft-js-plugins-editor": "~2.0.0-rc.1 || 2.0.0-rc2 || 2.0.0-rc1 || 2.0.0-beta12",
-    "react": "^15.0.0",
-    "react-dom": "^15.0.0"
+    "draft-js-plugins-editor": "^2.0.0 || ~2.0.0-rc.1 || 2.0.0-rc2 || 2.0.0-rc1 || 2.0.0-beta12",
+    "react": "^16.0.0 || ^15.0.0",
+    "react-dom": "^16.0.0 || ^15.0.0"
   },
   "contributors": [
     "Atsushi Nagase <a@ngs.io>"
   ],
   "dependencies": {
-    "decorate-component-with-props": "^1.0.2",
-    "draft-js": "~0.10.1",
-    "draft-js-checkable-list-item": "^2.0.5",
+    "decorate-component-with-props": "^1.1.0",
+    "draft-js": "~0.10.5",
+    "draft-js-checkable-list-item": "^3.0.0",
     "immutable": "~3.7.4"
   }
 }

testHelper.js

@@ -2,6 +2,8 @@ import chai from 'chai';
 import dirtyChai from 'dirty-chai';
 import hook from 'css-modules-require-hook';
 import { jsdom } from 'jsdom';
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
 
 process.env.NODE_ENV = 'test';
 
@@ -20,6 +22,8 @@ Object.keys(document.defaultView).forEach((property) => {
   }
 });
 
+Enzyme.configure({ adapter: new Adapter() });
+
 // chaiEnzyme needs to be initialised here, so that canUseDOM is set
 // to true when react-dom initialises (which chai-enzyme depends upon)
 const chaiEnzyme = require('chai-enzyme');