Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/utils/ServerRendering.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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'
);

Expand Down Expand Up @@ -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'
);

Expand Down
4 changes: 2 additions & 2 deletions modules/utils/Transition.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mixInto = require('react/lib/mixInto');
var Promise = require('./Promise');
var Redirect = require('./Redirect');
var objectAssign = require('object-assign');

/**
* Encapsulates a transition to a given path.
Expand All @@ -15,7 +15,7 @@ function Transition(routesComponent, path) {
this.isAborted = false;
}

mixInto(Transition, {
objectAssign(Transition.prototype, {

abort: function (reason) {
this.abortReason = reason;
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -46,6 +46,7 @@
},
"dependencies": {
"events": "1.0.1",
"object-assign": "1.0.0",
"qs": "2.2.2",
"when": "3.4.6"
},
Expand All @@ -64,4 +65,4 @@
"browserify-shim": {
"react": "global:React"
}
}
}