Merge pull request #231 from taion/update-deps

Update dependencies

package.json

@@ -35,9 +35,10 @@
   },
   "homepage": "https://github.com/relay-tools/react-router-relay#readme",
   "dependencies": {
-    "babel-runtime": "^6.22.0",
+    "babel-runtime": "^6.23.0",
     "invariant": "^2.2.2",
     "lodash": "^4.17.4",
+    "prop-types": "^15.5.6",
     "react-static-container": "^1.0.1"
   },
   "peerDependencies": {
@@ -46,46 +47,45 @@
     "react-router": ">=2.3.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.22.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.2.10",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.24.1",
+    "babel-eslint": "^7.2.1",
+    "babel-loader": "^6.4.1",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-polyfill": "^6.22.0",
-    "babel-preset-latest": "^6.22.0",
-    "babel-preset-react": "^6.22.0",
-    "babel-preset-stage-1": "^6.22.0",
-    "babel-register": "^6.22.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-1": "^6.24.1",
+    "babel-register": "^6.24.1",
     "babel-relay-plugin": "^0.10.0",
     "chai": "^3.5.0",
-    "cross-env": "^3.1.4",
-    "eslint": "^3.15.0",
+    "cross-env": "^4.0.0",
+    "eslint": "^3.19.0",
     "eslint-config-4catalyzer-react": "^0.2.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.9.0",
-    "graphql": "^0.9.1",
+    "eslint-plugin-react": "^6.10.3",
+    "graphql": "^0.9.2",
     "graphql-relay": "^0.5.1",
-    "karma": "^1.4.1",
+    "karma": "^1.6.0",
     "karma-chrome-launcher": "^2.0.0",
-    "karma-firefox-launcher": "^1.0.0",
+    "karma-firefox-launcher": "^1.0.1",
     "karma-mocha": "^1.3.0",
-    "karma-mocha-reporter": "^2.2.2",
-    "karma-sinon-chai": "^1.2.4",
+    "karma-mocha-reporter": "^2.2.3",
+    "karma-sinon-chai": "^1.3.1",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
     "mocha": "^3.2.0",
-    "react": "^15.4.2",
-    "react-addons-test-utils": "^15.4.2",
-    "react-dom": "^15.4.2",
+    "react": "^15.5.3",
+    "react-dom": "^15.5.3",
     "react-relay": "^0.10.0",
     "react-router": "^2.8.0",
     "relay-local-schema": "^0.5.5",
-    "rimraf": "^2.5.4",
-    "sinon": "^1.17.7",
-    "sinon-chai": "^2.8.0",
+    "rimraf": "^2.6.1",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.9.0",
     "webpack": "^1.13.2"
   }
 }

src/RelayRouterContext.js

@@ -1,18 +1,19 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Relay from 'react-relay';
 
 import QueryAggregator from './QueryAggregator';
 
-export default class RelayRouterContext extends React.Component {
-  static propTypes = {
-    location: React.PropTypes.object.isRequired,
-    children: React.PropTypes.element.isRequired,
-  };
+const propTypes = {
+  location: PropTypes.object.isRequired,
+  children: PropTypes.element.isRequired,
+};
 
-  static childContextTypes = {
-    queryAggregator: React.PropTypes.object.isRequired,
-  };
+const childContextTypes = {
+  queryAggregator: React.PropTypes.object.isRequired,
+};
 
+class RelayRouterContext extends React.Component {
   constructor(props, context) {
     super(props, context);
 
@@ -49,3 +50,8 @@ export default class RelayRouterContext extends React.Component {
     );
   }
 }
+
+RelayRouterContext.propTypes = propTypes;
+RelayRouterContext.childContextTypes = childContextTypes;
+
+export default RelayRouterContext;

src/RouteContainer.js

@@ -1,16 +1,17 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import StaticContainer from 'react-static-container';
 
 import mergeRouteParams from './utils/mergeRouteParams';
 
 const propTypes = {
-  queries: React.PropTypes.object.isRequired,
-  routerProps: React.PropTypes.object.isRequired,
-  children: React.PropTypes.element.isRequired,
+  queries: PropTypes.object.isRequired,
+  routerProps: PropTypes.object.isRequired,
+  children: PropTypes.element.isRequired,
 };
 
 const contextTypes = {
-  queryAggregator: React.PropTypes.object.isRequired,
+  queryAggregator: PropTypes.object.isRequired,
 };
 
 function RouteContainer(

test/useRelay.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import Relay from 'react-relay';
 import { applyRouterMiddleware, createMemoryHistory, Route, Router }
   from 'react-router';