Skip to content

Commit b320492

Browse files
author
22388o
committed
[flags] Clean up scheduler flags (facebook#31814)
These flags are hardcoded now, we can make them static. DiffTrain build for [d428725](facebook@d428725)
1 parent 463f1f4 commit b320492

File tree

54 files changed

+9795
-11485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+9795
-11485
lines changed

‎compiled/facebook-www/JSXDEVRuntime-dev.classic.js‎

Lines changed: 79 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ __DEV__ &&
361361
if ("object" === typeof type)
362362
switch (type.$$typeof) {
363363
case REACT_FORWARD_REF_TYPE:
364-
return (type = describeNativeComponentFrame(type.render, !1)), type;
364+
return describeNativeComponentFrame(type.render, !1);
365365
case REACT_MEMO_TYPE:
366366
return describeUnknownElementTypeFrameInDEV(type.type);
367367
case REACT_LAZY_TYPE:
@@ -373,6 +373,21 @@ __DEV__ &&
373373
}
374374
return "";
375375
}
376+
function getTaskName(type) {
377+
if (type === REACT_FRAGMENT_TYPE) return "<>";
378+
if (
379+
"object" === typeof type &&
380+
null !== type &&
381+
type.$$typeof === REACT_LAZY_TYPE
382+
)
383+
return "<...>";
384+
try {
385+
var name = getComponentNameFromType(type);
386+
return name ? "<" + name + ">" : "<...>";
387+
} catch (x) {
388+
return "<...>";
389+
}
390+
}
376391
function getOwner() {
377392
var dispatcher = ReactSharedInternals.A;
378393
return null === dispatcher ? null : dispatcher.getOwner();
@@ -409,7 +424,16 @@ __DEV__ &&
409424
componentName = this.props.ref;
410425
return void 0 !== componentName ? componentName : null;
411426
}
412-
function ReactElement(type, key, self, source, owner, props) {
427+
function ReactElement(
428+
type,
429+
key,
430+
self,
431+
source,
432+
owner,
433+
props,
434+
debugStack,
435+
debugTask
436+
) {
413437
self = props.ref;
414438
type = {
415439
$$typeof: REACT_ELEMENT_TYPE,
@@ -437,6 +461,19 @@ __DEV__ &&
437461
writable: !0,
438462
value: null
439463
});
464+
enableOwnerStacks &&
465+
(Object.defineProperty(type, "_debugStack", {
466+
configurable: !1,
467+
enumerable: !1,
468+
writable: !0,
469+
value: debugStack
470+
}),
471+
Object.defineProperty(type, "_debugTask", {
472+
configurable: !1,
473+
enumerable: !1,
474+
writable: !0,
475+
value: debugTask
476+
}));
440477
Object.freeze && (Object.freeze(type.props), Object.freeze(type));
441478
return type;
442479
}
@@ -446,14 +483,16 @@ __DEV__ &&
446483
maybeKey,
447484
isStaticChildren,
448485
source,
449-
self
486+
self,
487+
debugStack,
488+
debugTask
450489
) {
451490
if (
491+
enableOwnerStacks ||
452492
"string" === typeof type ||
453493
"function" === typeof type ||
454494
type === REACT_FRAGMENT_TYPE ||
455495
type === REACT_PROFILER_TYPE ||
456-
(enableDebugTracing && type === REACT_DEBUG_TRACING_MODE_TYPE) ||
457496
type === REACT_STRICT_MODE_TYPE ||
458497
type === REACT_SUSPENSE_TYPE ||
459498
type === REACT_SUSPENSE_LIST_TYPE ||
@@ -562,10 +601,21 @@ __DEV__ &&
562601
? type.displayName || type.name || "Unknown"
563602
: type
564603
);
565-
return ReactElement(type, children, self, source, getOwner(), maybeKey);
604+
return ReactElement(
605+
type,
606+
children,
607+
self,
608+
source,
609+
getOwner(),
610+
maybeKey,
611+
debugStack,
612+
debugTask
613+
);
566614
}
567615
function validateChildKeys(node, parentType) {
568-
if (
616+
if (enableOwnerStacks)
617+
isValidElement(node) && node._store && (node._store.validated = 1);
618+
else if (
569619
"object" === typeof node &&
570620
node &&
571621
node.$$typeof !== REACT_CLIENT_REFERENCE
@@ -601,6 +651,7 @@ __DEV__ &&
601651
}
602652
function validateExplicitKey(element, parentType) {
603653
if (
654+
!enableOwnerStacks &&
604655
element._store &&
605656
!element._store.validated &&
606657
null == element.key &&
@@ -649,14 +700,14 @@ __DEV__ &&
649700
dynamicFeatureFlags = require("ReactFeatureFlags"),
650701
disableDefaultPropsExceptForClasses =
651702
dynamicFeatureFlags.disableDefaultPropsExceptForClasses,
652-
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
653703
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
654-
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing;
655-
dynamicFeatureFlags = dynamicFeatureFlags.renameElementSymbol;
656-
var REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"),
657-
REACT_ELEMENT_TYPE = dynamicFeatureFlags
704+
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
705+
renameElementSymbol = dynamicFeatureFlags.renameElementSymbol,
706+
enableOwnerStacks = dynamicFeatureFlags.enableOwnerStacks;
707+
dynamicFeatureFlags = Symbol.for("react.element");
708+
var REACT_ELEMENT_TYPE = renameElementSymbol
658709
? Symbol.for("react.transitional.element")
659-
: REACT_LEGACY_ELEMENT_TYPE,
710+
: dynamicFeatureFlags,
660711
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
661712
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
662713
REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"),
@@ -670,7 +721,6 @@ __DEV__ &&
670721
REACT_MEMO_TYPE = Symbol.for("react.memo"),
671722
REACT_LAZY_TYPE = Symbol.for("react.lazy"),
672723
REACT_SCOPE_TYPE = Symbol.for("react.scope"),
673-
REACT_DEBUG_TRACING_MODE_TYPE = Symbol.for("react.debug_trace_mode"),
674724
REACT_OFFSCREEN_TYPE = Symbol.for("react.offscreen"),
675725
REACT_LEGACY_HIDDEN_TYPE = Symbol.for("react.legacy_hidden"),
676726
REACT_TRACING_MARKER_TYPE = Symbol.for("react.tracing_marker"),
@@ -699,6 +749,12 @@ __DEV__ &&
699749
"function" === typeof WeakMap ? WeakMap : Map
700750
)();
701751
var REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
752+
createTask =
753+
enableOwnerStacks && console.createTask
754+
? console.createTask
755+
: function () {
756+
return null;
757+
},
702758
specialPropKeyWarningShown;
703759
var didWarnAboutElementRef = {};
704760
var didWarnAboutKeySpread = {},
@@ -712,6 +768,15 @@ __DEV__ &&
712768
source,
713769
self
714770
) {
715-
return jsxDEVImpl(type, config, maybeKey, isStaticChildren, source, self);
771+
return jsxDEVImpl(
772+
type,
773+
config,
774+
maybeKey,
775+
isStaticChildren,
776+
source,
777+
self,
778+
enableOwnerStacks ? Error("react-stack-top-frame") : void 0,
779+
enableOwnerStacks ? createTask(getTaskName(type)) : void 0
780+
);
716781
};
717782
})();

