{"commit":{"authorName":"Ricky","subject":"Remove Blocking Mode (again) (#20974)","shortRevision":"860f673a7a","authorEmail":"rickhanlonii@gmail.com","authoredAt":"2021-03-10T18:34:35-05:00","revision":"860f673a7a6bf826010d41de2f66de62171ab676"},"body":"* Remove Blocking Mode (again)\r\n\r\n* Rename batchingmode file and comment","patch":"diff --git a\/packages\/react-dom\/index.classic.fb.js b\/packages\/react-dom\/index.classic.fb.js\nindex ea9dd9aba2..0b16c08083 100644\n--- a\/packages\/react-dom\/index.classic.fb.js\n+++ b\/packages\/react-dom\/index.classic.fb.js\n@@ -30,8 +30,6 @@ export {\n unmountComponentAtNode,\n createRoot,\n createRoot as unstable_createRoot,\n- createBlockingRoot,\n- createBlockingRoot as unstable_createBlockingRoot,\n unstable_flushControlled,\n unstable_scheduleHydration,\n unstable_runWithPriority,\ndiff --git a\/packages\/react-dom\/index.experimental.js b\/packages\/react-dom\/index.experimental.js\nindex 9ed70f3959..e685ec6e8a 100644\n--- a\/packages\/react-dom\/index.experimental.js\n+++ b\/packages\/react-dom\/index.experimental.js\n@@ -20,7 +20,6 @@ export {\n unmountComponentAtNode,\n \/\/ exposeConcurrentModeAPIs\n createRoot as unstable_createRoot,\n- createBlockingRoot as unstable_createBlockingRoot,\n unstable_flushControlled,\n unstable_scheduleHydration,\n \/\/ DO NOT USE: Temporarily exposing this to migrate off of Scheduler.runWithPriority.\ndiff --git a\/packages\/react-dom\/index.js b\/packages\/react-dom\/index.js\nindex 59825272c3..7adfaa4ad2 100644\n--- a\/packages\/react-dom\/index.js\n+++ b\/packages\/react-dom\/index.js\n@@ -21,8 +21,6 @@ export {\n unmountComponentAtNode,\n createRoot,\n createRoot as unstable_createRoot,\n- createBlockingRoot,\n- createBlockingRoot as unstable_createBlockingRoot,\n unstable_flushControlled,\n unstable_scheduleHydration,\n unstable_runWithPriority,\ndiff --git a\/packages\/react-dom\/index.modern.fb.js b\/packages\/react-dom\/index.modern.fb.js\nindex addcce9774..f91cc3cb89 100644\n--- a\/packages\/react-dom\/index.modern.fb.js\n+++ b\/packages\/react-dom\/index.modern.fb.js\n@@ -15,8 +15,6 @@ export {\n version,\n createRoot,\n createRoot as unstable_createRoot,\n- createBlockingRoot,\n- createBlockingRoot as unstable_createBlockingRoot,\n unstable_flushControlled,\n unstable_scheduleHydration,\n unstable_runWithPriority,\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.js\nindex 7fde6e5dde..ff4e1b5aee 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.js\n@@ -574,31 +574,29 @@ describe('ReactDOMFiberAsync', () => {\n expect(containerC.textContent).toEqual('Finished');\n });\n \n- describe('createBlockingRoot', () => {\n- \/\/ @gate experimental\n- it('updates flush without yielding in the next event', () => {\n- const root = ReactDOM.unstable_createBlockingRoot(container);\n+ \/\/ @gate experimental\n+ it('updates flush without yielding in the next event', () => {\n+ const root = ReactDOM.unstable_createRoot(container);\n \n- function Text(props) {\n- Scheduler.unstable_yieldValue(props.text);\n- return props.text;\n- }\n+ function Text(props) {\n+ Scheduler.unstable_yieldValue(props.text);\n+ return props.text;\n+ }\n \n- root.render(\n- <>\n- \n- \n- \n- <\/>,\n- );\n+ root.render(\n+ <>\n+ \n+ \n+ \n+ <\/>,\n+ );\n \n- \/\/ Nothing should have rendered yet\n- expect(container.textContent).toEqual('');\n+ \/\/ Nothing should have rendered yet\n+ expect(container.textContent).toEqual('');\n \n- \/\/ Everything should render immediately in the next event\n- expect(Scheduler).toFlushExpired(['A', 'B', 'C']);\n- expect(container.textContent).toEqual('ABC');\n- });\n+ \/\/ Everything should render immediately in the next event\n+ expect(Scheduler).toFlushAndYield(['A', 'B', 'C']);\n+ expect(container.textContent).toEqual('ABC');\n });\n \n \/\/ @gate experimental\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerPartialHydration-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerPartialHydration-test.internal.js\nindex 91f6e8f022..00ed4050d6 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerPartialHydration-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerPartialHydration-test.internal.js\n@@ -357,7 +357,7 @@ describe('ReactDOMServerPartialHydration', () => {\n }).toErrorDev(\n 'Warning: Cannot hydrate Suspense in legacy mode. Switch from ' +\n 'ReactDOM.hydrate(element, container) to ' +\n- 'ReactDOM.createBlockingRoot(container, { hydrate: true })' +\n+ 'ReactDOM.createRoot(container, { hydrate: true })' +\n '.render(element) or remove the Suspense components from the server ' +\n 'rendered components.' +\n '\\n in Suspense (at **)' +\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerSuspense-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerSuspense-test.internal.js\nindex 6c48b36bd1..7b28d572cc 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerSuspense-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerSuspense-test.internal.js\n@@ -127,7 +127,7 @@ describe('ReactDOMServerSuspense', () => {\n expect(divB.textContent).toBe('B');\n \n act(() => {\n- const root = ReactDOM.createBlockingRoot(parent, {hydrate: true});\n+ const root = ReactDOM.createRoot(parent, {hydrate: true});\n root.render(example);\n });\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\nindex 57807679e8..242743d2f3 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n@@ -72,33 +72,6 @@ describe('ReactTestUtils.act()', () => {\n \n runActTests('legacy mode', renderLegacy, unmountLegacy, rerenderLegacy);\n \n- \/\/ and then in blocking mode\n- if (__EXPERIMENTAL__) {\n- let blockingRoot = null;\n- const renderBatched = (el, dom) => {\n- blockingRoot = ReactDOM.unstable_createBlockingRoot(dom);\n- blockingRoot.render(el);\n- };\n-\n- const unmountBatched = dom => {\n- if (blockingRoot !== null) {\n- blockingRoot.unmount();\n- blockingRoot = null;\n- }\n- };\n-\n- const rerenderBatched = el => {\n- blockingRoot.render(el);\n- };\n-\n- runActTests(\n- 'blocking mode',\n- renderBatched,\n- unmountBatched,\n- rerenderBatched,\n- );\n- }\n-\n describe('unacted effects', () => {\n function App() {\n React.useEffect(() => {}, []);\n@@ -124,19 +97,6 @@ describe('ReactTestUtils.act()', () => {\n ]);\n });\n \n- \/\/ @gate experimental\n- it('warns in blocking mode', () => {\n- expect(() => {\n- const root = ReactDOM.unstable_createBlockingRoot(\n- document.createElement('div'),\n- );\n- root.render();\n- Scheduler.unstable_flushAll();\n- }).toErrorDev([\n- 'An update to App ran an effect, but was not wrapped in act(...)',\n- ]);\n- });\n-\n \/\/ @gate experimental\n it('warns in concurrent mode', () => {\n expect(() => {\n@@ -731,14 +691,10 @@ function runActTests(label, render, unmount, rerender) {\n \n it('triggers fallbacks if available', async () => {\n if (label !== 'legacy mode') {\n- \/\/ FIXME: Support for Blocking* and Concurrent Mode were\n- \/\/ intentionally removed from the public version of `act`. It will\n- \/\/ be added back in a future major version, before Blocking and and\n- \/\/ Concurrent Mode are officially released. Consider disabling all\n- \/\/ non-Legacy tests in this suite until then.\n- \/\/\n- \/\/ *Blocking Mode actually does happen to work, though\n- \/\/ not \"officially\" since it's an unreleased feature.\n+ \/\/ FIXME: Support for Concurrent Root intentionally removed\n+ \/\/ from the public version of `act`. It will be added back in\n+ \/\/ a future major version, before the Concurrent Root is released.\n+ \/\/ Consider skipping all non-Legacy tests in this suite until then.\n return;\n }\n \n@@ -794,10 +750,8 @@ function runActTests(label, render, unmount, rerender) {\n \/\/ In Concurrent Mode, refresh transitions delay indefinitely.\n expect(document.querySelector('[data-test-id=spinner]')).toBeNull();\n } else {\n- \/\/ In Legacy Mode and Blocking Mode, all fallbacks are forced to\n- \/\/ display, even during a refresh transition.\n- \/\/ TODO: Consider delaying indefinitely in Blocking Mode, to match\n- \/\/ Concurrent Mode semantics.\n+ \/\/ In Legacy Mode, all fallbacks are forced to display,\n+ \/\/ even during a refresh transition.\n expect(\n document.querySelector('[data-test-id=spinner]'),\n ).not.toBeNull();\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactUnmockedSchedulerWarning-test.js b\/packages\/react-dom\/src\/__tests__\/ReactUnmockedSchedulerWarning-test.js\nindex 435b4989c1..79437e7f5c 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactUnmockedSchedulerWarning-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactUnmockedSchedulerWarning-test.js\n@@ -43,22 +43,3 @@ it('should warn when rendering in concurrent mode', () => {\n ReactDOM.unstable_createRoot(document.createElement('div')).render();\n }).toErrorDev([]);\n });\n-\n-\/\/ @gate experimental\n-it('should warn when rendering in blocking mode', () => {\n- expect(() => {\n- ReactDOM.unstable_createBlockingRoot(document.createElement('div')).render(\n- ,\n- );\n- }).toErrorDev(\n- 'In Concurrent or Sync modes, the \"scheduler\" module needs to be mocked ' +\n- 'to guarantee consistent behaviour across tests and browsers.',\n- {withoutStack: true},\n- );\n- \/\/ does not warn twice\n- expect(() => {\n- ReactDOM.unstable_createBlockingRoot(document.createElement('div')).render(\n- ,\n- );\n- }).toErrorDev([]);\n-});\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex 66ae001c3b..7cff285a93 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -18,7 +18,7 @@ import {\n unstable_renderSubtreeIntoContainer,\n unmountComponentAtNode,\n } from '.\/ReactDOMLegacy';\n-import {createRoot, createBlockingRoot, isValidContainer} from '.\/ReactDOMRoot';\n+import {createRoot, isValidContainer} from '.\/ReactDOMRoot';\n import {createEventHandle} from '.\/ReactDOMEventHandle';\n \n import {\n@@ -201,7 +201,6 @@ export {\n unmountComponentAtNode,\n \/\/ exposeConcurrentModeAPIs\n createRoot,\n- createBlockingRoot,\n flushControlled as unstable_flushControlled,\n scheduleHydration as unstable_scheduleHydration,\n \/\/ Disabled behind disableUnstableRenderSubtreeIntoContainer\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMRoot.js b\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\nindex 62a72dc229..56532d5d67 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMRoot.js\n@@ -51,25 +51,17 @@ import {\n registerMutableSourceForHydration,\n } from 'react-reconciler\/src\/ReactFiberReconciler';\n import invariant from 'shared\/invariant';\n-import {\n- BlockingRoot,\n- ConcurrentRoot,\n- LegacyRoot,\n-} from 'react-reconciler\/src\/ReactRootTags';\n+import {ConcurrentRoot, LegacyRoot} from 'react-reconciler\/src\/ReactRootTags';\n \n function ReactDOMRoot(container: Container, options: void | RootOptions) {\n this._internalRoot = createRootImpl(container, ConcurrentRoot, options);\n }\n \n-function ReactDOMBlockingRoot(\n- container: Container,\n- tag: RootTag,\n- options: void | RootOptions,\n-) {\n- this._internalRoot = createRootImpl(container, tag, options);\n+function ReactDOMLegacyRoot(container: Container, options: void | RootOptions) {\n+ this._internalRoot = createRootImpl(container, LegacyRoot, options);\n }\n \n-ReactDOMRoot.prototype.render = ReactDOMBlockingRoot.prototype.render = function(\n+ReactDOMRoot.prototype.render = ReactDOMLegacyRoot.prototype.render = function(\n children: ReactNodeList,\n ): void {\n const root = this._internalRoot;\n@@ -99,7 +91,7 @@ ReactDOMRoot.prototype.render = ReactDOMBlockingRoot.prototype.render = function\n updateContainer(children, root, null, null);\n };\n \n-ReactDOMRoot.prototype.unmount = ReactDOMBlockingRoot.prototype.unmount = function(): void {\n+ReactDOMRoot.prototype.unmount = ReactDOMLegacyRoot.prototype.unmount = function(): void {\n if (__DEV__) {\n if (typeof arguments[0] === 'function') {\n console.error(\n@@ -169,23 +161,11 @@ export function createRoot(\n return new ReactDOMRoot(container, options);\n }\n \n-export function createBlockingRoot(\n- container: Container,\n- options?: RootOptions,\n-): RootType {\n- invariant(\n- isValidContainer(container),\n- 'createRoot(...): Target container is not a DOM element.',\n- );\n- warnIfReactDOMContainerInDEV(container);\n- return new ReactDOMBlockingRoot(container, BlockingRoot, options);\n-}\n-\n export function createLegacyRoot(\n container: Container,\n options?: RootOptions,\n ): RootType {\n- return new ReactDOMBlockingRoot(container, LegacyRoot, options);\n+ return new ReactDOMLegacyRoot(container, options);\n }\n \n export function isValidContainer(node: mixed): boolean {\ndiff --git a\/packages\/react-noop-renderer\/src\/ReactNoop.js b\/packages\/react-noop-renderer\/src\/ReactNoop.js\nindex 8305dd6d86..c09fa2d800 100644\n--- a\/packages\/react-noop-renderer\/src\/ReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/ReactNoop.js\n@@ -23,7 +23,6 @@ export const {\n getPendingChildren,\n getOrCreateRootContainer,\n createRoot,\n- createBlockingRoot,\n createLegacyRoot,\n getChildrenAsJSX,\n getPendingChildrenAsJSX,\ndiff --git a\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js b\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\nindex c4a73cdfb8..97876990a9 100644\n--- a\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\n+++ b\/packages\/react-noop-renderer\/src\/ReactNoopPersistent.js\n@@ -23,7 +23,6 @@ export const {\n getPendingChildren,\n getOrCreateRootContainer,\n createRoot,\n- createBlockingRoot,\n createLegacyRoot,\n getChildrenAsJSX,\n getPendingChildrenAsJSX,\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex f7663b0593..80c888a88e 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -21,11 +21,7 @@ import type {RootTag} from 'react-reconciler\/src\/ReactRootTags';\n \n import * as Scheduler from 'scheduler\/unstable_mock';\n import {REACT_FRAGMENT_TYPE, REACT_ELEMENT_TYPE} from 'shared\/ReactSymbols';\n-import {\n- ConcurrentRoot,\n- BlockingRoot,\n- LegacyRoot,\n-} from 'react-reconciler\/src\/ReactRootTags';\n+import {ConcurrentRoot, LegacyRoot} from 'react-reconciler\/src\/ReactRootTags';\n \n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import enqueueTask from 'shared\/enqueueTask';\n@@ -752,33 +748,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n };\n },\n \n- createBlockingRoot() {\n- const container = {\n- rootID: '' + idCounter++,\n- pendingChildren: [],\n- children: [],\n- };\n- const fiberRoot = NoopRenderer.createContainer(\n- container,\n- BlockingRoot,\n- false,\n- null,\n- null,\n- );\n- return {\n- _Scheduler: Scheduler,\n- render(children: ReactNodeList) {\n- NoopRenderer.updateContainer(children, fiberRoot, null, null);\n- },\n- getChildren() {\n- return getChildren(container);\n- },\n- getChildrenAsJSX() {\n- return getChildrenAsJSX(container);\n- },\n- };\n- },\n-\n createLegacyRoot() {\n const container = {\n rootID: '' + idCounter++,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.new.js b\/packages\/react-reconciler\/src\/ReactFiber.new.js\nindex 3c49e56431..de9c83e3a3 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.new.js\n@@ -26,7 +26,7 @@ import {\n enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {NoFlags, Placement, StaticMask} from '.\/ReactFiberFlags';\n-import {ConcurrentRoot, BlockingRoot} from '.\/ReactRootTags';\n+import {ConcurrentRoot} from '.\/ReactRootTags';\n import {\n IndeterminateComponent,\n ClassComponent,\n@@ -68,7 +68,6 @@ import {\n ProfileMode,\n StrictLegacyMode,\n StrictEffectsMode,\n- BlockingMode,\n } from '.\/ReactTypeOfMode';\n import {\n REACT_FORWARD_REF_TYPE,\n@@ -424,25 +423,7 @@ export function createHostRootFiber(\n ): Fiber {\n let mode;\n if (tag === ConcurrentRoot) {\n- mode = ConcurrentMode | BlockingMode;\n- if (strictModeLevelOverride !== null) {\n- if (strictModeLevelOverride >= 1) {\n- mode |= StrictLegacyMode;\n- }\n- if (enableStrictEffects) {\n- if (strictModeLevelOverride >= 2) {\n- mode |= StrictEffectsMode;\n- }\n- }\n- } else {\n- if (enableStrictEffects && createRootStrictEffectsByDefault) {\n- mode |= StrictLegacyMode | StrictEffectsMode;\n- } else {\n- mode |= StrictLegacyMode;\n- }\n- }\n- } else if (tag === BlockingRoot) {\n- mode = BlockingMode;\n+ mode = ConcurrentMode;\n if (strictModeLevelOverride !== null) {\n if (strictModeLevelOverride >= 1) {\n mode |= StrictLegacyMode;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.old.js b\/packages\/react-reconciler\/src\/ReactFiber.old.js\nindex e98634b37c..f399ab3593 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.old.js\n@@ -26,7 +26,7 @@ import {\n enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {NoFlags, Placement, StaticMask} from '.\/ReactFiberFlags';\n-import {ConcurrentRoot, BlockingRoot} from '.\/ReactRootTags';\n+import {ConcurrentRoot} from '.\/ReactRootTags';\n import {\n IndeterminateComponent,\n ClassComponent,\n@@ -68,7 +68,6 @@ import {\n ProfileMode,\n StrictLegacyMode,\n StrictEffectsMode,\n- BlockingMode,\n } from '.\/ReactTypeOfMode';\n import {\n REACT_FORWARD_REF_TYPE,\n@@ -424,25 +423,7 @@ export function createHostRootFiber(\n ): Fiber {\n let mode;\n if (tag === ConcurrentRoot) {\n- mode = ConcurrentMode | BlockingMode;\n- if (strictModeLevelOverride !== null) {\n- if (strictModeLevelOverride >= 1) {\n- mode |= StrictLegacyMode;\n- }\n- if (enableStrictEffects) {\n- if (strictModeLevelOverride >= 2) {\n- mode |= StrictEffectsMode;\n- }\n- }\n- } else {\n- if (enableStrictEffects && createRootStrictEffectsByDefault) {\n- mode |= StrictLegacyMode | StrictEffectsMode;\n- } else {\n- mode |= StrictLegacyMode;\n- }\n- }\n- } else if (tag === BlockingRoot) {\n- mode = BlockingMode;\n+ mode = ConcurrentMode;\n if (strictModeLevelOverride !== null) {\n if (strictModeLevelOverride >= 1) {\n mode |= StrictLegacyMode;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\nindex 345f668fc6..a014ef5747 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js\n@@ -128,7 +128,6 @@ import {\n NoMode,\n ProfileMode,\n StrictLegacyMode,\n- BlockingMode,\n } from '.\/ReactTypeOfMode';\n import {\n shouldSetTextContent,\n@@ -609,7 +608,6 @@ function updateOffscreenComponent(\n \/\/ Rendering a hidden tree.\n if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n \/\/ In legacy sync mode, don't defer the subtree. Render it now.\n- \/\/ TODO: Figure out what we should do in Blocking mode.\n const nextState: OffscreenState = {\n baseLanes: NoLanes,\n cachePool: null,\n@@ -2134,7 +2132,10 @@ function mountSuspenseFallbackChildren(\n \n let primaryChildFragment;\n let fallbackChildFragment;\n- if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {\n+ if (\n+ (mode & ConcurrentMode) === NoMode &&\n+ progressedPrimaryFragment !== null\n+ ) {\n \/\/ In legacy mode, we commit the primary tree as if it successfully\n \/\/ completed, even though it's in an inconsistent state.\n primaryChildFragment = progressedPrimaryFragment;\n@@ -2206,7 +2207,7 @@ function updateSuspensePrimaryChildren(\n children: primaryChildren,\n },\n );\n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n primaryChildFragment.lanes = renderLanes;\n }\n primaryChildFragment.return = workInProgress;\n@@ -2247,7 +2248,7 @@ function updateSuspenseFallbackChildren(\n if (\n \/\/ In legacy mode, we commit the primary tree as if it successfully\n \/\/ completed, even though it's in an inconsistent state.\n- (mode & BlockingMode) === NoMode &&\n+ (mode & ConcurrentMode) === NoMode &&\n \/\/ Make sure we're on the second pass, i.e. the primary child fragment was\n \/\/ already cloned. In legacy mode, the only case where this isn't true is\n \/\/ when DevTools forces us to display a fallback; we skip the first render\n@@ -2369,7 +2370,7 @@ function mountSuspenseFallbackAfterRetryWithoutHydrating(\n primaryChildFragment.sibling = fallbackChildFragment;\n workInProgress.child = primaryChildFragment;\n \n- if ((workInProgress.mode & BlockingMode) !== NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) !== NoMode) {\n \/\/ We will have dropped the effect list which contains the\n \/\/ deletion. We need to reconcile to delete the current child.\n reconcileChildFibers(workInProgress, current.child, null, renderLanes);\n@@ -2385,12 +2386,12 @@ function mountDehydratedSuspenseComponent(\n ): null | Fiber {\n \/\/ During the first pass, we'll bail out and not drill into the children.\n \/\/ Instead, we'll leave the content in place and try to hydrate it later.\n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n if (__DEV__) {\n console.error(\n 'Cannot hydrate Suspense in legacy mode. Switch from ' +\n 'ReactDOM.hydrate(element, container) to ' +\n- 'ReactDOM.createBlockingRoot(container, { hydrate: true })' +\n+ 'ReactDOM.createRoot(container, { hydrate: true })' +\n '.render(element) or remove the Suspense components from ' +\n 'the server rendered components.',\n );\n@@ -2443,7 +2444,7 @@ function updateDehydratedSuspenseComponent(\n );\n }\n \n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n return retrySuspenseComponentWithoutHydrating(\n current,\n workInProgress,\n@@ -2861,7 +2862,7 @@ function updateSuspenseListComponent(\n }\n pushSuspenseContext(workInProgress, suspenseContext);\n \n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n \/\/ In legacy mode, SuspenseList doesn't work so we just\n \/\/ use make it a noop by treating it as the default revealOrder.\n workInProgress.memoizedState = null;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\nindex 72b4e33431..2c355abdf9 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js\n@@ -128,7 +128,6 @@ import {\n NoMode,\n ProfileMode,\n StrictLegacyMode,\n- BlockingMode,\n } from '.\/ReactTypeOfMode';\n import {\n shouldSetTextContent,\n@@ -609,7 +608,6 @@ function updateOffscreenComponent(\n \/\/ Rendering a hidden tree.\n if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n \/\/ In legacy sync mode, don't defer the subtree. Render it now.\n- \/\/ TODO: Figure out what we should do in Blocking mode.\n const nextState: OffscreenState = {\n baseLanes: NoLanes,\n cachePool: null,\n@@ -2134,7 +2132,10 @@ function mountSuspenseFallbackChildren(\n \n let primaryChildFragment;\n let fallbackChildFragment;\n- if ((mode & BlockingMode) === NoMode && progressedPrimaryFragment !== null) {\n+ if (\n+ (mode & ConcurrentMode) === NoMode &&\n+ progressedPrimaryFragment !== null\n+ ) {\n \/\/ In legacy mode, we commit the primary tree as if it successfully\n \/\/ completed, even though it's in an inconsistent state.\n primaryChildFragment = progressedPrimaryFragment;\n@@ -2206,7 +2207,7 @@ function updateSuspensePrimaryChildren(\n children: primaryChildren,\n },\n );\n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n primaryChildFragment.lanes = renderLanes;\n }\n primaryChildFragment.return = workInProgress;\n@@ -2247,7 +2248,7 @@ function updateSuspenseFallbackChildren(\n if (\n \/\/ In legacy mode, we commit the primary tree as if it successfully\n \/\/ completed, even though it's in an inconsistent state.\n- (mode & BlockingMode) === NoMode &&\n+ (mode & ConcurrentMode) === NoMode &&\n \/\/ Make sure we're on the second pass, i.e. the primary child fragment was\n \/\/ already cloned. In legacy mode, the only case where this isn't true is\n \/\/ when DevTools forces us to display a fallback; we skip the first render\n@@ -2369,7 +2370,7 @@ function mountSuspenseFallbackAfterRetryWithoutHydrating(\n primaryChildFragment.sibling = fallbackChildFragment;\n workInProgress.child = primaryChildFragment;\n \n- if ((workInProgress.mode & BlockingMode) !== NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) !== NoMode) {\n \/\/ We will have dropped the effect list which contains the\n \/\/ deletion. We need to reconcile to delete the current child.\n reconcileChildFibers(workInProgress, current.child, null, renderLanes);\n@@ -2385,12 +2386,12 @@ function mountDehydratedSuspenseComponent(\n ): null | Fiber {\n \/\/ During the first pass, we'll bail out and not drill into the children.\n \/\/ Instead, we'll leave the content in place and try to hydrate it later.\n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n if (__DEV__) {\n console.error(\n 'Cannot hydrate Suspense in legacy mode. Switch from ' +\n 'ReactDOM.hydrate(element, container) to ' +\n- 'ReactDOM.createBlockingRoot(container, { hydrate: true })' +\n+ 'ReactDOM.createRoot(container, { hydrate: true })' +\n '.render(element) or remove the Suspense components from ' +\n 'the server rendered components.',\n );\n@@ -2443,7 +2444,7 @@ function updateDehydratedSuspenseComponent(\n );\n }\n \n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n return retrySuspenseComponentWithoutHydrating(\n current,\n workInProgress,\n@@ -2861,7 +2862,7 @@ function updateSuspenseListComponent(\n }\n pushSuspenseContext(workInProgress, suspenseContext);\n \n- if ((workInProgress.mode & BlockingMode) === NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) === NoMode) {\n \/\/ In legacy mode, SuspenseList doesn't work so we just\n \/\/ use make it a noop by treating it as the default revealOrder.\n workInProgress.memoizedState = null;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\nindex 47f65d2da6..1dcc0ec9c8 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js\n@@ -55,12 +55,7 @@ import {\n LegacyHiddenComponent,\n CacheComponent,\n } from '.\/ReactWorkTags';\n-import {\n- NoMode,\n- BlockingMode,\n- ConcurrentMode,\n- ProfileMode,\n-} from '.\/ReactTypeOfMode';\n+import {NoMode, ConcurrentMode, ProfileMode} from '.\/ReactTypeOfMode';\n import {\n Ref,\n Update,\n@@ -1059,12 +1054,10 @@ function completeWork(\n }\n \n if (nextDidTimeout && !prevDidTimeout) {\n- \/\/ If this subtree is running in blocking mode we can suspend,\n- \/\/ otherwise we won't suspend.\n \/\/ TODO: This will still suspend a synchronous tree if anything\n \/\/ in the concurrent tree already suspended during this render.\n \/\/ This is a known bug.\n- if ((workInProgress.mode & BlockingMode) !== NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) !== NoMode) {\n \/\/ TODO: Move this back to throwException because this is too late\n \/\/ if this is a large tree which is common for initial loads. We\n \/\/ don't know if we should restart a render or not until we get\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\nindex df878d24e7..dc1112d3b8 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js\n@@ -55,12 +55,7 @@ import {\n LegacyHiddenComponent,\n CacheComponent,\n } from '.\/ReactWorkTags';\n-import {\n- NoMode,\n- BlockingMode,\n- ConcurrentMode,\n- ProfileMode,\n-} from '.\/ReactTypeOfMode';\n+import {NoMode, ConcurrentMode, ProfileMode} from '.\/ReactTypeOfMode';\n import {\n Ref,\n Update,\n@@ -1059,12 +1054,10 @@ function completeWork(\n }\n \n if (nextDidTimeout && !prevDidTimeout) {\n- \/\/ If this subtree is running in blocking mode we can suspend,\n- \/\/ otherwise we won't suspend.\n \/\/ TODO: This will still suspend a synchronous tree if anything\n \/\/ in the concurrent tree already suspended during this render.\n \/\/ This is a known bug.\n- if ((workInProgress.mode & BlockingMode) !== NoMode) {\n+ if ((workInProgress.mode & ConcurrentMode) !== NoMode) {\n \/\/ TODO: Move this back to throwException because this is too late\n \/\/ if this is a large tree which is common for initial loads. We\n \/\/ don't know if we should restart a render or not until we get\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\nindex 9eb089d07d..00afb7daef 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\n@@ -34,7 +34,7 @@ import {\n \n import {\n NoMode,\n- BlockingMode,\n+ ConcurrentMode,\n DebugTracingMode,\n StrictEffectsMode,\n } from '.\/ReactTypeOfMode';\n@@ -1809,7 +1809,7 @@ function mountOpaqueIdentifier(): OpaqueIDType | void {\n \n const setId = mountState(id)[1];\n \n- if ((currentlyRenderingFiber.mode & BlockingMode) === NoMode) {\n+ if ((currentlyRenderingFiber.mode & ConcurrentMode) === NoMode) {\n if (\n __DEV__ &&\n enableStrictEffects &&\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\nindex b51d2020a8..3f60972dcd 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n@@ -34,7 +34,7 @@ import {\n \n import {\n NoMode,\n- BlockingMode,\n+ ConcurrentMode,\n DebugTracingMode,\n StrictEffectsMode,\n } from '.\/ReactTypeOfMode';\n@@ -1809,7 +1809,7 @@ function mountOpaqueIdentifier(): OpaqueIDType | void {\n \n const setId = mountState(id)[1];\n \n- if ((currentlyRenderingFiber.mode & BlockingMode) === NoMode) {\n+ if ((currentlyRenderingFiber.mode & ConcurrentMode) === NoMode) {\n if (\n __DEV__ &&\n enableStrictEffects &&\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\nindex ae6a5bdb59..f06925e10f 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.new.js\n@@ -25,7 +25,7 @@ import {\n } from 'shared\/ReactFeatureFlags';\n import {unstable_getThreadID} from 'scheduler\/tracing';\n import {initializeUpdateQueue} from '.\/ReactUpdateQueue.new';\n-import {LegacyRoot, BlockingRoot, ConcurrentRoot} from '.\/ReactRootTags';\n+import {LegacyRoot, ConcurrentRoot} from '.\/ReactRootTags';\n \n function FiberRootNode(containerInfo, tag, hydrate) {\n this.tag = tag;\n@@ -73,9 +73,6 @@ function FiberRootNode(containerInfo, tag, hydrate) {\n \n if (__DEV__) {\n switch (tag) {\n- case BlockingRoot:\n- this._debugRootType = 'createBlockingRoot()';\n- break;\n case ConcurrentRoot:\n this._debugRootType = 'createRoot()';\n break;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\nindex 0c0d45c098..712803920e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.old.js\n@@ -25,7 +25,7 @@ import {\n } from 'shared\/ReactFeatureFlags';\n import {unstable_getThreadID} from 'scheduler\/tracing';\n import {initializeUpdateQueue} from '.\/ReactUpdateQueue.old';\n-import {LegacyRoot, BlockingRoot, ConcurrentRoot} from '.\/ReactRootTags';\n+import {LegacyRoot, ConcurrentRoot} from '.\/ReactRootTags';\n \n function FiberRootNode(containerInfo, tag, hydrate) {\n this.tag = tag;\n@@ -73,9 +73,6 @@ function FiberRootNode(containerInfo, tag, hydrate) {\n \n if (__DEV__) {\n switch (tag) {\n- case BlockingRoot:\n- this._debugRootType = 'createBlockingRoot()';\n- break;\n case ConcurrentRoot:\n this._debugRootType = 'createRoot()';\n break;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberThrow.new.js b\/packages\/react-reconciler\/src\/ReactFiberThrow.new.js\nindex ba5a81eccc..2641bdd3b3 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberThrow.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberThrow.new.js\n@@ -34,7 +34,7 @@ import {\n ForceUpdateForLegacySuspense,\n } from '.\/ReactFiberFlags';\n import {shouldCaptureSuspense} from '.\/ReactFiberSuspenseComponent.new';\n-import {NoMode, BlockingMode, DebugTracingMode} from '.\/ReactTypeOfMode';\n+import {NoMode, ConcurrentMode, DebugTracingMode} from '.\/ReactTypeOfMode';\n import {\n enableDebugTracing,\n enableSchedulingProfiler,\n@@ -233,7 +233,7 @@ function throwException(\n \/\/ A legacy mode Suspense quirk, only relevant to hook components.\n const tag = sourceFiber.tag;\n if (\n- (sourceFiber.mode & BlockingMode) === NoMode &&\n+ (sourceFiber.mode & ConcurrentMode) === NoMode &&\n (tag === FunctionComponent ||\n tag === ForwardRef ||\n tag === SimpleMemoComponent)\n@@ -274,13 +274,13 @@ function throwException(\n wakeables.add(wakeable);\n }\n \n- \/\/ If the boundary is outside of blocking mode, we should *not*\n+ \/\/ If the boundary is in legacy mode, we should *not*\n \/\/ suspend the commit. Pretend as if the suspended component rendered\n \/\/ null and keep rendering. In the commit phase, we'll schedule a\n \/\/ subsequent synchronous update to re-render the Suspense.\n \/\/\n \/\/ Note: It doesn't matter whether the component that suspended was\n- \/\/ inside a blocking mode tree. If the Suspense is outside of it, we\n+ \/\/ inside a concurrent mode tree. If the Suspense is outside of it, we\n \/\/ should *not* suspend the commit.\n \/\/\n \/\/ If the suspense boundary suspended itself suspended, we don't have to\n@@ -288,7 +288,7 @@ function throwException(\n \/\/ directly do a second pass over the fallback in this render and\n \/\/ pretend we meant to render that directly.\n if (\n- (workInProgress.mode & BlockingMode) === NoMode &&\n+ (workInProgress.mode & ConcurrentMode) === NoMode &&\n workInProgress !== returnFiber\n ) {\n workInProgress.flags |= DidCapture;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js b\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\nindex baa807e180..294b807ebc 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\n@@ -34,7 +34,7 @@ import {\n ForceUpdateForLegacySuspense,\n } from '.\/ReactFiberFlags';\n import {shouldCaptureSuspense} from '.\/ReactFiberSuspenseComponent.old';\n-import {NoMode, BlockingMode, DebugTracingMode} from '.\/ReactTypeOfMode';\n+import {NoMode, ConcurrentMode, DebugTracingMode} from '.\/ReactTypeOfMode';\n import {\n enableDebugTracing,\n enableSchedulingProfiler,\n@@ -233,7 +233,7 @@ function throwException(\n \/\/ A legacy mode Suspense quirk, only relevant to hook components.\n const tag = sourceFiber.tag;\n if (\n- (sourceFiber.mode & BlockingMode) === NoMode &&\n+ (sourceFiber.mode & ConcurrentMode) === NoMode &&\n (tag === FunctionComponent ||\n tag === ForwardRef ||\n tag === SimpleMemoComponent)\n@@ -274,13 +274,13 @@ function throwException(\n wakeables.add(wakeable);\n }\n \n- \/\/ If the boundary is outside of blocking mode, we should *not*\n+ \/\/ If the boundary is in legacy mode, we should *not*\n \/\/ suspend the commit. Pretend as if the suspended component rendered\n \/\/ null and keep rendering. In the commit phase, we'll schedule a\n \/\/ subsequent synchronous update to re-render the Suspense.\n \/\/\n \/\/ Note: It doesn't matter whether the component that suspended was\n- \/\/ inside a blocking mode tree. If the Suspense is outside of it, we\n+ \/\/ inside a concurrent mode tree. If the Suspense is outside of it, we\n \/\/ should *not* suspend the commit.\n \/\/\n \/\/ If the suspense boundary suspended itself suspended, we don't have to\n@@ -288,7 +288,7 @@ function throwException(\n \/\/ directly do a second pass over the fallback in this render and\n \/\/ pretend we meant to render that directly.\n if (\n- (workInProgress.mode & BlockingMode) === NoMode &&\n+ (workInProgress.mode & ConcurrentMode) === NoMode &&\n workInProgress !== returnFiber\n ) {\n workInProgress.flags |= DidCapture;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\nindex 8f83cf88fe..5bd865cc4d 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n@@ -100,7 +100,6 @@ import {\n NoMode,\n StrictLegacyMode,\n ProfileMode,\n- BlockingMode,\n ConcurrentMode,\n } from '.\/ReactTypeOfMode';\n import {\n@@ -386,7 +385,7 @@ export function getCurrentTime() {\n export function requestUpdateLane(fiber: Fiber): Lane {\n \/\/ Special cases\n const mode = fiber.mode;\n- if ((mode & BlockingMode) === NoMode) {\n+ if ((mode & ConcurrentMode) === NoMode) {\n return (SyncLane: Lane);\n } else if ((mode & ConcurrentMode) === NoMode) {\n return getCurrentUpdateLanePriority() === SyncLanePriority\n@@ -467,7 +466,7 @@ function requestRetryLane(fiber: Fiber) {\n \n \/\/ Special cases\n const mode = fiber.mode;\n- if ((mode & BlockingMode) === NoMode) {\n+ if ((mode & ConcurrentMode) === NoMode) {\n return (SyncLane: Lane);\n } else if ((mode & ConcurrentMode) === NoMode) {\n return getCurrentUpdateLanePriority() === SyncLanePriority\n@@ -658,7 +657,7 @@ export function isInterleavedUpdate(fiber: Fiber, lane: Lane) {\n \/\/ Requires some refactoring. Not a big deal though since it's rare for\n \/\/ concurrent apps to have more than a single root.\n workInProgressRoot !== null &&\n- (fiber.mode & BlockingMode) !== NoMode &&\n+ (fiber.mode & ConcurrentMode) !== NoMode &&\n \/\/ If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),\n \/\/ then don't treat this as an interleaved update. This pattern is\n \/\/ accompanied by a warning but we haven't fully deprecated it yet. We can\n@@ -2545,7 +2544,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {\n return;\n }\n \n- if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {\n+ if (!(fiber.mode & ConcurrentMode)) {\n return;\n }\n \n@@ -2924,7 +2923,7 @@ export function warnIfUnmockedScheduler(fiber: Fiber) {\n didWarnAboutUnmockedScheduler === false &&\n Scheduler.unstable_flushAllWithoutAsserting === undefined\n ) {\n- if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {\n+ if (fiber.mode & ConcurrentMode) {\n didWarnAboutUnmockedScheduler = true;\n console.error(\n 'In Concurrent or Sync modes, the \"scheduler\" module needs to be mocked ' +\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\nindex 4b59de6b0d..fef8f4e56d 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n@@ -100,7 +100,6 @@ import {\n NoMode,\n StrictLegacyMode,\n ProfileMode,\n- BlockingMode,\n ConcurrentMode,\n } from '.\/ReactTypeOfMode';\n import {\n@@ -386,7 +385,7 @@ export function getCurrentTime() {\n export function requestUpdateLane(fiber: Fiber): Lane {\n \/\/ Special cases\n const mode = fiber.mode;\n- if ((mode & BlockingMode) === NoMode) {\n+ if ((mode & ConcurrentMode) === NoMode) {\n return (SyncLane: Lane);\n } else if ((mode & ConcurrentMode) === NoMode) {\n return getCurrentUpdateLanePriority() === SyncLanePriority\n@@ -467,7 +466,7 @@ function requestRetryLane(fiber: Fiber) {\n \n \/\/ Special cases\n const mode = fiber.mode;\n- if ((mode & BlockingMode) === NoMode) {\n+ if ((mode & ConcurrentMode) === NoMode) {\n return (SyncLane: Lane);\n } else if ((mode & ConcurrentMode) === NoMode) {\n return getCurrentUpdateLanePriority() === SyncLanePriority\n@@ -658,7 +657,7 @@ export function isInterleavedUpdate(fiber: Fiber, lane: Lane) {\n \/\/ Requires some refactoring. Not a big deal though since it's rare for\n \/\/ concurrent apps to have more than a single root.\n workInProgressRoot !== null &&\n- (fiber.mode & BlockingMode) !== NoMode &&\n+ (fiber.mode & ConcurrentMode) !== NoMode &&\n \/\/ If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),\n \/\/ then don't treat this as an interleaved update. This pattern is\n \/\/ accompanied by a warning but we haven't fully deprecated it yet. We can\n@@ -2545,7 +2544,7 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {\n return;\n }\n \n- if (!(fiber.mode & (BlockingMode | ConcurrentMode))) {\n+ if (!(fiber.mode & ConcurrentMode)) {\n return;\n }\n \n@@ -2924,7 +2923,7 @@ export function warnIfUnmockedScheduler(fiber: Fiber) {\n didWarnAboutUnmockedScheduler === false &&\n Scheduler.unstable_flushAllWithoutAsserting === undefined\n ) {\n- if (fiber.mode & BlockingMode || fiber.mode & ConcurrentMode) {\n+ if (fiber.mode & ConcurrentMode) {\n didWarnAboutUnmockedScheduler = true;\n console.error(\n 'In Concurrent or Sync modes, the \"scheduler\" module needs to be mocked ' +\ndiff --git a\/packages\/react-reconciler\/src\/ReactRootTags.js b\/packages\/react-reconciler\/src\/ReactRootTags.js\nindex 409f4bd931..cda44d6e1e 100644\n--- a\/packages\/react-reconciler\/src\/ReactRootTags.js\n+++ b\/packages\/react-reconciler\/src\/ReactRootTags.js\n@@ -7,8 +7,7 @@\n * @flow\n *\/\n \n-export type RootTag = 0 | 1 | 2;\n+export type RootTag = 0 | 1;\n \n export const LegacyRoot = 0;\n-export const BlockingRoot = 1;\n-export const ConcurrentRoot = 2;\n+export const ConcurrentRoot = 1;\ndiff --git a\/packages\/react-reconciler\/src\/ReactTypeOfMode.js b\/packages\/react-reconciler\/src\/ReactTypeOfMode.js\nindex a6499be7ac..466363fabd 100644\n--- a\/packages\/react-reconciler\/src\/ReactTypeOfMode.js\n+++ b\/packages\/react-reconciler\/src\/ReactTypeOfMode.js\n@@ -10,10 +10,9 @@\n export type TypeOfMode = number;\n \n export const NoMode = \/* *\/ 0b000000;\n-\/\/ TODO: Remove BlockingMode and ConcurrentMode by reading from the root tag instead\n-export const BlockingMode = \/* *\/ 0b000001;\n-export const ConcurrentMode = \/* *\/ 0b000010;\n-export const ProfileMode = \/* *\/ 0b000100;\n-export const DebugTracingMode = \/* *\/ 0b001000;\n-export const StrictLegacyMode = \/* *\/ 0b010000;\n-export const StrictEffectsMode = \/* *\/ 0b100000;\n+\/\/ TODO: Remove ConcurrentMode by reading from the root tag instead\n+export const ConcurrentMode = \/* *\/ 0b000001;\n+export const ProfileMode = \/* *\/ 0b000010;\n+export const DebugTracingMode = \/* *\/ 0b000100;\n+export const StrictLegacyMode = \/* *\/ 0b001000;\n+export const StrictEffectsMode = \/* *\/ 0b010000;\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactBatchedMode-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactBatching-test.internal.js\nsimilarity index 86%\nrename from packages\/react-reconciler\/src\/__tests__\/ReactBatchedMode-test.internal.js\nrename to packages\/react-reconciler\/src\/__tests__\/ReactBatching-test.internal.js\nindex c6af59fbd9..7998d2a231 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactBatchedMode-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactBatching-test.internal.js\n@@ -53,7 +53,7 @@ describe('ReactBlockingMode', () => {\n }\n \n it('updates flush without yielding in the next event', () => {\n- const root = ReactNoop.createBlockingRoot();\n+ const root = ReactNoop.createRoot();\n \n root.render(\n <>\n@@ -67,7 +67,7 @@ describe('ReactBlockingMode', () => {\n expect(root).toMatchRenderedOutput(null);\n \n \/\/ Everything should render immediately in the next event\n- expect(Scheduler).toFlushExpired(['A', 'B', 'C']);\n+ expect(Scheduler).toFlushAndYield(['A', 'B', 'C']);\n expect(root).toMatchRenderedOutput('ABC');\n });\n \n@@ -81,16 +81,17 @@ describe('ReactBlockingMode', () => {\n return ;\n }\n \n- const root = ReactNoop.createBlockingRoot();\n+ const root = ReactNoop.createRoot();\n root.render();\n expect(root).toMatchRenderedOutput(null);\n+ expect(Scheduler).toHaveYielded([]);\n \n- expect(Scheduler).toFlushExpired(['Hi', 'Layout effect']);\n+ expect(Scheduler).toFlushAndYield(['Hi', 'Layout effect']);\n expect(root).toMatchRenderedOutput('Hi');\n });\n \n it('uses proper Suspense semantics, not legacy ones', async () => {\n- const root = ReactNoop.createBlockingRoot();\n+ const root = ReactNoop.createRoot();\n root.render(\n }>\n \n@@ -105,15 +106,15 @@ describe('ReactBlockingMode', () => {\n <\/Suspense>,\n );\n \n- expect(Scheduler).toFlushExpired(['A', 'Suspend! [B]', 'C', 'Loading...']);\n- \/\/ In Legacy Mode, A and B would mount in a hidden primary tree. In Batched\n- \/\/ and Concurrent Mode, nothing in the primary tree should mount. But the\n+ expect(Scheduler).toFlushAndYield(['A', 'Suspend! [B]', 'C', 'Loading...']);\n+ \/\/ In Legacy Mode, A and B would mount in a hidden primary tree. In\n+ \/\/ Concurrent Mode, nothing in the primary tree should mount. But the\n \/\/ fallback should mount immediately.\n expect(root).toMatchRenderedOutput('Loading...');\n \n await jest.advanceTimersByTime(1000);\n expect(Scheduler).toHaveYielded(['Promise resolved [B]']);\n- expect(Scheduler).toFlushExpired(['A', 'B', 'C']);\n+ expect(Scheduler).toFlushAndYield(['A', 'B', 'C']);\n expect(root).toMatchRenderedOutput(\n <>\n A<\/span>\n@@ -125,7 +126,7 @@ describe('ReactBlockingMode', () => {\n \n it('flushSync does not flush batched work', () => {\n const {useState, forwardRef, useImperativeHandle} = React;\n- const root = ReactNoop.createBlockingRoot();\n+ const root = ReactNoop.createRoot();\n \n const Foo = forwardRef(({label}, ref) => {\n const [step, setStep] = useState(0);\n@@ -143,7 +144,7 @@ describe('ReactBlockingMode', () => {\n );\n \n \/\/ Mount\n- expect(Scheduler).toFlushExpired(['A0', 'B0']);\n+ expect(Scheduler).toFlushAndYield(['A0', 'B0']);\n expect(root).toMatchRenderedOutput('A0B0');\n \n \/\/ Schedule a batched update to the first sibling\n@@ -161,7 +162,7 @@ describe('ReactBlockingMode', () => {\n expect(root).toMatchRenderedOutput('A0B1');\n \n \/\/ Now flush the first update\n- expect(Scheduler).toFlushExpired(['A1']);\n+ expect(Scheduler).toFlushAndYield(['A1']);\n expect(root).toMatchRenderedOutput('A1B1');\n });\n });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\nindex 613fe89d63..a14c36bfce 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n@@ -1870,10 +1870,6 @@ describe('ReactIncrementalErrorHandling', () => {\n const root = ReactNoop.createRoot();\n root.render('Error when completing root');\n expect(Scheduler).toFlushAndThrow('Error when completing root');\n-\n- const blockingRoot = ReactNoop.createBlockingRoot();\n- blockingRoot.render('Error when completing root');\n- expect(Scheduler).toFlushAndThrow('Error when completing root');\n });\n }\n });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactOffscreen-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactOffscreen-test.js\nindex b3f14e6ad1..d04203089c 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactOffscreen-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactOffscreen-test.js\n@@ -125,7 +125,7 @@ describe('ReactOffscreen', () => {\n });\n \n \/\/ @gate experimental\n- it('does not defer in blocking mode', async () => {\n+ it('does defer in concurrent mode', async () => {\n let setState;\n function Foo() {\n const [state, _setState] = useState('A');\n@@ -133,7 +133,7 @@ describe('ReactOffscreen', () => {\n return ;\n }\n \n- const root = ReactNoop.createBlockingRoot();\n+ const root = ReactNoop.createRoot();\n await ReactNoop.act(async () => {\n root.render(\n <>\n@@ -143,9 +143,13 @@ describe('ReactOffscreen', () => {\n \n <\/>,\n );\n- \/\/ Should not defer the hidden tree\n- expect(Scheduler).toFlushUntilNextPaint(['A', 'Outside']);\n+ \/\/ Should defer the hidden tree.\n+ expect(Scheduler).toFlushUntilNextPaint(['Outside']);\n });\n+\n+ \/\/ The hidden tree was rendered at lower priority.\n+ expect(Scheduler).toHaveYielded(['A']);\n+\n expect(root).toMatchRenderedOutput(\n <>\n \ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseFuzz-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseFuzz-test.internal.js\nindex eabcb41be0..c67edf8a15 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseFuzz-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactSuspenseFuzz-test.internal.js\n@@ -170,13 +170,6 @@ describe('ReactSuspenseFuzz', () => {\n expect(legacyOutput).toEqual(expectedOutput);\n ReactNoop.renderLegacySyncRoot(null);\n \n- resetCache();\n- const batchedBlockingRoot = ReactNoop.createBlockingRoot();\n- batchedBlockingRoot.render(children);\n- resolveAllTasks();\n- const batchedSyncOutput = batchedBlockingRoot.getChildrenAsJSX();\n- expect(batchedSyncOutput).toEqual(expectedOutput);\n-\n resetCache();\n const concurrentRoot = ReactNoop.createRoot();\n concurrentRoot.render(children);\ndiff --git a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\nindex cb567340d3..20c83a46df 100644\n--- a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js\n@@ -66,23 +66,6 @@ describe('ReactStrictMode', () => {\n ]);\n });\n \n- \/\/ @gate experimental\n- it('should support overriding default via createBlockingRoot option', () => {\n- act(() => {\n- const container = document.createElement('div');\n- const root = ReactDOM.createBlockingRoot(container, {\n- unstable_strictModeLevel: 0,\n- });\n- root.render();\n- });\n-\n- expect(log).toEqual([\n- 'A: render',\n- 'A: useLayoutEffect mount',\n- 'A: useEffect mount',\n- ]);\n- });\n-\n \/\/ @gate experimental\n it('should disable strict mode if level 0 is specified', () => {\n act(() => {\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 5029a6f490..75ab4b6842 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -27,7 +27,7 @@ export const debugRenderPhaseSideEffectsForStrictMode = __DEV__;\n \/\/ this feature flag only impacts StrictEffectsMode.\n export const enableStrictEffects = false;\n \n-\/\/ If TRUE, trees rendered with createRoot (and createBlockingRoot) APIs will be StrictEffectsMode.\n+\/\/ If TRUE, trees rendered with createRoot will be StrictEffectsMode.\n \/\/ If FALSE, these trees will be StrictLegacyMode.\n export const createRootStrictEffectsByDefault = false;\n \n","files":[{"status":"M","path":"packages\/react-dom\/index.classic.fb.js"},{"status":"M","path":"packages\/react-dom\/index.experimental.js"},{"status":"M","path":"packages\/react-dom\/index.js"},{"status":"M","path":"packages\/react-dom\/index.modern.fb.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFiberAsync-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerPartialHydration-test.internal.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerSuspense-test.internal.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactUnmockedSchedulerWarning-test.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOM.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOMRoot.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/ReactNoop.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/ReactNoopPersistent.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/createReactNoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiber.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiber.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberThrow.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberThrow.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactRootTags.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactTypeOfMode.js"},{"previousPath":"packages\/react-reconciler\/src\/__tests__\/ReactBatchedMode-test.internal.js","status":"R086","path":"packages\/react-reconciler\/src\/__tests__\/ReactBatching-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactOffscreen-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactSuspenseFuzz-test.internal.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactStrictMode-test.internal.js"},{"status":"M","path":"packages\/shared\/ReactFeatureFlags.js"}],"parents":["acde654698659326af0ac4eded4a3ae7cb780a55"]}

dillon1000/react

Files changed