Skip to content

Don't use Stack-only helper in new SSR #10174

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
gaearon merged 1 commit into from
Jul 13, 2017
Merged

Don't use Stack-only helper in new SSR #10174

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
32 changes: 16 additions & 16 deletions scripts/rollup/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@
"gzip": 81957
},
"react-dom-server.development.js (UMD_DEV)": {
"size": 157366,
"gzip": 39194
"size": 150871,
"gzip": 37142
},
"react-dom-server.production.min.js (UMD_PROD)": {
"size": 26047,
"gzip": 9845
"size": 25025,
"gzip": 9431
},
"react-dom-server.development.js (NODE_DEV)": {
"size": 124505,
"gzip": 31491
"size": 118016,
"gzip": 29314
},
"react-dom-server.production.min.js (NODE_PROD)": {
"size": 23614,
"gzip": 8897
"size": 22584,
"gzip": 8461
},
"ReactDOMServerStream-dev.js (FB_DEV)": {
"size": 264750,
Expand Down Expand Up @@ -181,20 +181,20 @@
"gzip": 50920
},
"ReactDOMServer-dev.js (FB_DEV)": {
"size": 123959,
"gzip": 31418
"size": 117470,
"gzip": 29243
},
"ReactDOMServer-prod.js (FB_PROD)": {
"size": 65096,
"gzip": 17753
"size": 60410,
"gzip": 16315
},
"react-dom-node-stream.development.js (NODE_DEV)": {
"size": 126199,
"gzip": 31993
"size": 119710,
"gzip": 29969
},
"react-dom-node-stream.production.min.js (NODE_PROD)": {
"size": 24554,
"gzip": 9231
"size": 23526,
"gzip": 8790
},
"ReactDOMNodeStream-dev.js (FB_DEV)": {
"size": 264918,
Expand Down
12 changes: 5 additions & 7 deletions src/renderers/shared/server/ReactPartialRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ var emptyObject = require('fbjs/lib/emptyObject');
var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
var invariant = require('fbjs/lib/invariant');
var omittedCloseTags = require('omittedCloseTags');
var traverseStackChildren = require('traverseStackChildren');
var warning = require('fbjs/lib/warning');

var toArray = React.Children.toArray;

if (__DEV__) {
var {
validateProperties: validateARIAProperties,
Expand Down Expand Up @@ -650,9 +651,10 @@ class ReactDOMServerRenderer {
out += '>';
footer = '</' + element.type + '>';
}
var children = [];
var children;
var innerMarkup = getNonChildrenInnerMarkup(props);
if (innerMarkup != null) {
children = [];
if (newlineEatingTags[tag] && innerMarkup.charAt(0) === '\n') {
// text/html ignores the first character in these tags if it's a newline
// Prefer to break application/xml over text/html (for now) by adding
Expand All @@ -668,11 +670,7 @@ class ReactDOMServerRenderer {
}
out += innerMarkup;
} else {
traverseStackChildren(props.children, function(ctx, child, name) {
if (child != null) {
children.push(child);
}
});
children = toArray(props.children);
}
this.stack.push({
tag,
Expand Down