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' ); diff --git a/modules/utils/Transition.js b/modules/utils/Transition.js index 39abb42ccc..ecfbcbf50c 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, { +Transition.prototype = { abort: function (reason) { this.abortReason = reason; @@ -34,6 +33,6 @@ mixInto(Transition, { this.routesComponent.replaceWith(this.path); } -}); +}; module.exports = Transition; diff --git a/package.json b/package.json index 4aba58c8c0..bbdd59ce5b 100644 --- a/package.json +++ b/package.json @@ -34,15 +34,15 @@ "karma-firefox-launcher": "0.1.3", "karma-mocha": "0.1.3", "mocha": "1.20.1", - "react": "0.11.x", - "reactify": "^0.14.0", + "react": "0.12.x", + "reactify": "0.15.x", "rf-release": "0.3.2", "uglify-js": "2.4.15", "webpack": "1.4.5", "webpack-dev-server": "1.6.5" }, "peerDependencies": { - "react": "0.11.x" + "react": "0.12.x" }, "dependencies": { "events": "1.0.1", @@ -64,4 +64,4 @@ "browserify-shim": { "react": "global:React" } -} \ No newline at end of file +}