Skip to content

Commit 283d059

Browse files
Merge branch 'main' into modernization
2 parents 1b3aca5 + 38ec3b0 commit 283d059

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,6 +1898,7 @@ export default ErrorBoundary;
18981898

18991899
#### Concurrent React
19001900

1901+
<<<<<<< HEAD
19011902
The Concurrent React APIs (`Suspense`, `useTransition`, `useDeferredValue`, `startTransition`, `use`) let you keep the UI responsive while React renders work in the background or waits for data. They're all stable as of React 18 and gained additional capabilities in React 19.
19021903

19031904
#### `Suspense`
@@ -2043,7 +2044,9 @@ The standalone version does not provide an `isPending` flag — use the hook if
20432044
#### See also
20442045

20452046
- [`useActionState`, `useFormStatus`, `useOptimistic`](https://react.dev/reference/react) — built on top of transitions
2046-
- [Server Components and `'use server'`](https://react.dev/reference/rsc/server-components)
2047+
- # [Server Components and `'use server'`](https://react.dev/reference/rsc/server-components)
2048+
_Not written yet._ watch [https://github.com/sw-yx/fresh-async-react](https://github.com/sw-yx/fresh-async-react) for more on React Suspense and Time Slicing.
2049+
> > > > > > > main
20472050
20482051
[Something to add? File an issue](https://github.com/typescript-cheatsheets/react/issues/new).
20492052

0 commit comments

Comments
 (0)