From b125f826b4a59651df24b2d62b6f5a4377272732 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Thu, 13 Feb 2025 11:44:14 -0800 Subject: [PATCH 1/3] [flags] enable owner stacks everwhere --- .../shared/forks/ReactFeatureFlags.native-fb-dynamic.js | 2 -- packages/shared/forks/ReactFeatureFlags.native-fb.js | 6 ++++-- packages/shared/forks/ReactFeatureFlags.native-oss.js | 4 ++-- .../forks/ReactFeatureFlags.test-renderer.native-fb.js | 4 ++-- .../shared/forks/ReactFeatureFlags.test-renderer.www.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.www-dynamic.js | 2 -- packages/shared/forks/ReactFeatureFlags.www.js | 6 ++++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js index ffcec9334d663..d3c5de81bd909 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js @@ -25,7 +25,5 @@ export const enableShallowPropDiffing = __VARIANT__; export const passChildrenWhenCloningPersistedNodes = __VARIANT__; export const enableSiblingPrerendering = __VARIANT__; export const enableUseEffectCRUDOverload = __VARIANT__; -export const enableOwnerStacks = __VARIANT__; -export const enableRemoveConsolePatches = __VARIANT__; export const enableFastAddPropertiesInDiffing = __VARIANT__; export const enableLazyPublicInstanceInFabric = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 470e148959327..a0544dc161173 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -27,12 +27,14 @@ export const { enableUseEffectCRUDOverload, passChildrenWhenCloningPersistedNodes, enableSiblingPrerendering, - enableOwnerStacks, - enableRemoveConsolePatches, enableFastAddPropertiesInDiffing, enableLazyPublicInstanceInFabric, } = dynamicFlags; +// These two can be removed +export const enableOwnerStacks = true; +export const enableRemoveConsolePatches = true; + // The rest of the flags are static for better dead code elimination. export const disableClientCache = true; export const disableCommentsAsDOMContainers = true; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 361ebde4136ce..fd846cf312212 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -40,7 +40,7 @@ export const enableLegacyFBSupport = false; export const enableLegacyHidden = false; export const enableNoCloningMemoCache = false; export const enableObjectFiber = false; -export const enableOwnerStacks = false; +export const enableOwnerStacks = true; export const enablePersistedModeClonedFlag = false; export const enablePostpone = false; export const enableReactTestRendererWarning = false; @@ -80,7 +80,7 @@ export const enableProfilerTimer = __PROFILE__; export const enableProfilerCommitHooks = __PROFILE__; export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableUpdaterTracking = __PROFILE__; -export const enableRemoveConsolePatches = false; +export const enableRemoveConsolePatches = true; // Flow magic to verify the exports of this file match the original version. ((((null: any): ExportsType): FeatureFlagsType): ExportsType); diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index 18172fdfe5724..e4f1210c29f00 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -35,7 +35,7 @@ export const enableLegacyFBSupport = false; export const enableLegacyHidden = false; export const enableNoCloningMemoCache = false; export const enableObjectFiber = false; -export const enableOwnerStacks = false; +export const enableOwnerStacks = true; export const enablePersistedModeClonedFlag = false; export const enablePostpone = false; export const enableProfilerCommitHooks = __PROFILE__; @@ -67,8 +67,8 @@ export const enableHydrationLaneScheduling = true; export const enableYieldingBeforePassive = false; export const enableThrottledScheduling = false; export const enableViewTransition = false; +export const enableRemoveConsolePatches = true; export const enableSwipeTransition = false; -export const enableRemoveConsolePatches = false; export const enableFastAddPropertiesInDiffing = false; export const enableLazyPublicInstanceInFabric = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 628a834133f2f..112b30fe04a81 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -70,7 +70,7 @@ export const disableDefaultPropsExceptForClasses = true; export const renameElementSymbol = false; export const enableObjectFiber = false; -export const enableOwnerStacks = false; +export const enableOwnerStacks = true; export const enableShallowPropDiffing = false; export const enableSiblingPrerendering = true; @@ -82,8 +82,8 @@ export const enableYieldingBeforePassive = false; export const enableThrottledScheduling = false; export const enableViewTransition = false; +export const enableRemoveConsolePatches = true; export const enableSwipeTransition = false; -export const enableRemoveConsolePatches = false; export const enableFastAddPropertiesInDiffing = false; export const enableLazyPublicInstanceInFabric = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index d0b4404a3e946..e0f431fe7f10c 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -26,7 +26,6 @@ export const enableRetryLaneExpiration = __VARIANT__; export const enableTransitionTracing = __VARIANT__; export const favorSafetyOverHydrationPerf = __VARIANT__; export const renameElementSymbol = __VARIANT__; -export const enableOwnerStacks = __VARIANT__; export const retryLaneExpirationMs = 5000; export const syncLaneExpirationMs = 250; export const transitionLaneExpirationMs = 5000; @@ -37,7 +36,6 @@ export const enableInfiniteRenderLoopDetection = __VARIANT__; export const enableSiblingPrerendering = __VARIANT__; export const enableUseEffectCRUDOverload = __VARIANT__; -export const enableRemoveConsolePatches = __VARIANT__; export const enableFastAddPropertiesInDiffing = __VARIANT__; export const enableLazyPublicInstanceInFabric = false; export const enableViewTransition = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index 5932c6eddf6f1..ec0337382e957 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -35,8 +35,6 @@ export const { retryLaneExpirationMs, syncLaneExpirationMs, transitionLaneExpirationMs, - enableOwnerStacks, - enableRemoveConsolePatches, enableFastAddPropertiesInDiffing, enableViewTransition, } = dynamicFeatureFlags; @@ -44,6 +42,10 @@ export const { // On WWW, __EXPERIMENTAL__ is used for a new modern build. // It's not used anywhere in production yet. +// Can remove these two +export const enableOwnerStacks = true; +export const enableRemoveConsolePatches = true; + export const enableProfilerTimer = __PROFILE__; export const enableProfilerCommitHooks = __PROFILE__; export const enableProfilerNestedUpdatePhase = __PROFILE__; From f3e156b33891018b318162e6925d22d9e380702e Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Tue, 18 Feb 2025 10:03:44 -0500 Subject: [PATCH 2/3] blah --- scripts/jest/setupTests.www.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/jest/setupTests.www.js b/scripts/jest/setupTests.www.js index b0b653bb78ff9..9ac7ffc6db002 100644 --- a/scripts/jest/setupTests.www.js +++ b/scripts/jest/setupTests.www.js @@ -11,6 +11,7 @@ jest.mock('shared/ReactFeatureFlags', () => { // Flags that aren't currently used, but we still want to force variants to keep the // code live. actual.disableInputAttributeSyncing = __VARIANT__; + actual.enableOwnerStacks = __VARIANT__; // These are hardcoded to true for the next release, // but still run the tests against both variants until From f764b7cd3032e7ef2a944446c670d576163cb368 Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Tue, 18 Feb 2025 10:10:04 -0500 Subject: [PATCH 3/3] blah x2 --- scripts/jest/setupTests.xplat.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/jest/setupTests.xplat.js b/scripts/jest/setupTests.xplat.js index 859a5065988d6..87fbf8bef8ac5 100644 --- a/scripts/jest/setupTests.xplat.js +++ b/scripts/jest/setupTests.xplat.js @@ -11,6 +11,8 @@ jest.mock('shared/ReactFeatureFlags', () => { 'shared/forks/ReactFeatureFlags.native-fb.js' ); + actual.enableOwnerStacks = __VARIANT__; + // Lots of tests use these, but we don't want to expose it to RN. // Ideally, tests for xplat wouldn't use react-dom, but many of our tests do. // Since the xplat tests run with the www entry points, some of these flags