From caa84c8da0aed390ec25783e577d91711dfd6bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Sat, 22 Oct 2022 22:58:30 -0400
Subject: [PATCH] Revert fetch instrumentation to only RSC (#25540)

Revert fetch instrumentation so that it only affects RSC by applying it
only in the react-server condition of "react".

This helps make the rollout a little smoother because these affects
existing libraries that fetch during client components, and then gets
forever cached. We need to implement the GC first.

I haven't fully implemented the SSR part anyway.

The main problem that we discovered is that `"react"` and
`"react/react.shared-subset"` have separate dispatchers in an
environment that runs both Fizz and Flight. That's intentional and
sometimes a feature. However, in this case it means that we instrument
fetch twice and when you run Flight inside Fizz, that fetch goes into
both caches when it's supposed to only see the inner one. I'm not sure
how to solve that atm.
---
 packages/react/src/React.js                          | 3 ---
 packages/react/src/ReactSharedSubset.experimental.js | 3 +++
 packages/react/src/__tests__/ReactFetch-test.js      | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/react/src/React.js b/packages/react/src/React.js
index 3cb0d13a13a05..3c3cafe88bcf6 100644
--- 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
index 1283c51a9ad53..94dd4c2efbc88 100644
--- 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
index c68c697e29d6e..6d25a9ddd05a6 100644
--- a/packages/react/src/__tests__/ReactFetch-test.js
+++ b/packages/react/src/__tests__/ReactFetch-test.js
@@ -41,6 +41,9 @@ describe('ReactFetch', () => {
     fetchCount = 0;
     global.fetch = fetchMock;
 
+    if (gate(flags => flags.experimental && !flags.www)) {
+      jest.mock('react', () => require('react/react.shared-subset'));
+    }
     React = require('react');
     ReactServerDOMServer = require('react-server-dom-webpack/server.browser');
     ReactServerDOMClient = require('react-server-dom-webpack/client');