Merge pull request #10 from brucewpaul/master

Update to use external prop-types package
altjs · Aug 29, 2017 · a2d3585 · a2d3585
2 parents 9035501 + 2e84dfc
commit a2d3585
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
   },
   "homepage": "https://github.com/altjs/container",
   "dependencies": {
-    "object.assign": "^4.0.1"
+    "object.assign": "^4.0.1",
+    "prop-types": "^15.5.10"
   },
   "devDependencies": {
     "alt": "0.17.4",

diff --git a/src/AltContainer.js b/src/AltContainer.js
@@ -56,6 +56,7 @@
  * Full docs available at http://goatslacker.github.io/alt/
  */
 import React from 'react'
+import PropTypes from 'prop-types';
 import assign from 'object.assign'
 
 const id = it => it
@@ -116,11 +117,11 @@ const getStateFromStores = (props) => {
 // what about propTypes?
 class AltContainer extends React.Component {
   static contextTypes = {
-    flux: React.PropTypes.object,
+    flux: PropTypes.object,
   }
 
   static childContextTypes = {
-    flux: React.PropTypes.object,
+    flux: PropTypes.object,
   }
 
   getChildContext() {

diff --git a/src/mixinContainer.js b/src/mixinContainer.js
@@ -1,5 +1,6 @@
 /*eslint-disable*/
 import assign from 'object.assign'
+import PropTypes from 'prop-types';
 
 const id = it => it
 
@@ -23,11 +24,11 @@ const mixinContainer = (React) => {
 
   return {
     contextTypes: {
-      flux: React.PropTypes.object
+      flux: PropTypes.object
     },
 
     childContextTypes: {
-      flux: React.PropTypes.object
+      flux: PropTypes.object
     },
 
     getChildContext() {