From cbef3fd41228040eb580bb1298f91cd9fbce24f9 Mon Sep 17 00:00:00 2001
From: Toru Kobayashi <koba0004@gmail.com>
Date: Thu, 25 May 2017 23:31:35 +0900
Subject: [PATCH] Warn it only in DEV (#9772)

---
 .../shared/server/ReactServerRenderer.js      | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/renderers/shared/server/ReactServerRenderer.js b/src/renderers/shared/server/ReactServerRenderer.js
index 734667d09c..db96d478c8 100644
--- a/src/renderers/shared/server/ReactServerRenderer.js
+++ b/src/renderers/shared/server/ReactServerRenderer.js
@@ -116,12 +116,16 @@ function flattenOptionChildren(children) {
     }
     if (typeof child === 'string' || typeof child === 'number') {
       content += child;
-    } else if (!didWarnInvalidOptionChildren) {
-      didWarnInvalidOptionChildren = true;
-      warning(
-        false,
-        'Only strings and numbers are supported as <option> children.',
-      );
+    } else {
+      if (__DEV__) {
+        if (!didWarnInvalidOptionChildren) {
+          didWarnInvalidOptionChildren = true;
+          warning(
+            false,
+            'Only strings and numbers are supported as <option> children.',
+          );
+        }
+      }
     }
   });
   return content;
@@ -547,24 +551,23 @@ class ReactDOMServerRenderer {
             );
           }
         }
-      }
 
-      if (
-        props.value !== undefined &&
-        props.defaultValue !== undefined &&
-        !didWarnDefaultSelectValue
-      ) {
-        warning(
-          false,
-          'Select elements must be either controlled or uncontrolled ' +
-            '(specify either the value prop, or the defaultValue prop, but not ' +
-            'both). Decide between using a controlled or uncontrolled select ' +
-            'element and remove one of these props. More info: ' +
-            'https://fb.me/react-controlled-components',
-        );
-        didWarnDefaultSelectValue = true;
+        if (
+          props.value !== undefined &&
+          props.defaultValue !== undefined &&
+          !didWarnDefaultSelectValue
+        ) {
+          warning(
+            false,
+            'Select elements must be either controlled or uncontrolled ' +
+              '(specify either the value prop, or the defaultValue prop, but not ' +
+              'both). Decide between using a controlled or uncontrolled select ' +
+              'element and remove one of these props. More info: ' +
+              'https://fb.me/react-controlled-components',
+          );
+          didWarnDefaultSelectValue = true;
+        }
       }
-
       this.currentSelectValue = props.value != null
         ? props.value
         : props.defaultValue;