Reorganize how shared internals are accessed (#13201)

* Reorganize how shared internals are accessed

* Update forks.js

packages/react-dom/src/client/ReactDOM.js

@@ -29,7 +29,7 @@ import * as EventPluginRegistry from 'events/EventPluginRegistry';
 import * as EventPropagators from 'events/EventPropagators';
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
 import ReactVersion from 'shared/ReactVersion';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
@@ -46,6 +46,8 @@ import {
 } from '../shared/HTMLNodeType';
 import {ROOT_ATTRIBUTE_NAME} from '../shared/DOMProperty';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 let topLevelUpdateWarnings;
 let warnOnInvalidCallback;
 let didWarnAboutUnstableCreatePortal = false;

packages/react-dom/src/server/ReactPartialRenderer.js

@@ -21,7 +21,7 @@ import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'shared/warning';
 import checkPropTypes from 'prop-types/checkPropTypes';
 import describeComponentFrame from 'shared/describeComponentFrame';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {warnAboutDeprecatedLifecycles} from 'shared/ReactFeatureFlags';
 import {
   REACT_FORWARD_REF_TYPE,
@@ -68,6 +68,7 @@ const toArray = ((React.Children.toArray: any): toArrayType);
 // Each stack is an array of frames which may contain nested stacks of elements.
 let currentDebugStacks = [];
 
+let ReactDebugCurrentFrame;
 let prevGetCurrentStackImpl = null;
 let getCurrentServerStackImpl = () => '';
 let describeStackFrame = element => '';
@@ -78,6 +79,8 @@ let pushElementToDebugStack = (element: ReactElement) => {};
 let popCurrentDebugStack = () => {};
 
 if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
   validatePropertiesInDevelopment = function(type, props) {
     validateARIAProperties(type, props);
     validateInputProperties(type, props);

packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js

@@ -6,12 +6,14 @@
  */
 
 import warning from 'shared/warning';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 
 import {ATTRIBUTE_NAME_CHAR} from './DOMProperty';
 import isCustomComponent from './isCustomComponent';
 import validAriaProperties from './validAriaProperties';
 
+const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 const warnedProperties = {};
 const rARIA = new RegExp('^(aria)-[' + ATTRIBUTE_NAME_CHAR + ']*$');
 const rARIACamel = new RegExp('^(aria)[A-Z][' + ATTRIBUTE_NAME_CHAR + ']*$');

packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js

@@ -5,9 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
 
+let ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 let didWarnValueNull = false;
 
 export function validateProperties(type, props) {

packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js

@@ -9,7 +9,7 @@ import {
   registrationNameModules,
   possibleRegistrationNames,
 } from 'events/EventPluginRegistry';
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import warning from 'shared/warning';
 
 import {
@@ -21,9 +21,13 @@ import {
 import isCustomComponent from './isCustomComponent';
 import possibleStandardNames from './possibleStandardNames';
 
+let ReactDebugCurrentFrame = null;
+
 let validateProperty = () => {};
 
 if (__DEV__) {
+  ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
   const warnedProperties = {};
   const hasOwnProperty = Object.prototype.hasOwnProperty;
   const EVENT_NAME_REGEX = /^on./;

packages/react-native-renderer/src/ReactFabric.js

@@ -23,10 +23,11 @@ import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactFabricComponentTree from './ReactFabricComponentTree';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import warning from 'shared/warning';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactFabricRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {

packages/react-native-renderer/src/ReactNativeRenderer.js

@@ -26,10 +26,11 @@ import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import warning from 'shared/warning';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {

packages/react-reconciler/src/ReactCurrentFiber.js

@@ -7,7 +7,7 @@
  * @flow
  */
 
-import {ReactDebugCurrentFrame} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {
   IndeterminateComponent,
   FunctionalComponent,
@@ -17,6 +17,8 @@ import {
 import describeComponentFrame from 'shared/describeComponentFrame';
 import getComponentName from 'shared/getComponentName';
 
+const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
+
 import type {Fiber} from './ReactFiber';
 
 type LifeCyclePhase = 'render' | 'getChildContext';

packages/react-reconciler/src/ReactFiberBeginWork.js

@@ -38,7 +38,7 @@ import {
   Update,
   Ref,
 } from 'shared/ReactTypeOfSideEffect';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import {
   enableGetDerivedStateFromCatch,
   enableSuspense,
@@ -98,6 +98,8 @@ import {
 } from './ReactFiberClassComponent';
 import MAX_SIGNED_31_BIT_INT from './maxSigned31BitInt';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 let didWarnAboutBadClass;
 let didWarnAboutGetDerivedStateOnFunctionalComponent;
 let didWarnAboutStatelessRefs;

packages/react-reconciler/src/ReactFiberScheduler.js

@@ -12,7 +12,7 @@ import type {FiberRoot, Batch} from './ReactFiberRoot';
 import type {ExpirationTime} from './ReactFiberExpirationTime';
 
 import ReactErrorUtils from 'shared/ReactErrorUtils';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings';
 import {
   NoEffect,
@@ -155,6 +155,7 @@ export type Thenable = {
   then(resolve: () => mixed, reject?: () => mixed): mixed,
 };
 
+const {ReactCurrentOwner} = ReactSharedInternals;
 const {
   invokeGuardedCallback,
   hasCaughtError,

packages/react-reconciler/src/ReactFiberTreeReflection.js

@@ -13,7 +13,7 @@ import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
 import * as ReactInstanceMap from 'shared/ReactInstanceMap';
-import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
+import ReactSharedInternals from 'shared/ReactSharedInternals';
 import getComponentName from 'shared/getComponentName';
 import {
   ClassComponent,
@@ -24,6 +24,8 @@ import {
 } from 'shared/ReactTypeOfWork';
 import {NoEffect, Placement} from 'shared/ReactTypeOfSideEffect';
 
+const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
+
 const MOUNTING = 1;
 const MOUNTED = 2;
 const UNMOUNTED = 3;

packages/react/src/React.js

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import assign from 'object-assign';
 import ReactVersion from 'shared/ReactVersion';
 import {
   REACT_ASYNC_MODE_TYPE,
@@ -19,7 +18,6 @@ import {enableSuspense} from 'shared/ReactFeatureFlags';
 import {Component, PureComponent} from './ReactBaseClasses';
 import {createRef} from './ReactCreateRef';
 import {forEach, map, count, toArray, only} from './ReactChildren';
-import ReactCurrentOwner from './ReactCurrentOwner';
 import {
   createElement,
   createFactory,
@@ -33,7 +31,7 @@ import {
   createFactoryWithValidation,
   cloneElementWithValidation,
 } from './ReactElementValidator';
-import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+import ReactSharedInternals from './ReactSharedInternals';
 
 const React = {
   Children: {
@@ -63,25 +61,11 @@ const React = {
 
   version: ReactVersion,
 
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
-    ReactCurrentOwner,
-    // Used by renderers to avoid bundling object-assign twice in UMD bundles:
-    assign,
-  },
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,
 };
 
 if (enableSuspense) {
   React.Placeholder = REACT_PLACEHOLDER_TYPE;
 }
 
-if (__DEV__) {
-  Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
-    // These should not be included in production.
-    ReactDebugCurrentFrame,
-    // Shim for React DOM 16.0.0 which still destructured (but not used) this.
-    // TODO: remove in React 17.0.
-    ReactComponentTreeHook: {},
-  });
-}
-
 export default React;

packages/react/src/ReactSharedInternals.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import assign from 'object-assign';
+import ReactCurrentOwner from './ReactCurrentOwner';
+import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
+
+const ReactSharedInternals = {
+  ReactCurrentOwner,
+  // Used by renderers to avoid bundling object-assign twice in UMD bundles:
+  assign,
+};
+
+if (__DEV__) {
+  Object.assign(ReactSharedInternals, {
+    // These should not be included in production.
+    ReactDebugCurrentFrame,
+    // Shim for React DOM 16.0.0 which still destructured (but not used) this.
+    // TODO: remove in React 17.0.
+    ReactComponentTreeHook: {},
+  });
+}
+
+export default ReactSharedInternals;

packages/shared/ReactGlobalSharedState.js

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import React from 'react';
-
-const ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-export const ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-export const ReactDebugCurrentFrame = __DEV__
-  ? ReactInternals.ReactDebugCurrentFrame
-  : null;

packages/shared/ReactSharedInternals.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+
+const ReactSharedInternals =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+export default ReactSharedInternals;

scripts/jest/setupHostConfigs.js

@@ -56,3 +56,9 @@ inlinedHostConfigs.forEach(rendererInfo => {
     return renderer;
   });
 });
+
+// Make it possible to import this module inside
+// the React package itself.
+jest.mock('shared/ReactSharedInternals', () =>
+  require.requireActual('react/src/ReactSharedInternals')
+);

scripts/rollup/forks.js

@@ -38,6 +38,15 @@ const forks = Object.freeze({
     return 'shared/forks/object-assign.umd.js';
   },
 
+  // Without this fork, importing `shared/ReactSharedInternals` inside
+  // the `react` package itself would not work due to a cyclical dependency.
+  'shared/ReactSharedInternals': (bundleType, entry) => {
+    if (entry === 'react') {
+      return 'react/src/ReactSharedInternals';
+    }
+    return null;
+  },
+
   // We have a few forks for different environments.
   'shared/ReactFeatureFlags': (bundleType, entry) => {
     switch (entry) {