diff --git a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js index 5314564242ed9..a20abb62b2201 100644 --- a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js +++ b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js @@ -1960,21 +1960,6 @@ function pushLink( } } } - let resource = resources.preloadsMap.get(key); - if (!resource) { - resource = { - type: 'preload', - chunks: ([]: Array), - state: NoState, - props: preloadAsStylePropsFromProps(href, props), - }; - resources.preloadsMap.set(key, resource); - if (__DEV__) { - markAsImplicitResourceDEV(resource, props, resource.props); - } - } - pushLinkImpl(resource.chunks, resource.props); - resources.usedStylesheets.add(resource); return pushLinkImpl(target, props); } else { // This stylesheet refers to a Resource and we create a new one if necessary @@ -4246,22 +4231,6 @@ export function writePreamble( // Flush unblocked stylesheets by precedence resources.precedences.forEach(flushAllStylesInPreamble, destination); - resources.usedStylesheets.forEach(resource => { - const key = getResourceKey(resource.props.as, resource.props.href); - if (resources.stylesMap.has(key)) { - // The underlying stylesheet is represented both as a used stylesheet - // (a regular component we will attempt to preload) and as a StylesheetResource. - // We don't want to emit two preloads for the same href so we defer - // the preload rules of the StylesheetResource when there is a conflict - } else { - const chunks = resource.chunks; - for (i = 0; i < chunks.length; i++) { - writeChunk(destination, chunks[i]); - } - } - }); - resources.usedStylesheets.clear(); - resources.scripts.forEach(flushResourceInPreamble, destination); resources.scripts.clear(); @@ -4342,22 +4311,6 @@ export function writeHoistables( // but we want to kick off preloading as soon as possible resources.precedences.forEach(preloadLateStyles, destination); - resources.usedStylesheets.forEach(resource => { - const key = getResourceKey(resource.props.as, resource.props.href); - if (resources.stylesMap.has(key)) { - // The underlying stylesheet is represented both as a used stylesheet - // (a regular component we will attempt to preload) and as a StylesheetResource. - // We don't want to emit two preloads for the same href so we defer - // the preload rules of the StylesheetResource when there is a conflict - } else { - const chunks = resource.chunks; - for (i = 0; i < chunks.length; i++) { - writeChunk(destination, chunks[i]); - } - } - }); - resources.usedStylesheets.clear(); - resources.scripts.forEach(flushResourceLate, destination); resources.scripts.clear(); @@ -4908,7 +4861,6 @@ export type Resources = { // usedImagePreloads: Set, precedences: Map>, stylePrecedences: Map, - usedStylesheets: Set, scripts: Set, usedScripts: Set, explicitStylesheetPreloads: Set, @@ -4936,7 +4888,6 @@ export function createResources(): Resources { // usedImagePreloads: new Set(), precedences: new Map(), stylePrecedences: new Map(), - usedStylesheets: new Set(), scripts: new Set(), usedScripts: new Set(), explicitStylesheetPreloads: new Set(), diff --git a/packages/react-dom/src/__tests__/ReactDOMFloat-test.js b/packages/react-dom/src/__tests__/ReactDOMFloat-test.js index 842b9c4153e2c..7ee51765d57bb 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFloat-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFloat-test.js @@ -4503,71 +4503,6 @@ body { ); }); - // @gate enableFloat - it('preloads stylesheets without a precedence prop when server rendering', async () => { - await act(() => { - const {pipe} = renderToPipeableStream( - - - - -
hello world
- - , - ); - pipe(writable); - }); - - expect(getMeaningfulChildren(document)).toEqual( - - - - - - -
hello world
- - , - ); - }); - - // @gate enableFloat - it('respects attributes defined on the stylesheet element when preloading stylesheets during server rendering', async () => { - await act(() => { - const {pipe} = renderToPipeableStream( - - - - - - -
hello world
- - , - ); - pipe(writable); - }); - - expect(getMeaningfulChildren(document)).toEqual( - - - - - - - - -
hello world
- - , - ); - }); - // @gate enableFloat it('hoists stylesheet resources to the correct precedence', async () => { await act(() => { diff --git a/packages/react-dom/src/__tests__/ReactDOMSingletonComponents-test.js b/packages/react-dom/src/__tests__/ReactDOMSingletonComponents-test.js index 4d34f2edb7d56..7d1bddbe661c2 100644 --- a/packages/react-dom/src/__tests__/ReactDOMSingletonComponents-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMSingletonComponents-test.js @@ -245,9 +245,6 @@ describe('ReactDOM HostSingleton', () => { expect(getVisibleChildren(document)).toEqual( - - - a server title @@ -842,10 +839,7 @@ describe('ReactDOM HostSingleton', () => { await waitForAll([]); expect(getVisibleChildren(document)).toEqual( - - - - +