Skip to content

Commit 073b8aa

Browse files
committed
chore: remove concurrentRoot option
1 parent 81b73f1 commit 073b8aa

File tree

8 files changed

+8
-50
lines changed

8 files changed

+8
-50
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,6 @@ jobs:
6161
- name: Upload coverage to Codecov
6262
uses: codecov/codecov-action@v4
6363

64-
65-
test-concurrent:
66-
needs: [install-cache-deps]
67-
runs-on: ubuntu-latest
68-
name: Test (concurrent mode)
69-
steps:
70-
- name: Checkout
71-
uses: actions/checkout@v4
72-
73-
- name: Setup Node.js and deps
74-
uses: ./.github/actions/setup-deps
75-
76-
- name: Test in concurrent mode
77-
run: CONCURRENT_MODE=1 yarn test:ci
78-
7964
test-website:
8065
runs-on: ubuntu-latest
8166
name: Test Website

jest-setup.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ import './src/matchers/extend-expect';
33

44
beforeEach(() => {
55
resetToDefaults();
6-
if (process.env.CONCURRENT_MODE === '1') {
7-
configure({ concurrentRoot: true });
8-
}
96
});

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"jest": ">=28.0.0",
5656
"react": ">=18.0.0",
5757
"react-native": ">=0.59",
58-
"universal-test-renderer": "0.4.1"
58+
"universal-test-renderer": "0.5.0"
5959
},
6060
"peerDependenciesMeta": {
6161
"jest": {
@@ -89,7 +89,7 @@
8989
"release-it": "^17.10.0",
9090
"strip-ansi": "^6.0.1",
9191
"typescript": "^5.6.3",
92-
"universal-test-renderer": "0.4.1"
92+
"universal-test-renderer": "0.5.0"
9393
},
9494
"publishConfig": {
9595
"registry": "https://registry.npmjs.org"

src/__tests__/config.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ test('configure() overrides existing config values', () => {
1616
asyncUtilTimeout: 5000,
1717
defaultDebugOptions: { message: 'debug message' },
1818
defaultIncludeHiddenElements: false,
19-
concurrentRoot: false,
2019
});
2120
});
2221

src/__tests__/render.test.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,3 @@ test('render calls detects host component names', () => {
196196
render(<View testID="test" />);
197197
expect(getConfig().hostComponentNames).not.toBeUndefined();
198198
});
199-
200-
test('supports legacy rendering', () => {
201-
render(<View testID="test" />, { concurrentRoot: false });
202-
expect(screen.root).toBeDefined();
203-
});
204-
205-
test('supports concurrent rendering', () => {
206-
render(<View testID="test" />, { concurrentRoot: true });
207-
expect(screen.root).toBeOnTheScreen();
208-
});

src/config.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ export type Config = {
1313

1414
/** Default options for `debug` helper. */
1515
defaultDebugOptions?: Partial<DebugOptions>;
16-
17-
/**
18-
* Set to `true` to enable concurrent rendering.
19-
* Otherwise `render` will default to legacy synchronous rendering.
20-
*/
21-
concurrentRoot: boolean;
2216
};
2317

2418
export type ConfigAliasOptions = {
@@ -43,7 +37,6 @@ export type InternalConfig = Config & {
4337
const defaultConfig: InternalConfig = {
4438
asyncUtilTimeout: 1000,
4539
defaultIncludeHiddenElements: false,
46-
concurrentRoot: false,
4740
};
4841

4942
let config = { ...defaultConfig };

src/render.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ export interface RenderOptions {
1515
*/
1616
wrapper?: React.ComponentType<any>;
1717
createNodeMock?: (element: React.ReactElement) => object;
18-
/**
19-
* Set to `true` to enable concurrent rendering.
20-
* Otherwise `render` will default to legacy synchronous rendering.
21-
*/
22-
concurrentRoot?: boolean | undefined;
2318
}
2419

2520
export type RenderResult = ReturnType<typeof render>;
@@ -46,7 +41,6 @@ export function renderInternal<T>(element: React.ReactElement<T>, options?: Rend
4641
const wrap = (element: React.ReactElement) => (Wrapper ? <Wrapper>{element}</Wrapper> : element);
4742

4843
const renderer = createRoot({
49-
legacyRoot: !(options?.concurrentRoot ?? getConfig().concurrentRoot),
5044
createNodeMock: options?.createNodeMock,
5145
});
5246
void act(() => {

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,12 +2680,12 @@ __metadata:
26802680
release-it: "npm:^17.10.0"
26812681
strip-ansi: "npm:^6.0.1"
26822682
typescript: "npm:^5.6.3"
2683-
universal-test-renderer: "npm:0.4.1"
2683+
universal-test-renderer: "npm:0.5.0"
26842684
peerDependencies:
26852685
jest: ">=28.0.0"
26862686
react: ">=18.0.0"
26872687
react-native: ">=0.59"
2688-
universal-test-renderer: 0.4.1
2688+
universal-test-renderer: 0.5.0
26892689
peerDependenciesMeta:
26902690
jest:
26912691
optional: true
@@ -10661,14 +10661,14 @@ __metadata:
1066110661
languageName: node
1066210662
linkType: hard
1066310663

10664-
"universal-test-renderer@npm:0.4.1":
10665-
version: 0.4.1
10666-
resolution: "universal-test-renderer@npm:0.4.1"
10664+
"universal-test-renderer@npm:0.5.0":
10665+
version: 0.5.0
10666+
resolution: "universal-test-renderer@npm:0.5.0"
1066710667
dependencies:
1066810668
react-reconciler: "npm:^0.31.0-rc-fb9a90fa48-20240614"
1066910669
peerDependencies:
1067010670
react: ^19.0.0-rc-fb9a90fa48-20240614
10671-
checksum: 10c0/ee0c61e0161397575629600f20419dbd7d4b37a3540f88011f956913e8eb5c4c25554b98e23151b81e139a5e710038bb2d551898a60bba30c6c6fddfac294038
10671+
checksum: 10c0/baf87e2ca3ab77cc3f472b818437771dc95a6d2ecc11e513e0e1f992c106d9cfa94449137d26b159ec07d740ce5353dd4025fdc12730b8012ad3edbca474cb48
1067210672
languageName: node
1067310673
linkType: hard
1067410674

0 commit comments

Comments
 (0)