From a276ffccd268170589a0223a855458c267cef906 Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 10:01:22 -0400
Subject: [PATCH 1/7] Add failing iframe test

---
 .../shared/__tests__/ReactServerRendering-test.js   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index 632f7306c14ea..dc54e0551f286 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -358,6 +358,19 @@ describe('ReactDOMServer', () => {
         'Objects are not valid as a React child (found: object with keys {x})',
       );
     });
+
+    it('should not throw on <iframe /> with style attribute', () => {
+      expect(
+        () => ReactDOMServer.renderToString(<iframe style="border:none;" />)
+      ).not.toThrow();
+
+      expect(
+        ReactDOMServer.renderToString(<iframe style="border:none;" />),
+      ).toBe(
+        '<iframe src"border:none;"></iframe>',
+      );
+    });
+
   });
 
   describe('renderToStaticMarkup', () => {

From 8886e9faf559c300912fc17c2bbbf9ad28c5b706 Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 10:18:51 -0400
Subject: [PATCH 2/7] Possible fix by returning null ownerName in SSR

---
 .../shared/__tests__/ReactServerRendering-test.js    | 12 ++++--------
 src/renderers/shared/server/ReactPartialRenderer.js  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index dc54e0551f286..c8ea72cba22d7 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -359,16 +359,12 @@ describe('ReactDOMServer', () => {
       );
     });
 
-    it('should not throw on <iframe /> with style attribute', () => {
+    it('should throw prop mapping error for an <iframe /> with invalid props', () => {
       expect(
         () => ReactDOMServer.renderToString(<iframe style="border:none;" />)
-      ).not.toThrow();
-
-      expect(
-        ReactDOMServer.renderToString(<iframe style="border:none;" />),
-      ).toBe(
-        '<iframe src"border:none;"></iframe>',
-      );
+      ).toThrowError(
+        'The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + \'em\'}} when using JSX.'
+      )
     });
 
   });
diff --git a/src/renderers/shared/server/ReactPartialRenderer.js b/src/renderers/shared/server/ReactPartialRenderer.js
index 9f7e41ffd1f45..6bf7b0a42d788 100644
--- a/src/renderers/shared/server/ReactPartialRenderer.js
+++ b/src/renderers/shared/server/ReactPartialRenderer.js
@@ -780,7 +780,7 @@ class ReactDOMServerRenderer {
       validatePropertiesInDevelopment(tag, props);
     }
 
-    assertValidProps(tag, props);
+    assertValidProps(tag, props, () => null);
 
     var out = createOpenTagMarkup(
       element.type,

From c62b42ff46ee7cde5dfa70a4b2de379219a09023 Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 10:46:02 -0400
Subject: [PATCH 3/7] prettier

---
 .../dom/shared/__tests__/ReactServerRendering-test.js    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index c8ea72cba22d7..9f41a17a8198f 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -360,13 +360,12 @@ describe('ReactDOMServer', () => {
     });
 
     it('should throw prop mapping error for an <iframe /> with invalid props', () => {
-      expect(
-        () => ReactDOMServer.renderToString(<iframe style="border:none;" />)
+      expect(() =>
+        ReactDOMServer.renderToString(<iframe style="border:none;" />),
       ).toThrowError(
-        'The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + \'em\'}} when using JSX.'
-      )
+        "The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
+      );
     });
-
   });
 
   describe('renderToStaticMarkup', () => {

From dcfa52d354f8198ecb33458ce34b377f7c058422 Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 11:01:19 -0400
Subject: [PATCH 4/7] eslolint

---
 .../dom/shared/__tests__/ReactServerRendering-test.js          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index 9f41a17a8198f..dfd7d8e1db3d9 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -363,7 +363,8 @@ describe('ReactDOMServer', () => {
       expect(() =>
         ReactDOMServer.renderToString(<iframe style="border:none;" />),
       ).toThrowError(
-        "The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
+        "The `style` prop expects a mapping from style properties to values, not " +
+        "a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
       );
     });
   });

