Merge pull request #590 from netlify/update-depreciated-deps

Upgrade Depreciated React Dependencies

package.json

@@ -102,6 +102,7 @@
     "autoprefixer": "^6.3.3",
     "babel-plugin-transform-builtin-extend": "^1.1.0",
     "classnames": "^2.2.5",
+    "create-react-class": "^15.6.0",
     "dateformat": "^1.0.12",
     "deep-equal": "^1.0.1",
     "fuzzy": "^0.1.1",
@@ -124,6 +125,7 @@
     "preliminaries-parser-toml": "1.1.0",
     "preliminaries-parser-yaml": "1.1.0",
     "prismjs": "^1.5.1",
+    "prop-types": "^15.5.10",
     "react": "^15.1.0",
     "react-addons-css-transition-group": "^15.3.1",
     "react-autosuggest": "^7.0.1",

src/backends/git-gateway/AuthenticationPage.js

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from "react";
 import Input from "react-toolbox/lib/input";
 import Button from "react-toolbox/lib/button";
@@ -53,7 +54,7 @@ export default class AuthenticationPage extends React.Component {
   }
 
   static propTypes = {
-    onLogin: React.PropTypes.func.isRequired,
+    onLogin: PropTypes.func.isRequired,
   };
 
   state = { email: "", password: "", errors: {} };

src/backends/github/AuthenticationPage.js

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'react-toolbox/lib/button';
 import Authenticator from '../../lib/netlify-auth';
