Some of the internals are shared in shared/

Like ReactDebugCurrentFrame. So we preserve those simple cases on
the old name while still moving dispatcher and cache to the separate one.

Author: sebmarkbage

packages/react/src/React.js

@@ -67,7 +67,7 @@ import {
   cloneElementWithValidation,
 } from './ReactElementValidator';
 import {createServerContext} from './ReactServerContext';
-import ReactSharedInternals from './ReactSharedInternals';
+import ReactSharedInternals from './ReactSharedInternalsClient';
 import {startTransition} from './ReactStartTransition';
 import {act} from './ReactAct';
 

packages/react/src/ReactServerContext.js

@@ -19,9 +19,7 @@ import type {
 } from 'shared/ReactTypes';
 
 import {enableServerContext} from 'shared/ReactFeatureFlags';
-import ReactSharedInternals from './ReactSharedInternals';
-
-const ContextRegistry = ReactSharedInternals.ContextRegistry;
+import {ContextRegistry} from './ReactServerContextRegistry';
 
 export function createServerContext<T: ServerContextJSONValue>(
   globalName: string,

packages/react/src/ReactServerSharedInternals.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import ReactCurrentDispatcher from './ReactCurrentDispatcher';
+import ReactCurrentCache from './ReactCurrentCache';
+
+const ReactServerSharedInternals = {
+  ReactCurrentDispatcher,
+  ReactCurrentCache,
+};
+
+export default ReactServerSharedInternals;

packages/react/src/ReactSharedInternals.js renamed to packages/react/src/ReactSharedInternalsClient.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import ReactCurrentOwner from './ReactCurrentOwner';
+import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+import {enableServerContext} from 'shared/ReactFeatureFlags';
+import {ContextRegistry} from './ReactServerContextRegistry';
+
+const ReactSharedInternals = {
+  ReactCurrentOwner,
+};
+
+if (__DEV__) {
+  ReactSharedInternals.ReactDebugCurrentFrame = ReactDebugCurrentFrame;
+}
+
+if (enableServerContext) {
+  ReactSharedInternals.ContextRegistry = ContextRegistry;
+}
+
+export default ReactSharedInternals;

packages/react/src/ReactSharedInternalsServer.js

@@ -10,8 +10,11 @@
 // Patch fetch
 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';
+
 export {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED as __SECRET_SERVER_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   Children,
   Fragment,
   Profiler,

packages/react/src/ReactSharedSubset.experimental.js

@@ -10,8 +10,11 @@
 // Patch fetch
 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';
+
 export {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED as __SECRET_SERVER_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   Children,
   Fragment,
   Profiler,

packages/react/src/ReactSharedSubset.js

@@ -169,7 +169,7 @@ inlinedHostConfigs.forEach(rendererInfo => {
 // Make it possible to import this module inside
 // the React package itself.
 jest.mock('shared/ReactSharedInternals', () =>
-  jest.requireActual('react/src/ReactSharedInternals')
+  jest.requireActual('react/src/ReactSharedInternalsClient')
 );
 
 // Make it possible to import this module inside

scripts/jest/setupHostConfigs.js

@@ -60,8 +60,11 @@ const forks = Object.freeze({
     entry,
     dependencies
   ) => {
-    if (entry === 'react' || entry === 'react/src/ReactSharedSubset.js') {
-      return './packages/react/src/ReactSharedInternals.js';
+    if (entry === 'react') {
+      return './packages/react/src/ReactSharedInternalsClient.js';
+    }
+    if (entry === 'react/src/ReactSharedSubset.js') {
+      return './packages/react/src/ReactSharedInternalsServer.js';
     }
     if (!entry.startsWith('react/') && dependencies.indexOf('react') === -1) {
       // React internals are unavailable if we can't reference the package.