Skip to content

Update ReactServerRendering for the modern world #2304

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
zpao merged 1 commit into from
Oct 8, 2014
Merged

Update ReactServerRendering for the modern world #2304

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
26 changes: 10 additions & 16 deletions src/browser/server/ReactServerRendering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,13 @@ var instantiateReactComponent = require('instantiateReactComponent');
var invariant = require('invariant');

/**
* @param {ReactComponent} component
* @param {ReactElement} element
* @return {string} the HTML markup
*/
function renderComponentToString(component) {
function renderComponentToString(element) {
invariant(
ReactElement.isValidElement(component),
'renderComponentToString(): You must pass a valid ReactComponent.'
);

invariant(
!(arguments.length === 2 && typeof arguments[1] === 'function'),
'renderComponentToString(): This function became synchronous and now ' +
'returns the generated markup. Please remove the second parameter.'
ReactElement.isValidElement(element),
'renderComponentToString(): You must pass a valid ReactElement.'
);

var transaction;
Expand All @@ -49,7 +43,7 @@ function renderComponentToString(component) {
transaction = ReactServerRenderingTransaction.getPooled(false);

return transaction.perform(function() {
var componentInstance = instantiateReactComponent(component, null);
var componentInstance = instantiateReactComponent(element, null);
var markup = componentInstance.mountComponent(id, transaction, 0);
return ReactMarkupChecksum.addChecksumToMarkup(markup);
}, null);
Expand All @@ -59,14 +53,14 @@ function renderComponentToString(component) {
}

/**
* @param {ReactComponent} component
* @param {ReactElement} element
* @return {string} the HTML markup, without the extra React ID and checksum
* (for generating static pages)
*/
function renderComponentToStaticMarkup(component) {
function renderComponentToStaticMarkup(element) {
invariant(
ReactElement.isValidElement(component),
'renderComponentToStaticMarkup(): You must pass a valid ReactComponent.'
ReactElement.isValidElement(element),
'renderComponentToStaticMarkup(): You must pass a valid ReactElement.'
);

var transaction;
Expand All @@ -75,7 +69,7 @@ function renderComponentToStaticMarkup(component) {
transaction = ReactServerRenderingTransaction.getPooled(true);

return transaction.perform(function() {
var componentInstance = instantiateReactComponent(component, null);
var componentInstance = instantiateReactComponent(element, null);
return componentInstance.mountComponent(id, transaction, 0);
}, null);
} finally {
Expand Down
18 changes: 2 additions & 16 deletions src/browser/server/__tests__/ReactServerRendering-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,21 +247,7 @@ describe('ReactServerRendering', function() {
)
).toThrow(
'Invariant Violation: renderComponentToString(): You must pass ' +
'a valid ReactComponent.'
);
});

it('should provide guidance for breaking API changes', function() {
expect(
ReactServerRendering.renderComponentToString.bind(
ReactServerRendering,
<div />,
function(){}
)
).toThrow(
'Invariant Violation: renderComponentToString(): This function ' +
'became synchronous and now returns the generated markup. Please ' +
'remove the second parameter.'
'a valid ReactElement.'
);
});
});
Expand Down Expand Up @@ -373,7 +359,7 @@ describe('ReactServerRendering', function() {
)
).toThrow(
'Invariant Violation: renderComponentToStaticMarkup(): You must pass ' +
'a valid ReactComponent.'
'a valid ReactElement.'
);
});

Expand Down