From 97e9d3aacd6dd188c30944b5e5adbba5a1631c50 Mon Sep 17 00:00:00 2001 From: Dave McCabe Date: Sat, 19 Mar 2022 10:04:46 -0700 Subject: [PATCH 1/5] enableCacheElement flag --- 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 + .../shared/forks/ReactFeatureFlags.test-renderer.native.js | 1 + packages/shared/forks/ReactFeatureFlags.test-renderer.www.js | 1 + packages/shared/forks/ReactFeatureFlags.testing.js | 1 + packages/shared/forks/ReactFeatureFlags.testing.www.js | 1 + packages/shared/forks/ReactFeatureFlags.www.js | 1 + packages/shared/isValidElementType.js | 4 ++-- 10 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index a6bba286a6d..b4a1ababa64 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -96,6 +96,7 @@ export const enableLegacyFBSupport = false; // ----------------------------------------------------------------------------- export const enableCache = __EXPERIMENTAL__; +export const enableCacheElement = true; export const enableTransitionTracing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index d834914a24f..facc9c7d783 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -30,6 +30,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = false; +export const enableCacheElement = true; export const enableSchedulerDebugging = false; export const debugRenderPhaseSideEffectsForStrictMode = true; export const disableJavaScriptURLs = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 94c76a4c82f..45cb741a23f 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = false; +export const enableCacheElement = true; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index e28fd76fcd8..67dca19cd70 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = __EXPERIMENTAL__; +export const enableCacheElement = true; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index 4214fc7b79b..e05dc109843 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = true; +export const enableCacheElement = true; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index d025cafa3bc..042c2519043 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = true; +export const enableCacheElement = true; export const enableSchedulerDebugging = false; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js index 40b1fa2d5d7..e7fa10e8817 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = __EXPERIMENTAL__; +export const enableCacheElement = true; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js index e5e8e7295c8..5e41ca9992d 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.www.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.www.js @@ -24,6 +24,7 @@ export const enableSuspenseServerRenderer = true; export const enableSelectiveHydration = true; export const enableLazyElements = false; export const enableCache = true; +export const enableCacheElement = true; export const disableJavaScriptURLs = true; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index be3d5aa040a..d5edae5563a 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -72,6 +72,7 @@ export const enableSelectiveHydration = true; export const enableLazyElements = true; export const enableCache = true; +export const enableCacheElement = true; export const disableJavaScriptURLs = true; diff --git a/packages/shared/isValidElementType.js b/packages/shared/isValidElementType.js index 12d00f3e06f..87424982afc 100644 --- a/packages/shared/isValidElementType.js +++ b/packages/shared/isValidElementType.js @@ -27,7 +27,7 @@ import { } from 'shared/ReactSymbols'; import { enableScopeAPI, - enableCache, + enableCacheElement, enableTransitionTracing, enableDebugTracing, enableLegacyHidden, @@ -51,7 +51,7 @@ export default function isValidElementType(type: mixed) { (enableLegacyHidden && type === REACT_LEGACY_HIDDEN_TYPE) || type === REACT_OFFSCREEN_TYPE || (enableScopeAPI && type === REACT_SCOPE_TYPE) || - (enableCache && type === REACT_CACHE_TYPE) || + (enableCacheElement && type === REACT_CACHE_TYPE) || (enableTransitionTracing && type === REACT_TRACING_MARKER_TYPE) ) { return true; From f080d0a3ac9dd3ce97b6d4533b1a4e6c6c9987d6 Mon Sep 17 00:00:00 2001 From: David McCabe Date: Sun, 20 Mar 2022 17:26:31 -0700 Subject: [PATCH 2/5] Update packages/shared/forks/ReactFeatureFlags.testing.js Co-authored-by: Ricky --- packages/shared/forks/ReactFeatureFlags.testing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js index e7fa10e8817..6b640311000 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.js @@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = __EXPERIMENTAL__; -export const enableCacheElement = true; +export const enableCacheElement = __EXPERIMENTAL__; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; From 437bf7f9363acf44d7a9feb0d9d41ade067686a9 Mon Sep 17 00:00:00 2001 From: David McCabe Date: Sun, 20 Mar 2022 17:26:37 -0700 Subject: [PATCH 3/5] Update packages/shared/forks/ReactFeatureFlags.test-renderer.js Co-authored-by: Ricky --- packages/shared/forks/ReactFeatureFlags.test-renderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 67dca19cd70..b0c81a7a8bb 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = __EXPERIMENTAL__; -export const enableCacheElement = true; +export const enableCacheElement = __EXPERIMENTAL__; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; From eba44a650ce6ed6e360ca6c5b146981cda1b5ef3 Mon Sep 17 00:00:00 2001 From: David McCabe Date: Sun, 20 Mar 2022 17:26:44 -0700 Subject: [PATCH 4/5] Update packages/shared/forks/ReactFeatureFlags.native-oss.js Co-authored-by: Ricky --- packages/shared/forks/ReactFeatureFlags.native-oss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 45cb741a23f..94bd8386589 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableLazyElements = false; export const enableCache = false; -export const enableCacheElement = true; +export const enableCacheElement = false; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; From 7793f4da4a5f7f6e018ee78343e81a44feafe8d1 Mon Sep 17 00:00:00 2001 From: David McCabe Date: Sun, 20 Mar 2022 17:26:49 -0700 Subject: [PATCH 5/5] Update packages/shared/ReactFeatureFlags.js Co-authored-by: Ricky --- packages/shared/ReactFeatureFlags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index b4a1ababa64..33261df6d76 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -96,7 +96,7 @@ export const enableLegacyFBSupport = false; // ----------------------------------------------------------------------------- export const enableCache = __EXPERIMENTAL__; -export const enableCacheElement = true; +export const enableCacheElement = __EXPERIMENTAL__; export const enableTransitionTracing = false;