From 1c327df233658f99aebbe7360844f4fa46781aa5 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 9 Oct 2017 15:52:32 +0100
Subject: [PATCH 1/4] Add <noscript> with HTML in it to SSR fixture

---
 fixtures/ssr/src/components/Chrome.js | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/fixtures/ssr/src/components/Chrome.js b/fixtures/ssr/src/components/Chrome.js
index 2cd704064c4dd..541d96901c5fb 100644
--- a/fixtures/ssr/src/components/Chrome.js
+++ b/fixtures/ssr/src/components/Chrome.js
@@ -15,6 +15,11 @@ export default class Chrome extends Component {
           <title>{this.props.title}</title>
         </head>
         <body>
+          <noscript
+            dangerouslySetInnerHTML={{
+              __html: `<b>Enable JavaScript to run this app.</b>`,
+            }}
+          />
           {this.props.children}
           <script
             dangerouslySetInnerHTML={{

From 27a42503e2790a0d5cf0b90451a664fc6ab9d862 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 9 Oct 2017 16:05:05 +0100
Subject: [PATCH 2/4] Wrap <noscript> into a <div> to get its "client HTML"

---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 07a84c242ad28..b9a310e8f9b09 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -179,6 +179,19 @@ if (__DEV__) {
           parent.tagName,
         );
     testElement.innerHTML = html;
+
+    if (parent.tagName === 'NOSCRIPT') {
+      // <noscript> content is parsed as text, but only if the browser parses it
+      // together with <noscript> tag itself. So we have to wrap it once more.
+      var wrapperElement = document.createElement('div');
+      wrapperElement.innerHTML = '<noscript>' + html + '</noscript>';
+      var noscriptElement = wrapperElement.firstElementChild;
+      // Make Flow happy (but it'll always be there).
+      if (noscriptElement !== null && typeof noscriptElement !== 'undefined') {
+        return noscriptElement.innerHTML;
+      }
+    }
+
     return testElement.innerHTML;
   };
 }

From be4b82ce015e58f60a9e179f098030fdf84a63b9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 10 Oct 2017 14:30:39 +0100
Subject: [PATCH 3/4] Revert "Wrap <noscript> into a <div> to get its "client
 HTML""

This reverts commit 27a42503e2790a0d5cf0b90451a664fc6ab9d862.
---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index b9a310e8f9b09..07a84c242ad28 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -179,19 +179,6 @@ if (__DEV__) {
           parent.tagName,
         );
     testElement.innerHTML = html;
-
-    if (parent.tagName === 'NOSCRIPT') {
-      // <noscript> content is parsed as text, but only if the browser parses it
-      // together with <noscript> tag itself. So we have to wrap it once more.
-      var wrapperElement = document.createElement('div');
-      wrapperElement.innerHTML = '<noscript>' + html + '</noscript>';
-      var noscriptElement = wrapperElement.firstElementChild;
-      // Make Flow happy (but it'll always be there).
-      if (noscriptElement !== null && typeof noscriptElement !== 'undefined') {
-        return noscriptElement.innerHTML;
-      }
-    }
-
     return testElement.innerHTML;
   };
 }

From dc00d51524f2ff8843484a35baf597c7ad995f7c Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 10 Oct 2017 15:42:29 +0100
Subject: [PATCH 4/4] Always use parent.ownerDocument

---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 07a84c242ad28..dee116412bc48 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -164,17 +164,16 @@ if (__DEV__) {
     );
   };
 
-  var testDocument;
   // Parse the HTML and read it back to normalize the HTML string so that it
   // can be used for comparison.
   var normalizeHTML = function(parent: Element, html: string) {
-    if (!testDocument) {
-      // The title argument is required in IE11 so we pass an empty string.
-      testDocument = document.implementation.createHTMLDocument('');
-    }
+    // We could have created a separate document here to avoid
+    // re-initializing custom elements if they exist. But this breaks
+    // how <noscript> is being handled. So we use the same document.
+    // See the discussion in https://github.com/facebook/react/pull/11157.
     var testElement = parent.namespaceURI === HTML_NAMESPACE
-      ? testDocument.createElement(parent.tagName)
-      : testDocument.createElementNS(
+      ? parent.ownerDocument.createElement(parent.tagName)
+      : parent.ownerDocument.createElementNS(
           (parent.namespaceURI: any),
           parent.tagName,
         );
