Add ReactDOMClient to ServerIntegrationHooks

facebook · Jan 28, 2024 · d1eb303 · d1eb303
1 parent 233b65d
commit d1eb303
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
@@ -15,7 +15,7 @@
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 
 let React;
-let ReactDOM;
+let ReactDOMClient;
 let ReactDOMServer;
 let ReactTestUtils;
 let useState;
@@ -39,7 +39,7 @@ function initModules() {
   jest.resetModules();
 
   React = require('react');
-  ReactDOM = require('react-dom');
+  ReactDOMClient = require('react-dom/client');
   ReactDOMServer = require('react-dom/server');
   ReactTestUtils = require('react-dom/test-utils');
   useState = React.useState;
@@ -67,7 +67,7 @@ function initModules() {
 
   // Make them available to the helpers.
   return {
-    ReactDOM,
+    ReactDOMClient,
     ReactDOMServer,
     ReactTestUtils,
   };
@@ -422,7 +422,7 @@ describe('ReactDOMServerHooks', () => {
         });
         return 'hi';
       }
-
+      // TODO: fails due to render error retry
       const domNode = await render(<App />, 1);
       expect(domNode.textContent).toEqual('hi');
     });
@@ -436,6 +436,7 @@ describe('ReactDOMServerHooks', () => {
         return value;
       }
 
+      // TODO: fails due to render error retry
       const domNode = await render(<App />, 1);
       expect(domNode.textContent).toEqual('0');
     });
@@ -859,9 +860,11 @@ describe('ReactDOMServerHooks', () => {
         return <Text text={count} />;
       }
 
+      // TODO: fails due to render error retry
       const domNode1 = await render(<ReadInMemo />, 1);
       expect(domNode1.textContent).toEqual('42');
 
+      // TODO: fails due to render error retry
       const domNode2 = await render(<ReadInReducer />, 1);
       expect(domNode2.textContent).toEqual('42');
     });

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationNewContext-test.js
@@ -13,21 +13,21 @@
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 
 let React;
-let ReactDOM;
+let ReactDOMClient;
 let ReactDOMServer;
 let ReactTestUtils;
 
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
   React = require('react');
-  ReactDOM = require('react-dom');
+  ReactDOMClient = require('react-dom/client');
   ReactDOMServer = require('react-dom/server');
   ReactTestUtils = require('react-dom/test-utils');
 
   // Make them available to the helpers.
   return {
-    ReactDOM,
+    ReactDOMClient,
     ReactDOMServer,
     ReactTestUtils,
   };
@@ -365,6 +365,7 @@ describe('ReactDOMServerIntegration', () => {
             </div>
           );
         };
+        // TODO: fails due to render error retry
         // We expect 1 error.
         await render(<App />, 1);
       },
@@ -391,6 +392,7 @@ describe('ReactDOMServerIntegration', () => {
             </div>
           );
         };
+        // TODO: fails due to render error retry
         // We expect 1 error.
         await render(<App />, 1);
       },