From 358ccdb9d5ce3725ffd499a6042f9f5055aec469 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Mon, 27 Mar 2023 17:29:41 +0200 Subject: [PATCH 1/2] Remove unused feature flag disableSchedulerTimeoutBasedOnReactExpirationTime --- ...leSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js | 1 - packages/shared/ReactFeatureFlags.js | 1 - packages/shared/forks/ReactFeatureFlags.native-fb.js | 1 - packages/shared/forks/ReactFeatureFlags.native-oss.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.native.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.www.js | 1 - packages/shared/forks/ReactFeatureFlags.www-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.www.js | 1 - 9 files changed, 9 deletions(-) diff --git a/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js b/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js index c565f4a7b6d84..48ebca113b659 100644 --- a/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js +++ b/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js @@ -14,7 +14,6 @@ describe('ReactSuspenseList', () => { ReactFeatureFlags = require('shared/ReactFeatureFlags'); ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false; - ReactFeatureFlags.disableSchedulerTimeoutBasedOnReactExpirationTime = true; React = require('react'); ReactNoop = require('react-noop-renderer'); Scheduler = require('scheduler'); diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 075f5e9cb6f70..e2eb954817b7a 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -14,7 +14,6 @@ // ----------------------------------------------------------------------------- export const enableComponentStackLocations = true; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; // ----------------------------------------------------------------------------- // Killswitch diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 592063f349c3e..f2ed0b48ff122 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -42,7 +42,6 @@ export const enableScopeAPI = false; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = false; export const disableLegacyContext = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const revertRemovalOfSiblingPrerendering = false; export const enableTrustedTypesIntegration = false; export const disableTextareaChildren = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index e6a8b63d52979..48a4750f59615 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -32,7 +32,6 @@ export const enableScopeAPI = false; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = false; export const disableLegacyContext = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const revertRemovalOfSiblingPrerendering = false; export const enableTrustedTypesIntegration = false; export const disableTextareaChildren = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 5e6d05bc3b9e4..e60068f3e1c67 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -32,7 +32,6 @@ export const enableScopeAPI = false; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = false; export const disableLegacyContext = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const revertRemovalOfSiblingPrerendering = false; export const enableTrustedTypesIntegration = false; export const disableTextareaChildren = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index 7ba0c0da99d36..5d94dc871e111 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -32,7 +32,6 @@ export const enableScopeAPI = false; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = false; export const disableLegacyContext = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const revertRemovalOfSiblingPrerendering = false; export const enableTrustedTypesIntegration = false; export const disableTextareaChildren = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 6482d0fe460f6..7ac9d79271277 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -32,7 +32,6 @@ export const enableScopeAPI = true; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = true; export const disableLegacyContext = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const revertRemovalOfSiblingPrerendering = false; export const enableTrustedTypesIntegration = false; export const disableTextareaChildren = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index eae2363b6f9a8..15d775e750e14 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -59,7 +59,6 @@ export const revertRemovalOfSiblingPrerendering = false; // Update the tests so that they pass in either mode, then set these // to __VARIANT__. export const enableTrustedTypesIntegration = false; -export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const disableNativeComponentFrames = false; // You probably *don't* want to add more hardcoded ones. // Instead, try to add them above with the __VARIANT__ value. diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index f733aff93bccd..5c4bf8cc3956d 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -18,7 +18,6 @@ export const { disableInputAttributeSyncing, disableIEWorkarounds, enableTrustedTypesIntegration, - disableSchedulerTimeoutBasedOnReactExpirationTime, revertRemovalOfSiblingPrerendering, replayFailedUnitOfWorkWithInvokeGuardedCallback, enableLegacyFBSupport, From 83ce859681a523c84163bbfa752baca827ba3c90 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Mon, 27 Mar 2023 17:41:01 +0200 Subject: [PATCH 2/2] remove test --- ...asedOnReactExpirationTime-test.internal.js | 99 ------------------- 1 file changed, 99 deletions(-) delete mode 100644 packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js diff --git a/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js b/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js deleted file mode 100644 index 48ebca113b659..0000000000000 --- a/packages/react-reconciler/src/__tests__/ReactDisableSchedulerTimeoutBasedOnReactExpirationTime-test.internal.js +++ /dev/null @@ -1,99 +0,0 @@ -let React; -let ReactFeatureFlags; -let ReactNoop; -let Scheduler; -let Suspense; -let scheduleCallback; -let NormalPriority; -let waitForAll; -let waitFor; - -describe('ReactSuspenseList', () => { - beforeEach(() => { - jest.resetModules(); - ReactFeatureFlags = require('shared/ReactFeatureFlags'); - - ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false; - React = require('react'); - ReactNoop = require('react-noop-renderer'); - Scheduler = require('scheduler'); - Suspense = React.Suspense; - - scheduleCallback = Scheduler.unstable_scheduleCallback; - NormalPriority = Scheduler.unstable_NormalPriority; - - const InternalTestUtils = require('internal-test-utils'); - waitForAll = InternalTestUtils.waitForAll; - waitFor = InternalTestUtils.waitFor; - }); - - function Text(props) { - Scheduler.log(props.text); - return props.text; - } - - function createAsyncText(text) { - let resolved = false; - const Component = function () { - if (!resolved) { - Scheduler.log('Suspend! [' + text + ']'); - throw promise; - } - return ; - }; - const promise = new Promise(resolve => { - Component.resolve = function () { - resolved = true; - return resolve(); - }; - }); - return Component; - } - - it('appends rendering tasks to the end of the priority queue', async () => { - const A = createAsyncText('A'); - const B = createAsyncText('B'); - - function App({show}) { - return ( - }> - {show ? : null} - {show ? : null} - - ); - } - - const root = ReactNoop.createRoot(null); - - root.render(); - await waitForAll([]); - - React.startTransition(() => { - root.render(); - }); - await waitForAll(['Suspend! [A]', 'Loading...']); - expect(root).toMatchRenderedOutput(null); - - Scheduler.unstable_advanceTime(2000); - expect(root).toMatchRenderedOutput(null); - - scheduleCallback(NormalPriority, () => { - Scheduler.log('Resolve A'); - A.resolve(); - }); - scheduleCallback(NormalPriority, () => { - Scheduler.log('Resolve B'); - B.resolve(); - }); - - // This resolves A and schedules a task for React to retry. - await waitFor(['Resolve A']); - - // The next task that flushes should be the one that resolves B. The render - // task should not jump the queue ahead of B. - await waitFor(['Resolve B']); - - await waitForAll(['A', 'B']); - expect(root).toMatchRenderedOutput('AB'); - }); -});