From f8cb7f9bd3d1ffa218ef56962872b4356d651168 Mon Sep 17 00:00:00 2001
From: Paolo Moretti <paolo@undesk.co>
Date: Fri, 31 Oct 2014 15:55:30 +0000
Subject: [PATCH 1/2] [changed] use `Object.assign` instead of `merge`

---
 modules/components/DefaultRoute.js  | 4 ++--
 modules/components/Link.js          | 4 ++--
 modules/components/NotFoundRoute.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/components/DefaultRoute.js b/modules/components/DefaultRoute.js
index 33cbf211a2..61dbc2e9df 100644
--- a/modules/components/DefaultRoute.js
+++ b/modules/components/DefaultRoute.js
@@ -1,4 +1,4 @@
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var Route = require('./Route');
 
 /**
@@ -9,7 +9,7 @@ var Route = require('./Route');
  */
 function DefaultRoute(props) {
   return Route(
-    merge(props, {
+    objectAssign({}, props, {
       path: null,
       isDefault: true
     })
diff --git a/modules/components/Link.js b/modules/components/Link.js
index 9ca402d39f..8360314ded 100644
--- a/modules/components/Link.js
+++ b/modules/components/Link.js
@@ -1,6 +1,6 @@
 var React = require('react');
 var classSet = require('react/lib/cx');
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var ActiveState = require('../mixins/ActiveState');
 var Navigation = require('../mixins/Navigation');
 
@@ -93,7 +93,7 @@ var Link = React.createClass({
   },
 
   render: function () {
-    var props = merge(this.props, {
+    var props = objectAssign({}, this.props, {
       href: this.getHref(),
       className: this.getClassName(),
       onClick: this.handleClick
diff --git a/modules/components/NotFoundRoute.js b/modules/components/NotFoundRoute.js
index 24ed0a5299..5fe83ac922 100644
--- a/modules/components/NotFoundRoute.js
+++ b/modules/components/NotFoundRoute.js
@@ -1,4 +1,4 @@
-var merge = require('react/lib/merge');
+var objectAssign = require('react/lib/Object.assign');
 var Route = require('./Route');
 
 /**
@@ -10,7 +10,7 @@ var Route = require('./Route');
  */
 function NotFoundRoute(props) {
   return Route(
-    merge(props, {
+    objectAssign({}, props, {
       path: null,
       catchAll: true
     })

From 940a0d02dcc62c36881b8edf34d723233aae8fb9 Mon Sep 17 00:00:00 2001
From: Paolo Moretti <paolo@undesk.co>
Date: Fri, 31 Oct 2014 15:55:44 +0000
Subject: [PATCH 2/2] [changed] use `Object.assign` instead of `copyProperties`

---
 modules/components/Routes.js     | 4 ++--
 modules/mixins/ActiveContext.js  | 6 +++---
 modules/utils/ServerRendering.js | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/components/Routes.js b/modules/components/Routes.js
index d703627ded..2d92d3d358 100644
--- a/modules/components/Routes.js
+++ b/modules/components/Routes.js
@@ -1,7 +1,7 @@
 var React = require('react');
 var warning = require('react/lib/warning');
 var invariant = require('react/lib/invariant');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 var HashLocation = require('../locations/HashLocation');
 var ActiveContext = require('../mixins/ActiveContext');
 var LocationContext = require('../mixins/LocationContext');
@@ -416,7 +416,7 @@ var Routes = React.createClass({
           throw new Error('Passing children to a route handler is not supported');
 
         return route.props.handler(
-          copyProperties(props, addedProps)
+          objectAssign(props, addedProps)
         );
       }.bind(this, props);
     });
diff --git a/modules/mixins/ActiveContext.js b/modules/mixins/ActiveContext.js
index 842d78cef5..78354ce662 100644
--- a/modules/mixins/ActiveContext.js
+++ b/modules/mixins/ActiveContext.js
@@ -1,5 +1,5 @@
 var React = require('react');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 
 /**
  * A mixin for components that store the active state of routes,
@@ -40,14 +40,14 @@ var ActiveContext = {
    * Returns a read-only object of the currently active URL parameters.
    */
   getActiveParams: function () {
-    return copyProperties({}, this.state.activeParams);
+    return objectAssign({}, this.state.activeParams);
   },
 
   /**
    * Returns a read-only object of the currently active query parameters.
    */
   getActiveQuery: function () {
-    return copyProperties({}, this.state.activeQuery);
+    return objectAssign({}, this.state.activeQuery);
   },
 
   childContextTypes: {
diff --git a/modules/utils/ServerRendering.js b/modules/utils/ServerRendering.js
index 26d2038d8b..7eb5b30434 100644
--- a/modules/utils/ServerRendering.js
+++ b/modules/utils/ServerRendering.js
@@ -4,7 +4,7 @@ var ReactMarkupChecksum = require('react/lib/ReactMarkupChecksum');
 var ReactServerRenderingTransaction = require('react/lib/ReactServerRenderingTransaction');
 
 var cloneWithProps = require('react/lib/cloneWithProps');
-var copyProperties = require('react/lib/copyProperties');
+var objectAssign = require('react/lib/Object.assign');
 var instantiateReactComponent = require('react/lib/instantiateReactComponent');
 var invariant = require('react/lib/invariant');
 
@@ -16,7 +16,7 @@ function cloneRoutesForServerRendering(routes) {
 }
 
 function mergeStateIntoInitialProps(state, props) {
-  copyProperties(props, {
+  objectAssign(props, {
     initialPath: state.path,
     initialMatches: state.matches,
     initialActiveRoutes: state.activeRoutes,