Revert "Chore: Revert "Chore: React 15.5 & Prop type updates (styleguidist#389)" (styleguidist#391)"

This reverts commit 6d16f35.

Author: sapegin

docs/Documenting.md

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './Button.css';
 

examples/basic/src/components/Button/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactModal from 'react-modal';
 
 /**

examples/basic/src/components/Modal/Modal.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import './Placeholder.css';
 

examples/basic/src/components/Placeholder/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './PushButton.css';
 

examples/basic/src/components/PushButton/PushButton.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import './RandomButton.css';

examples/basic/src/components/RandomButton/RandomButton.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * A button wrapped by a Decorator/Enhancer

examples/basic/src/components/WrappedButton/WrappedButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './Button.css';
 

examples/cra/src/components/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import './Placeholder.css';
 

examples/cra/src/components/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import './RandomButton.css';

examples/cra/src/components/RandomButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import s from './Button.css';
 

examples/customised/src/components/Button/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactModal from 'react-modal';
 
 /**

examples/customised/src/components/Modal/Modal.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import s from './Placeholder.css';
 

examples/customised/src/components/Placeholder/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import s from './RandomButton.css';

examples/customised/src/components/RandomButton/RandomButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 import logo from './logo.svg';
 

examples/customised/styleguide/components/Logo.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Logo from 'rsg-components/Logo';
 import Markdown from 'rsg-components/Markdown';
 import Styled from 'rsg-components/Styled';

examples/customised/styleguide/components/StyleGuide.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './Button.css';
 

examples/preact/src/components/Button/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactModal from 'react-modal';
 
 /**

examples/preact/src/components/Modal/Modal.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import './Placeholder.css';
 

examples/preact/src/components/Placeholder/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './PushButton.css';
 

examples/preact/src/components/PushButton/PushButton.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import './RandomButton.css';

examples/preact/src/components/RandomButton/RandomButton.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * A button wrapped by a Decorator/Enhancer

examples/preact/src/components/WrappedButton/WrappedButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './Button.css';
 

examples/sections/src/components/Button/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import './Placeholder.css';
 

examples/sections/src/components/Placeholder/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import './RandomButton.css';

examples/sections/src/components/RandomButton/RandomButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import './Button.css';
 

examples/webpack/src/components/Button.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import './Placeholder.css';
 

examples/webpack/src/components/Placeholder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import sample from 'lodash/sample';
 
 import './RandomButton.css';

examples/webpack/src/components/RandomButton.js

@@ -61,6 +61,7 @@
     "markdown-to-jsx": "^5.0.1",
     "minimist": "^1.2.0",
     "pretty-format": "^19.0.0",
+    "prop-types": "^15.5.7",
     "react-codemirror": "^0.3.0",
     "react-dev-utils": "^0.5.2",
     "react-docgen": "^2.13.0",
@@ -106,9 +107,9 @@
     "pre-commit": "^1.2.2",
     "preact": "^7.2.1",
     "preact-compat": "^3.14.3",
-    "react": "^15.4.2",
-    "react-addons-test-utils": "^15.4.2",
-    "react-dom": "^15.4.2",
+    "react": "^15.5.4",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.4",
     "react-modal": "^1.7.3",
     "react-scripts": "^0.9.5",
     "semantic-release": "^6.3.2",

package.json

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 
 const styles = ({ monospace }) => ({

src/rsg-components/Code/CodeRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import ReactComponent from 'rsg-components/ReactComponent';
 import ComponentsRenderer from 'rsg-components/Components/ComponentsRenderer';
 

src/rsg-components/Components/Components.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 export default function ComponentsRenderer({ children }) {
 	return (

src/rsg-components/Components/ComponentsRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import cx from 'classnames';
 import Link from 'rsg-components/Link';
 import Styled from 'rsg-components/Styled';

src/rsg-components/ComponentsList/ComponentsListRenderer.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import debounce from 'lodash/debounce';
 import Codemirror from 'react-codemirror';
 import 'codemirror/mode/jsx/jsx';

src/rsg-components/Editor/Editor.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 
 const styles = ({ font, light, codeBackground }) => ({

src/rsg-components/Editor/EditorLoaderRenderer.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 import Markdown from 'rsg-components/Markdown';
 import { DOCS_DOCUMENTING } from '../../../scripts/consts';

src/rsg-components/ExamplePlaceholder/ExamplePlaceholderRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Playground from 'rsg-components/Playground';
 import Markdown from 'rsg-components/Markdown';
 import ExamplesRenderer from 'rsg-components/Examples/ExamplesRenderer';

src/rsg-components/Examples/Examples.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 
 const styles = () => ({

src/rsg-components/Examples/ExamplesRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import cx from 'classnames';
 import Styled from 'rsg-components/Styled';
 

src/rsg-components/Heading/HeadingRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import cx from 'classnames';
 import Styled from 'rsg-components/Styled';
 

src/rsg-components/Link/LinkRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 
 const styles = ({ font }) => ({

src/rsg-components/Logo/LogoRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { compiler } from 'markdown-to-jsx';
 import mapValues from 'lodash/mapValues';
 // import memoize from 'lodash/memoize';

src/rsg-components/Markdown/Markdown.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Markdown from 'rsg-components/Markdown';
 import Styled from 'rsg-components/Styled';
 

src/rsg-components/Message/MessageRenderer.js

@@ -4,7 +4,7 @@ import { MethodsRenderer } from './MethodsRenderer';
 
 function render(methods) {
 	const parsed = parse(`
-		import { Component, PropTypes } from 'react';
+		import { Component } from 'react';
 		export default class Cmpnt extends Component {
 			${methods.join('\n')}
 			render() {

src/rsg-components/Methods/Methods.spec.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Code from 'rsg-components/Code';
 import Markdown from 'rsg-components/Markdown';
 import Styled from 'rsg-components/Styled';

src/rsg-components/Methods/MethodsRenderer.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import debounce from 'lodash/debounce';
 import PlaygroundRenderer from 'rsg-components/Playground/PlaygroundRenderer';
 

src/rsg-components/Playground/Playground.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Editor from 'rsg-components/Editor';
 import Link from 'rsg-components/Link';
 import Preview from 'rsg-components/Preview';

src/rsg-components/Playground/PlaygroundRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Styled from 'rsg-components/Styled';
 
 const styles = ({ monospace, white, errorBackground }) => ({

src/rsg-components/PlaygroundError/PlaygroundErrorRenderer.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import noop from 'lodash/noop';
 import { transform } from 'buble';

src/rsg-components/Preview/Preview.js

@@ -5,7 +5,7 @@ import { unquote, getType } from './util';
 
 function render(propTypes, defaultProps = []) {
 	const props = parse(`
-		import { Component, PropTypes } from 'react';
+		import { Component } from 'react';
 		export default class Cmpnt extends Component {
 			static propTypes = {
 				${propTypes.join(',')}

src/rsg-components/Props/Props.spec.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Code from 'rsg-components/Code';
 import Markdown from 'rsg-components/Markdown';
 import Styled from 'rsg-components/Styled';

src/rsg-components/Props/PropsRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Markdown from 'rsg-components/Markdown';
 import Props from 'rsg-components/Props';
 import Methods from 'rsg-components/Methods';

src/rsg-components/ReactComponent/ReactComponent.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Link from 'rsg-components/Link';
 import Heading from 'rsg-components/Heading';
 import Styled from 'rsg-components/Styled';

src/rsg-components/ReactComponent/ReactComponentRenderer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Examples from 'rsg-components/Examples';
 import Components from 'rsg-components/Components';
 import Sections from 'rsg-components/Sections';