DevTools: Inline references to fiber flags (#26542)

acdlite · acdlite · commit 04d482a6b317 · 2023-04-04T15:10:17.000Z
We shouldn't be referencing internal fields like fiber's `flag` directly of DevTools. It's an implementation detail. However, over the years a few of these have snuck in. Because of how DevTools is currently shipped, where it's expected to be backwards compatible with older versions of React, this prevents us from refactoring those fields inside the reconciler. The plan we have to address this is to fix how DevTools is shipped: DevTools will be released in lockstep with each version of React. Until then, though, I need a temporary solution because it's blocking a feature I'm working on. So in meantime, I'm going to have to fork the DevTool's code based on the React version, like we already do with the fiber TypeOfWork enum. As a first step, I've inlined all the references to fiber flags into the specific call sites where they are used. Eventually we'll import these functions from the reconciler so they stay in sync, rather than maintaining duplicate copies of the logic. DiffTrain build for commit 0ba4d7b.
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js
@@ -23884,7 +23884,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-next-da94e8b24-20230404";
+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";
 
 // Might add PROFILE later.
 
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js
@@ -8683,7 +8683,7 @@ var devToolsConfig$jscomp$inline_1028 = {
     throw Error("TestRenderer does not support findFiberByHostInstance()");
   },
   bundleType: 0,
-  version: "18.3.0-next-da94e8b24-20230404",
+  version: "18.3.0-next-0ba4d7b0d-20230404",
   rendererPackageName: "react-test-renderer"
 };
 var internals$jscomp$inline_1220 = {
@@ -8714,7 +8714,7 @@ var internals$jscomp$inline_1220 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1221 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js
@@ -9108,7 +9108,7 @@ var devToolsConfig$jscomp$inline_1070 = {
     throw Error("TestRenderer does not support findFiberByHostInstance()");
   },
   bundleType: 0,
-  version: "18.3.0-next-da94e8b24-20230404",
+  version: "18.3.0-next-0ba4d7b0d-20230404",
   rendererPackageName: "react-test-renderer"
 };
 var internals$jscomp$inline_1261 = {
@@ -9139,7 +9139,7 @@ var internals$jscomp$inline_1261 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1262 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js
@@ -27,7 +27,7 @@ if (
 }
           "use strict";
 
-var ReactVersion = "18.3.0-next-da94e8b24-20230404";
+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";
 
 // ATTENTION
 // When adding new symbols to this file,
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js
@@ -639,4 +639,4 @@ exports.useSyncExternalStore = function (
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-next-da94e8b24-20230404";
+exports.version = "18.3.0-next-0ba4d7b0d-20230404";
diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js
@@ -642,7 +642,7 @@ exports.useSyncExternalStore = function (
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-next-da94e8b24-20230404";
+exports.version = "18.3.0-next-0ba4d7b0d-20230404";
 
           /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
 if (
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
@@ -1 +1 @@
-da94e8b24a3f31a3e805f9bf6bba73055aad9d41
+0ba4d7b0d80d942dc8f074f7ce0536e6b2559fbf
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
@@ -27177,7 +27177,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-next-da94e8b24-20230404";
+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";
 
 function createPortal$1(
   children,
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
@@ -9554,7 +9554,7 @@ var roots = new Map(),
   devToolsConfig$jscomp$inline_1052 = {
     findFiberByHostInstance: getInstanceFromNode,
     bundleType: 0,
-    version: "18.3.0-next-da94e8b24-20230404",
+    version: "18.3.0-next-0ba4d7b0d-20230404",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function () {
@@ -9596,7 +9596,7 @@ var internals$jscomp$inline_1297 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1298 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
@@ -10262,7 +10262,7 @@ var roots = new Map(),
   devToolsConfig$jscomp$inline_1130 = {
     findFiberByHostInstance: getInstanceFromNode,
     bundleType: 0,
-    version: "18.3.0-next-da94e8b24-20230404",
+    version: "18.3.0-next-0ba4d7b0d-20230404",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function () {
@@ -10317,7 +10317,7 @@ var roots = new Map(),
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 });
 exports.createPortal = function (children, containerTag) {
   return createPortal$1(
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
@@ -27700,7 +27700,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-next-da94e8b24-20230404";
+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";
 
 function createPortal$1(
   children,
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
@@ -9810,7 +9810,7 @@ var roots = new Map(),
   devToolsConfig$jscomp$inline_1107 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "18.3.0-next-da94e8b24-20230404",
+    version: "18.3.0-next-0ba4d7b0d-20230404",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function () {
@@ -9852,7 +9852,7 @@ var internals$jscomp$inline_1359 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1360 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
@@ -10518,7 +10518,7 @@ var roots = new Map(),
   devToolsConfig$jscomp$inline_1185 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "18.3.0-next-da94e8b24-20230404",
+    version: "18.3.0-next-0ba4d7b0d-20230404",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function () {
@@ -10573,7 +10573,7 @@ var roots = new Map(),
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-da94e8b24-20230404"
+  reconcilerVersion: "18.3.0-next-0ba4d7b0d-20230404"
 });
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
   computeComponentStackForErrorReporting: function (reactTag) {

Original file line number	Diff line number	Diff line change
`@@ -23884,7 +23884,7 @@ function createFiberRoot(`
`23884`	`23884`	`return root;`
`23885`	`23885`	`}`
`23886`	`23886`
`23887`		`-var ReactVersion = "18.3.0-next-da94e8b24-20230404";`
	`23887`	`+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";`
`23888`	`23888`
`23889`	`23889`	`// Might add PROFILE later.`
`23890`	`23890`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ if (`
`27`	`27`	`}`
`28`	`28`	`"use strict";`
`29`	`29`
`30`		`-var ReactVersion = "18.3.0-next-da94e8b24-20230404";`
	`30`	`+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";`
`31`	`31`
`32`	`32`	`// ATTENTION`
`33`	`33`	`// When adding new symbols to this file,`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-da94e8b24a3f31a3e805f9bf6bba73055aad9d41`
	`1`	`+0ba4d7b0d80d942dc8f074f7ce0536e6b2559fbf`
Original file line number	Diff line number	Diff line change
`@@ -27177,7 +27177,7 @@ function createFiberRoot(`
`27177`	`27177`	`return root;`
`27178`	`27178`	`}`
`27179`	`27179`
`27180`		`-var ReactVersion = "18.3.0-next-da94e8b24-20230404";`
	`27180`	`+var ReactVersion = "18.3.0-next-0ba4d7b0d-20230404";`
`27181`	`27181`
`27182`	`27182`	`function createPortal$1(`
`27183`	`27183`	`children,`