Commit 25e0b48
committed
Merge branch 'sync-a1ddcf51' of https://github.com/reactjs/ko.react.dev into sync-a1ddcf51
# Conflicts:
# package.json
# src/components/Layout/HomeContent.js
# src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md
# src/content/blog/2024/05/22/react-conf-2024-recap.md
# src/content/blog/2024/12/05/react-19.md
# src/content/blog/2025/02/14/sunsetting-create-react-app.md
# src/content/blog/index.md
# src/content/learn/add-react-to-an-existing-project.md
# src/content/learn/build-a-react-app-from-scratch.md
# src/content/learn/choosing-the-state-structure.md
# src/content/learn/creating-a-react-app.md
# src/content/learn/synchronizing-with-effects.md
# src/content/learn/typescript.md
# src/content/learn/you-might-not-need-an-effect.md
# src/content/learn/your-first-component.md
# src/content/reference/react-dom/index.md
# src/content/reference/react-dom/preinit.md
# src/content/reference/react-dom/preinitModule.md
# src/content/reference/react-dom/preload.md
# src/content/reference/react-dom/preloadModule.md
# src/content/reference/react/act.md
# src/content/reference/react/addTransitionType.md
# src/content/reference/react/index.md
# src/content/reference/react/useEffect.md
# src/content/reference/react/useId.md
# src/content/reference/react/useTransition.md
# src/content/reference/rsc/directives.md
# src/content/reference/rsc/use-client.md
# src/sidebarBlog.json
# yarn.lockFile tree
30 files changed
+297
-219
lines changed- src
- content
- blog
- 2023/03/22
- 2024
- 05/22
- 12/05
- 2025/02/14
- learn
- react-compiler
- reference
- react-dom
- react
- rsc
- wiki
30 files changed
+297
-219
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | | - | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
355 | 355 | | |
356 | 356 | | |
357 | 357 | | |
358 | | - | |
| 358 | + | |
359 | 359 | | |
360 | 360 | | |
361 | 361 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
180 | | - | |
| 180 | + | |
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
154 | | - | |
| 154 | + | |
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
100 | | - | |
| 100 | + | |
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
| 66 | + | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| |||
0 commit comments