Skip to content

Commit b44b002

Browse files
author
Brian Vaughn
committed
Added a few more feature flag guards and renamed DebugTracingMode export to unstable_*
1 parent f3678bc commit b44b002

File tree

10 files changed

+70
-62
lines changed

10 files changed

+70
-62
lines changed

‎packages/react-dom/src/__tests__/ReactDOMServerIntegrationModes-test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ describe('ReactDOMServerIntegration', () => {
4444
__EXPERIMENTAL__ &&
4545
require('shared/ReactFeatureFlags').enableDebugTracing
4646
) {
47-
describe('React.DebugTracingMode', () => {
47+
describe('React.unstable_DebugTracingMode', () => {
4848
beforeEach(() => {
4949
spyOnDevAndProd(console, 'log');
5050
});
5151

5252
itRenders('with one child', async render => {
5353
const e = await render(
54-
<React.DebugTracingMode>
54+
<React.unstable_DebugTracingMode>
5555
<div>text1</div>
56-
</React.DebugTracingMode>,
56+
</React.unstable_DebugTracingMode>,
5757
);
5858
const parent = e.parentNode;
5959
expect(parent.childNodes[0].tagName).toBe('DIV');
@@ -65,19 +65,19 @@ describe('ReactDOMServerIntegration', () => {
6565
};
6666
const Footer = props => {
6767
return (
68-
<React.DebugTracingMode>
68+
<React.unstable_DebugTracingMode>
6969
<h2>footer</h2>
7070
<h3>about</h3>
71-
</React.DebugTracingMode>
71+
</React.unstable_DebugTracingMode>
7272
);
7373
};
7474
const e = await render(
75-
<React.DebugTracingMode>
75+
<React.unstable_DebugTracingMode>
7676
<div>text1</div>
7777
<span>text2</span>
7878
<Header />
7979
<Footer />
80-
</React.DebugTracingMode>,
80+
</React.unstable_DebugTracingMode>,
8181
);
8282
const parent = e.parentNode;
8383
expect(parent.childNodes[0].tagName).toBe('DIV');

‎packages/react-reconciler/src/ReactFiberWorkLoop.new.js‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -392,19 +392,23 @@ export function computeExpirationForFiber(
392392
export function priorityLevelToLabel(
393393
priorityLevel: ReactPriorityLevel,
394394
): string {
395-
switch (priorityLevel) {
396-
case ImmediatePriority:
397-
return 'immediate';
398-
case UserBlockingPriority:
399-
return 'user-blocking';
400-
case NormalPriority:
401-
return 'normal';
402-
case LowPriority:
403-
return 'low';
404-
case IdlePriority:
405-
return 'idle';
406-
default:
407-
return 'other';
395+
if (__DEV__ && enableDebugTracing) {
396+
switch (priorityLevel) {
397+
case ImmediatePriority:
398+
return 'immediate';
399+
case UserBlockingPriority:
400+
return 'user-blocking';
401+
case NormalPriority:
402+
return 'normal';
403+
case LowPriority:
404+
return 'low';
405+
case IdlePriority:
406+
return 'idle';
407+
default:
408+
return 'other';
409+
}
410+
} else {
411+
return '';
408412
}
409413
}
410414

‎packages/react-reconciler/src/ReactFiberWorkLoop.old.js‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -385,19 +385,23 @@ export function computeExpirationForFiber(
385385
export function priorityLevelToLabel(
386386
priorityLevel: ReactPriorityLevel,
387387
): string {
388-
switch (priorityLevel) {
389-
case ImmediatePriority:
390-
return 'immediate';
391-
case UserBlockingPriority:
392-
return 'user-blocking';
393-
case NormalPriority:
394-
return 'normal';
395-
case LowPriority:
396-
return 'low';
397-
case IdlePriority:
398-
return 'idle';
399-
default:
400-
return 'other';
388+
if (__DEV__ && enableDebugTracing) {
389+
switch (priorityLevel) {
390+
case ImmediatePriority:
391+
return 'immediate';
392+
case UserBlockingPriority:
393+
return 'user-blocking';
394+
case NormalPriority:
395+
return 'normal';
396+
case LowPriority:
397+
return 'low';
398+
case IdlePriority:
399+
return 'idle';
400+
default:
401+
return 'other';
402+
}
403+
} else {
404+
return '';
401405
}
402406
}
403407

‎packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ describe('DebugTracing', () => {
4343
// @gate experimental
4444
it('should not log anything for sync render without suspends or state updates', () => {
4545
ReactTestRenderer.create(
46-
<React.DebugTracingMode>
46+
<React.unstable_DebugTracingMode>
4747
<div />
48-
</React.DebugTracingMode>,
48+
</React.unstable_DebugTracingMode>,
4949
);
5050

5151
expect(logs).toEqual([]);
@@ -54,9 +54,9 @@ describe('DebugTracing', () => {
5454
// @gate experimental
5555
it('should not log anything for concurrent render without suspends or state updates', () => {
5656
ReactTestRenderer.create(
57-
<React.DebugTracingMode>
57+
<React.unstable_DebugTracingMode>
5858
<div />
59-
</React.DebugTracingMode>,
59+
</React.unstable_DebugTracingMode>,
6060
{unstable_isConcurrent: true},
6161
);
6262

@@ -77,11 +77,11 @@ describe('DebugTracing', () => {
7777
}
7878

7979
ReactTestRenderer.create(
80-
<React.DebugTracingMode>
80+
<React.unstable_DebugTracingMode>
8181
<React.Suspense fallback={null}>
8282
<Example />
8383
</React.Suspense>
84-
</React.DebugTracingMode>,
84+
</React.unstable_DebugTracingMode>,
8585
);
8686

8787
expect(logs).toEqual([
@@ -104,11 +104,11 @@ describe('DebugTracing', () => {
104104
}
105105

106106
ReactTestRenderer.create(
107-
<React.DebugTracingMode>
107+
<React.unstable_DebugTracingMode>
108108
<React.Suspense fallback={null}>
109109
<Example />
110110
</React.Suspense>
111-
</React.DebugTracingMode>,
111+
</React.unstable_DebugTracingMode>,
112112
{unstable_isConcurrent: true},
113113
);
114114

@@ -143,9 +143,9 @@ describe('DebugTracing', () => {
143143
}
144144

145145
ReactTestRenderer.create(
146-
<React.DebugTracingMode>
146+
<React.unstable_DebugTracingMode>
147147
<Example />
148-
</React.DebugTracingMode>,
148+
</React.unstable_DebugTracingMode>,
149149
{unstable_isConcurrent: true},
150150
);
151151

@@ -177,9 +177,9 @@ describe('DebugTracing', () => {
177177
}
178178

179179
ReactTestRenderer.create(
180-
<React.DebugTracingMode>
180+
<React.unstable_DebugTracingMode>
181181
<Example />
182-
</React.DebugTracingMode>,
182+
</React.unstable_DebugTracingMode>,
183183
{unstable_isConcurrent: true},
184184
);
185185

@@ -210,9 +210,9 @@ describe('DebugTracing', () => {
210210
}
211211

212212
ReactTestRenderer.create(
213-
<React.DebugTracingMode>
213+
<React.unstable_DebugTracingMode>
214214
<Example />
215-
</React.DebugTracingMode>,
215+
</React.unstable_DebugTracingMode>,
216216
{unstable_isConcurrent: true},
217217
);
218218

@@ -243,9 +243,9 @@ describe('DebugTracing', () => {
243243

244244
ReactTestRenderer.act(() => {
245245
ReactTestRenderer.create(
246-
<React.DebugTracingMode>
246+
<React.unstable_DebugTracingMode>
247247
<Example />
248-
</React.DebugTracingMode>,
248+
</React.unstable_DebugTracingMode>,
249249
{unstable_isConcurrent: true},
250250
);
251251
});
@@ -268,9 +268,9 @@ describe('DebugTracing', () => {
268268

269269
ReactTestRenderer.act(() => {
270270
ReactTestRenderer.create(
271-
<React.DebugTracingMode>
271+
<React.unstable_DebugTracingMode>
272272
<Example />
273-
</React.DebugTracingMode>,
273+
</React.unstable_DebugTracingMode>,
274274
{unstable_isConcurrent: true},
275275
);
276276
});
@@ -290,9 +290,9 @@ describe('DebugTracing', () => {
290290
}
291291

292292
ReactTestRenderer.create(
293-
<React.DebugTracingMode>
293+
<React.unstable_DebugTracingMode>
294294
<Example />
295-
</React.DebugTracingMode>,
295+
</React.unstable_DebugTracingMode>,
296296
{unstable_isConcurrent: true},
297297
);
298298

@@ -310,7 +310,7 @@ describe('DebugTracing', () => {
310310
});
311311

312312
// @gate experimental
313-
it('should not log anything outside of a DebugTracingMode subtree', () => {
313+
it('should not log anything outside of a unstable_DebugTracingMode subtree', () => {
314314
function ExampleThatCascades() {
315315
const [didMount, setDidMount] = React.useState(false);
316316
React.useLayoutEffect(() => {
@@ -334,9 +334,9 @@ describe('DebugTracing', () => {
334334
<React.Suspense fallback={null}>
335335
<ExampleThatSuspends />
336336
</React.Suspense>
337-
<React.DebugTracingMode>
337+
<React.unstable_DebugTracingMode>
338338
<Example />
339-
</React.DebugTracingMode>
339+
</React.unstable_DebugTracingMode>
340340
</React.Fragment>,
341341
);
342342

‎packages/react/index.classic.fb.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ export {
5252
unstable_createScope,
5353
unstable_useOpaqueIdentifier,
5454
// enableDebugTracing
55-
DebugTracingMode,
55+
unstable_DebugTracingMode,
5656
} from './src/React';
5757
export {jsx, jsxs, jsxDEV} from './src/jsx/ReactJSX';

‎packages/react/index.experimental.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ export {
4747
block,
4848
unstable_useOpaqueIdentifier,
4949
// enableDebugTracing
50-
DebugTracingMode,
50+
unstable_DebugTracingMode,
5151
} from './src/React';

‎packages/react/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export {
5959
createMutableSource,
6060
Fragment,
6161
Profiler,
62-
DebugTracingMode,
62+
unstable_DebugTracingMode,
6363
StrictMode,
6464
Suspense,
6565
createElement,

‎packages/react/index.modern.fb.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ export {
5151
unstable_createScope,
5252
unstable_useOpaqueIdentifier,
5353
// enableDebugTracing
54-
DebugTracingMode,
54+
unstable_DebugTracingMode,
5555
} from './src/React';
5656
export {jsx, jsxs, jsxDEV} from './src/jsx/ReactJSX';

‎packages/react/src/React.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export {
9797
REACT_FRAGMENT_TYPE as Fragment,
9898
REACT_PROFILER_TYPE as Profiler,
9999
REACT_STRICT_MODE_TYPE as StrictMode,
100-
REACT_DEBUG_TRACING_MODE_TYPE as DebugTracingMode,
100+
REACT_DEBUG_TRACING_MODE_TYPE as unstable_DebugTracingMode,
101101
REACT_SUSPENSE_TYPE as Suspense,
102102
createElement,
103103
cloneElement,

‎packages/shared/forks/ReactFeatureFlags.testing.www.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags';
1111
import typeof * as ExportsType from './ReactFeatureFlags.testing.www';
1212

1313
export const debugRenderPhaseSideEffectsForStrictMode = false;
14-
export const enableDebugTracing = __EXPERIMENTAL__;
14+
export const enableDebugTracing = false;
1515
export const warnAboutDeprecatedLifecycles = true;
1616
export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
1717
export const enableProfilerTimer = false;

0 commit comments

Comments
 (0)