Skip to content

Commit e757f68

Browse files
committed
Merge branch 'enable-cache-element-flag' of github.com:facebook/react into enable-cache-element-flag
2 parents fa8969e + 1b948ff commit e757f68

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

packages/shared/ReactFeatureFlags.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ export const enableLegacyFBSupport = false;
9696
// -----------------------------------------------------------------------------
9797

9898
export const enableCache = __EXPERIMENTAL__;
99+
<<<<<<< HEAD
99100
export const enableCacheElement = true;
101+
=======
102+
export const enableCacheElement = __EXPERIMENTAL__;
103+
>>>>>>> 1b948ff7ab25948ec9b9d6d0a4dd7f4046a75e9b
100104

101105
export const enableTransitionTracing = false;
102106

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false;
2424
export const enableSelectiveHydration = false;
2525
export const enableLazyElements = false;
2626
export const enableCache = false;
27-
export const enableCacheElement = true;
27+
export const enableCacheElement = false;
2828
export const disableJavaScriptURLs = false;
2929
export const disableCommentsAsDOMContainers = true;
3030
export const disableInputAttributeSyncing = false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false;
2424
export const enableSelectiveHydration = false;
2525
export const enableLazyElements = false;
2626
export const enableCache = __EXPERIMENTAL__;
27-
export const enableCacheElement = true;
27+
export const enableCacheElement = __EXPERIMENTAL__;
2828
export const disableJavaScriptURLs = false;
2929
export const disableCommentsAsDOMContainers = true;
3030
export const disableInputAttributeSyncing = false;

packages/shared/forks/ReactFeatureFlags.testing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const enableSuspenseServerRenderer = false;
2424
export const enableSelectiveHydration = false;
2525
export const enableLazyElements = false;
2626
export const enableCache = __EXPERIMENTAL__;
27-
export const enableCacheElement = true;
27+
export const enableCacheElement = __EXPERIMENTAL__;
2828
export const disableJavaScriptURLs = false;
2929
export const disableCommentsAsDOMContainers = true;
3030
export const disableInputAttributeSyncing = false;

0 commit comments

Comments
 (0)