)\n if (\n (tag === HostComponent ||\n- (enableFloat ? tag === HostHoistable : false) ||\n+ tag === HostHoistable ||\n tag === HostSingleton) &&\n stateNode !== null\n ) {\n@@ -819,7 +818,7 @@ export function accumulateTwoPhaseListeners(\n \/\/ Handle listeners that are on HostComponents (i.e.

)\n if (\n (tag === HostComponent ||\n- (enableFloat ? tag === HostHoistable : false) ||\n+ tag === HostHoistable ||\n tag === HostSingleton) &&\n stateNode !== null\n ) {\n@@ -922,7 +921,7 @@ function accumulateEnterLeaveListenersForEvent(\n }\n if (\n (tag === HostComponent ||\n- (enableFloat ? tag === HostHoistable : false) ||\n+ tag === HostHoistable ||\n tag === HostSingleton) &&\n stateNode !== null\n ) {\ndiff --git a\/packages\/react-dom-bindings\/src\/server\/ReactDOMFlightServerHostDispatcher.js b\/packages\/react-dom-bindings\/src\/server\/ReactDOMFlightServerHostDispatcher.js\nindex 5cd5dbfb6d..64efccdded 100644\n--- a\/packages\/react-dom-bindings\/src\/server\/ReactDOMFlightServerHostDispatcher.js\n+++ b\/packages\/react-dom-bindings\/src\/server\/ReactDOMFlightServerHostDispatcher.js\n@@ -16,8 +16,6 @@ import type {\n PreinitModuleScriptOptions,\n } from 'react-dom\/src\/shared\/ReactDOMTypes';\n \n-import {enableFloat} from 'shared\/ReactFeatureFlags';\n-\n import {\n emitHint,\n getHints,\n@@ -40,107 +38,99 @@ ReactDOMCurrentDispatcher.current = {\n };\n \n function prefetchDNS(href: string) {\n- if (enableFloat) {\n- if (typeof href === 'string' && href) {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- const key = 'D|' + href;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n- emitHint(request, 'D', href);\n- } else {\n- previousDispatcher.prefetchDNS(href);\n+ if (typeof href === 'string' && href) {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ const key = 'D|' + href;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n }\n+ hints.add(key);\n+ emitHint(request, 'D', href);\n+ } else {\n+ previousDispatcher.prefetchDNS(href);\n }\n }\n }\n \n function preconnect(href: string, crossOrigin?: ?CrossOriginEnum) {\n- if (enableFloat) {\n- if (typeof href === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n+ if (typeof href === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n \n- const key = `C|${crossOrigin == null ? 'null' : crossOrigin}|${href}`;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n- if (typeof crossOrigin === 'string') {\n- emitHint(request, 'C', [href, crossOrigin]);\n- } else {\n- emitHint(request, 'C', href);\n- }\n+ const key = `C|${crossOrigin == null ? 'null' : crossOrigin}|${href}`;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n+ if (typeof crossOrigin === 'string') {\n+ emitHint(request, 'C', [href, crossOrigin]);\n } else {\n- previousDispatcher.preconnect(href, crossOrigin);\n+ emitHint(request, 'C', href);\n }\n+ } else {\n+ previousDispatcher.preconnect(href, crossOrigin);\n }\n }\n }\n \n function preload(href: string, as: string, options?: ?PreloadImplOptions) {\n- if (enableFloat) {\n- if (typeof href === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- let key = 'L';\n- if (as === 'image' && options) {\n- key += getImagePreloadKey(\n- href,\n- options.imageSrcSet,\n- options.imageSizes,\n- );\n- } else {\n- key += `[${as}]${href}`;\n- }\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n+ if (typeof href === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ let key = 'L';\n+ if (as === 'image' && options) {\n+ key += getImagePreloadKey(\n+ href,\n+ options.imageSrcSet,\n+ options.imageSizes,\n+ );\n+ } else {\n+ key += `[${as}]${href}`;\n+ }\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n \n- const trimmed = trimOptions(options);\n- if (trimmed) {\n- emitHint(request, 'L', [href, as, trimmed]);\n- } else {\n- emitHint(request, 'L', [href, as]);\n- }\n+ const trimmed = trimOptions(options);\n+ if (trimmed) {\n+ emitHint(request, 'L', [href, as, trimmed]);\n } else {\n- previousDispatcher.preload(href, as, options);\n+ emitHint(request, 'L', [href, as]);\n }\n+ } else {\n+ previousDispatcher.preload(href, as, options);\n }\n }\n }\n \n function preloadModule(href: string, options?: ?PreloadModuleImplOptions) {\n- if (enableFloat) {\n- if (typeof href === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- const key = 'm|' + href;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n+ if (typeof href === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ const key = 'm|' + href;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n \n- const trimmed = trimOptions(options);\n- if (trimmed) {\n- return emitHint(request, 'm', [href, trimmed]);\n- } else {\n- return emitHint(request, 'm', href);\n- }\n+ const trimmed = trimOptions(options);\n+ if (trimmed) {\n+ return emitHint(request, 'm', [href, trimmed]);\n } else {\n- previousDispatcher.preloadModule(href, options);\n+ return emitHint(request, 'm', href);\n }\n+ } else {\n+ previousDispatcher.preloadModule(href, options);\n }\n }\n }\n@@ -150,59 +140,55 @@ function preinitStyle(\n precedence: ?string,\n options?: ?PreinitStyleOptions,\n ) {\n- if (enableFloat) {\n- if (typeof href === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- const key = 'S|' + href;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n+ if (typeof href === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ const key = 'S|' + href;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n \n- const trimmed = trimOptions(options);\n- if (trimmed) {\n- return emitHint(request, 'S', [\n- href,\n- typeof precedence === 'string' ? precedence : 0,\n- trimmed,\n- ]);\n- } else if (typeof precedence === 'string') {\n- return emitHint(request, 'S', [href, precedence]);\n- } else {\n- return emitHint(request, 'S', href);\n- }\n+ const trimmed = trimOptions(options);\n+ if (trimmed) {\n+ return emitHint(request, 'S', [\n+ href,\n+ typeof precedence === 'string' ? precedence : 0,\n+ trimmed,\n+ ]);\n+ } else if (typeof precedence === 'string') {\n+ return emitHint(request, 'S', [href, precedence]);\n } else {\n- previousDispatcher.preinitStyle(href, precedence, options);\n+ return emitHint(request, 'S', href);\n }\n+ } else {\n+ previousDispatcher.preinitStyle(href, precedence, options);\n }\n }\n }\n \n function preinitScript(src: string, options?: ?PreinitScriptOptions) {\n- if (enableFloat) {\n- if (typeof src === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- const key = 'X|' + src;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n+ if (typeof src === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ const key = 'X|' + src;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n \n- const trimmed = trimOptions(options);\n- if (trimmed) {\n- return emitHint(request, 'X', [src, trimmed]);\n- } else {\n- return emitHint(request, 'X', src);\n- }\n+ const trimmed = trimOptions(options);\n+ if (trimmed) {\n+ return emitHint(request, 'X', [src, trimmed]);\n } else {\n- previousDispatcher.preinitScript(src, options);\n+ return emitHint(request, 'X', src);\n }\n+ } else {\n+ previousDispatcher.preinitScript(src, options);\n }\n }\n }\n@@ -211,27 +197,25 @@ function preinitModuleScript(\n src: string,\n options?: ?PreinitModuleScriptOptions,\n ) {\n- if (enableFloat) {\n- if (typeof src === 'string') {\n- const request = resolveRequest();\n- if (request) {\n- const hints = getHints(request);\n- const key = 'M|' + src;\n- if (hints.has(key)) {\n- \/\/ duplicate hint\n- return;\n- }\n- hints.add(key);\n+ if (typeof src === 'string') {\n+ const request = resolveRequest();\n+ if (request) {\n+ const hints = getHints(request);\n+ const key = 'M|' + src;\n+ if (hints.has(key)) {\n+ \/\/ duplicate hint\n+ return;\n+ }\n+ hints.add(key);\n \n- const trimmed = trimOptions(options);\n- if (trimmed) {\n- return emitHint(request, 'M', [src, trimmed]);\n- } else {\n- return emitHint(request, 'M', src);\n- }\n+ const trimmed = trimOptions(options);\n+ if (trimmed) {\n+ return emitHint(request, 'M', [src, trimmed]);\n } else {\n- previousDispatcher.preinitModuleScript(src, options);\n+ return emitHint(request, 'M', src);\n }\n+ } else {\n+ previousDispatcher.preinitModuleScript(src, options);\n }\n }\n }\ndiff --git a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\nindex 17442ee73e..5e96ca9d66 100644\n--- a\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\n+++ b\/packages\/react-dom-bindings\/src\/server\/ReactFizzConfigDOM.js\n@@ -31,7 +31,6 @@ import {\n enableBigIntSupport,\n enableFilterEmptyStringAttributesDOM,\n enableCustomElementPropertySupport,\n- enableFloat,\n enableFormActions,\n enableFizzExternalRuntime,\n enableNewBooleanProps,\n@@ -383,11 +382,6 @@ export function createRenderState(\n );\n }\n if (enableFizzExternalRuntime) {\n- if (!enableFloat) {\n- throw new Error(\n- 'enableFizzExternalRuntime without enableFloat is not supported. This should never appear in production, since it means you are using a misconfigured React bundle.',\n- );\n- }\n if (externalRuntimeConfig !== undefined) {\n if (typeof externalRuntimeConfig === 'string') {\n externalRuntimeScript = {\n@@ -2333,44 +2327,40 @@ function pushMeta(\n noscriptTagInScope: boolean,\n isFallback: boolean,\n ): null {\n- if (enableFloat) {\n- if (\n- insertionMode === SVG_MODE ||\n- noscriptTagInScope ||\n- props.itemProp != null\n- ) {\n- return pushSelfClosing(target, props, 'meta');\n- } else {\n- if (textEmbedded) {\n- \/\/ This link follows text but we aren't writing a tag. while not as efficient as possible we need\n- \/\/ to be safe and assume text will follow by inserting a textSeparator\n- target.push(textSeparator);\n- }\n+ if (\n+ insertionMode === SVG_MODE ||\n+ noscriptTagInScope ||\n+ props.itemProp != null\n+ ) {\n+ return pushSelfClosing(target, props, 'meta');\n+ } else {\n+ if (textEmbedded) {\n+ \/\/ This link follows text but we aren't writing a tag. while not as efficient as possible we need\n+ \/\/ to be safe and assume text will follow by inserting a textSeparator\n+ target.push(textSeparator);\n+ }\n \n- if (isFallback) {\n- \/\/ Hoistable Elements for fallbacks are simply omitted. we don't want to emit them early\n- \/\/ because they are likely superceded by primary content and we want to avoid needing to clean\n- \/\/ them up when the primary content is ready. They are never hydrated on the client anyway because\n- \/\/ boundaries in fallback are awaited or client render, in either case there is never hydration\n- return null;\n- } else if (typeof props.charSet === 'string') {\n- \/\/ \"charset\" Should really be config and not picked up from tags however since this is\n- \/\/ the only way to embed the tag today we flush it on a special queue on the Request so it\n- \/\/ can go before everything else. Like viewport this means that the tag will escape it's\n- \/\/ parent container.\n- return pushSelfClosing(renderState.charsetChunks, props, 'meta');\n- } else if (props.name === 'viewport') {\n- \/\/ \"viewport\" is flushed on the Request so it can go earlier that Float resources that\n- \/\/ might be affected by it. This means it can escape the boundary it is rendered within.\n- \/\/ This is a pragmatic solution to viewport being incredibly sensitive to document order\n- \/\/ without requiring all hoistables to be flushed too early.\n- return pushSelfClosing(renderState.viewportChunks, props, 'meta');\n- } else {\n- return pushSelfClosing(renderState.hoistableChunks, props, 'meta');\n- }\n+ if (isFallback) {\n+ \/\/ Hoistable Elements for fallbacks are simply omitted. we don't want to emit them early\n+ \/\/ because they are likely superceded by primary content and we want to avoid needing to clean\n+ \/\/ them up when the primary content is ready. They are never hydrated on the client anyway because\n+ \/\/ boundaries in fallback are awaited or client render, in either case there is never hydration\n+ return null;\n+ } else if (typeof props.charSet === 'string') {\n+ \/\/ \"charset\" Should really be config and not picked up from tags however since this is\n+ \/\/ the only way to embed the tag today we flush it on a special queue on the Request so it\n+ \/\/ can go before everything else. Like viewport this means that the tag will escape it's\n+ \/\/ parent container.\n+ return pushSelfClosing(renderState.charsetChunks, props, 'meta');\n+ } else if (props.name === 'viewport') {\n+ \/\/ \"viewport\" is flushed on the Request so it can go earlier that Float resources that\n+ \/\/ might be affected by it. This means it can escape the boundary it is rendered within.\n+ \/\/ This is a pragmatic solution to viewport being incredibly sensitive to document order\n+ \/\/ without requiring all hoistables to be flushed too early.\n+ return pushSelfClosing(renderState.viewportChunks, props, 'meta');\n+ } else {\n+ return pushSelfClosing(renderState.hoistableChunks, props, 'meta');\n }\n- } else {\n- return pushSelfClosing(target, props, 'meta');\n }\n }\n \n@@ -2385,172 +2375,168 @@ function pushLink(\n noscriptTagInScope: boolean,\n isFallback: boolean,\n ): null {\n- if (enableFloat) {\n- const rel = props.rel;\n- const href = props.href;\n- const precedence = props.precedence;\n+ const rel = props.rel;\n+ const href = props.href;\n+ const precedence = props.precedence;\n+ if (\n+ insertionMode === SVG_MODE ||\n+ noscriptTagInScope ||\n+ props.itemProp != null ||\n+ typeof rel !== 'string' ||\n+ typeof href !== 'string' ||\n+ href === ''\n+ ) {\n+ if (__DEV__) {\n+ if (rel === 'stylesheet' && typeof props.precedence === 'string') {\n+ if (typeof href !== 'string' || !href) {\n+ console.error(\n+ 'React encountered a `` with a `precedence` prop and expected the `href` prop to be a non-empty string but ecountered %s instead. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop ensure there is a non-empty string `href` prop as well, otherwise remove the `precedence` prop.',\n+ getValueDescriptorExpectingObjectForWarning(href),\n+ );\n+ }\n+ }\n+ }\n+ pushLinkImpl(target, props);\n+ return null;\n+ }\n+\n+ if (props.rel === 'stylesheet') {\n+ \/\/ This may hoistable as a Stylesheet Resource, otherwise it will emit in place\n+ const key = getResourceKey(href);\n if (\n- insertionMode === SVG_MODE ||\n- noscriptTagInScope ||\n- props.itemProp != null ||\n- typeof rel !== 'string' ||\n- typeof href !== 'string' ||\n- href === ''\n+ typeof precedence !== 'string' ||\n+ props.disabled != null ||\n+ props.onLoad ||\n+ props.onError\n ) {\n+ \/\/ This stylesheet is either not opted into Resource semantics or has conflicting properties which\n+ \/\/ disqualify it for such. We can still create a preload resource to help it load faster on the\n+ \/\/ client\n if (__DEV__) {\n- if (rel === 'stylesheet' && typeof props.precedence === 'string') {\n- if (typeof href !== 'string' || !href) {\n+ if (typeof precedence === 'string') {\n+ if (props.disabled != null) {\n+ console.error(\n+ 'React encountered a `` with a `precedence` prop and a `disabled` prop. The presence of the `disabled` prop indicates an intent to manage the stylesheet active state from your from your Component code and React will not hoist or deduplicate this stylesheet. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop remove the `disabled` prop, otherwise remove the `precedence` prop.',\n+ );\n+ } else if (props.onLoad || props.onError) {\n+ const propDescription =\n+ props.onLoad && props.onError\n+ ? '`onLoad` and `onError` props'\n+ : props.onLoad\n+ ? '`onLoad` prop'\n+ : '`onError` prop';\n console.error(\n- 'React encountered a `` with a `precedence` prop and expected the `href` prop to be a non-empty string but ecountered %s instead. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop ensure there is a non-empty string `href` prop as well, otherwise remove the `precedence` prop.',\n- getValueDescriptorExpectingObjectForWarning(href),\n+ 'React encountered a `` with a `precedence` prop and %s. The presence of loading and error handlers indicates an intent to manage the stylesheet loading state from your from your Component code and React will not hoist or deduplicate this stylesheet. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop remove the %s, otherwise remove the `precedence` prop.',\n+ propDescription,\n+ propDescription,\n );\n }\n }\n }\n- pushLinkImpl(target, props);\n- return null;\n- }\n-\n- if (props.rel === 'stylesheet') {\n- \/\/ This may hoistable as a Stylesheet Resource, otherwise it will emit in place\n- const key = getResourceKey(href);\n- if (\n- typeof precedence !== 'string' ||\n- props.disabled != null ||\n- props.onLoad ||\n- props.onError\n- ) {\n- \/\/ This stylesheet is either not opted into Resource semantics or has conflicting properties which\n- \/\/ disqualify it for such. We can still create a preload resource to help it load faster on the\n- \/\/ client\n- if (__DEV__) {\n- if (typeof precedence === 'string') {\n- if (props.disabled != null) {\n- console.error(\n- 'React encountered a `` with a `precedence` prop and a `disabled` prop. The presence of the `disabled` prop indicates an intent to manage the stylesheet active state from your from your Component code and React will not hoist or deduplicate this stylesheet. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop remove the `disabled` prop, otherwise remove the `precedence` prop.',\n- );\n- } else if (props.onLoad || props.onError) {\n- const propDescription =\n- props.onLoad && props.onError\n- ? '`onLoad` and `onError` props'\n- : props.onLoad\n- ? '`onLoad` prop'\n- : '`onError` prop';\n- console.error(\n- 'React encountered a `` with a `precedence` prop and %s. The presence of loading and error handlers indicates an intent to manage the stylesheet loading state from your from your Component code and React will not hoist or deduplicate this stylesheet. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop remove the %s, otherwise remove the `precedence` prop.',\n- propDescription,\n- propDescription,\n- );\n- }\n- }\n- }\n- return pushLinkImpl(target, props);\n- } else {\n- \/\/ This stylesheet refers to a Resource and we create a new one if necessary\n- let styleQueue = renderState.styles.get(precedence);\n- const hasKey = resumableState.styleResources.hasOwnProperty(key);\n- const resourceState = hasKey\n- ? resumableState.styleResources[key]\n- : undefined;\n- if (resourceState !== EXISTS) {\n- \/\/ We are going to create this resource now so it is marked as Exists\n- resumableState.styleResources[key] = EXISTS;\n-\n- \/\/ If this is the first time we've encountered this precedence we need\n- \/\/ to create a StyleQueue\n- if (!styleQueue) {\n- styleQueue = {\n- precedence: stringToChunk(escapeTextForBrowser(precedence)),\n- rules: ([]: Array),\n- hrefs: ([]: Array),\n- sheets: (new Map(): Map),\n- };\n- renderState.styles.set(precedence, styleQueue);\n- }\n-\n- const resource: StylesheetResource = {\n- state: PENDING,\n- props: stylesheetPropsFromRawProps(props),\n+ return pushLinkImpl(target, props);\n+ } else {\n+ \/\/ This stylesheet refers to a Resource and we create a new one if necessary\n+ let styleQueue = renderState.styles.get(precedence);\n+ const hasKey = resumableState.styleResources.hasOwnProperty(key);\n+ const resourceState = hasKey\n+ ? resumableState.styleResources[key]\n+ : undefined;\n+ if (resourceState !== EXISTS) {\n+ \/\/ We are going to create this resource now so it is marked as Exists\n+ resumableState.styleResources[key] = EXISTS;\n+\n+ \/\/ If this is the first time we've encountered this precedence we need\n+ \/\/ to create a StyleQueue\n+ if (!styleQueue) {\n+ styleQueue = {\n+ precedence: stringToChunk(escapeTextForBrowser(precedence)),\n+ rules: ([]: Array),\n+ hrefs: ([]: Array),\n+ sheets: (new Map(): Map),\n };\n+ renderState.styles.set(precedence, styleQueue);\n+ }\n \n- if (resourceState) {\n- \/\/ When resourceState is truty it is a Preload state. We cast it for clarity\n- const preloadState: Preloaded | PreloadedWithCredentials =\n- resourceState;\n- if (preloadState.length === 2) {\n- adoptPreloadCredentials(resource.props, preloadState);\n- }\n+ const resource: StylesheetResource = {\n+ state: PENDING,\n+ props: stylesheetPropsFromRawProps(props),\n+ };\n \n- const preloadResource = renderState.preloads.stylesheets.get(key);\n- if (preloadResource && preloadResource.length > 0) {\n- \/\/ The Preload for this resource was created in this render pass and has not flushed yet so\n- \/\/ we need to clear it to avoid it flushing.\n- preloadResource.length = 0;\n- } else {\n- \/\/ Either the preload resource from this render already flushed in this render pass\n- \/\/ or the preload flushed in a prior pass (prerender). In either case we need to mark\n- \/\/ this resource as already having been preloaded.\n- resource.state = PRELOADED;\n- }\n- } else {\n- \/\/ We don't need to check whether a preloadResource exists in the renderState\n- \/\/ because if it did exist then the resourceState would also exist and we would\n- \/\/ have hit the primary if condition above.\n+ if (resourceState) {\n+ \/\/ When resourceState is truty it is a Preload state. We cast it for clarity\n+ const preloadState: Preloaded | PreloadedWithCredentials =\n+ resourceState;\n+ if (preloadState.length === 2) {\n+ adoptPreloadCredentials(resource.props, preloadState);\n }\n \n- \/\/ We add the newly created resource to our StyleQueue and if necessary\n- \/\/ track the resource with the currently rendering boundary\n- styleQueue.sheets.set(key, resource);\n- if (hoistableState) {\n- hoistableState.stylesheets.add(resource);\n+ const preloadResource = renderState.preloads.stylesheets.get(key);\n+ if (preloadResource && preloadResource.length > 0) {\n+ \/\/ The Preload for this resource was created in this render pass and has not flushed yet so\n+ \/\/ we need to clear it to avoid it flushing.\n+ preloadResource.length = 0;\n+ } else {\n+ \/\/ Either the preload resource from this render already flushed in this render pass\n+ \/\/ or the preload flushed in a prior pass (prerender). In either case we need to mark\n+ \/\/ this resource as already having been preloaded.\n+ resource.state = PRELOADED;\n }\n } else {\n- \/\/ We need to track whether this boundary should wait on this resource or not.\n- \/\/ Typically this resource should always exist since we either had it or just created\n- \/\/ it. However, it's possible when you resume that the style has already been emitted\n- \/\/ and then it wouldn't be recreated in the RenderState and there's no need to track\n- \/\/ it again since we should've hoisted it to the shell already.\n- if (styleQueue) {\n- const resource = styleQueue.sheets.get(key);\n- if (resource) {\n- if (hoistableState) {\n- hoistableState.stylesheets.add(resource);\n- }\n+ \/\/ We don't need to check whether a preloadResource exists in the renderState\n+ \/\/ because if it did exist then the resourceState would also exist and we would\n+ \/\/ have hit the primary if condition above.\n+ }\n+\n+ \/\/ We add the newly created resource to our StyleQueue and if necessary\n+ \/\/ track the resource with the currently rendering boundary\n+ styleQueue.sheets.set(key, resource);\n+ if (hoistableState) {\n+ hoistableState.stylesheets.add(resource);\n+ }\n+ } else {\n+ \/\/ We need to track whether this boundary should wait on this resource or not.\n+ \/\/ Typically this resource should always exist since we either had it or just created\n+ \/\/ it. However, it's possible when you resume that the style has already been emitted\n+ \/\/ and then it wouldn't be recreated in the RenderState and there's no need to track\n+ \/\/ it again since we should've hoisted it to the shell already.\n+ if (styleQueue) {\n+ const resource = styleQueue.sheets.get(key);\n+ if (resource) {\n+ if (hoistableState) {\n+ hoistableState.stylesheets.add(resource);\n }\n }\n }\n- if (textEmbedded) {\n- \/\/ This link follows text but we aren't writing a tag. while not as efficient as possible we need\n- \/\/ to be safe and assume text will follow by inserting a textSeparator\n- target.push(textSeparator);\n- }\n- return null;\n }\n- } else if (props.onLoad || props.onError) {\n- \/\/ When using load handlers we cannot hoist and need to emit links in place\n- return pushLinkImpl(target, props);\n- } else {\n- \/\/ We can hoist this link so we may need to emit a text separator.\n- \/\/ @TODO refactor text separators so we don't have to defensively add\n- \/\/ them when we don't end up emitting a tag as a result of pushStartInstance\n if (textEmbedded) {\n \/\/ This link follows text but we aren't writing a tag. while not as efficient as possible we need\n \/\/ to be safe and assume text will follow by inserting a textSeparator\n target.push(textSeparator);\n }\n-\n- if (isFallback) {\n- \/\/ Hoistable Elements for fallbacks are simply omitted. we don't want to emit them early\n- \/\/ because they are likely superceded by primary content and we want to avoid needing to clean\n- \/\/ them up when the primary content is ready. They are never hydrated on the client anyway because\n- \/\/ boundaries in fallback are awaited or client render, in either case there is never hydration\n- return null;\n- } else {\n- return pushLinkImpl(renderState.hoistableChunks, props);\n- }\n+ return null;\n }\n- } else {\n+ } else if (props.onLoad || props.onError) {\n+ \/\/ When using load handlers we cannot hoist and need to emit links in place\n return pushLinkImpl(target, props);\n+ } else {\n+ \/\/ We can hoist this link so we may need to emit a text separator.\n+ \/\/ @TODO refactor text separators so we don't have to defensively add\n+ \/\/ them when we don't end up emitting a tag as a result of pushStartInstance\n+ if (textEmbedded) {\n+ \/\/ This link follows text but we aren't writing a tag. while not as efficient as possible we need\n+ \/\/ to be safe and assume text will follow by inserting a textSeparator\n+ target.push(textSeparator);\n+ }\n+\n+ if (isFallback) {\n+ \/\/ Hoistable Elements for fallbacks are simply omitted. we don't want to emit them early\n+ \/\/ because they are likely superceded by primary content and we want to avoid needing to clean\n+ \/\/ them up when the primary content is ready. They are never hydrated on the client anyway because\n+ \/\/ boundaries in fallback are awaited or client render, in either case there is never hydration\n+ return null;\n+ } else {\n+ return pushLinkImpl(renderState.hoistableChunks, props);\n+ }\n }\n }\n \n@@ -2623,84 +2609,78 @@ function pushStyle(\n }\n }\n }\n- if (enableFloat) {\n- const precedence = props.precedence;\n- const href = props.href;\n+ const precedence = props.precedence;\n+ const href = props.href;\n \n- if (\n- insertionMode === SVG_MODE ||\n- noscriptTagInScope ||\n- props.itemProp != null ||\n- typeof precedence !== 'string' ||\n- typeof href !== 'string' ||\n- href === ''\n- ) {\n- \/\/ This style tag is not able to be turned into a Style Resource\n- return pushStyleImpl(target, props);\n+ if (\n+ insertionMode === SVG_MODE ||\n+ noscriptTagInScope ||\n+ props.itemProp != null ||\n+ typeof precedence !== 'string' ||\n+ typeof href !== 'string' ||\n+ href === ''\n+ ) {\n+ \/\/ This style tag is not able to be turned into a Style Resource\n+ return pushStyleImpl(target, props);\n+ }\n+\n+ if (__DEV__) {\n+ if (href.includes(' ')) {\n+ console.error(\n+ 'React expected the `href` prop for a

dillon1000/react

Files changed