-
Notifications
You must be signed in to change notification settings - Fork 47.6k
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.
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
Fix false positive <noscript> rehydration text difference warning in React 16 #11157
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1c327df
Add <noscript> with HTML in it to SSR fixture
gaearon 27a4250
Wrap <noscript> into a <div> to get its "client HTML"
gaearon be4b82c
Revert "Wrap <noscript> into a <div> to get its "client HTML""
gaearon dc00d51
Always use parent.ownerDocument
gaearon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -179,6 +179,19 @@ if (__DEV__) { | |
parent.tagName, | ||
); | ||
testElement.innerHTML = html; | ||
|
||
if (parent.tagName === 'NOSCRIPT') { | ||
// <noscript> content is parsed as text, but only if the browser parses it | ||
// together with <noscript> tag itself. So we have to wrap it once more. | ||
var wrapperElement = document.createElement('div'); | ||
wrapperElement.innerHTML = '<noscript>' + html + '</noscript>'; | ||
var noscriptElement = wrapperElement.firstElementChild; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not just |
||
// Make Flow happy (but it'll always be there). | ||
if (noscriptElement !== null && typeof noscriptElement !== 'undefined') { | ||
return noscriptElement.innerHTML; | ||
} | ||
} | ||
|
||
return testElement.innerHTML; | ||
}; | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Outputs a single TextNode for me in both Chrome and Edge (it does not parse the b-tag), which seems to contradict the comment and the whole reason for this existing... right? Is there more to it than that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting. What you're saying is right for
document.createElement()
, but not fordocument.implementation.createHTMLDocument('').createElement()
which is what we're using. I'm not sure why there is a difference (is it because it doesn't have a body or something like this?)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There doesn't seem to be a difference between the wrapper and not in this test:
http://jsbin.com/mofexaxaya/2/edit?js,console
What is different?