Merge pull request #118 from open-sausages/pulls/1/proppa-pig

All proptypes replaced with external lib

client/src/components/IntroScreen/IntroScreen.js

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

client/src/containers/CampaignAdmin/CampaignAdmin.js

@@ -1,5 +1,6 @@
 /* global window */
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { formValueSelector } from 'redux-form';
 import { bindActionCreators } from 'redux';
@@ -504,7 +505,7 @@ CampaignAdmin.propTypes = {
   }),
   showMessage: PropTypes.bool,
   previewState: PropTypes.oneOf(['edit', 'preview', 'split']),
-  onResize: React.PropTypes.func.isRequired,
+  onResize: PropTypes.func.isRequired,
 };
 
 CampaignAdmin.defaultProps = {

client/src/containers/CampaignAdmin/CampaignAdminItem.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import i18n from 'i18n';
 import { UncontrolledTooltip } from 'reactstrap';
 import formatWrittenNumber from 'lib/formatWrittenNumber';
+import PropTypes from 'prop-types';
 
 /**
  * Describes an individual campaign item
@@ -162,9 +163,9 @@ class CampaignAdminItem extends Component {
 }
 
 CampaignAdminItem.propTypes = {
-  campaign: React.PropTypes.object.isRequired,
-  item: React.PropTypes.object.isRequired,
-  isLinked: React.PropTypes.bool,
+  campaign: PropTypes.object.isRequired,
+  item: PropTypes.object.isRequired,
+  isLinked: PropTypes.bool,
 };
 
 export default CampaignAdminItem;

client/src/containers/CampaignAdmin/CampaignAdminList.js

@@ -1,5 +1,6 @@
 /* global window */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { bindActionCreators, compose } from 'redux';
 import { connect } from 'react-redux';
 import * as breadcrumbsActions from 'state/breadcrumbs/BreadcrumbsActions';
@@ -521,22 +522,22 @@ class CampaignAdminList extends Component {
 }
 
 CampaignAdminList.propTypes = {
-  campaign: React.PropTypes.shape({
-    isPublishing: React.PropTypes.bool,
-    changeSetItemId: React.PropTypes.number,
+  campaign: PropTypes.shape({
+    isPublishing: PropTypes.bool,
+    changeSetItemId: PropTypes.number,
   }),
-  publishApi: React.PropTypes.func.isRequired,
-  record: React.PropTypes.object.isRequired,
-  sectionConfig: React.PropTypes.object.isRequired,
-  onBackButtonClick: React.PropTypes.func,
-  onRemoveCampaignItem: React.PropTypes.func,
-  breadcrumbsActions: React.PropTypes.object.isRequired,
-  campaignActions: React.PropTypes.object.isRequired,
-  recordActions: React.PropTypes.object.isRequired,
-  PreviewComponent: React.PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  ViewModeComponent: React.PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  publishApi: PropTypes.func.isRequired,
+  record: PropTypes.object.isRequired,
+  sectionConfig: PropTypes.object.isRequired,
+  onBackButtonClick: PropTypes.func,
+  onRemoveCampaignItem: PropTypes.func,
+  breadcrumbsActions: PropTypes.object.isRequired,
+  campaignActions: PropTypes.object.isRequired,
+  recordActions: PropTypes.object.isRequired,
+  PreviewComponent: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  ViewModeComponent: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   FormActionComponent: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  previewState: React.PropTypes.oneOf(['edit', 'preview', 'split']),
+  previewState: PropTypes.oneOf(['edit', 'preview', 'split']),
 };
 
 CampaignAdminList.defaultProps = {

package.json

@@ -37,6 +37,7 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-15.4": "^1.0.5",
     "es6-promise": "^3.1.2",
+    "prop-types": "^15.6.2",
     "react": "15.3.1",
     "react-addons-test-utils": "15.3.1",
     "react-dom": "15.3.1",
@@ -52,7 +53,7 @@
   },
   "devDependencies": {
     "@silverstripe/eslint-config": "^0.0.5",
-    "@silverstripe/webpack-config": "0.11.0",
+    "@silverstripe/webpack-config": "^0.12.0",
     "babel-jest": "^19.0.0",
     "jest-cli": "^19.0.2",
     "toposort": "^1.0.3",

yarn.lock

@@ -14,9 +14,9 @@
     eslint-plugin-jsx-a11y "^5.1.1"
     eslint-plugin-react "^7.3.0"
 
-"@silverstripe/webpack-config@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-0.11.0.tgz#54f083784083e12f4de5b376c0e655a1d8cc5f73"
+"@silverstripe/webpack-config@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-0.12.0.tgz#6e392af52adc81bc4856badc276cf4738b0af7e4"
   dependencies:
     autoprefixer "^6.4.0"
     babel-core "^6.24.1"
@@ -6104,6 +6104,13 @@ prop-types@^15.5.10, prop-types@^15.5.4, 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"