[fix] React 0.13 Support

Author: nhunzaker

modules/TestUtils.js

@@ -36,7 +36,7 @@ exports.Async = React.createClass({
     delay: 10,
 
     willTransitionTo: function (transition, params, query, callback) {
-      setTimeout(callback, this.delay);
+      setTimeout(callback, exports.Async.delay);
     }
   },
 
@@ -65,7 +65,7 @@ exports.RedirectToFooAsync = React.createClass({
       setTimeout(function () {
         transition.redirect('/foo');
         callback();
-      }, this.delay);
+      }, exports.RedirectToFooAsync.delay);
     }
   },
 
@@ -95,7 +95,7 @@ exports.AbortAsync = React.createClass({
       setTimeout(function () {
         transition.abort();
         callback();
-      }, this.delay);
+      }, exports.AbortAsync.delay);
     }
   },
 

modules/__tests__/Router-test.js

@@ -193,7 +193,7 @@ describe('Router', function () {
             delay: Async.delay * 2,
 
             willTransitionTo: function (transition, params, query, callback) {
-              setTimeout(callback, this.delay);
+              setTimeout(callback, LongAsync.delay);
             }
           },
 

modules/components/Link.js

@@ -1,5 +1,5 @@
 var React = require('react');
-var classSet = require('react/lib/cx');
+var classSet = require('classnames');
 var assign = require('react/lib/Object.assign');
 var PropTypes = require('../PropTypes');
 

modules/components/RouteHandler.js

@@ -12,7 +12,7 @@ class RouteHandler extends React.Component {
 
   getChildContext() {
     return {
-      routeHandlers: this.context.routeHandlers.concat([ this ])
+      depth: this.context.depth + 1
     };
   }
 
@@ -33,7 +33,7 @@ class RouteHandler extends React.Component {
   }
 
   getRouteDepth() {
-    return this.context.routeHandlers.length;
+    return this.context.depth;
   }
 
   createChildRouteHandler(props) {
@@ -52,12 +52,12 @@ class RouteHandler extends React.Component {
 // https://github.com/babel/babel/issues/619
 
 RouteHandler.contextTypes = {
-  routeHandlers: PropTypes.array.isRequired,
+  depth: PropTypes.number.isRequired,
   router: PropTypes.router.isRequired
 };
 
 RouteHandler.childContextTypes = {
-  routeHandlers: PropTypes.array.isRequired
+  depth: PropTypes.number.isRequired
 };
 
 module.exports = RouteHandler;

modules/createRouter.js

@@ -518,13 +518,13 @@ function createRouter(options) {
     },
 
     childContextTypes: {
-      routeHandlers: PropTypes.array.isRequired,
+      depth: PropTypes.number.isRequired,
       router: PropTypes.router.isRequired
     },
 
     getChildContext: function () {
       return {
-        routeHandlers: [ this ],
+        depth: 1,
         router: Router
       };
     },

modules/createRoutesFromReactChildren.js

@@ -2,9 +2,9 @@
 var React = require('react');
 var assign = require('react/lib/Object.assign');
 var warning = require('react/lib/warning');
-var DefaultRouteType = require('./components/DefaultRoute').type;
-var NotFoundRouteType = require('./components/NotFoundRoute').type;
-var RedirectType = require('./components/Redirect').type;
+var DefaultRoute = require('./components/DefaultRoute');
+var NotFoundRoute = require('./components/NotFoundRoute');
+var Redirect = require('./components/Redirect');
 var Route = require('./Route');
 
 function checkPropTypes(componentName, propTypes, props) {
@@ -42,13 +42,13 @@ function createRouteFromReactElement(element) {
   if (type.propTypes)
     checkPropTypes(type.displayName, type.propTypes, props);
 
-  if (type === DefaultRouteType)
+  if (type === DefaultRoute)
     return Route.createDefaultRoute(createRouteOptions(props));
 
-  if (type === NotFoundRouteType)
+  if (type === NotFoundRoute)
     return Route.createNotFoundRoute(createRouteOptions(props));
 
-  if (type === RedirectType)
+  if (type === Redirect)
     return Route.createRedirect(createRouteOptions(props));
 
   return Route.createRoute(createRouteOptions(props), function () {

package.json

@@ -25,6 +25,7 @@
     "babel-core": "^4.4.6",
     "babel-loader": "^4.0.0",
     "bundle-loader": "^0.5.2",
+    "classnames": "^1.1.4",
     "events": "1.0.2",
     "expect": "^1.1.0",
     "jsxhint": "^0.12.1",
@@ -36,14 +37,15 @@
     "karma-sourcemap-loader": "^0.3.2",
     "karma-webpack": "^1.3.1",
     "mocha": "^2.0.1",
-    "react": "^0.13.0-rc1",
+    "react": "^0.13.0",
     "rf-changelog": "^0.4.0",
     "rx": "2.3.18",
     "webpack": "^1.4.13",
     "webpack-dev-server": "^1.6.6"
   },
   "peerDependencies": {
-    "react": "^0.13.0-rc1"
+    "react": "^0.13.0",
+    "classnames": "^1.1.4"
   },
   "dependencies": {
     "qs": "2.4.1"