Re-enable shorthand CSS property collision warning (#18002)

sophiebits · web-flow · commit 4f71f25a34db · 2020-02-10T11:42:11.000Z
Originally added in #14181; disabled in #14245. Intention was to enable it in React 16.7 but we forgot.
diff --git a/packages/react-dom/src/__tests__/ReactDOMShorthandCSSPropertyCollision-test.js b/packages/react-dom/src/__tests__/ReactDOMShorthandCSSPropertyCollision-test.js
@@ -10,14 +10,11 @@
 'use strict';
 
 describe('ReactDOMShorthandCSSPropertyCollision', () => {
- let ReactFeatureFlags;
 let React;
 let ReactDOM;
 
 beforeEach(() => {
 jest.resetModules();
- ReactFeatureFlags = require('shared/ReactFeatureFlags');
- ReactFeatureFlags.warnAboutShorthandPropertyCollision = true;
 React = require('react');
 ReactDOM = require('react-dom');
 });
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
@@ -48,7 +48,7 @@ export const disableJavaScriptURLs = false;
 // Control this behavior with a flag to support 16.6 minor releases in the meanwhile.
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
 
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = true;
 
 // Experimental React Flare event system and event components support.
 export const enableDeprecatedFlareAPI = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js
@@ -25,7 +25,7 @@ export const enableSuspenseServerRenderer = false;
 export const enableSelectiveHydration = false;
 export const enableChunksAPI = false;
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = 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
@@ -24,7 +24,7 @@ export const enableChunksAPI = false;
 export const disableJavaScriptURLs = false;
 export const disableInputAttributeSyncing = false;
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = true;
 export const enableSchedulerDebugging = false;
 export const enableDeprecatedFlareAPI = false;
 export const enableFundamentalAPI = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.persistent.js b/packages/shared/forks/ReactFeatureFlags.persistent.js
@@ -24,7 +24,7 @@ export const enableChunksAPI = false;
 export const disableJavaScriptURLs = false;
 export const disableInputAttributeSyncing = false;
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = true;
 export const enableSchedulerDebugging = false;
 export const enableDeprecatedFlareAPI = false;
 export const enableFundamentalAPI = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js
@@ -24,7 +24,7 @@ export const enableChunksAPI = false;
 export const disableJavaScriptURLs = false;
 export const disableInputAttributeSyncing = false;
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = true;
 export const enableSchedulerDebugging = false;
 export const enableDeprecatedFlareAPI = false;
 export const enableFundamentalAPI = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js
@@ -24,7 +24,7 @@ export const enableChunksAPI = false;
 export const disableJavaScriptURLs = false;
 export const disableInputAttributeSyncing = false;
 export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;
-export const warnAboutShorthandPropertyCollision = false;
+export const warnAboutShorthandPropertyCollision = true;
 export const enableSchedulerDebugging = false;
 export const enableDeprecatedFlareAPI = false;
 export const enableFundamentalAPI = false;
diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -16,6 +16,7 @@ export const {
 disableInputAttributeSyncing,
 enableTrustedTypesIntegration,
 deferPassiveEffectCleanupDuringUnmount,
+ warnAboutShorthandPropertyCollision,
 } = require('ReactFeatureFlags');
 
 // In www, we have experimental support for gathering data
@@ -32,7 +33,6 @@ export const enableSchedulerDebugging = true;
 
 export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
 export const warnAboutDeprecatedLifecycles = true;
-export const warnAboutShorthandPropertyCollision = false;
 export const disableLegacyContext = false;
 export const warnAboutStringRefs = false;
 export const warnAboutDefaultPropsOnFunctionComponents = false;

-Original file line number
+Diff line change
 'use strict';
 describe('ReactDOMShorthandCSSPropertyCollision',()=>{
 -letReactFeatureFlags;
 letReact;
 letReactDOM;
 beforeEach(()=>{
 jest.resetModules();
 -ReactFeatureFlags=require('shared/ReactFeatureFlags');
 -ReactFeatureFlags.warnAboutShorthandPropertyCollision=true;
 React=require('react');
 ReactDOM=require('react-dom');
 });
-Original file line number
+Diff line change
 exportconstenableSelectiveHydration=false;
 exportconstenableChunksAPI=false;
 exportconstexposeConcurrentModeAPIs=__EXPERIMENTAL__;
 -exportconstwarnAboutShorthandPropertyCollision=false;
 +exportconstwarnAboutShorthandPropertyCollision=true;
 exportconstenableSchedulerDebugging=false;
 exportconstdebugRenderPhaseSideEffectsForStrictMode=true;
 exportconstdisableJavaScriptURLs=false;