Skip to content

Commit 1a97a12

Browse files
acdlitezhengjitf
authored andcommitted
Land warnOnSubscriptionInsideStartTransition flag (facebook#23353)
We're including this in 18. The feature was already enabled — this just removes the flag.
1 parent 735a427 commit 1a97a12

16 files changed

+5
-41
lines changed

packages/react-reconciler/src/ReactFiberHooks.new.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ import {
109109
entangleTransitions as entangleLegacyQueueTransitions,
110110
} from './ReactUpdateQueue.new';
111111
import {pushInterleavedQueue} from './ReactFiberInterleavedUpdates.new';
112-
import {warnOnSubscriptionInsideStartTransition} from 'shared/ReactFeatureFlags';
113112
import {getTreeId} from './ReactFiberTreeContext.new';
114113

115114
const {ReactCurrentDispatcher, ReactCurrentBatchConfig} = ReactSharedInternals;
@@ -1992,11 +1991,7 @@ function startTransition(setPending, callback) {
19921991

19931992
ReactCurrentBatchConfig.transition = prevTransition;
19941993
if (__DEV__) {
1995-
if (
1996-
prevTransition === null &&
1997-
warnOnSubscriptionInsideStartTransition &&
1998-
currentTransition._updatedFibers
1999-
) {
1994+
if (prevTransition === null && currentTransition._updatedFibers) {
20001995
const updatedFibersCount = currentTransition._updatedFibers.size;
20011996
if (updatedFibersCount > 10) {
20021997
console.warn(

packages/react-reconciler/src/ReactFiberHooks.old.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ import {
109109
entangleTransitions as entangleLegacyQueueTransitions,
110110
} from './ReactUpdateQueue.old';
111111
import {pushInterleavedQueue} from './ReactFiberInterleavedUpdates.old';
112-
import {warnOnSubscriptionInsideStartTransition} from 'shared/ReactFeatureFlags';
113112
import {getTreeId} from './ReactFiberTreeContext.old';
114113

115114
const {ReactCurrentDispatcher, ReactCurrentBatchConfig} = ReactSharedInternals;
@@ -1992,11 +1991,7 @@ function startTransition(setPending, callback) {
19921991

19931992
ReactCurrentBatchConfig.transition = prevTransition;
19941993
if (__DEV__) {
1995-
if (
1996-
prevTransition === null &&
1997-
warnOnSubscriptionInsideStartTransition &&
1998-
currentTransition._updatedFibers
1999-
) {
1994+
if (prevTransition === null && currentTransition._updatedFibers) {
20001995
const updatedFibersCount = currentTransition._updatedFibers.size;
20011996
if (updatedFibersCount > 10) {
20021997
console.warn(

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
disableSchedulerTimeoutInWorkLoop,
3232
enableStrictEffects,
3333
enableUpdaterTracking,
34-
warnOnSubscriptionInsideStartTransition,
3534
enableCache,
3635
} from 'shared/ReactFeatureFlags';
3736
import ReactSharedInternals from 'shared/ReactSharedInternals';
@@ -397,11 +396,7 @@ export function requestUpdateLane(fiber: Fiber): Lane {
397396

398397
const isTransition = requestCurrentTransition() !== NoTransition;
399398
if (isTransition) {
400-
if (
401-
__DEV__ &&
402-
warnOnSubscriptionInsideStartTransition &&
403-
ReactCurrentBatchConfig.transition !== null
404-
) {
399+
if (__DEV__ && ReactCurrentBatchConfig.transition !== null) {
405400
const transition = ReactCurrentBatchConfig.transition;
406401
if (!transition._updatedFibers) {
407402
transition._updatedFibers = new Set();

packages/react-reconciler/src/ReactFiberWorkLoop.old.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
disableSchedulerTimeoutInWorkLoop,
3232
enableStrictEffects,
3333
enableUpdaterTracking,
34-
warnOnSubscriptionInsideStartTransition,
3534
enableCache,
3635
} from 'shared/ReactFeatureFlags';
3736
import ReactSharedInternals from 'shared/ReactSharedInternals';
@@ -397,11 +396,7 @@ export function requestUpdateLane(fiber: Fiber): Lane {
397396

398397
const isTransition = requestCurrentTransition() !== NoTransition;
399398
if (isTransition) {
400-
if (
401-
__DEV__ &&
402-
warnOnSubscriptionInsideStartTransition &&
403-
ReactCurrentBatchConfig.transition !== null
404-
) {
399+
if (__DEV__ && ReactCurrentBatchConfig.transition !== null) {
405400
const transition = ReactCurrentBatchConfig.transition;
406401
if (!transition._updatedFibers) {
407402
transition._updatedFibers = new Set();

packages/react/src/ReactStartTransition.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
import ReactCurrentBatchConfig from './ReactCurrentBatchConfig';
11-
import {warnOnSubscriptionInsideStartTransition} from 'shared/ReactFeatureFlags';
1211

1312
export function startTransition(scope: () => void) {
1413
const prevTransition = ReactCurrentBatchConfig.transition;
@@ -24,11 +23,7 @@ export function startTransition(scope: () => void) {
2423
ReactCurrentBatchConfig.transition = prevTransition;
2524

2625
if (__DEV__) {
27-
if (
28-
prevTransition === null &&
29-
warnOnSubscriptionInsideStartTransition &&
30-
currentTransition._updatedFibers
31-
) {
26+
if (prevTransition === null && currentTransition._updatedFibers) {
3227
const updatedFibersCount = currentTransition._updatedFibers.size;
3328
if (updatedFibersCount > 10) {
3429
console.warn(

packages/react/src/__tests__/ReactStartTransition-test.js

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ describe('ReactStartTransition', () => {
2727
useTransition = React.useTransition;
2828
});
2929

30-
// @gate warnOnSubscriptionInsideStartTransition || !__DEV__
3130
it('Warns if a suspicious number of fibers are updated inside startTransition', () => {
3231
const subs = new Set();
3332
const useUserSpaceSubscription = () => {

packages/shared/ReactFeatureFlags.js

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// Flags that can likely be deleted or landed without consequences
1414
// -----------------------------------------------------------------------------
1515

16-
export const warnOnSubscriptionInsideStartTransition = false;
1716
export const enableSuspenseServerRenderer = true;
1817
export const enableSelectiveHydration = true;
1918
export const warnAboutDeprecatedLifecycles = true;

packages/shared/forks/ReactFeatureFlags.native-fb.js

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export const disableTextareaChildren = false;
4949
export const disableModulePatternComponents = false;
5050
export const warnUnstableRenderSubtreeIntoContainer = false;
5151
export const warnAboutSpreadingKeyToJSX = false;
52-
export const warnOnSubscriptionInsideStartTransition = false;
5352
export const enableSuspenseAvoidThisFallback = false;
5453
export const enableSuspenseAvoidThisFallbackFizz = false;
5554
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.native-oss.js

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const disableTextareaChildren = false;
4040
export const disableModulePatternComponents = false;
4141
export const warnUnstableRenderSubtreeIntoContainer = false;
4242
export const warnAboutSpreadingKeyToJSX = false;
43-
export const warnOnSubscriptionInsideStartTransition = false;
4443
export const enableSuspenseAvoidThisFallback = false;
4544
export const enableSuspenseAvoidThisFallbackFizz = false;
4645
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const disableTextareaChildren = false;
4040
export const disableModulePatternComponents = false;
4141
export const warnUnstableRenderSubtreeIntoContainer = false;
4242
export const warnAboutSpreadingKeyToJSX = false;
43-
export const warnOnSubscriptionInsideStartTransition = false;
4443
export const enableSuspenseAvoidThisFallback = false;
4544
export const enableSuspenseAvoidThisFallbackFizz = false;
4645
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.native.js

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export const enableSuspenseLayoutEffectSemantics = false;
4949
export const enableGetInspectorDataForInstanceInProduction = false;
5050
export const enableNewReconciler = false;
5151
export const deferRenderPhaseUpdateToNextBatch = false;
52-
export const warnOnSubscriptionInsideStartTransition = false;
5352
export const enableSuspenseAvoidThisFallback = false;
5453
export const enableSuspenseAvoidThisFallbackFizz = false;
5554
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const disableTextareaChildren = false;
4040
export const disableModulePatternComponents = true;
4141
export const warnUnstableRenderSubtreeIntoContainer = false;
4242
export const warnAboutSpreadingKeyToJSX = false;
43-
export const warnOnSubscriptionInsideStartTransition = false;
4443
export const enableSuspenseAvoidThisFallback = true;
4544
export const enableSuspenseAvoidThisFallbackFizz = false;
4645
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.testing.js

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const disableTextareaChildren = false;
4040
export const disableModulePatternComponents = false;
4141
export const warnUnstableRenderSubtreeIntoContainer = false;
4242
export const warnAboutSpreadingKeyToJSX = false;
43-
export const warnOnSubscriptionInsideStartTransition = false;
4443
export const enableSuspenseAvoidThisFallback = false;
4544
export const enableSuspenseAvoidThisFallbackFizz = false;
4645
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.testing.www.js

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export const disableTextareaChildren = __EXPERIMENTAL__;
4040
export const disableModulePatternComponents = true;
4141
export const warnUnstableRenderSubtreeIntoContainer = false;
4242
export const warnAboutSpreadingKeyToJSX = false;
43-
export const warnOnSubscriptionInsideStartTransition = false;
4443
export const enableSuspenseAvoidThisFallback = true;
4544
export const enableSuspenseAvoidThisFallbackFizz = false;
4645
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = true;

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export const disableSchedulerTimeoutInWorkLoop = __VARIANT__;
2424
export const enableLazyContextPropagation = __VARIANT__;
2525
export const enableSyncDefaultUpdates = __VARIANT__;
2626
export const consoleManagedByDevToolsDuringStrictMode = __VARIANT__;
27-
export const warnOnSubscriptionInsideStartTransition = __VARIANT__;
2827
export const enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay = __VARIANT__;
2928
export const enableClientRenderFallbackOnHydrationMismatch = __VARIANT__;
3029

packages/shared/forks/ReactFeatureFlags.www.js

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const {
3030
disableSchedulerTimeoutInWorkLoop,
3131
enableLazyContextPropagation,
3232
enableSyncDefaultUpdates,
33-
warnOnSubscriptionInsideStartTransition,
3433
enableCapturePhaseSelectiveHydrationWithoutDiscreteEventReplay,
3534
enableClientRenderFallbackOnHydrationMismatch,
3635
} = dynamicFeatureFlags;

0 commit comments

Comments
 (0)