From 51004e7538b5f4c79345d7db8360cba6cb3e181f Mon Sep 17 00:00:00 2001
From: Sean <S.Prashad@outlook.com>
Date: Sat, 24 Nov 2018 06:34:26 -0500
Subject: [PATCH] Add config to toggle StrictMode (#7035)

---
 config/default-disco.js           |  1 +
 config/default.js                 |  3 +++
 src/core/components/Root/index.js | 17 +++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/config/default-disco.js b/config/default-disco.js
index cd39898d246..238034296f0 100644
--- a/config/default-disco.js
+++ b/config/default-disco.js
@@ -23,6 +23,7 @@ module.exports = {
     'discoParamsToUse',
     'enableDevTools',
     'enableRequestID',
+    'enableStrictMode',
     'experiments',
     'hctEnabled',
     'hrefLangsMap',
diff --git a/config/default.js b/config/default.js
index b940df487c4..142830caa8b 100644
--- a/config/default.js
+++ b/config/default.js
@@ -50,6 +50,8 @@ module.exports = {
   // If true node will serve the static files.
   enableNodeStatics: false,
 
+  enableStrictMode: true,
+
   isDeployed: true,
   isDevelopment: false,
 
@@ -112,6 +114,7 @@ module.exports = {
     'enableFeatureHomeHeroGuides',
     'enableFeatureStaticThemesForAndroid',
     'enableRequestID',
+    'enableStrictMode',
     'experiments',
     'fxaConfig',
     'hctEnabled',
diff --git a/src/core/components/Root/index.js b/src/core/components/Root/index.js
index 8f50e05d60c..771080ea726 100644
--- a/src/core/components/Root/index.js
+++ b/src/core/components/Root/index.js
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { ConnectedRouter } from 'connected-react-router';
 import { CookiesProvider, Cookies } from 'react-cookie';
 import { Provider } from 'react-redux';
+import config from 'config';
 
 import I18nProvider from 'core/i18n/Provider';
 import type { I18nType } from 'core/types/i18n';
@@ -10,6 +11,7 @@ import type { ReduxStore } from 'core/types/redux';
 import type { ReactRouterHistoryType } from 'core/types/router';
 
 type Props = {|
+  _config?: typeof config,
   children: React.Node,
   cookies?: typeof Cookies,
   history: ReactRouterHistoryType,
@@ -17,13 +19,24 @@ type Props = {|
   store: ReduxStore,
 |};
 
-const Root = ({ children, history, i18n, store, cookies = null }: Props) => (
+const Root = ({
+  _config = config,
+  children,
+  history,
+  i18n,
+  store,
+  cookies = null,
+}: Props) => (
   <I18nProvider i18n={i18n}>
     <Provider store={store} key="provider">
       <ConnectedRouter history={history}>
         <CookiesProvider cookies={cookies}>
           {/* $FLOW_FIXME: https://github.com/facebook/react/issues/12553 */}
-          <React.StrictMode>{children}</React.StrictMode>
+          {_config.get('enableStrictMode') ? (
+            <React.StrictMode>{children}</React.StrictMode>
+          ) : (
+            children
+          )}
         </CookiesProvider>
       </ConnectedRouter>
     </Provider>