Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
398f09a
[v13] chore: remove deprecated stuff (#1603)
mdjastrzebski May 6, 2024
b797cf4
[v13] chore: remove react 16 & 17 code (#1602)
mdjastrzebski May 7, 2024
b5cfb98
[v13] chore: remove debug shallow (#1601)
mdjastrzebski May 8, 2024
450e750
[v13] chore: increase required React et al. versions
mdjastrzebski Aug 12, 2024
a3e1c5a
Merge branch 'main' into v13
mdjastrzebski Sep 5, 2024
e6d06a7
Merge branch 'main' into v13
mdjastrzebski Sep 12, 2024
c7f9132
Merge branch 'main' into v13
mdjastrzebski Oct 24, 2024
7455b21
feat: automatically extend matchers (#1684)
mdjastrzebski Oct 24, 2024
3abeac3
Merge branch 'main' into v13
mdjastrzebski Oct 25, 2024
383c241
feat(v13): enable concurrent rendering by default (#1692)
mdjastrzebski Oct 25, 2024
e90360b
refactor(v13): use react act if available (#1695)
mdjastrzebski Oct 25, 2024
1e788b6
chore: alpha release script
mdjastrzebski Oct 25, 2024
93eb539
chore: release v13.0.0-alpha.0
mdjastrzebski Oct 25, 2024
7905bb5
Merge branch 'main' into v13
mdjastrzebski Oct 31, 2024
13bc78a
refactor(v13): remove detect host component names (#1697)
mdjastrzebski Nov 4, 2024
a7404dc
Merge branch 'main' into v13
mdjastrzebski Nov 5, 2024
5a10b31
chore: change tsx to ts
mdjastrzebski Nov 5, 2024
83cafe4
refactor(v13): a11y label helpers (#1666)
mdjastrzebski Nov 5, 2024
f2de20c
chore: basic setup (#1659)
mdjastrzebski Nov 5, 2024
3f1d010
chore: release v13.0.0-alpha.1
mdjastrzebski Nov 5, 2024
71b059b
chore: update examples
mdjastrzebski Nov 5, 2024
868a9fc
Merge branch 'main' into v13
mdjastrzebski Nov 6, 2024
048d17d
chore(v13): remove jest preset (#1700)
mdjastrzebski Nov 6, 2024
2670b59
refactor(v13): cleanup existing code (#1701)
mdjastrzebski Nov 7, 2024
b402d14
chore: release v13.0.0-alpha.2
mdjastrzebski Nov 7, 2024
fec4c03
Merge branch 'main' into v13
mdjastrzebski Nov 7, 2024
b956cbc
chore: v13 beta
mdjastrzebski Nov 12, 2024
9ed7549
chore: release v13.0.0-beta.0
mdjastrzebski Nov 12, 2024
83716c2
Merge branch 'main' into v13
mdjastrzebski Nov 27, 2024
4f842f7
chore: fix example apps
mdjastrzebski Nov 27, 2024
1672880
chore: switch to RC
mdjastrzebski Dec 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(v13): enable concurrent rendering by default (#1692)
* feat!: enable concurrent rendering by default

* chore: tweaks
  • Loading branch information
mdjastrzebski authored Oct 25, 2024
commit 383c241d2e02029646bf1adece8d14a47b496e7c
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
test:
needs: [install-cache-deps]
runs-on: ubuntu-latest
name: Test
name: Test (concurrent by default)
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -61,11 +61,10 @@ jobs:
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4


test-concurrent:
test-legacy:
needs: [install-cache-deps]
runs-on: ubuntu-latest
name: Test (concurrent mode)
name: Test (legacy)
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -74,7 +73,7 @@ jobs:
uses: ./.github/actions/setup-deps

- name: Test in concurrent mode
run: CONCURRENT_MODE=1 yarn test:ci
run: CONCURRENT_MODE=0 yarn test:ci

test-website:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import './src/matchers/extend-expect';

beforeEach(() => {
resetToDefaults();
if (process.env.CONCURRENT_MODE === '1') {
configure({ concurrentRoot: true });
if (process.env.CONCURRENT_MODE === '0') {
configure({ concurrentRoot: false });
}
});
2 changes: 1 addition & 1 deletion src/__tests__/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test('configure() overrides existing config values', () => {
asyncUtilTimeout: 5000,
defaultDebugOptions: { message: 'debug message' },
defaultIncludeHiddenElements: false,
concurrentRoot: false,
concurrentRoot: true,
});
});

Expand Down
6 changes: 3 additions & 3 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export type Config = {
defaultDebugOptions?: Partial<DebugOptions>;

/**
* Set to `true` to enable concurrent rendering.
* Otherwise `render` will default to legacy synchronous rendering.
* Set to `false` to disable concurrent rendering.
* Otherwise `render` will default to concurrent rendering.
*/
concurrentRoot: boolean;
};
Expand All @@ -43,7 +43,7 @@ export type InternalConfig = Config & {
const defaultConfig: InternalConfig = {
asyncUtilTimeout: 1000,
defaultIncludeHiddenElements: false,
concurrentRoot: false,
concurrentRoot: true,
};

let config = { ...defaultConfig };
Expand Down
6 changes: 3 additions & 3 deletions src/render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ export interface RenderOptions {
wrapper?: React.ComponentType<any>;

/**
* Set to `true` to enable concurrent rendering.
* Otherwise `render` will default to legacy synchronous rendering.
* Set to `false` to disable concurrent rendering.
* Otherwise `render` will default to concurrent rendering.
*/
concurrentRoot?: boolean | undefined;
concurrentRoot?: boolean;

createNodeMock?: (element: React.ReactElement) => unknown;
unstable_validateStringsRenderedWithinText?: boolean;
Expand Down
Loading