Merge pull request #6 from olofd/master

Support React 16
batata-frita · Oct 17, 2017 · c8a81e7 · c8a81e7
2 parents 8892471 + f8beb5d
commit c8a81e7
Show file tree

Hide file tree

Showing 3 changed files with 149 additions and 126 deletions.
diff --git a/package.json b/package.json
@@ -29,20 +29,21 @@
   },
   "homepage": "https://github.com/batata-frita/lekplats#readme",
   "devDependencies": {
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "sagui": "^8.0.2"
   },
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0",
-    "react-dom": "^0.14.0 || ^15.0.0"
+    "react": "^15.4.2 || ^16.0.0",
+    "react-dom": "^15.4.2 || ^16.0.0"
   },
   "dependencies": {
     "classnames": "^2.2.5",
-    "html2react": "^1.0.2",
+    "html2react": "^1.2.1",
     "lodash.merge": "^4.6.0",
-    "patch-react-proptypes-add-introspection": "^0.1.0",
+    "patch-react-proptypes-add-introspection": "^1.0.0",
+    "prop-types": "^15.6.0",
     "ramda": "^0.23.0",
-    "react-frame-component": "^1.0.0"
+    "react-frame-component": "^2.0.0"
   }
 }
diff --git a/src/Demo.js b/src/Demo.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 export default function Demo ({ name, translations, rolling }) {
   const { first: firstname, last: lastname } = name