@@ -8,7 +9,7 @@ import styles from './AuthenticationPage.css';
 
 export default class AuthenticationPage extends React.Component {
   static propTypes = {
-    onLogin: React.PropTypes.func.isRequired,
+    onLogin: PropTypes.func.isRequired,
   };
 
   state = {};

src/backends/test-repo/AuthenticationPage.js

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Input from "react-toolbox/lib/input";
 import Button from "react-toolbox/lib/button";
@@ -7,7 +8,7 @@ import styles from "../git-gateway/AuthenticationPage.css";
 
 export default class AuthenticationPage extends React.Component {
   static propTypes = {
-    onLogin: React.PropTypes.func.isRequired,
+    onLogin: PropTypes.func.isRequired,
   };
 
   state = { email: '' };

src/components/AppHeader/AppHeader.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from "react";
+import PropTypes from 'prop-types';
+import React from "react";
 import ImmutablePropTypes from "react-immutable-proptypes";
 import { IndexLink } from "react-router";
 import { IconMenu, Menu, MenuItem } from "react-toolbox/lib/menu";

src/components/ControlPanel/ControlPane.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { Map, fromJS } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { resolveWidget } from '../Widgets';

src/components/EntryEditor/EntryEditor.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import SplitPane from 'react-split-pane';
 import Button from 'react-toolbox/lib/button';

src/components/EntryEditor/EntryEditorToolbar.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Button } from 'react-toolbox/lib/button';
 
 const EntryEditorToolbar = (

src/components/EntryListing/EntryListing.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Waypoint from 'react-waypoint';
 import { Map } from 'immutable';

src/components/FindBar/FindBar.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import styles from './FindBar.css';
 
 export const SEARCH = 'SEARCH';

src/components/PreviewPane/Preview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 function isVisible(field) {

src/components/PreviewPane/PreviewContent.js

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

src/components/PreviewPane/PreviewPane.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { List, Map } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Frame from 'react-frame-component';

src/components/ScrollSync/ScrollSync.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { without } from 'lodash';
 
 export default class ScrollSync extends Component {

src/components/ScrollSync/ScrollSyncPane.js

@@ -1,4 +1,5 @@
-import { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import { Component } from 'react';
 import ReactDOM from 'react-dom';
 
 export default class ScrollSyncPane extends Component {

src/components/UI/Sticky/Sticky.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import classnames from 'classnames';
 import { partial, without } from 'lodash';
 import styles from './Sticky.css';

src/components/UI/toast/Toast.js

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

src/components/UnpublishedListing/UnpublishedListing.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { DragSource, DropTarget, HTML5DragDrop } from 'react-simple-dnd';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Link } from 'react-router';

src/components/UnpublishedListing/UnpublishedListingCardMeta.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import styles from './UnpublishedListingCardMeta.css';
 
 const UnpublishedListingCardMeta = ({ meta, label }) =>

src/components/Widgets/BooleanControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from "react-immutable-proptypes";
 import Switch from 'react-toolbox/lib/switch';
 import { isBoolean } from 'lodash';

src/components/Widgets/ControlHOC.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import ImmutablePropTypes from "react-immutable-proptypes";
 
 const truthy = () => ({ error: false });

src/components/Widgets/DateControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import DateTime from 'react-datetime';
 
 export default class DateControl extends React.Component {

src/components/Widgets/DatePreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function DatePreview({ value }) {

src/components/Widgets/DateTimeControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import DateTime from 'react-datetime';
 
 export default class DateTimeControl extends React.Component {

src/components/Widgets/DateTimePreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function DateTimePreview({ value }) {

src/components/Widgets/FileControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { truncateMiddle } from '../../lib/textHelper';
 import { Loader } from '../UI';
 import AssetProxy, { createAssetProxy } from '../../valueObjects/AssetProxy';

src/components/Widgets/FilePreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function FilePreview({ value, getAsset }) {

src/components/Widgets/ImageControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { truncateMiddle } from '../../lib/textHelper';
 import { Loader } from '../UI';
 import AssetProxy, { createAssetProxy } from '../../valueObjects/AssetProxy';

src/components/Widgets/ImagePreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle, { imagePreviewStyle } from './defaultPreviewStyle';
 
 export default function ImagePreview({ value, getAsset }) {

src/components/Widgets/ListControl.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { List, Map, fromJS } from 'immutable';
 import { sortable } from 'react-sortable';
 import FontIcon from 'react-toolbox/lib/font_icon';

src/components/Widgets/ListPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { resolveWidget } from '../Widgets';
 import previewStyle from './defaultPreviewStyle';
 import ObjectPreview from './ObjectPreview';

src/components/Widgets/Markdown/MarkdownControl/RawEditor/index.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Editor as Slate, Plain } from 'slate';
 import { debounce } from 'lodash';
 import Toolbar from '../Toolbar/Toolbar';

src/components/Widgets/Markdown/MarkdownControl/Toolbar/Toolbar.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { List } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Switch from 'react-toolbox/lib/switch';

src/components/Widgets/Markdown/MarkdownControl/Toolbar/ToolbarButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import classnames from 'classnames';
 import { Icon } from '../../../../UI';
 import styles from './ToolbarButton.css';

src/components/Widgets/Markdown/MarkdownControl/Toolbar/ToolbarComponentsMenu.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { Menu, MenuItem } from 'react-toolbox/lib/menu';
 import ToolbarButton from './ToolbarButton';

src/components/Widgets/Markdown/MarkdownControl/Toolbar/ToolbarPluginForm.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Map } from 'immutable';
 import { Button } from 'react-toolbox/lib/button';
 import ToolbarPluginFormControl from './ToolbarPluginFormControl';

src/components/Widgets/Markdown/MarkdownControl/Toolbar/ToolbarPluginFormControl.js

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

src/components/Widgets/Markdown/MarkdownControl/VisualEditor/index.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { get, isEmpty, debounce } from 'lodash';
 import { Editor as Slate, Raw, Block, Text } from 'slate';
 import { slateToMarkdown, markdownToSlate, htmlToSlate } from '../../serializers';

src/components/Widgets/Markdown/MarkdownControl/index.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import registry from '../../../../lib/registry';
 import { markdownToRemark, remarkToMarkdown } from '../serializers'
 import RawEditor from './RawEditor';

src/components/Widgets/Markdown/MarkdownControl/plugins.js

@@ -1,4 +1,5 @@
-import { Component, PropTypes, Children } from 'react';
+import PropTypes from 'prop-types';
+import { Component, Children } from 'react';
 import { List, Record, fromJS } from 'immutable';
 import _ from 'lodash';
 

src/components/Widgets/Markdown/MarkdownPreview/index.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { markdownToHtml } from '../serializers';
 import previewStyle from '../../defaultPreviewStyle';
 

src/components/Widgets/NumberControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class NumberControl extends React.Component {
   handleChange = (e) => {

src/components/Widgets/NumberPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function NumberPreview({ value }) {

src/components/Widgets/ObjectControl.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { Map } from 'immutable';
 import { resolveWidget } from '../Widgets';
 import controlStyles from '../ControlPanel/ControlPane.css';

src/components/Widgets/ObjectPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { resolveWidget } from '../Widgets';
 import previewStyle from './defaultPreviewStyle';
 

src/components/Widgets/RelationControl.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import Autosuggest from 'react-autosuggest';
 import uuid from 'uuid';
 import { Map } from 'immutable';

src/components/Widgets/RelationPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function RelationPreview({ value }) {

src/components/Widgets/SelectControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 export default class SelectControl extends React.Component {

src/components/Widgets/SelectPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function SelectPreview({ value }) {

src/components/Widgets/StringControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class StringControl extends React.Component {
   handleChange = (e) => {

src/components/Widgets/StringPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function StringPreview({ value }) {

src/components/Widgets/TextControl.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class StringControl extends React.Component {
   componentDidMount() {

src/components/Widgets/TextPreview.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import previewStyle from './defaultPreviewStyle';
 
 export default function TextPreview({ value }) {

src/containers/App.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { IndexLink } from "react-router";

src/containers/CollectionPage.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { loadEntries } from '../actions/entries';

src/containers/DashboardPage.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { SIMPLE, EDITORIAL_WORKFLOW } from '../constants/publishModes';
 import history from '../routing/history';

src/containers/EntryPage.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import history from '../routing/history';

src/containers/SearchPage.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { selectSearchedEntries } from '../reducers';

src/containers/Sidebar.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { connect } from 'react-redux';
 import ReactSidebar from 'react-sidebar';
 import _ from 'lodash';

src/containers/editorialWorkflow/UnpublishedEntriesPanel.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { OrderedMap } from 'immutable';
 import { connect } from 'react-redux';

src/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import createReactClass from 'create-react-class';
 import { render } from 'react-dom';
 import { AppContainer } from 'react-hot-loader';
 import 'file-loader?name=index.html!../example/index.html';
@@ -57,7 +58,7 @@ for (const method in registry) { // eslint-disable-line
 
 if (typeof window !== 'undefined') {
   window.CMS = CMS;
-  window.createClass = window.createClass || React.createClass;
+  window.createClass = window.createClass || createReactClass;
   window.h = window.h || React.createElement;
 }