All proptypes replaced with external lib

client/src/components/AssetDropzone/AssetDropzone.js

@@ -5,6 +5,7 @@ import i18n from 'i18n';
 import DropzoneLib from 'dropzone';
 import $ from 'jquery';
 import { getFileExtension } from 'lib/DataFormat';
+import PropTypes from 'prop-types';
 
 let idCounter = 0;
 
@@ -527,32 +528,32 @@ class AssetDropzone extends Component {
 }
 
 AssetDropzone.propTypes = {
-  folderId: React.PropTypes.number.isRequired,
-  onAccept: React.PropTypes.func,
-  onAddedFile: React.PropTypes.func.isRequired,
-  onDragEnter: React.PropTypes.func,
-  onDragLeave: React.PropTypes.func,
-  onDrop: React.PropTypes.func,
-  onError: React.PropTypes.func.isRequired,
-  onPreviewLoaded: React.PropTypes.func,
-  onSending: React.PropTypes.func,
-  onSuccess: React.PropTypes.func.isRequired,
-  onMaxFilesExceeded: React.PropTypes.func,
-  updateFormData: React.PropTypes.func,
-  canFileUpload: React.PropTypes.func,
-  options: React.PropTypes.shape({
-    url: React.PropTypes.string.isRequired,
+  folderId: PropTypes.number.isRequired,
+  onAccept: PropTypes.func,
+  onAddedFile: PropTypes.func.isRequired,
+  onDragEnter: PropTypes.func,
+  onDragLeave: PropTypes.func,
+  onDrop: PropTypes.func,
+  onError: PropTypes.func.isRequired,
+  onPreviewLoaded: PropTypes.func,
+  onSending: PropTypes.func,
+  onSuccess: PropTypes.func.isRequired,
+  onMaxFilesExceeded: PropTypes.func,
+  updateFormData: PropTypes.func,
+  canFileUpload: PropTypes.func,
+  options: PropTypes.shape({
+    url: PropTypes.string.isRequired,
   }),
-  promptOnRemove: React.PropTypes.string,
-  securityID: React.PropTypes.string.isRequired,
-  uploadButton: React.PropTypes.bool,
-  uploadSelector: React.PropTypes.string,
-  canUpload: React.PropTypes.bool.isRequired,
-  preview: React.PropTypes.shape({
-    width: React.PropTypes.number,
-    height: React.PropTypes.number,
+  promptOnRemove: PropTypes.string,
+  securityID: PropTypes.string.isRequired,
+  uploadButton: PropTypes.bool,
+  uploadSelector: PropTypes.string,
+  canUpload: PropTypes.bool.isRequired,
+  preview: PropTypes.shape({
+    width: PropTypes.number,
+    height: PropTypes.number,
   }),
-  className: React.PropTypes.string,
+  className: PropTypes.string,
 };
 
 AssetDropzone.defaultProps = {

client/src/components/AssetDropzone/README.md

@@ -28,6 +28,7 @@ __container.js__
 
 ```js
 import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import SilverStripeComponent from 'lib/SilverStripeComponent';
@@ -62,8 +63,8 @@ class Container extends SilverStripeComponent {
 }
 
 Container.propTypes = {
-    actions: React.PropTypes.object.isRequired,
-    files: React.PropTypes.array.isRequired
+    actions: PropTypes.object.isRequired,
+    files: PropTypes.array.isRequired
 };
 
 function mapStateToProps(state) {

client/src/components/BackButton/BackButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import droppable from 'components/GalleryItem/droppable';
 import Badge from 'components/Badge/Badge';
 import i18n from 'i18n';

client/src/components/GalleryItem/GalleryItemDragLayer.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { DragLayer } from 'react-dnd';
 import GalleryItem from './GalleryItem';
 import Badge from 'components/Badge/Badge';

client/src/components/GalleryItem/draggable.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { DragSource } from 'react-dnd';
 import { getEmptyImage } from 'react-dnd-html5-backend';
 

client/src/components/GalleryItem/droppable.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { DropTarget } from 'react-dnd';
 
 export default function droppable(types) {

client/src/components/GalleryItem/tests/SelectGalleryItemTracker.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { action } from '@storybook/addon-actions';
 

client/src/components/GalleryToolbar/Buttons/AddFolderButton.js

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

client/src/components/GalleryToolbar/Buttons/BackButton.js

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

client/src/components/GalleryToolbar/GalleryToolbar.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import BackButtonDefault from './Buttons/BackButton';
 import UploadButtonDefault from './Buttons/UploadButton';

client/src/components/ProportionConstraintField/ProportionConstraintField.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component, Children, cloneElement } from 'react';
+import React, { Component, Children, cloneElement } from 'react';
+import PropTypes from 'prop-types';
 import { inject } from 'lib/Injector';
 
 class ProportionConstraintField extends Component {

client/src/components/UploadField/UploadFieldItem.js

@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import CONSTANTS from 'constants';
 import fileShape from 'lib/fileShape';
 import { fileSize } from 'lib/DataFormat';
+import PropTypes from 'prop-types';
 
 class UploadFieldItem extends Component {
   constructor(props) {
@@ -374,12 +375,12 @@ class UploadFieldItem extends Component {
 }
 
 UploadFieldItem.propTypes = {
-  canEdit: React.PropTypes.bool,
-  name: React.PropTypes.string.isRequired,
+  canEdit: PropTypes.bool,
+  name: PropTypes.string.isRequired,
   item: fileShape,
-  onRemove: React.PropTypes.func,
-  onItemClick: React.PropTypes.func,
-  onView: React.PropTypes.func,
+  onRemove: PropTypes.func,
+  onItemClick: PropTypes.func,
+  onView: PropTypes.func,
 };
 
 export default UploadFieldItem;

client/src/containers/AssetAdmin/AssetAdmin.js

@@ -1,5 +1,6 @@
 /* global alert, confirm */
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators, compose } from 'redux';
 import backend from 'lib/Backend';

client/src/containers/AssetAdmin/AssetAdminRouter.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import AssetAdmin from 'containers/AssetAdmin/AssetAdmin';

client/src/containers/AssetAdmin/stateRouter.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { buildUrl } from 'containers/AssetAdmin/AssetAdminRouter';
 import CONSTANTS from 'constants/index';

client/src/containers/Gallery/Gallery.js

@@ -1,7 +1,7 @@
 /* global window */
 import $ from 'jquery';
 import i18n from 'i18n';
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-addons-test-utils';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
@@ -22,6 +22,7 @@ import GalleryDND from './GalleryDND';
 import configShape from 'lib/configShape';
 import MoveModal from '../MoveModal/MoveModal';
 import { inject } from 'lib/Injector';
+import PropTypes from 'prop-types';
 
 class Gallery extends Component {
   constructor(props) {
@@ -1002,7 +1003,7 @@ const galleryViewPropTypes = Object.assign({}, sharedPropTypes, {
   selectableFolders: PropTypes.bool,
   onSelect: PropTypes.func,
   onCancelUpload: PropTypes.func,
-  onDelete: React.PropTypes.func,
+  onDelete: PropTypes.func,
   onRemoveErroredUpload: PropTypes.func,
   onEnableDropzone: PropTypes.func,
 });
@@ -1014,12 +1015,12 @@ Gallery.defaultProps = Object.assign({}, sharedDefaultProps, {
 });
 
 Gallery.propTypes = Object.assign({}, sharedPropTypes, {
-  onUploadSuccess: React.PropTypes.func,
-  onCreateFolder: React.PropTypes.func,
-  onMoveFilesSuccess: React.PropTypes.func,
-  onDelete: React.PropTypes.func,
-  onPublish: React.PropTypes.func,
-  onUnpublish: React.PropTypes.func,
+  onUploadSuccess: PropTypes.func,
+  onCreateFolder: PropTypes.func,
+  onMoveFilesSuccess: PropTypes.func,
+  onDelete: PropTypes.func,
+  onPublish: PropTypes.func,
+  onUnpublish: PropTypes.func,
   type: PropTypes.oneOf(['insert-media', 'insert-link', 'select', 'admin']),
   view: PropTypes.oneOf(['tile', 'table']),
   lastSelected: PropTypes.number,

client/src/containers/Gallery/GalleryDND.js

@@ -1,9 +1,10 @@
 /* global window */
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
 import { DragDropContext } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
 import classnames from 'classnames';
 import GalleryItemDragLayer from 'components/GalleryItem/GalleryItemDragLayer';
+import PropTypes from 'prop-types';
 
 // add middleware to capture the manager that is to be used
 // eslint-disable-next-line new-cap
@@ -75,9 +76,9 @@ GalleryDND.contextTypes = {
 
 GalleryDND.propTypes = {
   className: PropTypes.string,
-  children: React.PropTypes.oneOfType([
-    React.PropTypes.arrayOf(React.PropTypes.node),
-    React.PropTypes.node,
+  children: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node,
   ]),
 };
 

client/src/containers/HistoryList/HistoryItem.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 class HistoryItem extends Component {
   constructor(props) {

client/src/containers/HistoryList/HistoryList.js

@@ -4,6 +4,7 @@ import backend from 'lib/Backend';
 import Config from 'lib/Config';
 import HistoryItem from 'containers/HistoryList/HistoryItem';
 import FormBuilderLoader from 'containers/FormBuilderLoader/FormBuilderLoader';
+import PropTypes from 'prop-types';
 
 const sectionConfigKey = 'SilverStripe\\AssetAdmin\\Controller\\AssetAdmin';
 
@@ -163,16 +164,16 @@ class HistoryList extends Component {
 }
 
 HistoryList.propTypes = {
-  sectionConfig: React.PropTypes.shape({
-    form: React.PropTypes.object,
-    historyEndpoint: React.PropTypes.shape({
-      url: React.PropTypes.string,
-      method: React.PropTypes.string,
-      responseFormat: React.PropTypes.string,
+  sectionConfig: PropTypes.shape({
+    form: PropTypes.object,
+    historyEndpoint: PropTypes.shape({
+      url: PropTypes.string,
+      method: PropTypes.string,
+      responseFormat: PropTypes.string,
     }),
   }),
-  historySchemaUrl: React.PropTypes.string,
-  data: React.PropTypes.object,
+  historySchemaUrl: PropTypes.string,
+  data: PropTypes.object,
 };
 
 HistoryList.defaultProps = {

client/src/containers/MoveModal/MoveModal.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import i18n from 'i18n';
 import CONSTANTS from 'constants/index';
+import PropTypes from 'prop-types';
 import {
   deactivateModal,
   setNoticeMessage,
@@ -74,19 +75,19 @@ class MoveModal extends React.Component {
 
 MoveModal.propTypes = {
   sectionConfig: configShape,
-  folderId: React.PropTypes.number.isRequired,
-  isOpen: React.PropTypes.bool,
-  onClosed: React.PropTypes.func,
-  setNotice: React.PropTypes.func,
-  setBadge: React.PropTypes.func,
-  setError: React.PropTypes.func,
-  title: React.PropTypes.string,
-  onSuccess: React.PropTypes.func,
-  onOpenFolder: React.PropTypes.func.isRequired,
-  selectedFiles: React.PropTypes.array.isRequired,
-  actions: React.PropTypes.shape({
-    files: React.PropTypes.shape({
-      moveFiles: React.PropTypes.func,
+  folderId: PropTypes.number.isRequired,
+  isOpen: PropTypes.bool,
+  onClosed: PropTypes.func,
+  setNotice: PropTypes.func,
+  setBadge: PropTypes.func,
+  setError: PropTypes.func,
+  title: PropTypes.string,
+  onSuccess: PropTypes.func,
+  onOpenFolder: PropTypes.func.isRequired,
+  selectedFiles: PropTypes.array.isRequired,
+  actions: PropTypes.shape({
+    files: PropTypes.shape({
+      moveFiles: PropTypes.func,
     }),
   }).isRequired,
 };

client/src/containers/TableView/TableView.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Griddle from 'griddle-react';
 import i18n from 'i18n';
 import { galleryViewPropTypes, galleryViewDefaultProps } from 'containers/Gallery/Gallery';

client/src/lib/configShape.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 const configShape = PropTypes.shape({
   url: PropTypes.string,

client/src/lib/fileShape.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 const fileShape = PropTypes.shape({
   canEdit: PropTypes.bool,

package.json

@@ -71,6 +71,7 @@
     "griddle-react": "^0.7.0",
     "jquery": "^3.1.1",
     "modernizr": "^3.5.0",
+    "prop-types": "^15.6.2",
     "qs": "^6.2.1",
     "react": "15.3.1",
     "react-addons-css-transition-group": "15.3.1",

yarn.lock

@@ -7183,6 +7183,13 @@ prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9,
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"