‎compiled/facebook-www/JSXDEVRuntime-dev.modern.js‎

Lines changed: 79 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ __DEV__ &&
361361
if ("object" === typeof type)
362362
switch (type.$$typeof) {
363363
case REACT_FORWARD_REF_TYPE:
364-
return (type = describeNativeComponentFrame(type.render, !1)), type;
364+
return describeNativeComponentFrame(type.render, !1);
365365
case REACT_MEMO_TYPE:
366366
return describeUnknownElementTypeFrameInDEV(type.type);
367367
case REACT_LAZY_TYPE:
@@ -373,6 +373,21 @@ __DEV__ &&
373373
}
374374
return "";
375375
}
376+
function getTaskName(type) {
377+
if (type === REACT_FRAGMENT_TYPE) return "<>";
378+
if (
379+
"object" === typeof type &&
380+
null !== type &&
381+
type.$$typeof === REACT_LAZY_TYPE
382+
)
383+
return "<...>";
384+
try {
385+
var name = getComponentNameFromType(type);
386+
return name ? "<" + name + ">" : "<...>";
387+
} catch (x) {
388+
return "<...>";
389+
}
390+
}
376391
function getOwner() {
377392
var dispatcher = ReactSharedInternals.A;
378393
return null === dispatcher ? null : dispatcher.getOwner();
@@ -409,7 +424,16 @@ __DEV__ &&
409424
componentName = this.props.ref;
410425
return void 0 !== componentName ? componentName : null;
411426
}
412-
function ReactElement(type, key, self, source, owner, props) {
427+
function ReactElement(
428+
type,
429+
key,
430+
self,
431+
source,
432+
owner,
433+
props,
434+
debugStack,
435+
debugTask
436+
) {
413437
self = props.ref;
414438
type = {
415439
$$typeof: REACT_ELEMENT_TYPE,
@@ -437,6 +461,19 @@ __DEV__ &&
437461
writable: !0,
438462
value: null
439463
});
464+
enableOwnerStacks &&
465+
(Object.defineProperty(type, "_debugStack", {
466+
configurable: !1,
467+
enumerable: !1,
468+
writable: !0,
469+
value: debugStack
470+
}),
471+
Object.defineProperty(type, "_debugTask", {
472+
configurable: !1,
473+
enumerable: !1,
474+
writable: !0,
475+
value: debugTask
476+
}));
440477
Object.freeze && (Object.freeze(type.props), Object.freeze(type));
441478
return type;
442479
}
@@ -446,14 +483,16 @@ __DEV__ &&
446483
maybeKey,
447484
isStaticChildren,
448485
source,
449-
self
486+
self,
487+
debugStack,
488+
debugTask
450489
) {
451490
if (
491+
enableOwnerStacks ||
452492
"string" === typeof type ||
453493
"function" === typeof type ||
454494
type === REACT_FRAGMENT_TYPE ||
455495
type === REACT_PROFILER_TYPE ||
456-
(enableDebugTracing && type === REACT_DEBUG_TRACING_MODE_TYPE) ||
457496
type === REACT_STRICT_MODE_TYPE ||
458497
type === REACT_SUSPENSE_TYPE ||
459498
type === REACT_SUSPENSE_LIST_TYPE ||
@@ -562,10 +601,21 @@ __DEV__ &&
562601
? type.displayName || type.name || "Unknown"
563602
: type
564603
);
565-
return ReactElement(type, children, self, source, getOwner(), maybeKey);
604+
return ReactElement(
605+
type,
606+
children,
607+
self,
608+
source,
609+
getOwner(),
610+
maybeKey,
611+
debugStack,
612+
debugTask
613+
);
566614
}
567615
function validateChildKeys(node, parentType) {
568-
if (
616+
if (enableOwnerStacks)
617+
isValidElement(node) && node._store && (node._store.validated = 1);
618+
else if (
569619
"object" === typeof node &&
570620
node &&
571621
node.$$typeof !== REACT_CLIENT_REFERENCE
@@ -601,6 +651,7 @@ __DEV__ &&
601651
}
602652
function validateExplicitKey(element, parentType) {
603653
if (
654+
!enableOwnerStacks &&
604655
element._store &&
605656
!element._store.validated &&
606657
null == element.key &&
@@ -649,14 +700,14 @@ __DEV__ &&
649700
dynamicFeatureFlags = require("ReactFeatureFlags"),
650701
disableDefaultPropsExceptForClasses =
651702
dynamicFeatureFlags.disableDefaultPropsExceptForClasses,
652-
enableDebugTracing = dynamicFeatureFlags.enableDebugTracing,
653703
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
654-
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing;
655-
dynamicFeatureFlags = dynamicFeatureFlags.renameElementSymbol;
656-
var REACT_LEGACY_ELEMENT_TYPE = Symbol.for("react.element"),
657-
REACT_ELEMENT_TYPE = dynamicFeatureFlags
704+
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
705+
renameElementSymbol = dynamicFeatureFlags.renameElementSymbol,
706+
enableOwnerStacks = dynamicFeatureFlags.enableOwnerStacks;
707+
dynamicFeatureFlags = Symbol.for("react.element");
708+
var REACT_ELEMENT_TYPE = renameElementSymbol
658709
? Symbol.for("react.transitional.element")
659-
: REACT_LEGACY_ELEMENT_TYPE,
710+
: dynamicFeatureFlags,
660711
REACT_PORTAL_TYPE = Symbol.for("react.portal"),
661712
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
662713
REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"),
@@ -670,7 +721,6 @@ __DEV__ &&
670721
REACT_MEMO_TYPE = Symbol.for("react.memo"),
671722
REACT_LAZY_TYPE = Symbol.for("react.lazy"),
672723
REACT_SCOPE_TYPE = Symbol.for("react.scope"),
673-
REACT_DEBUG_TRACING_MODE_TYPE = Symbol.for("react.debug_trace_mode"),
674724
REACT_OFFSCREEN_TYPE = Symbol.for("react.offscreen"),
675725
REACT_LEGACY_HIDDEN_TYPE = Symbol.for("react.legacy_hidden"),
676726
REACT_TRACING_MARKER_TYPE = Symbol.for("react.tracing_marker"),
@@ -699,6 +749,12 @@ __DEV__ &&
699749
"function" === typeof WeakMap ? WeakMap : Map
700750
)();
701751
var REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"),
752+
createTask =
753+
enableOwnerStacks && console.createTask
754+
? console.createTask
755+
: function () {
756+
return null;
757+
},
702758
specialPropKeyWarningShown;
703759
var didWarnAboutElementRef = {};
704760
var didWarnAboutKeySpread = {},
@@ -712,6 +768,15 @@ __DEV__ &&
712768
source,
713769
self
714770
) {
715-
return jsxDEVImpl(type, config, maybeKey, isStaticChildren, source, self);
771+
return jsxDEVImpl(
772+
type,
773+
config,
774+
maybeKey,
775+
isStaticChildren,
776+
source,
777+
self,
778+
enableOwnerStacks ? Error("react-stack-top-frame") : void 0,
779+
enableOwnerStacks ? createTask(getTaskName(type)) : void 0
780+
);
716781
};
717782
})();

‎compiled/facebook-www/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7283a213dbbc31029e65005276f12202558558fc
1+
d42872588282b9eef56b8fa02441b33d596fd197

‎compiled/facebook-www/REVISION_TRANSFORMS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7283a213dbbc31029e65005276f12202558558fc
1+
d42872588282b9eef56b8fa02441b33d596fd197

0 commit comments

Comments
 (0)