Move ReactServerSharedInternals on to ReactSharedInternalsServer

Really the top level secret export should just be forked into two different
versions. This was just trying to move some earlier than others.

Author: sebmarkbage

packages/react-server-dom-turbopack/src/ReactFlightTurbopackNodeRegister.js

@@ -44,7 +44,7 @@ module.exports = function register() {
       }).body;
     } catch (x) {
       // eslint-disable-next-line react-internal/no-production-logging
-      console.error('Error parsing %s %s', url, x.message);
+      console['error']('Error parsing %s %s', url, x.message);
       return originalCompile.apply(this, arguments);
     }
 

packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js

@@ -44,7 +44,7 @@ module.exports = function register() {
       }).body;
     } catch (x) {
       // eslint-disable-next-line react-internal/no-production-logging
-      console.error('Error parsing %s %s', url, x.message);
+      console['error']('Error parsing %s %s', url, x.message);
       return originalCompile.apply(this, arguments);
     }
 

packages/react-server/src/ReactFlightServer.js

@@ -111,7 +111,6 @@ import {
 import type {SharedStateServer} from 'react/src/ReactSharedInternalsServer';
 import ReactSharedInternalsImpl from 'shared/ReactSharedInternals';
 const ReactSharedInternals: SharedStateServer = (ReactSharedInternalsImpl: any);
-import ReactServerSharedInternals from './ReactServerSharedInternals';
 import isArray from 'shared/isArray';
 import getPrototypeOf from 'shared/getPrototypeOf';
 import binaryToComparableString from 'shared/binaryToComparableString';
@@ -307,7 +306,7 @@ const {
   TaintRegistryValues,
   TaintRegistryByteLengths,
   TaintRegistryPendingRequests,
-} = ReactServerSharedInternals;
+} = ReactSharedInternals;
 
 function throwTaintViolation(message: string) {
   // eslint-disable-next-line react-internal/prod-error-codes

packages/react-server/src/ReactServerSharedInternals.js

@@ -12,8 +12,6 @@ import './ReactFetch';
 
 export {default as __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} from './ReactSharedInternalsServer';
 
-export {default as __SECRET_SERVER_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} from './ReactServerSharedInternals';
-
 import {forEach, map, count, toArray, only} from './ReactChildren';
 import {
   REACT_FRAGMENT_TYPE,

packages/react/src/ReactServer.experimental.js

@@ -12,8 +12,6 @@ import './ReactFetch';
 
 export {default as __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} from './ReactSharedInternalsServer';
 
-export {default as __SECRET_SERVER_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} from './ReactServerSharedInternals';
-
 import {forEach, map, count, toArray, only} from './ReactChildren';
 import {
   REACT_FRAGMENT_TYPE,

packages/react/src/ReactServer.js

@@ -11,12 +11,31 @@ import type {Dispatcher} from 'react-reconciler/src/ReactInternalTypes';
 import type {CacheDispatcher} from 'react-reconciler/src/ReactInternalTypes';
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
-import {disableStringRefs} from 'shared/ReactFeatureFlags';
+import type {
+  Reference,
+  TaintEntry,
+  RequestCleanupQueue,
+} from './ReactTaintRegistry';
+
+import {
+  TaintRegistryObjects,
+  TaintRegistryValues,
+  TaintRegistryByteLengths,
+  TaintRegistryPendingRequests,
+} from './ReactTaintRegistry';
+
+import {disableStringRefs, enableTaint} from 'shared/ReactFeatureFlags';
 
 export type SharedStateServer = {
   H: null | Dispatcher, // ReactCurrentDispatcher for Hooks
   C: null | CacheDispatcher, // ReactCurrentCache for Cache
 
+  // enableTaint
+  TaintRegistryObjects: WeakMap<Reference, string>,
+  TaintRegistryValues: Map<string | bigint, TaintEntry>,
+  TaintRegistryByteLengths: Set<number>,
+  TaintRegistryPendingRequests: Set<RequestCleanupQueue>,
+
   // DEV-only-ish
   owner: null | ReactComponentInfo, // ReactCurrentOwner is ReactComponentInfo in Flight, null in Fizz. Fiber/Fizz uses SharedStateClient.
 
@@ -33,6 +52,14 @@ const ReactSharedInternals: SharedStateServer = ({
   C: null,
 }: any);
 
+if (enableTaint) {
+  ReactSharedInternals.TaintRegistryObjects = TaintRegistryObjects;
+  ReactSharedInternals.TaintRegistryValues = TaintRegistryValues;
+  ReactSharedInternals.TaintRegistryByteLengths = TaintRegistryByteLengths;
+  ReactSharedInternals.TaintRegistryPendingRequests =
+    TaintRegistryPendingRequests;
+}
+
 if (__DEV__ || !disableStringRefs) {
   ReactSharedInternals.owner = null;
 }

packages/react/src/ReactServerSharedInternals.js

@@ -13,13 +13,13 @@ import getPrototypeOf from 'shared/getPrototypeOf';
 
 import binaryToComparableString from 'shared/binaryToComparableString';
 
-import ReactServerSharedInternals from './ReactServerSharedInternals';
+import ReactSharedInternals from './ReactSharedInternalsServer';
 const {
   TaintRegistryObjects,
   TaintRegistryValues,
   TaintRegistryByteLengths,
   TaintRegistryPendingRequests,
-} = ReactServerSharedInternals;
+} = ReactSharedInternals;
 
 interface Reference {}
 

packages/react/src/ReactSharedInternalsServer.js

@@ -46,6 +46,11 @@ function mockReact() {
     );
     return jest.requireActual(resolvedEntryPoint);
   });
+  // Make it possible to import this module inside
+  // the React package itself.
+  jest.mock('shared/ReactSharedInternals', () => {
+    return jest.requireActual('react/src/ReactSharedInternalsClient');
+  });
 }
 
 // When we want to unmock React we really need to mock it again.
@@ -54,6 +59,10 @@ global.__unmockReact = mockReact;
 mockReact();
 
 jest.mock('react/react.react-server', () => {
+  // If we're requiring an RSC environment, use those internals instead.
+  jest.mock('shared/ReactSharedInternals', () => {
+    return jest.requireActual('react/src/ReactSharedInternalsServer');
+  });
   const resolvedEntryPoint = resolveEntryFork(
     require.resolve('react/src/ReactServer'),
     global.__WWW__
@@ -161,11 +170,13 @@ inlinedHostConfigs.forEach(rendererInfo => {
   });
 });
 
-// Make it possible to import this module inside
-// the React package itself.
-jest.mock('shared/ReactSharedInternals', () =>
-  jest.requireActual('react/src/ReactSharedInternalsClient')
-);
+jest.mock('react-server/src/ReactFlightServer', () => {
+  // If we're requiring an RSC environment, use those internals instead.
+  jest.mock('shared/ReactSharedInternals', () => {
+    return jest.requireActual('react/src/ReactSharedInternalsServer');
+  });
+  return jest.requireActual('react-server/src/ReactFlightServer');
+});
 
 // Make it possible to import this module inside
 // the ReactDOM package itself.