From f18192966747d3def1e110599747acc076eca8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik.hoglund@gmail.com>
Date: Sun, 2 Sep 2018 15:36:40 +0200
Subject: [PATCH 1/3] Ignore noscript content on the client (#11423)

---
 .../ReactServerRenderingHydration.js          | 33 +++++++++++++++++++
 .../src/client/ReactDOMHostConfig.js          |  1 +
 2 files changed, 34 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 63a0104f0cc60..06ab2a37f592e 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -341,4 +341,37 @@ describe('ReactDOMServerHydration', () => {
       expect(callback).toHaveBeenCalledTimes(0);
     }
   });
+
+  // Regression test for https://github.com/facebook/react/issues/11423
+  it('should ignore noscript content on the client and not warn about mismatches', () => {
+    const callback = jest.fn();
+    const TestComponent = ({onRender}) => {
+      onRender();
+      return <div>Enable JavaScript to run this app.</div>;
+    };
+    const markup = (
+      <noscript>
+        <TestComponent onRender={callback} />
+      </noscript>
+    );
+
+    const element = document.createElement('div');
+    element.innerHTML = ReactDOMServer.renderToString(markup);
+    expect(callback).toHaveBeenCalledTimes(1);
+    expect(element.textContent).toBe(
+      '<div>Enable JavaScript to run this app.</div>',
+    );
+
+    // On the client we want to keep the existing markup, but not render the
+    // actual elements for performance reasons and to avoid for example
+    // downloading images. This should also not warn for hydration mismatches.
+    expect(() => ReactDOM.hydrate(markup, element)).not.toWarnDev(
+      'Expected server HTML to contain a matching <div> in <noscript>.',
+      {withoutStack: true},
+    );
+    expect(callback).toHaveBeenCalledTimes(1);
+    expect(element.textContent).toBe(
+      '<div>Enable JavaScript to run this app.</div>',
+    );
+  });
 });
diff --git a/packages/react-dom/src/client/ReactDOMHostConfig.js b/packages/react-dom/src/client/ReactDOMHostConfig.js
index 8a5c0578a8229..8102cd13dd8bb 100644
--- a/packages/react-dom/src/client/ReactDOMHostConfig.js
+++ b/packages/react-dom/src/client/ReactDOMHostConfig.js
@@ -247,6 +247,7 @@ export function shouldSetTextContent(type: string, props: Props): boolean {
   return (
     type === 'textarea' ||
     type === 'option' ||
+    type === 'noscript' ||
     typeof props.children === 'string' ||
     typeof props.children === 'number' ||
     (typeof props.dangerouslySetInnerHTML === 'object' &&

From f5ac55ebdb5590071404fa53054471c21ffd245a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik.hoglund@gmail.com>
Date: Sun, 2 Sep 2018 16:17:52 +0200
Subject: [PATCH 2/3] Fix failing test for ignoring noscript content

---
 .../react-dom/src/__tests__/ReactServerRenderingHydration.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
index 06ab2a37f592e..721071837aab3 100644
--- a/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
+++ b/packages/react-dom/src/__tests__/ReactServerRenderingHydration.js
@@ -365,10 +365,7 @@ describe('ReactDOMServerHydration', () => {
     // On the client we want to keep the existing markup, but not render the
     // actual elements for performance reasons and to avoid for example
     // downloading images. This should also not warn for hydration mismatches.
-    expect(() => ReactDOM.hydrate(markup, element)).not.toWarnDev(
-      'Expected server HTML to contain a matching <div> in <noscript>.',
-      {withoutStack: true},
-    );
+    ReactDOM.hydrate(markup, element);
     expect(callback).toHaveBeenCalledTimes(1);
     expect(element.textContent).toBe(
       '<div>Enable JavaScript to run this app.</div>',

From eb7d7925d5c275f5e985cb9df6e08ceb22bdc759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik.hoglund@gmail.com>
Date: Sun, 2 Sep 2018 22:45:24 +0200
Subject: [PATCH 3/3] Add a ServerIntegration test for noscript

---
 .../ReactDOMServerIntegrationElements-test.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
index 39f9cf4c2ad4a..24fc8cd49aeca 100644
--- a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
@@ -36,6 +36,7 @@ const {
   itThrowsWhenRendering,
   serverRender,
   streamRender,
+  clientCleanRender,
   clientRenderOnServerString,
 } = ReactDOMServerIntegrationUtils(initModules);
 
@@ -576,6 +577,24 @@ describe('ReactDOMServerIntegration', () => {
       },
     );
 
+    itRenders('a noscript with children', async render => {
+      const e = await render(
+        <noscript>
+          <div>Enable JavaScript to run this app.</div>
+        </noscript>,
+      );
+      if (render === clientCleanRender) {
+        // On the client we ignore the contents of a noscript
+        expect(e.childNodes.length).toBe(0);
+      } else {
+        // On the server or when hydrating the content should be correct
+        expect(e.childNodes.length).toBe(1);
+        expect(e.firstChild.textContent).toBe(
+          '<div>Enable JavaScript to run this app.</div>',
+        );
+      }
+    });
+
     describe('newline-eating elements', function() {
       itRenders(
         'a newline-eating tag with content not starting with \\n',