All proptypes replaced with external lib

client/src/bundles/vendor.js

@@ -44,6 +44,7 @@ require('expose-loader?modernizr!modernizr');
 require('expose-loader?history!history');
 require('expose-loader?moment!moment');
 require('expose-loader?merge!merge');
+require('expose-loader?PropTypes!prop-types');
 
 require('../../../thirdparty/jquery-ondemand/jquery.ondemand.js');
 require('../../../thirdparty/jquery-ui/jquery-ui.js');

client/src/components/ActionMenu/ActionMenu.js

@@ -1,4 +1,5 @@
-import React, { PureComponent, PropTypes } from 'react';
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
 import { Dropdown, DropdownToggle, DropdownMenu } from 'reactstrap';
 import i18n from 'i18n';
 import classnames from 'classnames';

client/src/components/DateField/DateField.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import fieldHolder from 'components/FieldHolder/FieldHolder';
 import { Component as TextField } from '../TextField/TextField';
 import moment from 'moment';

client/src/components/DatetimeField/DatetimeField.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import fieldHolder from 'components/FieldHolder/FieldHolder';
 import { Component as DateField } from '../DateField/DateField';
 import moment from 'moment';

client/src/components/FormBuilder/FormBuilder.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import merge from 'merge';
 import schemaFieldValues, { schemaMerge } from 'lib/schemaFieldValues';
 import { createErrorBlock } from 'lib/createErrorBlock';

client/src/components/GridFieldActions/GridFieldActions.js

@@ -4,7 +4,6 @@ import GridFieldDropdownAction from './GridFieldDropdownAction';
 import ActionMenu from '../ActionMenu/ActionMenu';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import PropTypes from 'prop-types';
 
 class GridFieldActions extends PureComponent {
   constructor(props) {

client/src/components/TimeField/TimeField.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import fieldHolder from 'components/FieldHolder/FieldHolder';
 import { Component as DateField } from '../DateField/DateField';
 import moment from 'moment';

client/src/components/Toolbar/Toolbar.js

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

client/src/components/TreeDropdownField/TreeDropdownField.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 { bindActionCreators } from 'redux';
 import fieldHolder from 'components/FieldHolder/FieldHolder';

client/src/components/TreeDropdownField/TreeDropdownFieldMenu.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';
 import classNames from 'classnames';
 import TreeDropdownFieldNode from 'components/TreeDropdownField/TreeDropdownFieldNode';

client/src/components/TreeDropdownField/TreeDropdownFieldNode.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 const TreeDropdownFieldNode = () => null;
 

client/src/components/UsedOnTable/UsedOnTable.js

@@ -1,4 +1,5 @@
-import React, { PureComponent, PropTypes } from 'react';
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import i18n from 'i18n';
 import provideUsedOnData from './provideUsedOnData';

client/src/components/UsedOnTable/provideUsedOnData.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 { loadUsedOn } from 'state/usedOn/usedOnActions';
 

client/src/components/ViewModeToggle/ViewModeToggle.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import i18n from 'i18n';
 import { connect } from 'react-redux';

client/src/containers/FormBuilderLoader/FormBuilderLoader.js

@@ -1,5 +1,6 @@
 import i18n from 'i18n';
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose, bindActionCreators } from 'redux';
 import fetch from 'isomorphic-fetch';

client/src/containers/InsertLinkModal/InsertLinkModal.js

@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { bindActionCreators, compose } from 'redux';
 import { connect } from 'react-redux';
 import FormBuilderModal from 'components/FormBuilderModal/FormBuilderModal';

client/src/containers/InsertLinkModal/fileSchemaModalHandler.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import * as schemaActions from 'state/schema/SchemaActions';
 import { connect } from 'react-redux';

client/src/lib/dependency-injection/injectorContext.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 export default {
   injector: PropTypes.shape({

client/src/lib/dependency-injection/tests/loadComponent-test.js

@@ -4,7 +4,6 @@
 import React from 'react';
 import ReactTestUtils from 'react-addons-test-utils';
 import { createStore } from 'redux';
-import PropTypes from 'prop-types';
 
 const mockStore = createStore(state => state);
 
@@ -17,6 +16,9 @@ const mockProvider = Item => Item;
 jest.mock('../provideInjector', () => function mockInjector(Injected) {
   // eslint-disable-next-line
   const React = require('react');
+  // eslint-disable-next-line
+  const PropTypes = require('prop-types');
+
   function TestRegisteredComponent() {
     return <span>def</span>;
   }

client/src/stories/ValueTracker.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';
 

package.json

@@ -66,6 +66,7 @@
     "modernizr": "^3.5.0",
     "moment": "^2.18.1",
     "page.js": "^4.13.3",
+    "prop-types": "^15.6.2",
     "qs": "^6.1.0",
     "react": "15.3.1",
     "react-addons-css-transition-group": "15.3.1",