From 2504a9bf51d40360dca0dba2e1a5e5cd954edce7 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Tue, 28 Oct 2014 13:22:36 -0700
Subject: [PATCH 1/4] react ^0.12.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 48668c514f..04750a04ea 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "karma-firefox-launcher": "0.1.3",
     "karma-mocha": "0.1.3",
     "mocha": "1.20.1",
-    "react": ">=0.11.0",
+    "react": "^0.12.0",
     "reactify": "^0.14.0",
     "rf-release": "0.3.2",
     "uglify-js": "2.4.15",
@@ -64,4 +64,4 @@
   "browserify-shim": {
     "react": "global:React"
   }
-}
\ No newline at end of file
+}

From d19d4a1455e0ad1de82067850f975f2590689785 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Tue, 28 Oct 2014 13:45:35 -0700
Subject: [PATCH 2/4] ReactDescriptor to ReactElement

---
 modules/utils/ServerRendering.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/utils/ServerRendering.js b/modules/utils/ServerRendering.js
index 3bc49962ec..26d2038d8b 100644
--- a/modules/utils/ServerRendering.js
+++ b/modules/utils/ServerRendering.js
@@ -1,4 +1,4 @@
-var ReactDescriptor = require('react/lib/ReactDescriptor');
+var ReactElement = require('react/lib/ReactElement');
 var ReactInstanceHandles = require('react/lib/ReactInstanceHandles');
 var ReactMarkupChecksum = require('react/lib/ReactMarkupChecksum');
 var ReactServerRenderingTransaction = require('react/lib/ReactServerRenderingTransaction');
@@ -39,7 +39,7 @@ function mergeStateIntoInitialProps(state, props) {
  */
 function renderRoutesToString(routes, path, callback) {
   invariant(
-    ReactDescriptor.isValidDescriptor(routes),
+    ReactElement.isValidElement(routes),
     'You must pass a valid ReactComponent to renderRoutesToString'
   );
 
@@ -74,7 +74,7 @@ function renderRoutesToString(routes, path, callback) {
  */
 function renderRoutesToStaticMarkup(routes, path, callback) {
   invariant(
-    ReactDescriptor.isValidDescriptor(routes),
+    ReactElement.isValidElement(routes),
     'You must pass a valid ReactComponent to renderRoutesToStaticMarkup'
   );
 

From 3e3b561b3343a7f355c07807dc0bdcd511f6c0e5 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Tue, 28 Oct 2014 14:03:00 -0700
Subject: [PATCH 3/4] replace mixInto with Object.assign

---
 modules/utils/Transition.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/utils/Transition.js b/modules/utils/Transition.js
index 39abb42ccc..46542ff59e 100644
--- a/modules/utils/Transition.js
+++ b/modules/utils/Transition.js
@@ -1,4 +1,3 @@
-var mixInto = require('react/lib/mixInto');
 var Promise = require('./Promise');
 var Redirect = require('./Redirect');
 
@@ -15,7 +14,7 @@ function Transition(routesComponent, path) {
   this.isAborted = false;
 }
 
-mixInto(Transition, {
+Object.assign(Transition.prototype, {
 
   abort: function (reason) {
     this.abortReason = reason;

From 93e42297bb632449c90a36f1fa6544d9f4ccec44 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Tue, 28 Oct 2014 14:03:34 -0700
Subject: [PATCH 4/4] use object-assign to polyfill Object.assign

---
 modules/utils/Transition.js | 3 ++-
 package.json                | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/utils/Transition.js b/modules/utils/Transition.js
index 46542ff59e..01f89d75ba 100644
--- a/modules/utils/Transition.js
+++ b/modules/utils/Transition.js
@@ -1,5 +1,6 @@
 var Promise = require('./Promise');
 var Redirect = require('./Redirect');
+var objectAssign = require('object-assign');
 
 /**
  * Encapsulates a transition to a given path.
@@ -14,7 +15,7 @@ function Transition(routesComponent, path) {
   this.isAborted = false;
 }
 
-Object.assign(Transition.prototype, {
+objectAssign(Transition.prototype, {
 
   abort: function (reason) {
     this.abortReason = reason;
diff --git a/package.json b/package.json
index 04750a04ea..93507cdcd6 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "events": "1.0.1",
+    "object-assign": "1.0.0",
     "qs": "2.2.2",
     "when": "3.4.6"
   },