Skip to content

Commit 4ffb70f

Browse files
committed
Disable legacy mode in Modern www builds
These already don't expose the entry points to create legacy roots.
1 parent 30225e9 commit 4ffb70f

File tree

3 files changed

+41
-25
lines changed

3 files changed

+41
-25
lines changed

packages/react-dom/src/__tests__/findDOMNodeFB-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const ReactDOM = require('react-dom');
1414
const StrictMode = React.StrictMode;
1515

1616
describe('findDOMNode', () => {
17-
// @gate www
17+
// @gate www && !disableLegacyMode
1818
it('findDOMNode should return null if passed null', () => {
1919
expect(ReactDOM.findDOMNode(null)).toBe(null);
2020
});
@@ -66,7 +66,7 @@ describe('findDOMNode', () => {
6666
expect(b.tagName).toBe('SPAN');
6767
});
6868

69-
// @gate www
69+
// @gate www && !disableLegacyMode
7070
it('findDOMNode should reject random objects', () => {
7171
expect(function () {
7272
ReactDOM.findDOMNode({foo: 'bar'});

packages/react-reconciler/src/__tests__/ReactScope-test.internal.js

+38-22
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ describe('ReactScope', () => {
393393
});
394394

395395
// @gate www
396-
it('DO_NOT_USE_queryAllNodes() works as intended', () => {
396+
it('DO_NOT_USE_queryAllNodes() works as intended', async () => {
397397
const testScopeQuery = (type, props) => true;
398398
const TestScope = React.unstable_Scope;
399399
const scopeRef = React.createRef();
@@ -417,20 +417,25 @@ describe('ReactScope', () => {
417417
);
418418
}
419419

420-
const renderer = ReactTestRenderer.create(<Test toggle={true} />, {
421-
createNodeMock: element => {
422-
return element;
423-
},
424-
});
420+
let renderer;
421+
await act(
422+
() =>
423+
(renderer = ReactTestRenderer.create(<Test toggle={true} />, {
424+
createNodeMock: element => {
425+
return element;
426+
},
427+
unstable_isConcurrent: true,
428+
})),
429+
);
425430
let nodes = scopeRef.current.DO_NOT_USE_queryAllNodes(testScopeQuery);
426431
expect(nodes).toEqual([divRef.current, spanRef.current, aRef.current]);
427-
renderer.update(<Test toggle={false} />);
432+
await act(() => renderer.update(<Test toggle={false} />));
428433
nodes = scopeRef.current.DO_NOT_USE_queryAllNodes(testScopeQuery);
429434
expect(nodes).toEqual([aRef.current, divRef.current, spanRef.current]);
430435
});
431436

432437
// @gate www
433-
it('DO_NOT_USE_queryFirstNode() works as intended', () => {
438+
it('DO_NOT_USE_queryFirstNode() works as intended', async () => {
434439
const testScopeQuery = (type, props) => true;
435440
const TestScope = React.unstable_Scope;
436441
const scopeRef = React.createRef();
@@ -454,20 +459,26 @@ describe('ReactScope', () => {
454459
);
455460
}
456461

457-
const renderer = ReactTestRenderer.create(<Test toggle={true} />, {
458-
createNodeMock: element => {
459-
return element;
460-
},
461-
});
462+
let renderer;
463+
await act(
464+
() =>
465+
(renderer = ReactTestRenderer.create(<Test toggle={true} />, {
466+
createNodeMock: element => {
467+
return element;
468+
},
469+
unstable_isConcurrent: true,
470+
})),
471+
);
462472
let node = scopeRef.current.DO_NOT_USE_queryFirstNode(testScopeQuery);
463473
expect(node).toEqual(divRef.current);
464-
renderer.update(<Test toggle={false} />);
474+
await act(() => renderer.update(<Test toggle={false} />));
475+
465476
node = scopeRef.current.DO_NOT_USE_queryFirstNode(testScopeQuery);
466477
expect(node).toEqual(aRef.current);
467478
});
468479

469480
// @gate www
470-
it('containsNode() works as intended', () => {
481+
it('containsNode() works as intended', async () => {
471482
const TestScope = React.unstable_Scope;
472483
const scopeRef = React.createRef();
473484
const divRef = React.createRef();
@@ -500,23 +511,28 @@ describe('ReactScope', () => {
500511
);
501512
}
502513

503-
const renderer = ReactTestRenderer.create(<Test toggle={true} />, {
504-
createNodeMock: element => {
505-
return element;
506-
},
507-
});
514+
let renderer;
515+
await act(
516+
() =>
517+
(renderer = ReactTestRenderer.create(<Test toggle={true} />, {
518+
createNodeMock: element => {
519+
return element;
520+
},
521+
unstable_isConcurrent: true,
522+
})),
523+
);
508524
expect(scopeRef.current.containsNode(divRef.current)).toBe(true);
509525
expect(scopeRef.current.containsNode(spanRef.current)).toBe(true);
510526
expect(scopeRef.current.containsNode(aRef.current)).toBe(true);
511527
expect(scopeRef.current.containsNode(outerSpan.current)).toBe(false);
512528
expect(scopeRef.current.containsNode(emRef.current)).toBe(false);
513-
renderer.update(<Test toggle={false} />);
529+
await act(() => renderer.update(<Test toggle={false} />));
514530
expect(scopeRef.current.containsNode(divRef.current)).toBe(true);
515531
expect(scopeRef.current.containsNode(spanRef.current)).toBe(true);
516532
expect(scopeRef.current.containsNode(aRef.current)).toBe(true);
517533
expect(scopeRef.current.containsNode(outerSpan.current)).toBe(false);
518534
expect(scopeRef.current.containsNode(emRef.current)).toBe(true);
519-
renderer.update(<Test toggle={true} />);
535+
await act(() => renderer.update(<Test toggle={true} />));
520536
expect(scopeRef.current.containsNode(emRef.current)).toBe(false);
521537
});
522538
});

packages/shared/forks/ReactFeatureFlags.www.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export const useModernStrictMode = true;
113113
// because JSX is an extremely hot path.
114114
export const disableStringRefs = false;
115115

116-
export const disableLegacyMode = false;
116+
export const disableLegacyMode = __EXPERIMENTAL__;
117117

118118
export const disableDOMTestUtils = false;
119119

0 commit comments

Comments
 (0)