Skip to content

Commit

Permalink
React Native sync for revisions fccf3a9...3554c88
Browse files Browse the repository at this point in the history
Summary:
This sync includes the following changes:
- **[3554c8852](facebook/react@3554c8852 )**: Clean interface for public instances between React and React Native ([#26416](facebook/react#26416)) //<Rubén Norte>//
- **[db281b3d9](facebook/react@db281b3d9 )**: Feature: Suspend commit without blocking render ([#26398](facebook/react#26398)) //<Andrew Clark>//
- **[55308554e](facebook/react@55308554e )**: [www] enable enableFilterEmptyStringAttributesDOM flag ([#26410](facebook/react#26410)) //<Jan Kassens>//
- **[163d86e19](facebook/react@163d86e19 )**: Updated comment message ([#26158](facebook/react#26158)) //<Ibrahim Amin>//
- **[108aed083](facebook/react@108aed083 )**: Fix use of stale props in Fabric events ([#26408](facebook/react#26408)) //<Rubén Norte>//
- **[8fa41ffa2](facebook/react@8fa41ffa2 )**: Don't "fix up" mismatched text content with suppressedHydrationWarning ([#26391](facebook/react#26391)) //<Sebastian Markbåge>//
- **[05777ffb0](facebook/react@05777ffb0 )**: Setting transition pending flag shouldn't be part of a surrounding transition ([#26243](facebook/react#26243)) //<Sophie Alpert>//
- **[99aa082be](facebook/react@99aa082be )**: Remove unstable_flushControlled ([#26397](facebook/react#26397)) //<Jan Kassens>//
- **[47cf4e578](facebook/react@47cf4e578 )**: Restore some guards in ReactFabricGlobalResponderHandler after refactor ([#26394](facebook/react#26394)) //<Rubén Norte>//
- **[cfc1274e3](facebook/react@cfc1274e3 )**: Disable IE innerHTML workaround behind a flag ([#26390](facebook/react#26390)) //<Sebastian Markbåge>//
- **[a57f40d83](facebook/react@a57f40d83 )**: Undo dependency injection of batching ([#26389](facebook/react#26389)) //<Sebastian Markbåge>//
- **[d310d654a](facebook/react@d310d654a )**: Avoid meta programming to initialize functions in module scope  ([#26388](facebook/react#26388)) //<Sebastian Markbåge>//
- **[21aee59e4](facebook/react@21aee59e4 )**: Delete unused DOM files ([#26387](facebook/react#26387)) //<Sebastian Markbåge>//
- **[6bd53a5bd](facebook/react@6bd53a5bd )**: Remove FeatureFlags fork for `react-dom/unstable_testing` ([#26383](facebook/react#26383)) //<Sebastian Markbåge>//
- **[2788d0d8d](facebook/react@2788d0d8d )**: Allow empty string to be passed to formAction ([#26379](facebook/react#26379)) //<Sebastian Markbåge>//
- **[f828bad38](facebook/react@f828bad38 )**: Extracted definition and access to public instances to a separate module in Fabric ([#26321](facebook/react#26321)) //<Rubén Norte>//
- **[131768166](facebook/react@131768166 )**: Support Context as renderable node ([#25641](facebook/react#25641)) //<Andrew Clark>//
- **[d4f58c3b8](facebook/react@d4f58c3b8 )**: Support Promise as a renderable node  ([#25634](facebook/react#25634)) //<Andrew Clark>//
- **[633461486](facebook/react@633461486 )**: Add disableLegacyContext test gates where needed ([#26371](facebook/react#26371)) //<Andrew Clark>//
- **[432ffc9d0](facebook/react@432ffc9d0 )**: Convert more Scheduler.unstable_flushAll in tests to new test utils ([#26369](facebook/react#26369)) //<Tianyu Yao>//
- **[69fd78fe3](facebook/react@69fd78fe3 )**: Update Float tests to check for specific errors ([#26367](facebook/react#26367)) //<Andrew Clark>//
- **[93c10dfa6](facebook/react@93c10dfa6 )**: flushSync: Exhaust queue even if something throws ([#26366](facebook/react#26366)) //<Andrew Clark>//
- **[be353d251](facebook/react@be353d251 )**: [Flight Reply] Add undefined and Iterable Support ([#26365](facebook/react#26365)) //<Sebastian Markbåge>//
- **[ef8bdbecb](facebook/react@ef8bdbecb )**: [Flight Reply] Add Reply Encoding ([#26360](facebook/react#26360)) //<Sebastian Markbåge>//
- **[a8875eab7](facebook/react@a8875eab7 )**: Update more tests to not rely on sync queuing ([#26358](facebook/react#26358)) //<Andrew Clark>//
- **[d1ad984db](facebook/react@d1ad984db )**: [Flight] Add support for returning `undefined` from render ([#26349](facebook/react#26349)) //<Sebastian Silbermann>//
- **[39d4b9365](facebook/react@39d4b9365 )**: [Internal tests] Close MessageChannel port to prevent leak ([#26357](facebook/react#26357)) //<Andrew Clark>//
- **[3706edb81](facebook/react@3706edb81 )**: [Float][Fizz]: Don't preload nomodule scripts ([#26353](facebook/react#26353)) //<Josh Story>//
- **[2b003a5cc](facebook/react@2b003a5cc )**: Split out ServerReferenceMetadata into Id and Bound Arguments ([#26351](facebook/react#26351)) //<Sebastian Markbåge>//
- **[62cd5af08](facebook/react@62cd5af08 )**: Codemod redundant async act scopes ([#26350](facebook/react#26350)) //<Andrew Clark>//
- **[037378202](facebook/react@037378202 )**: Internal `act`: Call scope function after an async gap ([#26347](facebook/react#26347)) //<Andrew Clark>//
- **[d8e49f2af](facebook/react@d8e49f2af )**: Use setTimeout to schedule work on the server in Edge environments ([#26348](facebook/react#26348)) //<Sebastian Markbåge>//
- **[83643778b](facebook/react@83643778b )**: Internal test helpers: Use Node's MessageChannel to queue task ([#26345](facebook/react#26345)) //<Andrew Clark>//
- **[44d380794](facebook/react@44d380794 )**: Move internalAct to internal-test-utils package ([#26344](facebook/react#26344)) //<Andrew Clark>//
- **[d81447304](facebook/react@d81447304 )**: [Internal API only] Delete non-awaited form of act ([#26339](facebook/react#26339)) //<Andrew Clark>//
- **[702fc984e](facebook/react@702fc984e )**: Codemod act -> await act (4/?) ([#26338](facebook/react#26338)) //<Andrew Clark>//
- **[9fb2469a6](facebook/react@9fb2469a6 )**: Restore definition of NativeMethods as an object for React Native ([#26341](facebook/react#26341)) //<Rubén Norte>//
- **[161f6ae42](facebook/react@161f6ae42 )**: Codemod act -> await act (3/?) ([#26336](facebook/react#26336)) //<Andrew Clark>//
- **[58605f798](facebook/react@58605f798 )**: Codemod act -> await act (2/?) ([#26335](facebook/react#26335)) //<Andrew Clark>//
- **[703c67560](facebook/react@703c67560 )**: Codemod act -> await act (1/?) ([#26334](facebook/react#26334)) //<Andrew Clark>//
- **[b380c2485](facebook/react@b380c2485 )**: Convert class equivlance tests to flushSync ([#26333](facebook/react#26333)) //<Andrew Clark>//
- **[8f812e75d](facebook/react@8f812e75d )**: Refactor ReactFabricHostComponent ([#26323](facebook/react#26323)) //<Rubén Norte>//
- **[978fae4b4](facebook/react@978fae4b4 )**: [Float][Fiber] implement a faster hydration match for hoistable elements ([#26154](facebook/react#26154)) //<Josh Story>//
- **[8a9f82ed5](facebook/react@8a9f82ed5 )**: [Float][Fizz][Fiber] - Do not hoist elements with `itemProp` & hydrate more tolerantly in hoist contexts ([#26256](facebook/react#26256)) //<Josh Story>//
- **[3cad3a54e](facebook/react@3cad3a54e )**: Use content hash for facebook-www builds ([#26331](facebook/react#26331)) //<Jan Kassens>//
- **[ba353a50a](facebook/react@ba353a50a )**: Build: make version in build artifacts match ([#26329](facebook/react#26329)) //<Jan Kassens>//
- **[6e1756a5a](facebook/react@6e1756a5a )**: Move suspended render logic to ensureRootIsScheduled ([#26328](facebook/react#26328)) //<Andrew Clark>//
- **[1528c5ccd](facebook/react@1528c5ccd )**: SchedulerMock.unstable_yieldValue -> SchedulerMock.log ([#26312](facebook/react#26312)) //<Andrew Clark>//
- **[4bbac04cd](facebook/react@4bbac04cd )**: Upgrade Flow to 0.201 ([#26326](facebook/react#26326)) //<Jan Kassens>//
- **[eb616a12f](facebook/react@eb616a12f )**: Extract duplicated methods in Fabric and the legacy renderer to a shared module ([#26319](facebook/react#26319)) //<Rubén Norte>//
- **[49f741046](facebook/react@49f741046 )**: Fix: Infinite act loop caused by wrong shouldYield ([#26317](facebook/react#26317)) //<Andrew Clark>//
- **[106ea1c58](facebook/react@106ea1c58 )**: Support Iterables in Flight ([#26313](facebook/react#26313)) //<Sebastian Markbåge>//
- **[f905da227](facebook/react@f905da227 )**: [Flight] Send server reference error chunks to the client ([#26293](facebook/react#26293)) //<Hendrik Liebau>//
- **[e0241b660](facebook/react@e0241b660 )**: Simplify Webpack References by encoding file path + export name as single id ([#26300](facebook/react#26300)) //<Sebastian Markbåge>//
- **[25685d8a9](facebook/react@25685d8a9 )**: Codemod tests to waitFor pattern (9/?) ([#26309](facebook/react#26309)) //<Andrew Clark>//
- **[64dde7082](facebook/react@64dde7082 )**: Codemod tests to waitFor pattern (8/?) ([#26308](facebook/react#26308)) //<Andrew Clark>//
- **[3cb5afb82](facebook/react@3cb5afb82 )**: Codemod tests to waitFor pattern (7/?) ([#26307](facebook/react#26307)) //<Andrew Clark>//
- **[e98695db9](facebook/react@e98695db9 )**: Codemod tests to waitFor pattern (6/?) ([#26305](facebook/react#26305)) //<Andrew Clark>//
- **[9a52cc8bc](facebook/react@9a52cc8bc )**: Convert ReactLazy-test to waitFor pattern ([#26304](facebook/react#26304)) //<Andrew Clark>//
- **[03462cfc7](facebook/react@03462cfc7 )**: [Fizz] External runtime: fix bug in processing existing elements ([#26303](facebook/react#26303)) //<mofeiZ>//
- **[faacefb4d](facebook/react@faacefb4d )**: Codemod tests to waitFor pattern (4/?) ([#26302](facebook/react#26302)) //<Andrew Clark>//
- **[06460b6fb](facebook/react@06460b6fb )**: Remove unnecessary (and incorrect) code for compatibility with Paper in the Fabric version of GlobalResponderHandler ([#26290](facebook/react#26290)) //<Rubén Norte>//
- **[ce8a72fd4](facebook/react@ce8a72fd4 )**: Codemod tests to waitFor pattern (2/?) ([#26296](facebook/react#26296)) //<Andrew Clark>//
- **[1f1f8eb55](facebook/react@1f1f8eb55 )**: [Float][Fizz][Fiber]: Refactor <style> Resource implementation to group on flush ([#26280](facebook/react#26280)) //<Josh Story>//
- **[5c633a48f](facebook/react@5c633a48f )**: Add back accidentally deleted test comments ([#26294](facebook/react#26294)) //<Andrew Clark>//
- **[b72ed698f](facebook/react@b72ed698f )**: Fixed incorrect value returned as public instance from reconciler ([#26283](facebook/react#26283)) //<Rubén Norte>//
- **[25a8b9735](facebook/react@25a8b9735 )**: Codemod tests to waitFor pattern (1/?) ([#26288](facebook/react#26288)) //<Andrew Clark>//
- **[e52446733](facebook/react@e52446733 )**: New internal testing helpers: waitFor, waitForAll, waitForPaint ([#26285](facebook/react#26285)) //<Andrew Clark>//
- **[d49e0e0be](facebook/react@d49e0e0be )**: Removed unused imperative events implementation from React Native renderer ([#26282](facebook/react#26282)) //<Rubén Norte>//
- **[41110021f](facebook/react@41110021f )**: Fix: Selective hydration causing incorrect thenable type passed to DevTools ([#26275](facebook/react#26275)) //<Andrew Clark>//
- **[67a61d5bd](facebook/react@67a61d5bd )**: [Flight Fixture] Show SSR Support with CSS ([#26263](facebook/react#26263)) //<Sebastian Markbåge>//
- **[40755c01a](facebook/react@40755c01a )**: [Flight Fixture] Proxy requests through the global server instead of directly ([#26257](facebook/react#26257)) //<Sebastian Markbåge>//
- **[b2ae9ddb3](facebook/react@b2ae9ddb3 )**: Cleanup enableSyncDefaultUpdate flag ([#26236](facebook/react#26236)) //<Jan Kassens>//
- **[6ff1733e6](facebook/react@6ff1733e6 )**: [Float][Fizz][Fiber] support type for ReactDOM.preload() options ([#26239](facebook/react#26239)) //<Josh Story>//
- **[1173a17e6](facebook/react@1173a17e6 )**: [Float][Fizz][Fiber] implement preconnect and prefetchDNS float methods ([#26237](facebook/react#26237)) //<Josh Story>//
- **[a8f971b7a](facebook/react@a8f971b7a )**: Switch to mount dispatcher after use() when needed ([#26232](facebook/react#26232)) //<Sophie Alpert>//
- **[96cdeaf89](facebook/react@96cdeaf89 )**: [Fizz Node] Fix null bytes written at text chunk boundaries ([#26228](facebook/react#26228)) //<Sophie Alpert>//
- **[c04b18070](facebook/react@c04b18070 )**: Remove eventTime field from class Update type ([#26219](facebook/react#26219)) //<Andrew Clark>//
- **[60144a04d](facebook/react@60144a04d )**: Split out Edge and Node implementations of the Flight Client ([#26187](facebook/react#26187)) //<Sebastian Markbåge>//
- **[70b0bbda7](facebook/react@70b0bbda7 )**: [fizz][external-runtime] Fix: process mutation records before disconnecting ([#26169](facebook/react#26169)) //<mofeiZ>//
- **[c7967b194](facebook/react@c7967b194 )**: Distribute bundles more evenly into CI shards ([#26208](facebook/react#26208)) //<Sebastian Silbermann>//
- **[bb1e3d0e1](facebook/react@bb1e3d0e1 )**: Fail yarn build if any bundle fails to build ([#26207](facebook/react#26207)) //<Sebastian Silbermann>//
- **[62e6c4612](facebook/react@62e6c4612 )**: Move Mutation/Persistence fork inline into the functions ([#26206](facebook/react#26206)) //<Sebastian Markbåge>//
- **[80cf4a099](facebook/react@80cf4a099 )**: Update Closure Compiler ([#26205](facebook/react#26205)) //<Sebastian Markbåge>//
- **[6b6d0617e](facebook/react@6b6d0617e )**: Update Rollup and related plugins to their most recent versions ([#24916](facebook/react#24916)) //<Glenn 'devalias' Grant>//
- **[bc38a3dfa](facebook/react@bc38a3dfa )**: Update rollup config to use moduleSideEffects ([#26199](facebook/react#26199)) //<Ming Ye>//
- **[c9d9f524d](facebook/react@c9d9f524d )**: Make enableCustomElementPropertySupport a dynamic flag in www build ([#26194](facebook/react#26194)) //<Andrew Clark>//
- **[189f70e17](facebook/react@189f70e17 )**: Create a bunch of custom webpack vs unbundled node bundles ([#26172](facebook/react#26172)) //<Sebastian Markbåge>//
- **[fbf3bc315](facebook/react@fbf3bc315 )**: Add `scale` as a unitless property ([#25601](facebook/react#25601)) //<Jonny Burger>//

Changelog:
[General][Changed] - React Native sync for revisions fccf3a9...3554c88

jest_e2e[run_all_tests]
bypass-github-export-checks

Fixes tests for current React version.

Reviewed By: sammy-SC

Differential Revision: D44216371

fbshipit-source-id: a569c9aeaf2d96d150219e148f06dcde9ba6f7cd
  • Loading branch information
rubennorte authored and facebook-github-bot committed Mar 21, 2023
1 parent 6ed8289 commit 41ace35
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ describe('ReactRelayFragmentContainer', () => {

describe('concurrent mode', () => {
function assertYieldsWereCleared(_scheduler) {
const actualYields = _scheduler.unstable_clearYields();
const actualYields = _scheduler.unstable_clearLog();
if (actualYields.length !== 0) {
throw new Error(
'Log of yielded values is not empty. ' +
Expand All @@ -653,22 +653,22 @@ describe('ReactRelayFragmentContainer', () => {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushAllWithoutAsserting();
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

function expectSchedulerToFlushAndYieldThrough(expectedYields) {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushNumberOfYields(expectedYields.length);
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

it('upon commit, it should pick up changes in data that happened before comitting', () => {
const Scheduler = require('scheduler');
const YieldChild = props => {
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
};
const YieldyUserComponent = ({user}) => {
Expand Down
16 changes: 8 additions & 8 deletions packages/react-relay/__tests__/ReactRelayQueryRenderer-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ describe('ReactRelayQueryRenderer', () => {
it('fetches the query only once, renders loading state', () => {
environment.mockClear();
function Child(props) {
// NOTE the unstable_yield method will move to the static renderer.
// NOTE the log method will move to the static renderer.
// When React sync runs we need to update this.
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
}

Expand Down Expand Up @@ -173,7 +173,7 @@ describe('ReactRelayQueryRenderer', () => {

// Flush some of the changes, but don't commit
Scheduler.unstable_flushNumberOfYields(2);
expect(Scheduler.unstable_clearYields()).toEqual(['A', 'B']);
expect(Scheduler.unstable_clearLog()).toEqual(['A', 'B']);
expect(renderer.toJSON()).toEqual(null);
expect({
error: null,
Expand Down Expand Up @@ -214,7 +214,7 @@ describe('ReactRelayQueryRenderer', () => {
function Child(props) {
// NOTE the unstable_yield method will move to the static renderer.
// When React sync runs we need to update this.
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
}

Expand Down Expand Up @@ -244,7 +244,7 @@ describe('ReactRelayQueryRenderer', () => {

// Flush some of the changes, but don't commit
Scheduler.unstable_flushNumberOfYields(2);
expect(Scheduler.unstable_clearYields()).toEqual(['A', 'B']);
expect(Scheduler.unstable_clearLog()).toEqual(['A', 'B']);
expect(renderer.toJSON()).toEqual(null);
expect({
error: null,
Expand Down Expand Up @@ -300,9 +300,9 @@ describe('ReactRelayQueryRenderer', () => {
});

function Child(props) {
// NOTE the unstable_yieldValue method will move to the static renderer.
// NOTE the log method will move to the static renderer.
// When React sync runs we need to update this.
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
}

Expand Down Expand Up @@ -332,7 +332,7 @@ describe('ReactRelayQueryRenderer', () => {

// Flush some of the changes, but don't commit
Scheduler.unstable_flushNumberOfYields(2);
expect(Scheduler.unstable_clearYields()).toEqual(['A', 'B']);
expect(Scheduler.unstable_clearLog()).toEqual(['A', 'B']);
expect(renderer.toJSON()).toEqual(null);
expect({
error: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ describe('ReactRelayRefetchContainer', () => {

describe('concurrent mode', () => {
function assertYieldsWereCleared(_scheduler) {
const actualYields = _scheduler.unstable_clearYields();
const actualYields = _scheduler.unstable_clearLog();
if (actualYields.length !== 0) {
throw new Error(
'Log of yielded values is not empty. ' +
Expand All @@ -1100,22 +1100,22 @@ describe('ReactRelayRefetchContainer', () => {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushAllWithoutAsserting();
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

function expectSchedulerToFlushAndYieldThrough(expectedYields) {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushNumberOfYields(expectedYields.length);
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

it('upon commit, it should pick up changes in data that happened before comitting', () => {
const Scheduler = require('scheduler');
const YieldChild = props => {
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
};
const YieldyUserComponent = ({user, relay}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ describe('useBlockingPaginationFragment with useTransition', () => {
result.isPendingNext = isPendingNext;

useEffect(() => {
Scheduler.unstable_yieldValue({data, ...result});
Scheduler.log({data, ...result});
});

return {data, ...result};
}

function assertYieldsWereCleared() {
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
if (actualYields.length !== 0) {
throw new Error(
'Log of yielded values is not empty. ' +
Expand Down Expand Up @@ -135,7 +135,7 @@ describe('useBlockingPaginationFragment with useTransition', () => {
) {
assertYieldsWereCleared();
Scheduler.unstable_flushNumberOfYields(expectedYields.length);
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields.length).toEqual(expectedYields.length);
expectedYields.forEach((expected, idx) =>
assertYield(expected, actualYields[idx]),
Expand Down Expand Up @@ -429,7 +429,7 @@ describe('useBlockingPaginationFragment with useTransition', () => {

const Fallback = () => {
useEffect(() => {
Scheduler.unstable_yieldValue('Fallback');
Scheduler.log('Fallback');
});

return 'Fallback';
Expand Down Expand Up @@ -1052,7 +1052,7 @@ describe('useBlockingPaginationFragment with useTransition', () => {
});

Scheduler.unstable_flushNumberOfYields(1);
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();

if (flushFallback) {
// Flushing fallbacks by running a timer could cause other side-effects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ disallowWarnings();
const {useEffect, useMemo, useState} = React;

function assertYieldsWereCleared(_scheduler: any) {
const actualYields = _scheduler.unstable_clearYields();
const actualYields = _scheduler.unstable_clearLog();
if (actualYields.length !== 0) {
throw new Error(
'Log of yielded values is not empty. ' +
Expand All @@ -61,15 +61,15 @@ function assertYieldsWereCleared(_scheduler: any) {

function expectSchedulerToHaveYielded(expectedYields: any) {
const Scheduler = require('scheduler');
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

function flushScheduler() {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushAllWithoutAsserting();
return Scheduler.unstable_clearYields();
return Scheduler.unstable_clearLog();
}

function expectSchedulerToFlushAndYield(expectedYields: any) {
Expand All @@ -81,7 +81,7 @@ function expectSchedulerToFlushAndYieldThrough(expectedYields: any) {
const Scheduler = require('scheduler');
assertYieldsWereCleared(Scheduler);
Scheduler.unstable_flushNumberOfYields(expectedYields.length);
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields).toEqual(expectedYields);
}

Expand Down Expand Up @@ -856,7 +856,7 @@ describe.each([
const YieldChild = (props: any) => {
// NOTE the unstable_yield method will move to the static renderer.
// When React sync runs we need to update this.
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
};
const YieldyUserComponent = ({user}: any) => (
Expand Down Expand Up @@ -1058,7 +1058,7 @@ describe.each([
it('should ignore updates to initially rendered data when variables change', () => {
const Scheduler = require('scheduler');
const YieldChild = (props: any) => {
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
};
const YieldyUserComponent = ({user}: any) => (
Expand Down Expand Up @@ -1387,7 +1387,7 @@ describe.each([
it('upon commit, it should pick up changes in data that happened before comitting', () => {
const Scheduler = require('scheduler');
const YieldChild = (props: any) => {
Scheduler.unstable_yieldValue(props.children);
Scheduler.log(props.children);
return props.children;
};
const YieldyUserComponent = ({user}: any) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ describe.each([

const Fallback = () => {
useEffect(() => {
Scheduler.unstable_yieldValue('Fallback');
Scheduler.log('Fallback');
});

return 'Fallback';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ describe('useRefetchableFragmentNode with useTransition', () => {
};

useLayoutEffect(() => {
Scheduler.unstable_yieldValue({data, isPending});
Scheduler.log({data, isPending});
});

return {data, ...result};
}

function assertYieldsWereCleared() {
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
if (actualYields.length !== 0) {
throw new Error(
'Log of yielded values is not empty. ' +
Expand All @@ -104,7 +104,7 @@ describe('useRefetchableFragmentNode with useTransition', () => {
) {
assertYieldsWereCleared();
Scheduler.unstable_flushAllWithoutAsserting();
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields.length).toEqual(expectedYields.length);
expectedYields.forEach((expected, idx) =>
assertYield(expected, actualYields[idx]),
Expand All @@ -114,7 +114,7 @@ describe('useRefetchableFragmentNode with useTransition', () => {
function expectNoYields() {
assertYieldsWereCleared();
Scheduler.unstable_flushAllWithoutAsserting();
const actualYields = Scheduler.unstable_clearYields();
const actualYields = Scheduler.unstable_clearLog();
expect(actualYields.length).toEqual(0);
}

Expand Down Expand Up @@ -295,7 +295,7 @@ describe('useRefetchableFragmentNode with useTransition', () => {

const Fallback = () => {
useLayoutEffect(() => {
Scheduler.unstable_yieldValue('Fallback');
Scheduler.log('Fallback');
});

return 'Fallback';
Expand Down

0 comments on commit 41ace35

Please sign in to comment.