From e5db5302ac76e688ca044177d199435272c3ade1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 10 Oct 2017 19:35:43 +0100
Subject: [PATCH] Fix false positive <noscript> rehydration text difference
 warning in React 16 (#11157)

* Add <noscript> with HTML in it to SSR fixture

* Wrap <noscript> into a <div> to get its "client HTML"

* Revert "Wrap <noscript> into a <div> to get its "client HTML""

This reverts commit 27a42503e2790a0d5cf0b90451a664fc6ab9d862.

* Always use parent.ownerDocument
---
 fixtures/ssr/src/components/Chrome.js             |  5 +++++
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/fixtures/ssr/src/components/Chrome.js b/fixtures/ssr/src/components/Chrome.js
index 2cd704064c..541d96901c 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={{
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 72ed46f285..2b75e96390 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,
         );
