Skip to content

Commit cb4ff7b

Browse files
sebmarkbagesebmarkbage
committed
Remove additional FeatureFlags that are no longer needed
These are only flagging the exports and no implementation details so we can control them fully through the export overrides.
1 parent 76b7e97 commit cb4ff7b

11 files changed

+2
-65
lines changed

‎packages/react-dom/src/__tests__/ReactDOMFiber-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ const React = require('react');
1313
const ReactDOM = require('react-dom');
1414
const PropTypes = require('prop-types');
1515

16-
const ReactFeatureFlags = require('shared/ReactFeatureFlags');
17-
1816
describe('ReactDOMFiber', () => {
1917
let container;
2018

@@ -249,7 +247,7 @@ describe('ReactDOMFiber', () => {
249247
});
250248

251249
// TODO: remove in React 17
252-
if (!ReactFeatureFlags.disableUnstableCreatePortal) {
250+
if (!__EXPERIMENTAL__) {
253251
it('should support unstable_createPortal alias', () => {
254252
const portalContainer = document.createElement('div');
255253

‎packages/react-dom/src/__tests__/renderSubtreeIntoContainer-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const renderSubtreeIntoContainer = require('react-dom')
1919
const ReactFeatureFlags = require('shared/ReactFeatureFlags');
2020

2121
// Once this flag is always true, we should delete this test file
22-
if (ReactFeatureFlags.disableUnstableRenderSubtreeIntoContainer) {
22+
if (__EXPERIMENTAL__) {
2323
describe('renderSubtreeIntoContainer', () => {
2424
it('empty test', () => {
2525
// Empty test to prevent "Your test suite must contain at least one test." error.

‎packages/shared/ReactFeatureFlags.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ export function addUserTimingListener() {
4444
// Disable javascript: URL strings in href for XSS protection.
4545
export const disableJavaScriptURLs = false;
4646

47-
// These APIs will no longer be "unstable" in the upcoming 16.7 release,
48-
// Control this behavior with a flag to support 16.6 minor releases in the meanwhile.
49-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
50-
5147
// Warns when a combination of updates on a dom can cause a style declaration
5248
// that clashes with a previous one https://github.com/facebook/react/pull/14181
5349
export const warnAboutShorthandPropertyCollision = true;
@@ -107,10 +103,6 @@ export const runAllPassiveEffectDestroysBeforeCreates = false;
107103
// WARNING This flag only has an affect if used with runAllPassiveEffectDestroysBeforeCreates.
108104
export const deferPassiveEffectCleanupDuringUnmount = false;
109105

110-
// Use this flag to generate "testing" builds, that include APIs like act()
111-
// and extra warnings/errors
112-
export const isTestEnvironment = false;
113-
114106
// Enables a warning when trying to spread a 'key' to an element;
115107
// a deprecated pattern we want to get rid of in the future
116108
export const warnAboutSpreadingKeyToJSX = false;
@@ -127,22 +119,14 @@ export const warnAboutStringRefs = false;
127119

128120
export const disableLegacyContext = false;
129121

130-
// Disables hydrate, render, findDOMNode, unmountComponentAtNode
131-
export const disableLegacyReactDOMAPIs = false;
132-
133122
// Disables children for <textarea> elements
134123
export const disableTextareaChildren = false;
135124

136125
// Disables Maps as ReactElement children
137126
export const disableMapsAsChildren = false;
138127

139-
// Disables ReactDOM.unstable_renderSubtreeIntoContainer
140-
export const disableUnstableRenderSubtreeIntoContainer = false;
141128
// We should remove this flag once the above flag becomes enabled
142129
export const warnUnstableRenderSubtreeIntoContainer = false;
143130

144-
// Disables ReactDOM.unstable_createPortal
145-
export const disableUnstableCreatePortal = false;
146-
147131
// Modern event system where events get registered at roots
148132
export const enableModernEventSystem = false;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export const enableSchedulerTracing = __PROFILE__;
2424
export const enableSuspenseServerRenderer = false;
2525
export const enableSelectiveHydration = false;
2626
export const enableBlocksAPI = false;
27-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2827
export const warnAboutShorthandPropertyCollision = true;
2928
export const enableSchedulerDebugging = false;
3029
export const debugRenderPhaseSideEffectsForStrictMode = true;
@@ -44,15 +43,11 @@ export const disableLegacyContext = false;
4443
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
4544
export const enableTrainModelFix = true;
4645
export const enableTrustedTypesIntegration = false;
47-
export const disableLegacyReactDOMAPIs = false;
4846
export const disableTextareaChildren = false;
4947
export const disableMapsAsChildren = false;
50-
export const disableUnstableRenderSubtreeIntoContainer = false;
5148
export const warnUnstableRenderSubtreeIntoContainer = false;
52-
export const disableUnstableCreatePortal = false;
5349
export const deferPassiveEffectCleanupDuringUnmount = false;
5450
export const runAllPassiveEffectDestroysBeforeCreates = false;
55-
export const isTestEnvironment = false;
5651
export const enableModernEventSystem = false;
5752
export const warnAboutSpreadingKeyToJSX = false;
5853

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const enableSelectiveHydration = false;
2323
export const enableBlocksAPI = false;
2424
export const disableJavaScriptURLs = false;
2525
export const disableInputAttributeSyncing = false;
26-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2726
export const warnAboutShorthandPropertyCollision = true;
2827
export const enableSchedulerDebugging = false;
2928
export const enableDeprecatedFlareAPI = false;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = false;
4341
export const disableTextareaChildren = false;
4442
export const disableMapsAsChildren = false;
45-
export const disableUnstableRenderSubtreeIntoContainer = false;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = false;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = false;
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

‎packages/shared/forks/ReactFeatureFlags.persistent.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const enableSelectiveHydration = false;
2323
export const enableBlocksAPI = false;
2424
export const disableJavaScriptURLs = false;
2525
export const disableInputAttributeSyncing = false;
26-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2726
export const warnAboutShorthandPropertyCollision = true;
2827
export const enableSchedulerDebugging = false;
2928
export const enableDeprecatedFlareAPI = false;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = false;
4341
export const disableTextareaChildren = false;
4442
export const disableMapsAsChildren = false;
45-
export const disableUnstableRenderSubtreeIntoContainer = false;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = false;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = false;
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const enableSelectiveHydration = false;
2323
export const enableBlocksAPI = false;
2424
export const disableJavaScriptURLs = false;
2525
export const disableInputAttributeSyncing = false;
26-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2726
export const warnAboutShorthandPropertyCollision = true;
2827
export const enableSchedulerDebugging = false;
2928
export const enableDeprecatedFlareAPI = false;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = false;
4341
export const disableTextareaChildren = false;
4442
export const disableMapsAsChildren = false;
45-
export const disableUnstableRenderSubtreeIntoContainer = false;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = false;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = true; // this should probably *never* change
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export const enableSchedulerTracing = __PROFILE__;
2121
export const enableSuspenseServerRenderer = false;
2222
export const enableSelectiveHydration = false;
2323
export const enableBlocksAPI = false;
24-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2524
export const warnAboutShorthandPropertyCollision = true;
2625
export const enableSchedulerDebugging = false;
2726
export const disableJavaScriptURLs = false;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = false;
4341
export const disableTextareaChildren = false;
4442
export const disableMapsAsChildren = false;
45-
export const disableUnstableRenderSubtreeIntoContainer = false;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = false;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = true; // this should probably *never* change
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const enableSelectiveHydration = false;
2323
export const enableBlocksAPI = false;
2424
export const disableJavaScriptURLs = false;
2525
export const disableInputAttributeSyncing = false;
26-
export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
2726
export const warnAboutShorthandPropertyCollision = true;
2827
export const enableSchedulerDebugging = false;
2928
export const enableDeprecatedFlareAPI = false;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = false;
4341
export const disableTextareaChildren = false;
4442
export const disableMapsAsChildren = false;
45-
export const disableUnstableRenderSubtreeIntoContainer = false;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = false;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = true;
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const enableSelectiveHydration = true;
2323
export const enableBlocksAPI = true;
2424
export const disableJavaScriptURLs = true;
2525
export const disableInputAttributeSyncing = false;
26-
export const exposeConcurrentModeAPIs = true;
2726
export const warnAboutShorthandPropertyCollision = true;
2827
export const enableSchedulerDebugging = false;
2928
export const enableDeprecatedFlareAPI = true;
@@ -39,15 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
3938
export const enableTrainModelFix = true;
4039
export const enableTrustedTypesIntegration = false;
4140
export const enableNativeTargetAsInstance = false;
42-
export const disableLegacyReactDOMAPIs = __EXPERIMENTAL__;
4341
export const disableTextareaChildren = __EXPERIMENTAL__;
4442
export const disableMapsAsChildren = __EXPERIMENTAL__;
45-
export const disableUnstableRenderSubtreeIntoContainer = __EXPERIMENTAL__;
4643
export const warnUnstableRenderSubtreeIntoContainer = false;
47-
export const disableUnstableCreatePortal = __EXPERIMENTAL__;
4844
export const deferPassiveEffectCleanupDuringUnmount = false;
4945
export const runAllPassiveEffectDestroysBeforeCreates = false;
50-
export const isTestEnvironment = true;
5146
export const enableModernEventSystem = false;
5247
export const warnAboutSpreadingKeyToJSX = false;
5348

0 commit comments

Comments
 (0)