{"commit":{"revision":"cd4a96035fc262334e96e7ca2547b086d8a00dab","subject":"Remove old CM exports (#18710)","authorEmail":"sema@fb.com","authoredAt":"2020-05-04T21:39:57-07:00","shortRevision":"cd4a96035f","authorName":"Sebastian Markbåge"},"parents":["9751935abfa5585623f3ee85bb3c4eff4154e376"],"patch":"diff --git a\/packages\/react-dom\/index.classic.fb.js b\/packages\/react-dom\/index.classic.fb.js\nindex e946df7b76..1264badae7 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 createBlockingRoot,\n- unstable_discreteUpdates,\n- unstable_flushDiscreteUpdates,\n unstable_flushControlled,\n unstable_scheduleHydration,\n unstable_renderSubtreeIntoContainer,\ndiff --git a\/packages\/react-dom\/index.experimental.js b\/packages\/react-dom\/index.experimental.js\nindex b771d0105b..40676689ee 100644\n--- a\/packages\/react-dom\/index.experimental.js\n+++ b\/packages\/react-dom\/index.experimental.js\n@@ -21,8 +21,6 @@ export {\n \/\/ exposeConcurrentModeAPIs\n createRoot,\n createBlockingRoot,\n- unstable_discreteUpdates,\n- unstable_flushDiscreteUpdates,\n unstable_flushControlled,\n unstable_scheduleHydration,\n \/\/ Disabled behind disableUnstableRenderSubtreeIntoContainer\ndiff --git a\/packages\/react-dom\/index.modern.fb.js b\/packages\/react-dom\/index.modern.fb.js\nindex bcb213ad4e..258e12303e 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 createBlockingRoot,\n- unstable_discreteUpdates,\n- unstable_flushDiscreteUpdates,\n unstable_flushControlled,\n unstable_scheduleHydration,\n } from '.\/src\/client\/ReactDOM';\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex ee294218ce..741d24f731 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -200,8 +200,6 @@ export {\n \/\/ exposeConcurrentModeAPIs\n createRoot,\n createBlockingRoot,\n- discreteUpdates as unstable_discreteUpdates,\n- flushDiscreteUpdates as unstable_flushDiscreteUpdates,\n flushControlled as unstable_flushControlled,\n scheduleHydration as unstable_scheduleHydration,\n \/\/ Disabled behind disableUnstableRenderSubtreeIntoContainer\ndiff --git a\/packages\/react-interactions\/events\/src\/dom\/__tests__\/MixedResponders-test-internal.js b\/packages\/react-interactions\/events\/src\/dom\/__tests__\/MixedResponders-test-internal.js\nindex 2a31c5f37f..614aaffc1b 100644\n--- a\/packages\/react-interactions\/events\/src\/dom\/__tests__\/MixedResponders-test-internal.js\n+++ b\/packages\/react-interactions\/events\/src\/dom\/__tests__\/MixedResponders-test-internal.js\n@@ -104,76 +104,6 @@ describe('mixing responders with the heritage event system', () => {\n document.body.removeChild(newContainer);\n });\n \n- \/\/ @gate experimental\n- it('should properly flush sync when the event systems are mixed with unstable_flushDiscreteUpdates', () => {\n- const useTap = require('react-interactions\/events\/tap').useTap;\n- const ref = React.createRef();\n- let renderCounts = 0;\n-\n- function MyComponent() {\n- const [, updateCounter] = React.useState(0);\n- renderCounts++;\n-\n- function handleTap() {\n- updateCounter(count => count + 1);\n- }\n-\n- const listener = useTap({\n- onTapEnd: handleTap,\n- });\n-\n- return (\n-

\n- {\n- \/\/ This should flush synchronously\n- ReactDOM.unstable_flushDiscreteUpdates();\n- updateCounter(count => count + 1);\n- }}>\n- Press me\n- <\/button>\n- <\/div>\n- );\n- }\n-\n- const newContainer = document.createElement('div');\n- const root = ReactDOM.createRoot(newContainer);\n- document.body.appendChild(newContainer);\n- root.render();\n- Scheduler.unstable_flushAll();\n-\n- const target = createEventTarget(ref.current);\n- target.pointerdown({timeStamp: 100});\n- target.pointerup({timeStamp: 100});\n-\n- if (__DEV__) {\n- expect(renderCounts).toBe(4);\n- } else {\n- expect(renderCounts).toBe(2);\n- }\n- Scheduler.unstable_flushAll();\n- if (__DEV__) {\n- expect(renderCounts).toBe(6);\n- } else {\n- expect(renderCounts).toBe(3);\n- }\n-\n- target.pointerdown({timeStamp: 100});\n- \/\/ Ensure the timeStamp logic works\n- target.pointerup({timeStamp: 101});\n-\n- if (__DEV__) {\n- expect(renderCounts).toBe(8);\n- } else {\n- expect(renderCounts).toBe(4);\n- }\n-\n- Scheduler.unstable_flushAll();\n- document.body.removeChild(newContainer);\n- });\n-\n \/\/ @gate experimental\n it(\n 'should only flush before outermost discrete event handler when mixing ' +\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHotReloading.new.js b\/packages\/react-reconciler\/src\/ReactFiberHotReloading.new.js\nindex 21819bf9ed..0fe04f2cc9 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHotReloading.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHotReloading.new.js\n@@ -18,7 +18,7 @@ import {\n scheduleUpdateOnFiber,\n flushPassiveEffects,\n } from '.\/ReactFiberWorkLoop.new';\n-import {updateContainer, syncUpdates} from '.\/ReactFiberReconciler.new';\n+import {updateContainer} from '.\/ReactFiberReconciler.new';\n import {emptyContextObject} from '.\/ReactFiberContext.new';\n import {SyncLane} from '.\/ReactFiberLane';\n import {\n@@ -258,7 +258,7 @@ export const scheduleRoot: ScheduleRoot = (\n return;\n }\n flushPassiveEffects();\n- syncUpdates(() => {\n+ flushSync(() => {\n updateContainer(element, root, null, null);\n });\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHotReloading.old.js b\/packages\/react-reconciler\/src\/ReactFiberHotReloading.old.js\nindex 4e2951b7d4..6796db9511 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHotReloading.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHotReloading.old.js\n@@ -18,7 +18,7 @@ import {\n scheduleUpdateOnFiber,\n flushPassiveEffects,\n } from '.\/ReactFiberWorkLoop.old';\n-import {updateContainer, syncUpdates} from '.\/ReactFiberReconciler.old';\n+import {updateContainer} from '.\/ReactFiberReconciler.old';\n import {emptyContextObject} from '.\/ReactFiberContext.old';\n import {Sync} from '.\/ReactFiberExpirationTime.old';\n import {\n@@ -258,7 +258,7 @@ export const scheduleRoot: ScheduleRoot = (\n return;\n }\n flushPassiveEffects();\n- syncUpdates(() => {\n+ flushSync(() => {\n updateContainer(element, root, null, null);\n });\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\nindex 1215a5f3f4..311a76fc66 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.js\n@@ -21,7 +21,6 @@ import {\n batchedUpdates as batchedUpdates_old,\n unbatchedUpdates as unbatchedUpdates_old,\n deferredUpdates as deferredUpdates_old,\n- syncUpdates as syncUpdates_old,\n discreteUpdates as discreteUpdates_old,\n flushDiscreteUpdates as flushDiscreteUpdates_old,\n flushControlled as flushControlled_old,\n@@ -49,7 +48,6 @@ import {\n batchedUpdates as batchedUpdates_new,\n unbatchedUpdates as unbatchedUpdates_new,\n deferredUpdates as deferredUpdates_new,\n- syncUpdates as syncUpdates_new,\n discreteUpdates as discreteUpdates_new,\n flushDiscreteUpdates as flushDiscreteUpdates_new,\n flushControlled as flushControlled_new,\n@@ -88,9 +86,6 @@ export const unbatchedUpdates = enableNewReconciler\n export const deferredUpdates = enableNewReconciler\n ? deferredUpdates_new\n : deferredUpdates_old;\n-export const syncUpdates = enableNewReconciler\n- ? syncUpdates_new\n- : syncUpdates_old;\n export const discreteUpdates = enableNewReconciler\n ? discreteUpdates_new\n : discreteUpdates_old;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\nindex 4b694f7665..e18bc39b6c 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.new.js\n@@ -56,7 +56,6 @@ import {\n flushSync,\n flushControlled,\n deferredUpdates,\n- syncUpdates,\n discreteUpdates,\n flushDiscreteUpdates,\n flushPassiveEffects,\n@@ -306,7 +305,6 @@ export {\n batchedUpdates,\n unbatchedUpdates,\n deferredUpdates,\n- syncUpdates,\n discreteUpdates,\n flushDiscreteUpdates,\n flushControlled,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\nindex 38059c6820..396e2ef8c1 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n@@ -56,7 +56,6 @@ import {\n flushSync,\n flushControlled,\n deferredUpdates,\n- syncUpdates,\n discreteUpdates,\n flushDiscreteUpdates,\n flushPassiveEffects,\n@@ -308,7 +307,6 @@ export {\n batchedUpdates,\n unbatchedUpdates,\n deferredUpdates,\n- syncUpdates,\n discreteUpdates,\n flushDiscreteUpdates,\n flushControlled,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\nindex 0e9b9caaf0..43bb00cc78 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n@@ -1008,15 +1008,6 @@ export function deferredUpdates(fn: () => A): A {\n return runWithPriority(NormalSchedulerPriority, fn);\n }\n \n-export function syncUpdates(\n- fn: (A, B, C) => R,\n- a: A,\n- b: B,\n- c: C,\n-): R {\n- return runWithPriority(ImmediateSchedulerPriority, fn.bind(null, a, b, c));\n-}\n-\n function flushPendingDiscreteUpdates() {\n if (rootsWithPendingDiscreteUpdates !== null) {\n \/\/ For each root with pending discrete updates, schedule a callback to\n@@ -1113,7 +1104,11 @@ export function flushSync(fn: A => R, a: A): R {\n }\n executionContext |= BatchedContext;\n try {\n- return runWithPriority(ImmediateSchedulerPriority, fn.bind(null, a));\n+ if (fn) {\n+ return runWithPriority(ImmediateSchedulerPriority, fn.bind(null, a));\n+ } else {\n+ return (undefined: $FlowFixMe);\n+ }\n } finally {\n executionContext = prevExecutionContext;\n \/\/ Flush the immediate callbacks that were scheduled during this batch.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\nindex daadbbc570..a319602c38 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n@@ -1065,15 +1065,6 @@ export function deferredUpdates (fn: () => A): A {\n return runWithPriority(NormalPriority, fn);\n }\n \n-export function syncUpdates(\n- fn: (A, B, C) => R,\n- a: A,\n- b: B,\n- c: C,\n-): R {\n- return runWithPriority(ImmediatePriority, fn.bind(null, a, b, c));\n-}\n-\n function flushPendingDiscreteUpdates() {\n if (rootsWithPendingDiscreteUpdates !== null) {\n \/\/ For each root with pending discrete updates, schedule a callback to\n@@ -1167,7 +1158,11 @@ export function flushSync(fn: A => R, a: A): R {\n }\n executionContext |= BatchedContext;\n try {\n- return runWithPriority(ImmediatePriority, fn.bind(null, a));\n+ if (fn) {\n+ return runWithPriority(ImmediatePriority, fn.bind(null, a));\n+ } else {\n+ return (undefined: $FlowFixMe);\n+ }\n } finally {\n executionContext = prevExecutionContext;\n \/\/ Flush the immediate callbacks that were scheduled during this batch.\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\nindex 13ea6cf074..5dff2fde2c 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactHooksWithNoopRenderer-test.js\n@@ -1656,7 +1656,7 @@ describe('ReactHooksWithNoopRenderer', () => {\n });\n });\n \n- it('flushes passive effects when flushing discrete updates', () => {\n+ it('does not flush non-discrete passive effects when flushing sync', () => {\n let _updateCount;\n function Counter(props) {\n const [count, updateCount] = useState(0);\n@@ -1678,28 +1678,28 @@ describe('ReactHooksWithNoopRenderer', () => {\n expect(ReactNoop.getChildren()).toEqual([span('Count: 0')]);\n }).toErrorDev(['An update to Counter ran an effect']);\n \n- \/\/ A discrete event forces the passive effect to be flushed --\n- \/\/ updateCount(1) happens first, so 2 wins.\n- ReactNoop.flushDiscreteUpdates();\n- ReactNoop.discreteUpdates(() => {\n- \/\/ (use batchedUpdates to silence the act() warning)\n- ReactNoop.batchedUpdates(() => {\n+ \/\/ A flush sync doesn't cause the passive effects to fire.\n+ \/\/ So we haven't added the other update yet.\n+ act(() => {\n+ ReactNoop.flushSync(() => {\n _updateCount(2);\n });\n });\n- expect(Scheduler).toHaveYielded(['Will set count to 1']);\n- expect(() => {\n- expect(Scheduler).toFlushAndYield(['Count: 2']);\n- }).toErrorDev([\n- 'An update to Counter ran an effect',\n- 'An update to Counter ran an effect',\n+\n+ \/\/ As a result we, somewhat surprisingly, commit them in the opposite order.\n+ \/\/ This should be fine because any non-discrete set of work doesn't guarantee order\n+ \/\/ and easily could've happened slightly later too.\n+ expect(Scheduler).toHaveYielded([\n+ 'Will set count to 1',\n+ 'Count: 2',\n+ 'Count: 1',\n ]);\n \n- expect(ReactNoop.getChildren()).toEqual([span('Count: 2')]);\n+ expect(ReactNoop.getChildren()).toEqual([span('Count: 1')]);\n });\n \n \/\/ @gate enableSchedulerTracing\n- it('flushes passive effects when flushing discrete updates (with tracing)', () => {\n+ it('does not flush non-discrete passive effects when flushing sync (with tracing)', () => {\n const onInteractionScheduledWorkCompleted = jest.fn();\n const onWorkCanceled = jest.fn();\n SchedulerTracing.unstable_subscribe({\n@@ -1744,24 +1744,20 @@ describe('ReactHooksWithNoopRenderer', () => {\n \n expect(onInteractionScheduledWorkCompleted).toHaveBeenCalledTimes(0);\n \n- \/\/ A discrete event forces the passive effect to be flushed --\n- \/\/ updateCount(1) happens first, so 2 wins.\n- ReactNoop.flushDiscreteUpdates();\n- ReactNoop.discreteUpdates(() => {\n- \/\/ (use batchedUpdates to silence the act() warning)\n- ReactNoop.batchedUpdates(() => {\n+ \/\/ A flush sync doesn't cause the passive effects to fire.\n+ act(() => {\n+ ReactNoop.flushSync(() => {\n _updateCount(2);\n });\n });\n- expect(Scheduler).toHaveYielded(['Will set count to 1']);\n- expect(() => {\n- expect(Scheduler).toFlushAndYield(['Count: 2']);\n- }).toErrorDev([\n- 'An update to Counter ran an effect',\n- 'An update to Counter ran an effect',\n+\n+ expect(Scheduler).toHaveYielded([\n+ 'Will set count to 1',\n+ 'Count: 2',\n+ 'Count: 1',\n ]);\n \n- expect(ReactNoop.getChildren()).toEqual([span('Count: 2')]);\n+ expect(ReactNoop.getChildren()).toEqual([span('Count: 1')]);\n \n expect(onInteractionScheduledWorkCompleted).toHaveBeenCalledTimes(1);\n expect(onWorkCanceled).toHaveBeenCalledTimes(0);\n","body":"","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.modern.fb.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOM.js"},{"status":"M","path":"packages\/react-interactions\/events\/src\/dom\/__tests__\/MixedResponders-test-internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHotReloading.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHotReloading.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberReconciler.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberReconciler.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberReconciler.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\/__tests__\/ReactHooksWithNoopRenderer-test.js"}]}

dillon1000/react

Files changed