Skip to content
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

Jump to bottom

Clean up partial renderer entry points #21682

Merged
merged 2 commits into from
Jun 14, 2021
Merged

Clean up partial renderer entry points #21682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88fcd47
Clean up partial renderer entry points
sebmarkbage Jun 14, 2021
e4e5909
Remove GC test
sebmarkbage Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-dom/server.browser.classic.fb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export {
renderToNodeStream,
renderToStaticNodeStream,
version,
} from './src/server/ReactDOMServerBrowser';
} from './src/server/ReactDOMServerLegacyPartialRendererBrowser';
16 changes: 0 additions & 16 deletions packages/react-dom/server.browser.stable.js
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions packages/react-dom/server.node.classic.fb.js
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,77 +486,6 @@ describe('ReactDOMServerIntegration', () => {
}
});

// Regression test for https://github.com/facebook/react/issues/14705
// @gate !experimental && www
it('does not pollute later renders when stream destroyed', () => {
const LoggedInUser = React.createContext('default');

const AppWithUser = user => (
<LoggedInUser.Provider value={user}>
<header>
<LoggedInUser.Consumer>{whoAmI => whoAmI}</LoggedInUser.Consumer>
</header>
</LoggedInUser.Provider>
);

const stream = ReactDOMServer.renderToNodeStream(
AppWithUser('Amy'),
).setEncoding('utf8');

// This is an implementation detail because we test a memory leak
const {threadID} = stream.partialRenderer;

// Read enough to render Provider but not enough for it to be exited
stream._read(10);
expect(LoggedInUser[threadID]).toBe('Amy');

stream.destroy();

const AppWithUserNoProvider = () => (
<LoggedInUser.Consumer>{whoAmI => whoAmI}</LoggedInUser.Consumer>
);

const stream2 = ReactDOMServer.renderToNodeStream(
AppWithUserNoProvider(),
).setEncoding('utf8');

// Sanity check to ensure 2nd render has same threadID as 1st render,
// otherwise this test is not testing what it's meant to
expect(stream2.partialRenderer.threadID).toBe(threadID);

const markup = stream2.read(Infinity);

expect(markup).toBe('default');
});

// Regression test for https://github.com/facebook/react/issues/14705
// @gate !experimental && www
it('frees context value reference when stream destroyed', () => {
const LoggedInUser = React.createContext('default');

const AppWithUser = user => (
<LoggedInUser.Provider value={user}>
<header>
<LoggedInUser.Consumer>{whoAmI => whoAmI}</LoggedInUser.Consumer>
</header>
</LoggedInUser.Provider>
);

const stream = ReactDOMServer.renderToNodeStream(
AppWithUser('Amy'),
).setEncoding('utf8');

// This is an implementation detail because we test a memory leak
const {threadID} = stream.partialRenderer;

// Read enough to render Provider but not enough for it to be exited
stream._read(10);
expect(LoggedInUser[threadID]).toBe('Amy');

stream.destroy();
expect(LoggedInUser[threadID]).toBe('default');
});

it('does not pollute sync renders after an error', () => {
const LoggedInUser = React.createContext('default');
const Crash = () => {
Expand Down
55 changes: 0 additions & 55 deletions packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js
View file
Open in desktop

This file was deleted.

0 ...t-dom/src/server/ReactDOMServerBrowser.js → ...tDOMServerLegacyPartialRendererBrowser.js
View file
Open in desktop
File renamed without changes.
22 changes: 0 additions & 22 deletions packages/react-dom/src/server/ReactDOMServerNode.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/shared/inlinedHostConfigs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module.exports = [
'react-dom',
'react-dom/unstable-fizz',
'react-dom/unstable-fizz.node',
'react-dom/server.node.stable',
'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
'react-server-dom-webpack',
'react-server-dom-webpack/writer',
Expand All @@ -45,7 +44,6 @@ module.exports = [
'react-dom',
'react-dom/testing',
'react-dom/unstable-fizz.browser',
'react-dom/server.browser.stable',
'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
'react-server-dom-webpack',
'react-server-dom-webpack/writer.browser.server',
Expand Down