Skip to content

Commit 97eab46

Browse files
kassenskassens
committed
Revert "Track Owner for Server Components in DEV (#28753)"
This reverts commit e0455fe. DiffTrain build for commit 87b495f.
1 parent 812db07 commit 97eab46

13 files changed

Lines changed: 434 additions & 361 deletions

File tree

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<568cb702cdaad263cf51f5b74157b2ba>>
10+
* @generated SignedSource<<3151ca79177b1e7b421f14db372bfd97>>
1111
*/
1212

1313
"use strict";
@@ -349,17 +349,6 @@ if (__DEV__) {
349349
return type.displayName || "Context";
350350
}
351351

352-
function getComponentNameFromOwner(owner) {
353-
if (typeof owner.tag === "number") {
354-
return getComponentNameFromFiber(owner);
355-
}
356-
357-
if (typeof owner.name === "string") {
358-
return owner.name;
359-
}
360-
361-
return null;
362-
}
363352
function getComponentNameFromFiber(fiber) {
364353
var tag = fiber.tag,
365354
type = fiber.type;
@@ -2892,14 +2881,21 @@ if (__DEV__) {
28922881

28932882
var objectIs = typeof Object.is === "function" ? Object.is : is; // $FlowFixMe[method-unbinding]
28942883

2895-
function describeBuiltInComponentFrame(name) {
2884+
function describeBuiltInComponentFrame(name, ownerFn) {
28962885
{
2897-
return describeComponentFrame(name);
2886+
var ownerName = null;
2887+
2888+
if (ownerFn) {
2889+
ownerName = ownerFn.displayName || ownerFn.name || null;
2890+
}
2891+
2892+
return describeComponentFrame(name, ownerName);
28982893
}
28992894
}
29002895
function describeDebugInfoFrame(name, env) {
29012896
return describeBuiltInComponentFrame(
2902-
name + (env ? " (" + env + ")" : "")
2897+
name + (env ? " (" + env + ")" : ""),
2898+
null
29032899
);
29042900
}
29052901

@@ -2908,51 +2904,65 @@ if (__DEV__) {
29082904
new PossiblyWeakMap$1();
29092905
}
29102906

2911-
function describeComponentFrame(name) {
2912-
return "\n in " + (name || "Unknown");
2907+
function describeComponentFrame(name, ownerName) {
2908+
var sourceInfo = "";
2909+
2910+
if (ownerName) {
2911+
sourceInfo = " (created by " + ownerName + ")";
2912+
}
2913+
2914+
return "\n in " + (name || "Unknown") + sourceInfo;
29132915
}
29142916

2915-
function describeClassComponentFrame(ctor) {
2917+
function describeClassComponentFrame(ctor, ownerFn) {
29162918
{
2917-
return describeFunctionComponentFrame(ctor);
2919+
return describeFunctionComponentFrame(ctor, ownerFn);
29182920
}
29192921
}
2920-
function describeFunctionComponentFrame(fn) {
2922+
function describeFunctionComponentFrame(fn, ownerFn) {
29212923
{
29222924
if (!fn) {
29232925
return "";
29242926
}
29252927

29262928
var name = fn.displayName || fn.name || null;
2927-
return describeComponentFrame(name);
2929+
var ownerName = null;
2930+
2931+
if (ownerFn) {
2932+
ownerName = ownerFn.displayName || ownerFn.name || null;
2933+
}
2934+
2935+
return describeComponentFrame(name, ownerName);
29282936
}
29292937
}
29302938

29312939
function describeFiber(fiber) {
2940+
var owner = fiber._debugOwner ? fiber._debugOwner.type : null;
2941+
29322942
switch (fiber.tag) {
29332943
case HostHoistable:
29342944
case HostSingleton:
29352945
case HostComponent:
2936-
return describeBuiltInComponentFrame(fiber.type);
2946+
return describeBuiltInComponentFrame(fiber.type, owner);
29372947

29382948
case LazyComponent:
2939-
return describeBuiltInComponentFrame("Lazy");
2949+
return describeBuiltInComponentFrame("Lazy", owner);
29402950

29412951
case SuspenseComponent:
2942-
return describeBuiltInComponentFrame("Suspense");
2952+
return describeBuiltInComponentFrame("Suspense", owner);
29432953

29442954
case SuspenseListComponent:
2945-
return describeBuiltInComponentFrame("SuspenseList");
2955+
return describeBuiltInComponentFrame("SuspenseList", owner);
29462956

29472957
case FunctionComponent:
29482958
case SimpleMemoComponent:
2949-
return describeFunctionComponentFrame(fiber.type);
2959+
return describeFunctionComponentFrame(fiber.type, owner);
29502960

29512961
case ForwardRef:
2952-
return describeFunctionComponentFrame(fiber.type.render);
2962+
return describeFunctionComponentFrame(fiber.type.render, owner);
29532963

29542964
case ClassComponent:
2955-
return describeClassComponentFrame(fiber.type);
2965+
return describeClassComponentFrame(fiber.type, owner);
29562966

29572967
default:
29582968
return "";
@@ -5243,8 +5253,8 @@ if (__DEV__) {
52435253

52445254
var owner = current._debugOwner;
52455255

5246-
if (owner != null) {
5247-
return getComponentNameFromOwner(owner);
5256+
if (owner !== null && typeof owner !== "undefined") {
5257+
return getComponentNameFromFiber(owner);
52485258
}
52495259
}
52505260

@@ -26550,7 +26560,7 @@ if (__DEV__) {
2655026560
"named imports.";
2655126561
}
2655226562

26553-
var ownerName = owner ? getComponentNameFromOwner(owner) : null;
26563+
var ownerName = owner ? getComponentNameFromFiber(owner) : null;
2655426564

2655526565
if (ownerName) {
2655626566
info += "\n\nCheck the render method of `" + ownerName + "`.";
@@ -26813,7 +26823,7 @@ if (__DEV__) {
2681326823
return root;
2681426824
}
2681526825

26816-
var ReactVersion = "19.0.0-canary-6077cfa0";
26826+
var ReactVersion = "19.0.0-canary-29bd6113";
2681726827

2681826828
// Might add PROFILE later.
2681926829

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<edf13283385b2e5a6dba5a299a226ed0>>
10+
* @generated SignedSource<<432e9d2dc4a6b45da0162dd89f63ecfc>>
1111
*/
1212

1313
"use strict";
@@ -654,24 +654,28 @@ function is(x, y) {
654654
return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
655655
}
656656
var objectIs = "function" === typeof Object.is ? Object.is : is;
657-
function describeBuiltInComponentFrame(name) {
658-
return "\n in " + (name || "Unknown");
657+
function describeComponentFrame(name, ownerName) {
658+
var sourceInfo = "";
659+
ownerName && (sourceInfo = " (created by " + ownerName + ")");
660+
return "\n in " + (name || "Unknown") + sourceInfo;
659661
}
660662
function describeFunctionComponentFrame(fn) {
661-
return fn ? "\n in " + (fn.displayName || fn.name || "Unknown") : "";
663+
return fn
664+
? describeComponentFrame(fn.displayName || fn.name || null, null)
665+
: "";
662666
}
663667
function describeFiber(fiber) {
664668
switch (fiber.tag) {
665669
case 26:
666670
case 27:
667671
case 5:
668-
return describeBuiltInComponentFrame(fiber.type);
672+
return describeComponentFrame(fiber.type, null);
669673
case 16:
670-
return describeBuiltInComponentFrame("Lazy");
674+
return describeComponentFrame("Lazy", null);
671675
case 13:
672-
return describeBuiltInComponentFrame("Suspense");
676+
return describeComponentFrame("Suspense", null);
673677
case 19:
674-
return describeBuiltInComponentFrame("SuspenseList");
678+
return describeComponentFrame("SuspenseList", null);
675679
case 0:
676680
case 15:
677681
return describeFunctionComponentFrame(fiber.type);
@@ -9207,19 +9211,19 @@ function wrapFiber(fiber) {
92079211
fiberToWrapper.set(fiber, wrapper));
92089212
return wrapper;
92099213
}
9210-
var devToolsConfig$jscomp$inline_994 = {
9214+
var devToolsConfig$jscomp$inline_995 = {
92119215
findFiberByHostInstance: function () {
92129216
throw Error("TestRenderer does not support findFiberByHostInstance()");
92139217
},
92149218
bundleType: 0,
9215-
version: "19.0.0-canary-51953c35",
9219+
version: "19.0.0-canary-0689007c",
92169220
rendererPackageName: "react-test-renderer"
92179221
};
9218-
var internals$jscomp$inline_1184 = {
9219-
bundleType: devToolsConfig$jscomp$inline_994.bundleType,
9220-
version: devToolsConfig$jscomp$inline_994.version,
9221-
rendererPackageName: devToolsConfig$jscomp$inline_994.rendererPackageName,
9222-
rendererConfig: devToolsConfig$jscomp$inline_994.rendererConfig,
9222+
var internals$jscomp$inline_1185 = {
9223+
bundleType: devToolsConfig$jscomp$inline_995.bundleType,
9224+
version: devToolsConfig$jscomp$inline_995.version,
9225+
rendererPackageName: devToolsConfig$jscomp$inline_995.rendererPackageName,
9226+
rendererConfig: devToolsConfig$jscomp$inline_995.rendererConfig,
92239227
overrideHookState: null,
92249228
overrideHookStateDeletePath: null,
92259229
overrideHookStateRenamePath: null,
@@ -9236,26 +9240,26 @@ var internals$jscomp$inline_1184 = {
92369240
return null === fiber ? null : fiber.stateNode;
92379241
},
92389242
findFiberByHostInstance:
9239-
devToolsConfig$jscomp$inline_994.findFiberByHostInstance ||
9243+
devToolsConfig$jscomp$inline_995.findFiberByHostInstance ||
92409244
emptyFindFiberByHostInstance,
92419245
findHostInstancesForRefresh: null,
92429246
scheduleRefresh: null,
92439247
scheduleRoot: null,
92449248
setRefreshHandler: null,
92459249
getCurrentFiber: null,
9246-
reconcilerVersion: "19.0.0-canary-51953c35"
9250+
reconcilerVersion: "19.0.0-canary-0689007c"
92479251
};
92489252
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
9249-
var hook$jscomp$inline_1185 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
9253+
var hook$jscomp$inline_1186 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
92509254
if (
9251-
!hook$jscomp$inline_1185.isDisabled &&
9252-
hook$jscomp$inline_1185.supportsFiber
9255+
!hook$jscomp$inline_1186.isDisabled &&
9256+
hook$jscomp$inline_1186.supportsFiber
92539257
)
92549258
try {
9255-
(rendererID = hook$jscomp$inline_1185.inject(
9256-
internals$jscomp$inline_1184
9259+
(rendererID = hook$jscomp$inline_1186.inject(
9260+
internals$jscomp$inline_1185
92579261
)),
9258-
(injectedHook = hook$jscomp$inline_1185);
9262+
(injectedHook = hook$jscomp$inline_1186);
92599263
} catch (err) {}
92609264
}
92619265
exports._Scheduler = Scheduler;

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<ab4a7efab0297a08768bdea5ec49f164>>
10+
* @generated SignedSource<<c03b4f2580a3f28e5204dac43fdc8e39>>
1111
*/
1212

1313
"use strict";
@@ -742,24 +742,28 @@ function is(x, y) {
742742
return (x === y && (0 !== x || 1 / x === 1 / y)) || (x !== x && y !== y);
743743
}
744744
var objectIs = "function" === typeof Object.is ? Object.is : is;
745-
function describeBuiltInComponentFrame(name) {
746-
return "\n in " + (name || "Unknown");
745+
function describeComponentFrame(name, ownerName) {
746+
var sourceInfo = "";
747+
ownerName && (sourceInfo = " (created by " + ownerName + ")");
748+
return "\n in " + (name || "Unknown") + sourceInfo;
747749
}
748750
function describeFunctionComponentFrame(fn) {
749-
return fn ? "\n in " + (fn.displayName || fn.name || "Unknown") : "";
751+
return fn
752+
? describeComponentFrame(fn.displayName || fn.name || null, null)
753+
: "";
750754
}
751755
function describeFiber(fiber) {
752756
switch (fiber.tag) {
753757
case 26:
754758
case 27:
755759
case 5:
756-
return describeBuiltInComponentFrame(fiber.type);
760+
return describeComponentFrame(fiber.type, null);
757761
case 16:
758-
return describeBuiltInComponentFrame("Lazy");
762+
return describeComponentFrame("Lazy", null);
759763
case 13:
760-
return describeBuiltInComponentFrame("Suspense");
764+
return describeComponentFrame("Suspense", null);
761765
case 19:
762-
return describeBuiltInComponentFrame("SuspenseList");
766+
return describeComponentFrame("SuspenseList", null);
763767
case 0:
764768
case 15:
765769
return describeFunctionComponentFrame(fiber.type);
@@ -9823,12 +9827,12 @@ function wrapFiber(fiber) {
98239827
fiberToWrapper.set(fiber, wrapper));
98249828
return wrapper;
98259829
}
9826-
var devToolsConfig$jscomp$inline_1078 = {
9830+
var devToolsConfig$jscomp$inline_1079 = {
98279831
findFiberByHostInstance: function () {
98289832
throw Error("TestRenderer does not support findFiberByHostInstance()");
98299833
},
98309834
bundleType: 0,
9831-
version: "19.0.0-canary-c0ff0c26",
9835+
version: "19.0.0-canary-3aa3c53d",
98329836
rendererPackageName: "react-test-renderer"
98339837
};
98349838
(function (internals) {
@@ -9845,10 +9849,10 @@ var devToolsConfig$jscomp$inline_1078 = {
98459849
} catch (err) {}
98469850
return hook.checkDCE ? !0 : !1;
98479851
})({
9848-
bundleType: devToolsConfig$jscomp$inline_1078.bundleType,
9849-
version: devToolsConfig$jscomp$inline_1078.version,
9850-
rendererPackageName: devToolsConfig$jscomp$inline_1078.rendererPackageName,
9851-
rendererConfig: devToolsConfig$jscomp$inline_1078.rendererConfig,
9852+
bundleType: devToolsConfig$jscomp$inline_1079.bundleType,
9853+
version: devToolsConfig$jscomp$inline_1079.version,
9854+
rendererPackageName: devToolsConfig$jscomp$inline_1079.rendererPackageName,
9855+
rendererConfig: devToolsConfig$jscomp$inline_1079.rendererConfig,
98529856
overrideHookState: null,
98539857
overrideHookStateDeletePath: null,
98549858
overrideHookStateRenamePath: null,
@@ -9865,14 +9869,14 @@ var devToolsConfig$jscomp$inline_1078 = {
98659869
return null === fiber ? null : fiber.stateNode;
98669870
},
98679871
findFiberByHostInstance:
9868-
devToolsConfig$jscomp$inline_1078.findFiberByHostInstance ||
9872+
devToolsConfig$jscomp$inline_1079.findFiberByHostInstance ||
98699873
emptyFindFiberByHostInstance,
98709874
findHostInstancesForRefresh: null,
98719875
scheduleRefresh: null,
98729876
scheduleRoot: null,
98739877
setRefreshHandler: null,
98749878
getCurrentFiber: null,
9875-
reconcilerVersion: "19.0.0-canary-c0ff0c26"
9879+
reconcilerVersion: "19.0.0-canary-3aa3c53d"
98769880
});
98779881
exports._Scheduler = Scheduler;
98789882
exports.act = act;

0 commit comments

Comments
 (0)