From 17fb7d682d4019a0072162ddea6875489a2de79f Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 11:16:59 -0400
Subject: [PATCH 5/7] =?UTF-8?q?gah=20c=E2=80=99mon=20really=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dom/shared/__tests__/ReactServerRendering-test.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index dfd7d8e1db3d9..30d93363b5cb2 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -363,8 +363,8 @@ describe('ReactDOMServer', () => {
       expect(() =>
         ReactDOMServer.renderToString(<iframe style="border:none;" />),
       ).toThrowError(
-        "The `style` prop expects a mapping from style properties to values, not " +
-        "a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
+        'The `style` prop expects a mapping from style properties to values, not ' +
+          "a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
       );
     });
   });

From 6efdcc48c6c7361601c87a5d5ad7c5fef6548804 Mon Sep 17 00:00:00 2001
From: Dustan Kasten <dustan.kasten@gmail.com>
Date: Tue, 10 Oct 2017 11:29:56 -0400
Subject: [PATCH 6/7] emptyFunction.thatReturnsNull

---
 src/renderers/shared/server/ReactPartialRenderer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderers/shared/server/ReactPartialRenderer.js b/src/renderers/shared/server/ReactPartialRenderer.js
index 6bf7b0a42d788..abca6becbd804 100644
--- a/src/renderers/shared/server/ReactPartialRenderer.js
+++ b/src/renderers/shared/server/ReactPartialRenderer.js
@@ -18,6 +18,7 @@ var DOMMarkupOperations = require('DOMMarkupOperations');
 var React = require('react');
 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
 
+var emptyFunction = require('fbjs/lib/emptyFunction');
 var assertValidProps = require('assertValidProps');
 var dangerousStyleValue = require('dangerousStyleValue');
 var emptyObject = require('fbjs/lib/emptyObject');
@@ -780,7 +781,7 @@ class ReactDOMServerRenderer {
       validatePropertiesInDevelopment(tag, props);
     }
 
-    assertValidProps(tag, props, () => null);
+    assertValidProps(tag, props, emptyFunction.thatReturnsNull);
 
     var out = createOpenTagMarkup(
       element.type,

From 5fe9a9be462c268af2145ffcce3b89b0f90060c8 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 10 Oct 2017 16:35:28 +0100
Subject: [PATCH 7/7] One less property access

---
 src/renderers/shared/server/ReactPartialRenderer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderers/shared/server/ReactPartialRenderer.js b/src/renderers/shared/server/ReactPartialRenderer.js
index abca6becbd804..26ffaef0e3106 100644
--- a/src/renderers/shared/server/ReactPartialRenderer.js
+++ b/src/renderers/shared/server/ReactPartialRenderer.js
@@ -18,9 +18,9 @@ var DOMMarkupOperations = require('DOMMarkupOperations');
 var React = require('react');
 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
 
-var emptyFunction = require('fbjs/lib/emptyFunction');
 var assertValidProps = require('assertValidProps');
 var dangerousStyleValue = require('dangerousStyleValue');
+var emptyFunction = require('fbjs/lib/emptyFunction');
 var emptyObject = require('fbjs/lib/emptyObject');
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
 var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName');
@@ -30,6 +30,7 @@ var omittedCloseTags = require('omittedCloseTags');
 var isCustomComponent = require('isCustomComponent');
 
 var toArray = React.Children.toArray;
+var emptyFunctionThatReturnsNull = emptyFunction.thatReturnsNull;
 
 if (__DEV__) {
   var warning = require('fbjs/lib/warning');
@@ -781,7 +782,7 @@ class ReactDOMServerRenderer {
       validatePropertiesInDevelopment(tag, props);
     }
 
-    assertValidProps(tag, props, emptyFunction.thatReturnsNull);
+    assertValidProps(tag, props, emptyFunctionThatReturnsNull);
 
     var out = createOpenTagMarkup(
       element.type,