feat:merge master

.travis.yml

@@ -1,10 +1,14 @@
 language: node_js
 node_js:
-  - "7"
+    - "8"
+    - "10"
+env:
+    - REACT=16.x
 script:
-  - npm test
-  - npm run coverage
+    - npm test
+    - npm run coverage
 before_install:
-    npm install --save react@15.4.0 react-dom@15.4.0
+    - npm install
+    - npm install react react-dom
 after_script:
     npm install coveralls && nyc report --reporter=text-lcov | coveralls

docs/components/preview.js

@@ -1,7 +1,8 @@
 //original code by FormidableLabs
 //https://github.com/FormidableLabs/component-playground/blob/master/src/components/preview.jsx
 
-import React, { Component, PropTypes } from "react";
+import React, { Component } from "react";
+import PropTypes from "prop-types";
 import { render } from "react-dom";
 import ReactDOMServer from "react-dom/server";
 import { transform } from "babel-standalone";
@@ -125,4 +126,4 @@ class Preview extends Component {
 
 }
 
-export default Preview;
+export default Preview;