Skip to content

Commit e9b8865

Browse files
authored
Sync with react.dev @ b011783 (#170)
This PR was automatically generated. Merge changes from [react.dev](https://github.com/reactjs/react.dev/commits/main) at b011783 The following files have conflicts and may need new translations: * [ ] [package.json](/reactjs/react.dev/commits/main/package.json) * [ ] [yarn.lock](/reactjs/react.dev/commits/main/yarn.lock) Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch. ## DO NOT SQUASH MERGE THIS PULL REQUEST! Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.
2 parents 04c4f79 + 0d4b2b3 commit e9b8865

4 files changed

Lines changed: 27 additions & 13 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,7 @@
9393
"postcss-flexbugs-fixes": "4.2.1",
9494
"postcss-preset-env": "^6.7.0",
9595
"prettier": "^2.5.1",
96-
<<<<<<< HEAD
97-
"react-server-dom-webpack": "^19.2.5",
98-
=======
9996
"react-server-dom-webpack": "^19.3.0",
100-
>>>>>>> 8efce7853d0fc59e615ed1c253799cf1798b8428
10197
"reading-time": "^1.2.0",
10298
"remark": "^12.0.1",
10399
"remark-external-links": "^7.0.0",

‎src/content/community/conferences.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,31 @@ October 21-23, 2026. In-person in Athens
2525

2626
[Website](https://athens.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
2727

28+
### React Advanced London 2026 {/*react-advanced-london-2026*/}
29+
October 23 & 26, 2026. In-person in London, UK + online (hybrid event)
30+
31+
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced) - [LinkedIn](https://www.linkedin.com/showcase/react-advanced-london/)
32+
33+
### React Summit US 2026 {/*react-summit-us-2026*/}
34+
November 17 & 20, 2026. In-person in New York, USA + online (hybrid event)
35+
36+
[Website](https://reactsummit.us/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
37+
38+
### React Day Berlin 2026 {/*react-day-berlin-2026*/}
39+
December 4 & 7, 2026. In-person in Berlin, Germany + online (hybrid event)
40+
41+
[Website](https://reactday.berlin/) - [Twitter](https://x.com/reactdayberlin) - [LinkedIn](https://www.linkedin.com/showcase/react-day-berlin/)
42+
43+
### React Summit Asia 2027 {/*react-summit-asia-2027*/}
44+
April 15 & 19, 2027. In-person in Singapore + online (hybrid event)
45+
46+
[Website](https://reactsummit.asia/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
47+
48+
### React Summit 2027 {/*react-summit-2027*/}
49+
May 21 & 25, 2027. In-person in Amsterdam, Netherlands + online (hybrid event)
50+
51+
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit) - [LinkedIn](https://www.linkedin.com/showcase/reactsummit)
52+
2853

2954
## Past Conferences {/*past-conferences*/}
3055

‎src/content/reference/react-dom/browser.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ During server rendering, `use(browser())` stops rendering the component and leav
4747
#### Caveats {/*caveats*/}
4848
4949
* `use(browser())` must be inside a `<Suspense>` boundary during server rendering. Without one, the server render fails.
50-
* In a React Server Components app, `use(browser())` must be called from a [Client Component](/reference/rsc/use-client), not a [Server Component](/reference/rsc/server-components).
50+
* `use(browser())` must be called from a [Client Component](/reference/rsc/use-client), not a [Server Component](/reference/rsc/server-components).
5151
* Calling `browser()` by itself has no effect. To mark a component as browser-only, pass the value returned by `browser` to `use`. Do not throw it.
5252
5353
---
@@ -206,7 +206,7 @@ iframe {
206206
207207
<Note>
208208
209-
In a React Server Components app, `use(browser())` must be called from a Client Component. If your framework uses Server Components by default, add the [`'use client'`](/reference/rsc/use-client) directive to that file or move the call to a child Client Component:
209+
`use(browser())` must be called from a Client Component. If your framework uses Server Components by default, add the [`'use client'`](/reference/rsc/use-client) directive to that file or move the call to a child Client Component:
210210
211211
```js {1}
212212
'use client';

‎yarn.lock‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7120,17 +7120,10 @@ react-remove-scroll@2.5.5:
71207120
use-callback-ref "^1.3.0"
71217121
use-sidecar "^1.1.2"
71227122

7123-
<<<<<<< HEAD
7124-
react-server-dom-webpack@^19.2.5:
7125-
version "19.2.5"
7126-
resolved "https://registry.yarnpkg.com/react-server-dom-webpack/-/react-server-dom-webpack-19.2.5.tgz#b16c0bd15e6cb469bab952f367f8ceaaebe11206"
7127-
integrity sha512-bYhdd2cZJhXHqyJBoloYaJrn8MrL9Egf3ZZVn0OrIODCCORm2goFD7C+xszf6xgfsSJi0rtgB/ichcuHfkJ4yQ==
7128-
=======
71297123
react-server-dom-webpack@^19.3.0:
71307124
version "19.3.0"
71317125
resolved "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.3.0.tgz#f30eaac50578db6f9aa5a38ece7c28d17de05271"
71327126
integrity sha512-ymt9RkvWtW4OpIhWf1wj4u5CxnBaVbDCkz/bw3/QFmOE7+/wg8C30uiJ/QqkEdWn/UqT5c7/rOUW/eWYMwceCg==
7133-
>>>>>>> 8efce7853d0fc59e615ed1c253799cf1798b8428
71347127
dependencies:
71357128
acorn-loose "^8.3.0"
71367129
neo-async "^2.6.1"

0 commit comments

Comments
 (0)