Skip to content

Fix support for mixing react-dom/server@16.6 and react@<16.6#14291

Merged
gaearon merged 1 commit into
react:masterfrom
gaearon:ssr-166
Nov 20, 2018
Merged

Fix support for mixing react-dom/server@16.6 and react@<16.6#14291
gaearon merged 1 commit into
react:masterfrom
gaearon:ssr-166

Conversation

@gaearon

@gaearon gaearon commented Nov 20, 2018

Copy link
Copy Markdown
Collaborator

This prevents an obscure issue if you use react-dom/server from 16.6 but react from 16.5 or earlier. We decided to support this a while ago and it's easy to keep working.

I didn't bother writing a test because I'm lazy.

@gaearon gaearon merged commit 327cf0e into react:master Nov 20, 2018
@gaearon gaearon deleted the ssr-166 branch November 20, 2018 13:09
@sebmarkbage

sebmarkbage commented Nov 20, 2018

Copy link
Copy Markdown
Contributor

Is this slower now? Please add a follow up task to make it faster again. Does it prevent inlining (by making the generated to code larger)? This was very intentional minimal code.

@sebmarkbage

Copy link
Copy Markdown
Contributor

The idea here is that it should just do a hidden class check, then put the current value in the register and jump over it with the same label as it would use for the loop. Thereby making this code inline-friendly (in the VM).

This check would add additional logic that at least deals with the other case and might need more registers.

@gaearon

gaearon commented Nov 20, 2018

Copy link
Copy Markdown
Collaborator Author

Isn’t this DEV only?

@gaearon

gaearon commented Nov 20, 2018

Copy link
Copy Markdown
Collaborator Author

Doh. I misread the DEV closing brace. 😳

jetoneza pushed a commit to jetoneza/react that referenced this pull request Jan 23, 2019
n8schloss pushed a commit to n8schloss/react that referenced this pull request Jan 31, 2019
mrizwanashiq pushed a commit to mrizwanashiq/react that referenced this pull request Jun 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants