From 3d502d2495b1ae5456f330c441417c73be88d375 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Thu, 17 Dec 2020 17:04:25 -0500 Subject: [PATCH] Nvm, keep it as disableSchedulerTimeoutInWorkLoop --- .../src/ReactFiberWorkLoop.new.js | 4 +-- .../src/ReactFiberWorkLoop.old.js | 4 +-- packages/shared/ReactFeatureFlags.js | 2 +- .../forks/ReactFeatureFlags.native-fb.js | 2 +- .../forks/ReactFeatureFlags.native-oss.js | 2 +- .../forks/ReactFeatureFlags.test-renderer.js | 2 +- .../ReactFeatureFlags.test-renderer.native.js | 2 +- .../ReactFeatureFlags.test-renderer.www.js | 2 +- .../shared/forks/ReactFeatureFlags.testing.js | 2 +- .../forks/ReactFeatureFlags.testing.www.js | 2 +- .../forks/ReactFeatureFlags.www-dynamic.js | 2 +- .../shared/forks/ReactFeatureFlags.www.js | 32 +++++++++---------- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js index 2e27ee18bb3c4..284c95d16d4f9 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js @@ -31,7 +31,7 @@ import { enableDebugTracing, enableSchedulingProfiler, enableScopeAPI, - enableSchedulerTimeoutInWorkLoop, + disableSchedulerTimeoutInWorkLoop, } from 'shared/ReactFeatureFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import invariant from 'shared/invariant'; @@ -833,7 +833,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { // bug we're still investigating. Once the bug in Scheduler is fixed, // we can remove this, since we track expiration ourselves. if ( - enableSchedulerTimeoutInWorkLoop && + disableSchedulerTimeoutInWorkLoop && didTimeout ) { // Something expired. Flush synchronously until there's no expired diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js index 5046e03936002..21023d6c10161 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js @@ -33,7 +33,7 @@ import { enableSchedulingProfiler, enableScopeAPI, enableDoubleInvokingEffects, - enableSchedulerTimeoutInWorkLoop, + disableSchedulerTimeoutInWorkLoop, } from 'shared/ReactFeatureFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import invariant from 'shared/invariant'; @@ -841,7 +841,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { // bug we're still investigating. Once the bug in Scheduler is fixed, // we can remove this, since we track expiration ourselves. if ( - enableSchedulerTimeoutInWorkLoop && + disableSchedulerTimeoutInWorkLoop && didTimeout ) { // Something expired. Flush synchronously until there's no expired diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index ea1a03377e02c..c3ffb65e96ff2 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -142,4 +142,4 @@ export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 88ba86e0f7b56..23c926c65a3fb 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -56,7 +56,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index d8d01b1e58db0..3ed2d7701c93f 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 56eb405a4ea07..16e488409e0c4 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index 07fa3f20f1eab..84ea8902f60c2 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 6214dc8a600b6..eb1630fc49bd7 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = true; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js index 36606b8367a08..87133385439f3 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js index a1211cd565c5f..671f44be02952 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.www.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.www.js @@ -55,7 +55,7 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = false; export const enableRecursiveCommitTraversal = false; -export const enableSchedulerTimeoutInWorkLoop = false; +export const disableSchedulerTimeoutInWorkLoop = false; // Flow magic to verify the exports of this file match the original version. // eslint-disable-next-line no-unused-vars diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index 1937d94df8ddc..cf0ca5ae54393 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -53,4 +53,4 @@ export const enableDoubleInvokingEffects = false; export const enableUseRefAccessWarning = __VARIANT__; export const enableProfilerNestedUpdateScheduledHook = __VARIANT__; -export const enableSchedulerTimeoutInWorkLoop = __VARIANT__; +export const disableSchedulerTimeoutInWorkLoop = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index fb30b645cdd7b..8b2bda551339e 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -15,22 +15,22 @@ import typeof * as DynamicFeatureFlags from './ReactFeatureFlags.www-dynamic'; const dynamicFeatureFlags: DynamicFeatureFlags = require('ReactFeatureFlags'); export const { - debugRenderPhaseSideEffectsForStrictMode, - disableInputAttributeSyncing, - enableTrustedTypesIntegration, - disableSchedulerTimeoutBasedOnReactExpirationTime, - warnAboutSpreadingKeyToJSX, - replayFailedUnitOfWorkWithInvokeGuardedCallback, - enableFilterEmptyStringAttributesDOM, - enableLegacyFBSupport, - deferRenderPhaseUpdateToNextBatch, - decoupleUpdatePriorityFromScheduler, - enableDebugTracing, - enableDoubleInvokingEffects, - enableUseRefAccessWarning, - disableNativeComponentFrames, - enableSchedulerTimeoutInWorkLoop, - } = dynamicFeatureFlags; + debugRenderPhaseSideEffectsForStrictMode, + disableInputAttributeSyncing, + enableTrustedTypesIntegration, + disableSchedulerTimeoutBasedOnReactExpirationTime, + warnAboutSpreadingKeyToJSX, + replayFailedUnitOfWorkWithInvokeGuardedCallback, + enableFilterEmptyStringAttributesDOM, + enableLegacyFBSupport, + deferRenderPhaseUpdateToNextBatch, + decoupleUpdatePriorityFromScheduler, + enableDebugTracing, + enableDoubleInvokingEffects, + enableUseRefAccessWarning, + disableNativeComponentFrames, + disableSchedulerTimeoutInWorkLoop, +} = dynamicFeatureFlags; // On WWW, __EXPERIMENTAL__ is used for a new modern build. // It's not used anywhere in production yet.