Skip to content

Commit 1495a3d

Browse files
nikeeenikeee
committed
[DevTools] Fix crash when inspecting Components suspended on data awaited in anonymous functions (facebook#34234)
DiffTrain build for [3e20dc8](facebook@3e20dc8)
1 parent 2a822f5 commit 1495a3d

Some content is hidden

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

45 files changed

+44719
-40633
lines changed

‎compiled/eslint-plugin-react-hooks/index.js‎

Lines changed: 6058 additions & 11464 deletions
Large diffs are not rendered by default.

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

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,10 @@ __DEV__ &&
4848
) {
4949
case REACT_PORTAL_TYPE:
5050
return "Portal";
51-
case REACT_PROVIDER_TYPE:
52-
if (enableRenderableContext) break;
53-
else return (type._context.displayName || "Context") + ".Provider";
5451
case REACT_CONTEXT_TYPE:
55-
return enableRenderableContext
56-
? (type.displayName || "Context") + ".Provider"
57-
: (type.displayName || "Context") + ".Consumer";
52+
return type.displayName || "Context";
5853
case REACT_CONSUMER_TYPE:
59-
if (enableRenderableContext)
60-
return (type._context.displayName || "Context") + ".Consumer";
61-
break;
54+
return (type._context.displayName || "Context") + ".Consumer";
6255
case REACT_FORWARD_REF_TYPE:
6356
var innerType = type.render;
6457
type = type.displayName;
@@ -163,25 +156,16 @@ __DEV__ &&
163156
componentName = this.props.ref;
164157
return void 0 !== componentName ? componentName : null;
165158
}
166-
function ReactElement(
167-
type,
168-
key,
169-
self,
170-
source,
171-
owner,
172-
props,
173-
debugStack,
174-
debugTask
175-
) {
176-
self = props.ref;
159+
function ReactElement(type, key, props, owner, debugStack, debugTask) {
160+
var refProp = props.ref;
177161
type = {
178162
$$typeof: REACT_ELEMENT_TYPE,
179163
type: type,
180164
key: key,
181165
props: props,
182166
_owner: owner
183167
};
184-
null !== (void 0 !== self ? self : null)
168+
null !== (void 0 !== refProp ? refProp : null)
185169
? Object.defineProperty(type, "ref", {
186170
enumerable: !1,
187171
get: elementRefGetterWithDeprecationWarning
@@ -220,8 +204,6 @@ __DEV__ &&
220204
config,
221205
maybeKey,
222206
isStaticChildren,
223-
source,
224-
self,
225207
debugStack,
226208
debugTask
227209
) {
@@ -272,12 +254,6 @@ __DEV__ &&
272254
for (var propName in config)
273255
"key" !== propName && (maybeKey[propName] = config[propName]);
274256
} else maybeKey = config;
275-
if (!disableDefaultPropsExceptForClasses && type && type.defaultProps) {
276-
config = type.defaultProps;
277-
for (var _propName2 in config)
278-
void 0 === maybeKey[_propName2] &&
279-
(maybeKey[_propName2] = config[_propName2]);
280-
}
281257
children &&
282258
defineKeyPropWarningGetter(
283259
maybeKey,
@@ -288,10 +264,8 @@ __DEV__ &&
288264
return ReactElement(
289265
type,
290266
children,
291-
self,
292-
source,
293-
getOwner(),
294267
maybeKey,
268+
getOwner(),
295269
debugStack,
296270
debugTask
297271
);
@@ -305,9 +279,6 @@ __DEV__ &&
305279
}
306280
var React = require("react"),
307281
dynamicFeatureFlags = require("ReactFeatureFlags"),
308-
disableDefaultPropsExceptForClasses =
309-
dynamicFeatureFlags.disableDefaultPropsExceptForClasses,
310-
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
311282
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
312283
renameElementSymbol = dynamicFeatureFlags.renameElementSymbol,
313284
enableViewTransition = dynamicFeatureFlags.enableViewTransition;
@@ -319,7 +290,6 @@ __DEV__ &&
319290
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
320291
REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"),
321292
REACT_PROFILER_TYPE = Symbol.for("react.profiler"),
322-
REACT_PROVIDER_TYPE = Symbol.for("react.provider"),
323293
REACT_CONSUMER_TYPE = Symbol.for("react.consumer"),
324294
REACT_CONTEXT_TYPE = Symbol.for("react.context"),
325295
REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"),
@@ -341,36 +311,27 @@ __DEV__ &&
341311
return null;
342312
};
343313
React = {
344-
"react-stack-bottom-frame": function (callStackForError) {
314+
react_stack_bottom_frame: function (callStackForError) {
345315
return callStackForError();
346316
}
347317
};
348318
var specialPropKeyWarningShown;
349319
var didWarnAboutElementRef = {};
350-
var unknownOwnerDebugStack = React["react-stack-bottom-frame"].bind(
320+
var unknownOwnerDebugStack = React.react_stack_bottom_frame.bind(
351321
React,
352322
UnknownOwner
353323
)();
354324
var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
355325
var didWarnAboutKeySpread = {};
356326
exports.Fragment = REACT_FRAGMENT_TYPE;
357-
exports.jsxDEV = function (
358-
type,
359-
config,
360-
maybeKey,
361-
isStaticChildren,
362-
source,
363-
self
364-
) {
327+
exports.jsxDEV = function (type, config, maybeKey, isStaticChildren) {
365328
var trackActualOwner =
366329
1e4 > ReactSharedInternals.recentlyCreatedOwnerStacks++;
367330
return jsxDEVImpl(
368331
type,
369332
config,
370333
maybeKey,
371334
isStaticChildren,
372-
source,
373-
self,
374335
trackActualOwner
375336
? Error("react-stack-top-frame")
376337
: unknownOwnerDebugStack,

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

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,10 @@ __DEV__ &&
4848
) {
4949
case REACT_PORTAL_TYPE:
5050
return "Portal";
51-
case REACT_PROVIDER_TYPE:
52-
if (enableRenderableContext) break;
53-
else return (type._context.displayName || "Context") + ".Provider";
5451
case REACT_CONTEXT_TYPE:
55-
return enableRenderableContext
56-
? (type.displayName || "Context") + ".Provider"
57-
: (type.displayName || "Context") + ".Consumer";
52+
return type.displayName || "Context";
5853
case REACT_CONSUMER_TYPE:
59-
if (enableRenderableContext)
60-
return (type._context.displayName || "Context") + ".Consumer";
61-
break;
54+
return (type._context.displayName || "Context") + ".Consumer";
6255
case REACT_FORWARD_REF_TYPE:
6356
var innerType = type.render;
6457
type = type.displayName;
@@ -163,25 +156,16 @@ __DEV__ &&
163156
componentName = this.props.ref;
164157
return void 0 !== componentName ? componentName : null;
165158
}
166-
function ReactElement(
167-
type,
168-
key,
169-
self,
170-
source,
171-
owner,
172-
props,
173-
debugStack,
174-
debugTask
175-
) {
176-
self = props.ref;
159+
function ReactElement(type, key, props, owner, debugStack, debugTask) {
160+
var refProp = props.ref;
177161
type = {
178162
$$typeof: REACT_ELEMENT_TYPE,
179163
type: type,
180164
key: key,
181165
props: props,
182166
_owner: owner
183167
};
184-
null !== (void 0 !== self ? self : null)
168+
null !== (void 0 !== refProp ? refProp : null)
185169
? Object.defineProperty(type, "ref", {
186170
enumerable: !1,
187171
get: elementRefGetterWithDeprecationWarning
@@ -220,8 +204,6 @@ __DEV__ &&
220204
config,
221205
maybeKey,
222206
isStaticChildren,
223-
source,
224-
self,
225207
debugStack,
226208
debugTask
227209
) {
@@ -272,12 +254,6 @@ __DEV__ &&
272254
for (var propName in config)
273255
"key" !== propName && (maybeKey[propName] = config[propName]);
274256
} else maybeKey = config;
275-
if (!disableDefaultPropsExceptForClasses && type && type.defaultProps) {
276-
config = type.defaultProps;
277-
for (var _propName2 in config)
278-
void 0 === maybeKey[_propName2] &&
279-
(maybeKey[_propName2] = config[_propName2]);
280-
}
281257
children &&
282258
defineKeyPropWarningGetter(
283259
maybeKey,
@@ -288,10 +264,8 @@ __DEV__ &&
288264
return ReactElement(
289265
type,
290266
children,
291-
self,
292-
source,
293-
getOwner(),
294267
maybeKey,
268+
getOwner(),
295269
debugStack,
296270
debugTask
297271
);
@@ -305,9 +279,6 @@ __DEV__ &&
305279
}
306280
var React = require("react"),
307281
dynamicFeatureFlags = require("ReactFeatureFlags"),
308-
disableDefaultPropsExceptForClasses =
309-
dynamicFeatureFlags.disableDefaultPropsExceptForClasses,
310-
enableRenderableContext = dynamicFeatureFlags.enableRenderableContext,
311282
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
312283
renameElementSymbol = dynamicFeatureFlags.renameElementSymbol,
313284
enableViewTransition = dynamicFeatureFlags.enableViewTransition;
@@ -319,7 +290,6 @@ __DEV__ &&
319290
REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"),
320291
REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"),
321292
REACT_PROFILER_TYPE = Symbol.for("react.profiler"),
322-
REACT_PROVIDER_TYPE = Symbol.for("react.provider"),
323293
REACT_CONSUMER_TYPE = Symbol.for("react.consumer"),
324294
REACT_CONTEXT_TYPE = Symbol.for("react.context"),
325295
REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"),
@@ -341,36 +311,27 @@ __DEV__ &&
341311
return null;
342312
};
343313
React = {
344-
"react-stack-bottom-frame": function (callStackForError) {
314+
react_stack_bottom_frame: function (callStackForError) {
345315
return callStackForError();
346316
}
347317
};
348318
var specialPropKeyWarningShown;
349319
var didWarnAboutElementRef = {};
350-
var unknownOwnerDebugStack = React["react-stack-bottom-frame"].bind(
320+
var unknownOwnerDebugStack = React.react_stack_bottom_frame.bind(
351321
React,
352322
UnknownOwner
353323
)();
354324
var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
355325
var didWarnAboutKeySpread = {};
356326
exports.Fragment = REACT_FRAGMENT_TYPE;
357-
exports.jsxDEV = function (
358-
type,
359-
config,
360-
maybeKey,
361-
isStaticChildren,
362-
source,
363-
self
364-
) {
327+
exports.jsxDEV = function (type, config, maybeKey, isStaticChildren) {
365328
var trackActualOwner =
366329
1e4 > ReactSharedInternals.recentlyCreatedOwnerStacks++;
367330
return jsxDEVImpl(
368331
type,
369332
config,
370333
maybeKey,
371334
isStaticChildren,
372-
source,
373-
self,
374335
trackActualOwner
375336
? Error("react-stack-top-frame")
376337
: unknownOwnerDebugStack,

‎compiled/facebook-www/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3820740a7fbfc3b27a5127b43bdad44382ff3ce0
1+
3e20dc8b9c4d335c77e246d114a1bcfd1b77aaae

‎compiled/facebook-www/REVISION_TRANSFORMS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3820740a7fbfc3b27a5127b43bdad44382ff3ce0
1+
3e20dc8b9c4d335c77e246d114a1bcfd1b77aaae

0 commit comments

Comments
 (0)