Skip to content

Support React v15 on legacy v0.13 branch #3607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2016
Merged

Support React v15 on legacy v0.13 branch #3607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = function (config) {
devtool: 'inline-source-map',
module: {
loaders: [
{ test: /\.js$/, loader: 'babel-loader' }
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' }
]
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion modules/PropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var assign = require('react/lib/Object.assign');
var assign = require('object-assign');
var ReactPropTypes = require('react').PropTypes;
var Route = require('./Route');

Expand Down
2 changes: 1 addition & 1 deletion modules/Route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var assign = require('react/lib/Object.assign');
var assign = require('object-assign');
var invariant = require('invariant');
var warning = require('./warning');
var PathUtils = require('./PathUtils');
Expand Down
68 changes: 35 additions & 33 deletions modules/__tests__/Router-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var expect = require('expect');
var React = require('react');
var ReactDOM = require('react-dom');
var ReactDOMServer = require('react-dom/server');
var Router = require('../index');
var Route = require('../components/Route');
var RouteHandler = require('../components/RouteHandler');
Expand Down Expand Up @@ -64,7 +66,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -100,7 +102,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -143,7 +145,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -181,7 +183,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -241,7 +243,7 @@ describe('Router', function () {
});

router.run(function (Handler, state) {
React.render(<Handler />, div, function () {
ReactDOM.render(<Handler />, div, function () {
steps.shift()();
});
});
Expand All @@ -255,7 +257,7 @@ describe('Router', function () {
var div = document.createElement('div');

Router.run(routes, location, function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
expect(div.innerHTML).toMatch(/Foo/);
done();
});
Expand Down Expand Up @@ -291,7 +293,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -327,7 +329,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -370,7 +372,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -408,7 +410,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand All @@ -422,7 +424,7 @@ describe('Router', function () {
var div = document.createElement('div');

Router.run(routes, location, function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
location.push('/abort');
expect(div.innerHTML).toMatch(/Foo/);
expect(location.getCurrentPath()).toEqual('/foo');
Expand Down Expand Up @@ -459,7 +461,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -495,7 +497,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -538,7 +540,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -576,7 +578,7 @@ describe('Router', function () {
});

router.run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -630,7 +632,7 @@ describe('Router', function () {
});

router.run(function (Handler, state) {
React.render(<Handler />, div, function () {
ReactDOM.render(<Handler />, div, function () {
steps.shift()();
});
});
Expand All @@ -642,7 +644,7 @@ describe('Router', function () {
it('renders with query params', function (done) {
var routes = <Route handler={EchoFooProp} path='/'/>;
Router.run(routes, '/?foo=bar', function (Handler, state) {
var html = React.renderToString(<Handler foo={state.query.foo} />);
var html = ReactDOMServer.renderToString(<Handler foo={state.query.foo} />);
expect(html).toMatch(/bar/);
done();
});
Expand All @@ -651,7 +653,7 @@ describe('Router', function () {
it('renders with empty query string', function (done) {
var routes = <Route handler={Foo} path='/'/>;
Router.run(routes, '/?', function (Handler, state) {
var html = React.renderToString(<Handler />);
var html = ReactDOMServer.renderToString(<Handler />);
expect(html).toMatch(/Foo/);
done();
});
Expand Down Expand Up @@ -706,7 +708,7 @@ describe('Router', function () {

var div = document.createElement('div');
Router.run(routes, location, function (Handler, state) {
React.render(<Handler/>, div);
ReactDOM.render(<Handler/>, div);
});

location.push('/spoon?filter=second');
Expand All @@ -720,7 +722,7 @@ describe('Router', function () {
var Bar = React.createClass({
statics: {
willTransitionFrom: function (transition, component) {
expect(div.querySelector('#bar')).toBe(component.getDOMNode());
expect(div.querySelector('#bar')).toBe(ReactDOM.findDOMNode(component));
done();
}
},
Expand All @@ -740,7 +742,7 @@ describe('Router', function () {
var location = new TestLocation([ '/bar' ]);

Router.run(routes, location, function (Handler, state) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
location.push('/baz');
});
});
Expand Down Expand Up @@ -802,9 +804,9 @@ describe('Router', function () {
Router.run(routes, location, function (Handler, state) {

// Calling render on the handler twice should be allowed
React.render(<Handler data={{FooBar: 1}}/>, div);
ReactDOM.render(<Handler data={{FooBar: 1}}/>, div);

React.render(<Handler data={{FooBar: 1}}/>, div, function () {
ReactDOM.render(<Handler data={{FooBar: 1}}/>, div, function () {
setTimeout(function() {
steps.shift()();
}, 1);
Expand Down Expand Up @@ -854,7 +856,7 @@ describe('Router.run', function () {
it('matches a root route', function (done) {
var routes = <Route path="/" handler={EchoFooProp} />;
Router.run(routes, '/', function (Handler, state) {
var html = React.renderToString(<Handler foo="bar"/>);
var html = ReactDOMServer.renderToString(<Handler foo="bar"/>);
expect(html).toMatch(/bar/);
done();
});
Expand All @@ -866,7 +868,7 @@ describe('Router.run', function () {
<Route handler={Bar} path="/bar"/>
];
Router.run(routes, '/foo', function (Handler, state) {
var html = React.renderToString(<Handler/>);
var html = ReactDOMServer.renderToString(<Handler/>);
expect(html).toMatch(/Foo/);
done();
});
Expand All @@ -879,7 +881,7 @@ describe('Router.run', function () {
</Route>
);
Router.run(routes, '/foo', function (Handler, state) {
var html = React.renderToString(<Handler/>);
var html = ReactDOMServer.renderToString(<Handler/>);
expect(html).toMatch(/Nested/);
expect(html).toMatch(/Foo/);
done();
Expand All @@ -894,7 +896,7 @@ describe('Router.run', function () {
</Route>
);
Router.run(routes, '/Foo', function (Handler, state) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
expect(div.querySelectorAll('.Nested').length).toEqual(1);
done();
});
Expand All @@ -904,7 +906,7 @@ describe('Router.run', function () {
it('supports dynamic segments', function (done) {
var routes = <Route handler={EchoBarParam} path='/:bar'/>;
Router.run(routes, '/d00d3tt3', function (Handler, state) {
var html = React.renderToString(<Handler/>);
var html = ReactDOMServer.renderToString(<Handler/>);
expect(html).toMatch(/d00d3tt3/);
done();
});
Expand All @@ -917,7 +919,7 @@ describe('Router.run', function () {
</Route>
);
Router.run(routes, '/foo/bar', function (Handler, state) {
var html = React.renderToString(<Handler />);
var html = ReactDOMServer.renderToString(<Handler />);
expect(html).toMatch(/bar/);
done();
});
Expand Down Expand Up @@ -947,7 +949,7 @@ describe('Router.run', function () {
});

Router.run(routes, location, function (Handler, state) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
steps.shift()();
});
});
Expand Down Expand Up @@ -989,7 +991,7 @@ describe('Router.run', function () {
location: location,
scrollBehavior: ScrollToTopBehavior
}).run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
if (renderCount === 0) {
position = { x: 20, y: 50 };
window.scrollTo(position.x, position.y);
Expand Down Expand Up @@ -1054,7 +1056,7 @@ describe('Router.run', function () {
renderCount = 0;

Router.run(routes, location, function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
if (renderCount === 0) {
position = { x: 20, y: 50 };
window.scrollTo(position.x, position.y);
Expand Down Expand Up @@ -1129,7 +1131,7 @@ describe('Router.run', function () {
location: location,
scrollBehavior: MockScrollBehavior
}).run(function (Handler) {
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
if (!isDone) {
isDone = true;
done();
Expand Down
5 changes: 3 additions & 2 deletions modules/__tests__/Routing-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var expect = require('expect');
var React = require('react');
var ReactDOMServer = require('react-dom/server');
var Router = require('../index');
var Route = require('../components/Route');
var { Foo, Bar, Nested } = require('../TestUtils');
Expand All @@ -14,7 +15,7 @@ describe('creating routes from ReactChildren', function () {
];

Router.run(routes, '/foo', function (Handler, state) {
var html = React.renderToString(<Handler/>);
var html = ReactDOMServer.renderToString(<Handler/>);
expect(html).toMatch(/Foo/);
done();
});
Expand All @@ -29,7 +30,7 @@ describe('creating routes from ReactChildren', function () {
];

Router.run(routes, '/bar', function (Handler, state) {
var html = React.renderToString(<Handler/>);
var html = ReactDOMServer.renderToString(<Handler/>);
expect(html).toMatch(/Bar/);
done();
});
Expand Down
7 changes: 4 additions & 3 deletions modules/__tests__/State-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var assert = require('assert');
var React = require('react');
var ReactDOM = require('react-dom');
var Router = require('../index');
var Route = require('../components/Route');
var TestLocation = require('../locations/TestLocation');
Expand All @@ -20,7 +21,7 @@ describe('State', function () {

Router.run(routes, location, function (Handler) {
router = this;
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
assert(router.isActive('foo'));
done();
});
Expand All @@ -37,14 +38,14 @@ describe('State', function () {
location = new TestLocation([ '/products/123/456?search=abc&limit=789' ]);
Router.run(routes, location, function (Handler) {
router = this;
React.render(<Handler/>, div, function () {
ReactDOM.render(<Handler/>, div, function () {
done();
});
});
});

afterEach(function () {
React.unmountComponentAtNode(div);
ReactDOM.unmountComponentAtNode(div);
});

describe('and no query is used', function () {
Expand Down
2 changes: 1 addition & 1 deletion modules/components/ActiveHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var React = require('react');
var ContextWrapper = require('./ContextWrapper')
var assign = require('react/lib/Object.assign');
var assign = require('object-assign');
var PropTypes = require('../PropTypes');

var REF_NAME = '__routeHandler__';
Expand Down
2 changes: 1 addition & 1 deletion modules/components/Link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var React = require('react');
var assign = require('react/lib/Object.assign');
var assign = require('object-assign');
var PropTypes = require('../PropTypes');

function isLeftClickEvent(event) {
Expand Down
Loading