diff --git a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js index 6279e08ea3..0d55c77ae1 100644 --- a/packages/create-subscription/src/__tests__/createSubscription-test.internal.js +++ b/packages/create-subscription/src/__tests__/createSubscription-test.internal.js @@ -60,7 +60,7 @@ describe('createSubscription', () => { ReactNoop.render( {(value = 'default') => { - Scheduler.yieldValue(value); + Scheduler.unstable_yieldValue(value); return null; }} , @@ -97,7 +97,7 @@ describe('createSubscription', () => { }); function render(value = 'default') { - Scheduler.yieldValue(value); + Scheduler.unstable_yieldValue(value); return null; } @@ -126,9 +126,9 @@ describe('createSubscription', () => { function render(hasLoaded) { if (hasLoaded === undefined) { - Scheduler.yieldValue('loading'); + Scheduler.unstable_yieldValue('loading'); } else { - Scheduler.yieldValue(hasLoaded ? 'finished' : 'failed'); + Scheduler.unstable_yieldValue(hasLoaded ? 'finished' : 'failed'); } return null; } @@ -169,7 +169,7 @@ describe('createSubscription', () => { }); function render(value = 'default') { - Scheduler.yieldValue(value); + Scheduler.unstable_yieldValue(value); return null; } @@ -203,7 +203,7 @@ describe('createSubscription', () => { }); function render(hasLoaded) { - Scheduler.yieldValue('rendered'); + Scheduler.unstable_yieldValue('rendered'); return null; } @@ -235,7 +235,7 @@ describe('createSubscription', () => { }); function render(value = 'default') { - Scheduler.yieldValue(value); + Scheduler.unstable_yieldValue(value); return null; } @@ -268,7 +268,7 @@ describe('createSubscription', () => { const log = []; function Child({value}) { - Scheduler.yieldValue('Child: ' + value); + Scheduler.unstable_yieldValue('Child: ' + value); return null; } @@ -305,7 +305,7 @@ describe('createSubscription', () => { return ( {(value = 'default') => { - Scheduler.yieldValue('Subscriber: ' + value); + Scheduler.unstable_yieldValue('Subscriber: ' + value); return ; }} @@ -355,7 +355,7 @@ describe('createSubscription', () => { const log = []; function Child({value}) { - Scheduler.yieldValue('Child: ' + value); + Scheduler.unstable_yieldValue('Child: ' + value); return null; } @@ -392,7 +392,7 @@ describe('createSubscription', () => { return ( {(value = 'default') => { - Scheduler.yieldValue('Subscriber: ' + value); + Scheduler.unstable_yieldValue('Subscriber: ' + value); return ; }} diff --git a/packages/react-art/src/__tests__/ReactART-test.js b/packages/react-art/src/__tests__/ReactART-test.js index 647587c468..bc8bc79e1c 100644 --- a/packages/react-art/src/__tests__/ReactART-test.js +++ b/packages/react-art/src/__tests__/ReactART-test.js @@ -359,7 +359,7 @@ describe('ReactART', () => { const CurrentRendererContext = React.createContext(null); function Yield(props) { - Scheduler.yieldValue(props.value); + Scheduler.unstable_yieldValue(props.value); return null; } diff --git a/packages/react-cache/src/__tests__/ReactCache-test.internal.js b/packages/react-cache/src/__tests__/ReactCache-test.internal.js index f8a599b360..f7be9de093 100644 --- a/packages/react-cache/src/__tests__/ReactCache-test.internal.js +++ b/packages/react-cache/src/__tests__/ReactCache-test.internal.js @@ -45,12 +45,12 @@ describe('ReactCache', () => { listeners = [{resolve, reject}]; setTimeout(() => { if (textResourceShouldFail) { - Scheduler.yieldValue(`Promise rejected [${text}]`); + Scheduler.unstable_yieldValue(`Promise rejected [${text}]`); status = 'rejected'; value = new Error('Failed to load: ' + text); listeners.forEach(listener => listener.reject(value)); } else { - Scheduler.yieldValue(`Promise resolved [${text}]`); + Scheduler.unstable_yieldValue(`Promise resolved [${text}]`); status = 'resolved'; value = text; listeners.forEach(listener => listener.resolve(value)); @@ -78,7 +78,7 @@ describe('ReactCache', () => { }); function Text(props) { - Scheduler.yieldValue(props.text); + Scheduler.unstable_yieldValue(props.text); return props.text; } @@ -86,13 +86,13 @@ describe('ReactCache', () => { const text = props.text; try { TextResource.read([props.text, props.ms]); - Scheduler.yieldValue(text); + Scheduler.unstable_yieldValue(text); return text; } catch (promise) { if (typeof promise.then === 'function') { - Scheduler.yieldValue(`Suspend! [${text}]`); + Scheduler.unstable_yieldValue(`Suspend! [${text}]`); } else { - Scheduler.yieldValue(`Error! [${text}]`); + Scheduler.unstable_yieldValue(`Error! [${text}]`); } throw promise; } @@ -156,7 +156,7 @@ describe('ReactCache', () => { }); function App() { - Scheduler.yieldValue('App'); + Scheduler.unstable_yieldValue('App'); return BadTextResource.read(['Hi', 100]); } @@ -321,13 +321,13 @@ describe('ReactCache', () => { const text = props.text; try { const actualText = BadTextResource.read([props.text, props.ms]); - Scheduler.yieldValue(actualText); + Scheduler.unstable_yieldValue(actualText); return actualText; } catch (promise) { if (typeof promise.then === 'function') { - Scheduler.yieldValue(`Suspend! [${text}]`); + Scheduler.unstable_yieldValue(`Suspend! [${text}]`); } else { - Scheduler.yieldValue(`Error! [${text}]`); + Scheduler.unstable_yieldValue(`Error! [${text}]`); } throw promise; } diff --git a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js index 6ab8fe74a9..a3542d86ce 100644 --- a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js +++ b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js @@ -623,7 +623,7 @@ describe('ReactHooksInspectionIntegration', () => { await LazyFoo; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); let childFiber = renderer.root._currentFiber(); let tree = ReactDebugTools.inspectHooksOfFiber(childFiber); diff --git a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js index a63e45cec6..4c0f5bee50 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js +++ b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.internal.js @@ -85,7 +85,7 @@ describe('ReactDOMFiberAsync', () => { } const root = ReactDOM.unstable_createRoot(container); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(asyncValueRef.current.textContent).toBe(''); expect(syncValueRef.current.textContent).toBe(''); @@ -97,7 +97,7 @@ describe('ReactDOMFiberAsync', () => { // Should flush both updates now. jest.runAllTimers(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(asyncValueRef.current.textContent).toBe('hello'); expect(syncValueRef.current.textContent).toBe('hello'); }); @@ -115,12 +115,12 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); expect(container.textContent).toEqual(''); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); root.render(
Bye
); expect(container.textContent).toEqual('Hi'); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Bye'); }); @@ -137,12 +137,12 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(); expect(container.textContent).toEqual(''); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('0'); instance.setState({step: 1}); expect(container.textContent).toEqual('0'); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('1'); }); @@ -264,7 +264,7 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // Updates are async by default instance.push('A'); @@ -287,7 +287,7 @@ describe('ReactDOMFiberAsync', () => { expect(ops).toEqual(['BC']); // Flush the async updates - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('ABCD'); expect(ops).toEqual(['BC', 'ABCD']); }); @@ -305,13 +305,13 @@ describe('ReactDOMFiberAsync', () => { } const root = ReactDOM.unstable_createRoot(container); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('0'); // Test that a normal update is async inst.increment(); expect(container.textContent).toEqual('0'); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('1'); let ops = []; @@ -417,7 +417,7 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
); // Flush - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); let disableButton = disableButtonRef.current; expect(disableButton.tagName).toBe('BUTTON'); @@ -484,7 +484,7 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(); // Flush - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); let disableButton = disableButtonRef.current; expect(disableButton.tagName).toBe('BUTTON'); @@ -544,7 +544,7 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createRoot(container); root.render(); // Flush - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); let enableButton = enableButtonRef.current; expect(enableButton.tagName).toBe('BUTTON'); @@ -576,7 +576,7 @@ describe('ReactDOMFiberAsync', () => { const root = ReactDOM.unstable_createSyncRoot(container); function Text(props) { - Scheduler.yieldValue(props.text); + Scheduler.unstable_yieldValue(props.text); return props.text; } diff --git a/packages/react-dom/src/__tests__/ReactDOMHooks-test.js b/packages/react-dom/src/__tests__/ReactDOMHooks-test.js index ec23c88fa9..896c8c0aca 100644 --- a/packages/react-dom/src/__tests__/ReactDOMHooks-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMHooks-test.js @@ -60,7 +60,7 @@ describe('ReactDOMHooks', () => { expect(container.textContent).toBe('1'); expect(container2.textContent).toBe(''); expect(container3.textContent).toBe(''); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toBe('1'); expect(container2.textContent).toBe('2'); expect(container3.textContent).toBe('3'); @@ -69,7 +69,7 @@ describe('ReactDOMHooks', () => { expect(container.textContent).toBe('2'); expect(container2.textContent).toBe('2'); // Not flushed yet expect(container3.textContent).toBe('3'); // Not flushed yet - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toBe('2'); expect(container2.textContent).toBe('4'); expect(container3.textContent).toBe('6'); @@ -137,14 +137,14 @@ describe('ReactDOMHooks', () => { const root = ReactDOM.unstable_createRoot(container); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); inputRef.current.value = 'abc'; inputRef.current.dispatchEvent( new Event('input', {bubbles: true, cancelable: true}), ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(labelRef.current.innerHTML).toBe('abc'); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js index 095f44f554..75fca79208 100644 --- a/packages/react-dom/src/__tests__/ReactDOMRoot-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMRoot-test.js @@ -29,17 +29,17 @@ describe('ReactDOMRoot', () => { it('renders children', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); }); it('unmounts children', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); root.unmount(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual(''); }); @@ -51,7 +51,7 @@ describe('ReactDOMRoot', () => { ops.push('inside callback: ' + container.textContent); }); ops.push('before committing: ' + container.textContent); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); ops.push('after committing: ' + container.textContent); expect(ops).toEqual([ 'before committing: ', @@ -64,7 +64,7 @@ describe('ReactDOMRoot', () => { it('resolves `work.then` callback synchronously if the work already committed', () => { const root = ReactDOM.unstable_createRoot(container); const work = root.render('Hi'); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); let ops = []; work.then(() => { ops.push('inside callback'); @@ -92,7 +92,7 @@ describe('ReactDOMRoot', () => { , ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // Accepts `hydrate` option const container2 = document.createElement('div'); @@ -103,7 +103,7 @@ describe('ReactDOMRoot', () => { , ); - expect(() => Scheduler.flushAll()).toWarnDev('Extra attributes', { + expect(() => Scheduler.unstable_flushAll()).toWarnDev('Extra attributes', { withoutStack: true, }); }); @@ -117,7 +117,7 @@ describe('ReactDOMRoot', () => { d , ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('abcd'); root.render(
@@ -125,7 +125,7 @@ describe('ReactDOMRoot', () => { c
, ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('abdc'); }); @@ -157,7 +157,7 @@ describe('ReactDOMRoot', () => { const batch = root.createBatch(); batch.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // Hasn't updated yet expect(container.textContent).toEqual(''); @@ -186,7 +186,7 @@ describe('ReactDOMRoot', () => { const batch = root.createBatch(); batch.render(Hi); // Flush all async work. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // Root should complete without committing. expect(ops).toEqual(['Foo']); expect(container.textContent).toEqual(''); @@ -204,7 +204,7 @@ describe('ReactDOMRoot', () => { const batch = root.createBatch(); batch.render('Foo'); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // Hasn't updated yet expect(container.textContent).toEqual(''); @@ -244,7 +244,7 @@ describe('ReactDOMRoot', () => { const root = ReactDOM.unstable_createRoot(container); root.render(1); - Scheduler.advanceTime(2000); + Scheduler.unstable_advanceTime(2000); // This batch has a later expiration time than the earlier update. const batch = root.createBatch(); @@ -252,7 +252,7 @@ describe('ReactDOMRoot', () => { batch.commit(); expect(container.textContent).toEqual(''); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('1'); }); @@ -279,7 +279,7 @@ describe('ReactDOMRoot', () => { batch1.render(1); // This batch has a later expiration time - Scheduler.advanceTime(2000); + Scheduler.unstable_advanceTime(2000); const batch2 = root.createBatch(); batch2.render(2); @@ -298,7 +298,7 @@ describe('ReactDOMRoot', () => { batch1.render(1); // This batch has a later expiration time - Scheduler.advanceTime(2000); + Scheduler.unstable_advanceTime(2000); const batch2 = root.createBatch(); batch2.render(2); @@ -308,7 +308,7 @@ describe('ReactDOMRoot', () => { expect(container.textContent).toEqual('2'); batch1.commit(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('1'); }); @@ -334,7 +334,7 @@ describe('ReactDOMRoot', () => { it('warns when rendering with legacy API into createRoot() container', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); expect(() => { ReactDOM.render(
Bye
, container); @@ -349,7 +349,7 @@ describe('ReactDOMRoot', () => { ], {withoutStack: true}, ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // This works now but we could disallow it: expect(container.textContent).toEqual('Bye'); }); @@ -357,7 +357,7 @@ describe('ReactDOMRoot', () => { it('warns when hydrating with legacy API into createRoot() container', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); expect(() => { ReactDOM.hydrate(
Hi
, container); @@ -377,7 +377,7 @@ describe('ReactDOMRoot', () => { it('warns when unmounting with legacy API (no previous content)', () => { const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); let unmounted = false; expect(() => { @@ -393,10 +393,10 @@ describe('ReactDOMRoot', () => { {withoutStack: true}, ); expect(unmounted).toBe(false); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); root.unmount(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual(''); }); @@ -406,17 +406,17 @@ describe('ReactDOMRoot', () => { // The rest is the same as test above. const root = ReactDOM.unstable_createRoot(container); root.render(
Hi
); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); let unmounted = false; expect(() => { unmounted = ReactDOM.unmountComponentAtNode(container); }).toWarnDev('Did you mean to call root.unmount()?', {withoutStack: true}); expect(unmounted).toBe(false); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('Hi'); root.unmount(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual(''); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js index 2cc696ae6e..d5d632c987 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationSpecialTypes-test.js @@ -18,7 +18,7 @@ let ReactTestUtils; let forwardRef; let memo; let yieldedValues; -let yieldValue; +let unstable_yieldValue; let clearYields; function initModules() { @@ -32,7 +32,7 @@ function initModules() { memo = React.memo; yieldedValues = []; - yieldValue = value => { + unstable_yieldValue = value => { yieldedValues.push(value); }; clearYields = () => { @@ -92,7 +92,7 @@ describe('ReactDOMServerIntegration', () => { }); function Text({text}) { - yieldValue(text); + unstable_yieldValue(text); return {text}; } @@ -127,7 +127,7 @@ describe('ReactDOMServerIntegration', () => { 'comparator functions are not invoked on the server', async render => { const MemoCounter = React.memo(Counter, (oldProps, newProps) => { - yieldValue( + unstable_yieldValue( `Old count: ${oldProps.count}, New count: ${newProps.count}`, ); return oldProps.count === newProps.count; diff --git a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js index 36f4441397..8f67689f83 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js @@ -74,7 +74,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = true; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -83,7 +83,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; resolve(); await promise; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // We should now have hydrated with a ref on the existing span. @@ -242,7 +242,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = true; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -258,7 +258,7 @@ describe('ReactDOMServerPartialHydration', () => { // Flushing both of these in the same batch won't be able to hydrate so we'll // probably throw away the existing subtree. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // Pick up the new span. In an ideal implementation this might be the same span @@ -311,14 +311,14 @@ describe('ReactDOMServerPartialHydration', () => { suspend = true; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); // Render an update, but leave it still suspended. root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // Flushing now should delete the existing content and show the fallback. @@ -332,7 +332,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); let span = container.getElementsByTagName('span')[0]; @@ -384,7 +384,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = true; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -393,7 +393,7 @@ describe('ReactDOMServerPartialHydration', () => { root.render(); // Flushing now should delete the existing content and show the fallback. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(container.getElementsByTagName('span').length).toBe(0); @@ -405,7 +405,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); let span = container.getElementsByTagName('span')[0]; @@ -456,7 +456,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = true; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -465,7 +465,7 @@ describe('ReactDOMServerPartialHydration', () => { root.render(); // Flushing now should delete the existing content and show the fallback. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(container.getElementsByTagName('span').length).toBe(0); @@ -477,7 +477,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); let span = container.getElementsByTagName('span')[0]; @@ -537,7 +537,7 @@ describe('ReactDOMServerPartialHydration', () => { , ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -557,7 +557,7 @@ describe('ReactDOMServerPartialHydration', () => { // Flushing both of these in the same batch won't be able to hydrate so we'll // probably throw away the existing subtree. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // Pick up the new span. In an ideal implementation this might be the same span @@ -620,7 +620,7 @@ describe('ReactDOMServerPartialHydration', () => { , ); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(ref.current).toBe(null); @@ -633,7 +633,7 @@ describe('ReactDOMServerPartialHydration', () => { ); // Flushing now should delete the existing content and show the fallback. - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(container.getElementsByTagName('span').length).toBe(0); @@ -645,7 +645,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); let span = container.getElementsByTagName('span')[0]; @@ -694,7 +694,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); expect(container.textContent).toBe('Hello'); @@ -750,7 +750,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // This will have exceeded the suspended time so we should timeout. jest.advanceTimersByTime(500); // The boundary should longer be suspended for the middle content @@ -811,7 +811,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); // This will have exceeded the suspended time so we should timeout. jest.advanceTimersByTime(500); // The boundary should longer be suspended for the middle content @@ -887,7 +887,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // We're still loading because we're waiting for the server to stream more content. @@ -903,7 +903,7 @@ describe('ReactDOMServerPartialHydration', () => { // But it is not yet hydrated. expect(ref.current).toBe(null); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // Now it's hydrated. @@ -980,7 +980,7 @@ describe('ReactDOMServerPartialHydration', () => { suspend = false; let root = ReactDOM.unstable_createRoot(container, {hydrate: true}); root.render(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // We're still loading because we're waiting for the server to stream more content. @@ -994,7 +994,7 @@ describe('ReactDOMServerPartialHydration', () => { expect(container.textContent).toBe('Loading...'); expect(ref.current).toBe(null); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); jest.runAllTimers(); // Hydrating should've generated an error and replaced the suspense boundary. diff --git a/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.js b/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.js index d3fb9d0872..7f1d1c5db0 100644 --- a/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMSuspensePlaceholder-test.js @@ -96,7 +96,7 @@ describe('ReactDOMSuspensePlaceholder', () => { await advanceTimers(500); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(window.getComputedStyle(divs[0].current).display).toEqual('block'); expect(window.getComputedStyle(divs[1].current).display).toEqual('block'); @@ -119,7 +119,7 @@ describe('ReactDOMSuspensePlaceholder', () => { await advanceTimers(500); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.textContent).toEqual('ABC'); }); @@ -168,7 +168,7 @@ describe('ReactDOMSuspensePlaceholder', () => { await advanceTimers(500); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(container.innerHTML).toEqual( 'SiblingAsync', diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js index 4d046af383..38d300debd 100644 --- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration-test.js @@ -500,7 +500,7 @@ describe('ReactDOMServerHydration', () => { jest.runAllTimers(); await Promise.resolve(); - Scheduler.flushAll(); + Scheduler.unstable_flushAll(); expect(element.textContent).toBe('Hello world'); }); }); diff --git a/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js b/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js index de4877b45f..fb1027a306 100644 --- a/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js +++ b/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js @@ -71,7 +71,7 @@ function runActTests(label, render, unmount) { it('can use act to flush effects', () => { function App() { React.useEffect(() => { - Scheduler.yieldValue(100); + Scheduler.unstable_yieldValue(100); }); return null; } @@ -87,7 +87,7 @@ function runActTests(label, render, unmount) { function App() { let [ctr, setCtr] = React.useState(0); React.useEffect(() => { - Scheduler.yieldValue(ctr); + Scheduler.unstable_yieldValue(ctr); }); return (