Revert fetch instrumentation to only RSC

facebook · Oct 23, 2022 · 23e8027 · 23e8027
1 parent 0c11baa
commit 23e8027
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/react/src/React.js b/packages/react/src/React.js
@@ -71,9 +71,6 @@ import ReactSharedInternals from './ReactSharedInternals';
 import {startTransition} from './ReactStartTransition';
 import {act} from './ReactAct';
 
-// Patch fetch
-import './ReactFetch';
-
 // TODO: Move this branching into the other module instead and just re-export.
 const createElement: any = __DEV__
   ? createElementWithValidation

diff --git a/packages/react/src/ReactSharedSubset.experimental.js b/packages/react/src/ReactSharedSubset.experimental.js
@@ -7,6 +7,9 @@
  * @flow
  */
 
+// Patch fetch
+import './ReactFetch';
+
 export {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   Children,

diff --git a/packages/react/src/__tests__/ReactFetch-test.js b/packages/react/src/__tests__/ReactFetch-test.js
@@ -41,7 +41,9 @@ describe('ReactFetch', () => {
     fetchCount = 0;
     global.fetch = fetchMock;
 
-    React = require('react');
+    React = gate(flags => flags.experimental && !flags.www)
+      ? require('react/react.shared-subset')
+      : require('react');
     ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
     ReactServerDOMClient = require('react-server-dom-webpack/client');
     use = React.experimental_use;