Flatten ReactSharedInternals (#28783)

This is similar to #28771 but for isomorphic. We need a make over for these dispatchers anyway so this is the first step. Also helps flush out some internals usage that will break anyway. It flattens the inner mutable objects onto the ReactSharedInternals. DiffTrain build for [d50323e](d50323e)
facebook · Apr 8, 2024 · 74e25ca · 74e25ca
1 parent 550d416
commit 74e25ca
Show file tree

Hide file tree

Showing 37 changed files with 2,234 additions and 2,922 deletions.
diff --git a/compiled/facebook-www/JSXDEVRuntime-dev.classic.js b/compiled/facebook-www/JSXDEVRuntime-dev.classic.js
@@ -87,9 +87,7 @@ if (__DEV__) {
           React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; // Defensive in case this is fired before React is initialized.
 
         if (ReactSharedInternals != null) {
-          var ReactDebugCurrentFrame =
-            ReactSharedInternals.ReactDebugCurrentFrame;
-          var stack = ReactDebugCurrentFrame.getStackAddendum();
+          var stack = ReactSharedInternals.getStackAddendum();
 
           if (stack !== "") {
             format += "%s";
@@ -486,7 +484,6 @@ if (__DEV__) {
       }
     }
 
-    var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
     var prefix;
     function describeBuiltInComponentFrame(name) {
       {
@@ -540,13 +537,13 @@ if (__DEV__) {
       var previousPrepareStackTrace = Error.prepareStackTrace; // $FlowFixMe[incompatible-type] It does accept undefined.
 
       Error.prepareStackTrace = undefined;
-      var previousDispatcher;
+      var previousDispatcher = null;
 
       {
-        previousDispatcher = ReactCurrentDispatcher.current; // Set the dispatcher in DEV because this might be call in the render function
+        previousDispatcher = ReactSharedInternals.H; // Set the dispatcher in DEV because this might be call in the render function
         // for warnings.
 
-        ReactCurrentDispatcher.current = null;
+        ReactSharedInternals.H = null;
         disableLogs();
       }
       /**
@@ -739,7 +736,7 @@ if (__DEV__) {
         reentry = false;
 
         {
-          ReactCurrentDispatcher.current = previousDispatcher;
+          ReactSharedInternals.H = previousDispatcher;
           reenableLogs();
         }
 
@@ -967,8 +964,6 @@ if (__DEV__) {
       return null;
     }
 
-    var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
-    var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
     var REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
     var specialPropKeyWarningShown;
     var specialPropRefWarningShown;
@@ -1012,12 +1007,12 @@ if (__DEV__) {
       {
         if (
           typeof config.ref === "string" &&
-          ReactCurrentOwner.current &&
+          ReactSharedInternals.owner &&
           self &&
-          ReactCurrentOwner.current.stateNode !== self
+          ReactSharedInternals.owner.stateNode !== self
         ) {
           var componentName = getComponentNameFromType(
-            ReactCurrentOwner.current.type
+            ReactSharedInternals.owner.type
           );
 
           if (!didWarnAboutStringRefs[componentName]) {
@@ -1028,7 +1023,7 @@ if (__DEV__) {
                 "We ask you to manually fix this case by using useRef() or createRef() instead. " +
                 "Learn more about using refs safely here: " +
                 "https://react.dev/link/strict-mode-string-ref",
-              getComponentNameFromType(ReactCurrentOwner.current.type),
+              getComponentNameFromType(ReactSharedInternals.owner.type),
               config.ref
             );
 
@@ -1381,7 +1376,7 @@ if (__DEV__) {
             ref = config.ref;
 
             {
-              ref = coerceStringRef(ref, ReactCurrentOwner.current, type);
+              ref = coerceStringRef(ref, ReactSharedInternals.owner, type);
             }
           }
 
@@ -1415,7 +1410,7 @@ if (__DEV__) {
               if (enableRefAsProp && !disableStringRefs && propName === "ref") {
                 props.ref = coerceStringRef(
                   config[propName],
-                  ReactCurrentOwner.current,
+                  ReactSharedInternals.owner,
                   type
                 );
               } else {
@@ -1459,7 +1454,7 @@ if (__DEV__) {
           ref,
           self,
           source,
-          ReactCurrentOwner.current,
+          ReactSharedInternals.owner,
           props
         );
 
@@ -1473,8 +1468,8 @@ if (__DEV__) {
 
     function getDeclarationErrorAddendum() {
       {
-        if (ReactCurrentOwner.current) {
-          var name = getComponentNameFromType(ReactCurrentOwner.current.type);
+        if (ReactSharedInternals.owner) {
+          var name = getComponentNameFromType(ReactSharedInternals.owner.type);
 
           if (name) {
             return "\n\nCheck the render method of `" + name + "`.";
@@ -1589,7 +1584,7 @@ if (__DEV__) {
         if (
           element &&
           element._owner != null &&
-          element._owner !== ReactCurrentOwner.current
+          element._owner !== ReactSharedInternals.owner
         ) {
           var ownerName = null;
 
@@ -1619,9 +1614,9 @@ if (__DEV__) {
       {
         if (element) {
           var stack = describeUnknownElementTypeFrameInDEV(element.type);
-          ReactDebugCurrentFrame.setExtraStackFrame(stack);
+          ReactSharedInternals.setExtraStackFrame(stack);
         } else {
-          ReactDebugCurrentFrame.setExtraStackFrame(null);
+          ReactSharedInternals.setExtraStackFrame(null);
         }
       }
     }

diff --git a/compiled/facebook-www/JSXDEVRuntime-dev.modern.js b/compiled/facebook-www/JSXDEVRuntime-dev.modern.js
@@ -87,9 +87,7 @@ if (__DEV__) {
           React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; // Defensive in case this is fired before React is initialized.
 
         if (ReactSharedInternals != null) {
-          var ReactDebugCurrentFrame =
-            ReactSharedInternals.ReactDebugCurrentFrame;
-          var stack = ReactDebugCurrentFrame.getStackAddendum();
+          var stack = ReactSharedInternals.getStackAddendum();
 
           if (stack !== "") {
             format += "%s";
@@ -486,7 +484,6 @@ if (__DEV__) {
       }
     }
 
-    var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
     var prefix;
     function describeBuiltInComponentFrame(name) {
       {
@@ -540,13 +537,13 @@ if (__DEV__) {
       var previousPrepareStackTrace = Error.prepareStackTrace; // $FlowFixMe[incompatible-type] It does accept undefined.
 
       Error.prepareStackTrace = undefined;
-      var previousDispatcher;
+      var previousDispatcher = null;
 
       {
-        previousDispatcher = ReactCurrentDispatcher.current; // Set the dispatcher in DEV because this might be call in the render function
+        previousDispatcher = ReactSharedInternals.H; // Set the dispatcher in DEV because this might be call in the render function
         // for warnings.
 
-        ReactCurrentDispatcher.current = null;
+        ReactSharedInternals.H = null;
         disableLogs();
       }
       /**
@@ -739,7 +736,7 @@ if (__DEV__) {
         reentry = false;
 
         {
-          ReactCurrentDispatcher.current = previousDispatcher;
+          ReactSharedInternals.H = previousDispatcher;
           reenableLogs();
         }
 
@@ -969,8 +966,6 @@ if (__DEV__) {
       return null;
     }
 
-    var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
-    var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
     var REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
     var specialPropKeyWarningShown;
     var specialPropRefWarningShown;
@@ -1014,12 +1009,12 @@ if (__DEV__) {
       {
         if (
           typeof config.ref === "string" &&
-          ReactCurrentOwner.current &&
+          ReactSharedInternals.owner &&
           self &&
-          ReactCurrentOwner.current.stateNode !== self
+          ReactSharedInternals.owner.stateNode !== self
         ) {
           var componentName = getComponentNameFromType(
-            ReactCurrentOwner.current.type
+            ReactSharedInternals.owner.type
           );
 
           if (!didWarnAboutStringRefs[componentName]) {
@@ -1030,7 +1025,7 @@ if (__DEV__) {
                 "We ask you to manually fix this case by using useRef() or createRef() instead. " +
                 "Learn more about using refs safely here: " +
                 "https://react.dev/link/strict-mode-string-ref",
-              getComponentNameFromType(ReactCurrentOwner.current.type),
+              getComponentNameFromType(ReactSharedInternals.owner.type),
               config.ref
             );
 
@@ -1383,7 +1378,7 @@ if (__DEV__) {
             ref = config.ref;
 
             {
-              ref = coerceStringRef(ref, ReactCurrentOwner.current, type);
+              ref = coerceStringRef(ref, ReactSharedInternals.owner, type);
             }
           }
 
@@ -1417,7 +1412,7 @@ if (__DEV__) {
               if (enableRefAsProp && !disableStringRefs && propName === "ref") {
                 props.ref = coerceStringRef(
                   config[propName],
-                  ReactCurrentOwner.current,
+                  ReactSharedInternals.owner,
                   type
                 );
               } else {
@@ -1461,7 +1456,7 @@ if (__DEV__) {
           ref,
           self,
           source,
-          ReactCurrentOwner.current,
+          ReactSharedInternals.owner,
           props
         );
 
@@ -1475,8 +1470,8 @@ if (__DEV__) {
 
     function getDeclarationErrorAddendum() {
       {
-        if (ReactCurrentOwner.current) {
-          var name = getComponentNameFromType(ReactCurrentOwner.current.type);
+        if (ReactSharedInternals.owner) {
+          var name = getComponentNameFromType(ReactSharedInternals.owner.type);
 
           if (name) {
             return "\n\nCheck the render method of `" + name + "`.";
@@ -1591,7 +1586,7 @@ if (__DEV__) {
         if (
           element &&
           element._owner != null &&
-          element._owner !== ReactCurrentOwner.current
+          element._owner !== ReactSharedInternals.owner
         ) {
           var ownerName = null;
 
@@ -1621,9 +1616,9 @@ if (__DEV__) {
       {
         if (element) {
           var stack = describeUnknownElementTypeFrameInDEV(element.type);
-          ReactDebugCurrentFrame.setExtraStackFrame(stack);
+          ReactSharedInternals.setExtraStackFrame(stack);
         } else {
-          ReactDebugCurrentFrame.setExtraStackFrame(null);
+          ReactSharedInternals.setExtraStackFrame(null);
         }
       }
     }

diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-f62cf8c62052ae780d351090013f7155cf9a868c
+d50323eb845c5fde0d720cae888bf35dedd05506