From f4cc970276ee7d66db54191b626b19c721ebaa91 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 31 Mar 2020 10:05:15 -0700
Subject: [PATCH] Enable new passive effect behavior for FB builds (#18444)

* Enable new passive effect behavior for FB builds

Previously this behavior was controlled by GKs. This PR updates the flags to be enabled statically. It also enables the flags in the test builds.
---
 packages/shared/forks/ReactFeatureFlags.test-renderer.www.js | 4 ++--
 packages/shared/forks/ReactFeatureFlags.testing.www.js       | 4 ++--
 packages/shared/forks/ReactFeatureFlags.www-dynamic.js       | 2 --
 packages/shared/forks/ReactFeatureFlags.www.js               | 5 +++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
index 93bd9db122..39463c92d3 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -39,8 +39,8 @@ export const disableTextareaChildren = false;
 export const disableMapsAsChildren = false;
 export const disableModulePatternComponents = false;
 export const warnUnstableRenderSubtreeIntoContainer = false;
-export const deferPassiveEffectCleanupDuringUnmount = false;
-export const runAllPassiveEffectDestroysBeforeCreates = false;
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
 export const enableModernEventSystem = false;
 export const warnAboutSpreadingKeyToJSX = false;
 export const enableLegacyFBSupport = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js
index 1934254cc2..aa4ab37762 100644
--- a/packages/shared/forks/ReactFeatureFlags.testing.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.testing.www.js
@@ -39,8 +39,8 @@ export const disableTextareaChildren = __EXPERIMENTAL__;
 export const disableMapsAsChildren = __EXPERIMENTAL__;
 export const disableModulePatternComponents = false;
 export const warnUnstableRenderSubtreeIntoContainer = false;
-export const deferPassiveEffectCleanupDuringUnmount = false;
-export const runAllPassiveEffectDestroysBeforeCreates = false;
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
 export const enableModernEventSystem = false;
 export const warnAboutSpreadingKeyToJSX = false;
 export const enableLegacyFBSupport = !__EXPERIMENTAL__;
diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js
index 007577a1f4..a4b2d9d128 100644
--- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js
+++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js
@@ -13,8 +13,6 @@
 // Use __VARIANT__ to simulate a GK. The tests will be run twice: once
 // with the __VARIANT__ set to `true`, and once set to `false`.
 
-export const deferPassiveEffectCleanupDuringUnmount = __VARIANT__;
-export const runAllPassiveEffectDestroysBeforeCreates = __VARIANT__;
 export const warnAboutSpreadingKeyToJSX = __VARIANT__;
 
 // These are already tested in both modes using the build type dimension,
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
index 979b9334bb..1717915938 100644
--- a/packages/shared/forks/ReactFeatureFlags.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -16,10 +16,8 @@ const dynamicFeatureFlags: DynamicFeatureFlags = require('ReactFeatureFlags');
 
 export const {
   debugRenderPhaseSideEffectsForStrictMode,
-  deferPassiveEffectCleanupDuringUnmount,
   disableInputAttributeSyncing,
   enableTrustedTypesIntegration,
-  runAllPassiveEffectDestroysBeforeCreates,
   warnAboutShorthandPropertyCollision,
   disableSchedulerTimeoutBasedOnReactExpirationTime,
   warnAboutSpreadingKeyToJSX,
@@ -83,6 +81,9 @@ export const throwEarlyForMysteriousError = false;
 // to the correct value.
 export const enableNewReconciler = __VARIANT__;
 
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
+
 // Flow magic to verify the exports of this file match the original version.
 // eslint-disable-next-line no-unused-vars
 type Check<_X, Y: _X, X: Y = _X> = null;