Fix remaining files after stricter check

gaearon · gaearon · commit 21158df3ec67 · 2019-12-06T17:59:34.000Z
diff --git a/packages/react-dom/src/shared/sanitizeURL.js b/packages/react-dom/src/shared/sanitizeURL.js
@@ -38,15 +38,17 @@ function sanitizeURL(url: string) {
       'React has blocked a javascript: URL as a security precaution.%s',
       __DEV__ ? ReactDebugCurrentFrame.getStackAddendum() : '',
     );
-  } else if (__DEV__ && !didWarn && isJavaScriptProtocol.test(url)) {
-    didWarn = true;
-    warning(
-      false,
-      'A future version of React will block javascript: URLs as a security precaution. ' +
-        'Use event handlers instead if you can. If you need to generate unsafe HTML try ' +
-        'using dangerouslySetInnerHTML instead. React was passed %s.',
-      JSON.stringify(url),
-    );
+  } else if (__DEV__) {
+    if (!didWarn && isJavaScriptProtocol.test(url)) {
+      didWarn = true;
+      warning(
+        false,
+        'A future version of React will block javascript: URLs as a security precaution. ' +
+          'Use event handlers instead if you can. If you need to generate unsafe HTML try ' +
+          'using dangerouslySetInnerHTML instead. React was passed %s.',
+        JSON.stringify(url),
+      );
+    }
   }
 }
 
diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js
@@ -89,27 +89,31 @@ export function injectInternals(internals: Object): boolean {
           hook.onCommitFiberRoot(rendererID, root, undefined, didError);
         }
       } catch (err) {
-        if (__DEV__ && !hasLoggedError) {
-          hasLoggedError = true;
-          warningWithoutStack(
-            false,
-            'React instrumentation encountered an error: %s',
-            err,
-          );
+        if (__DEV__) {
+          if (!hasLoggedError) {
+            hasLoggedError = true;
+            warningWithoutStack(
+              false,
+              'React instrumentation encountered an error: %s',
+              err,
+            );
+          }
         }
       }
     };
     onCommitFiberUnmount = fiber => {
       try {
         hook.onCommitFiberUnmount(rendererID, fiber);
       } catch (err) {
-        if (__DEV__ && !hasLoggedError) {
-          hasLoggedError = true;
-          warningWithoutStack(
-            false,
-            'React instrumentation encountered an error: %s',
-            err,
-          );
+        if (__DEV__) {
+          if (!hasLoggedError) {
+            hasLoggedError = true;
+            warningWithoutStack(
+              false,
+              'React instrumentation encountered an error: %s',
+              err,
+            );
+          }
         }
       }
     };
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js
@@ -1089,12 +1089,14 @@ export function flushDiscreteUpdates() {
     (executionContext & (BatchedContext | RenderContext | CommitContext)) !==
     NoContext
   ) {
-    if (__DEV__ && (executionContext & RenderContext) !== NoContext) {
-      warning(
-        false,
-        'unstable_flushDiscreteUpdates: Cannot flush updates when React is ' +
-          'already rendering.',
-      );
+    if (__DEV__) {
+      if ((executionContext & RenderContext) !== NoContext) {
+        warning(
+          false,
+          'unstable_flushDiscreteUpdates: Cannot flush updates when React is ' +
+            'already rendering.',
+        );
+      }
     }
     // We're already rendering, so we can't synchronously flush pending work.
     // This is probably a nested event dispatch triggered by a lifecycle/effect,
diff --git a/packages/react-test-renderer/src/ReactTestHostConfig.js b/packages/react-test-renderer/src/ReactTestHostConfig.js
@@ -214,13 +214,15 @@ export function createTextInstance(
   hostContext: Object,
   internalInstanceHandle: Object,
 ): TextInstance {
-  if (__DEV__ && enableFlareAPI) {
-    warning(
-      hostContext !== EVENT_COMPONENT_CONTEXT,
-      'validateDOMNesting: React event components cannot have text DOM nodes as children. ' +
-        'Wrap the child text "%s" in an element.',
-      text,
-    );
+  if (__DEV__) {
+    if (enableFlareAPI) {
+      warning(
+        hostContext !== EVENT_COMPONENT_CONTEXT,
+        'validateDOMNesting: React event components cannot have text DOM nodes as children. ' +
+          'Wrap the child text "%s" in an element.',
+        text,
+      );
+    }
   }
   return {
     text,
