Commit 0891507
authored
This PR was automatically generated.
Merge changes from
[react.dev](https://github.com/reactjs/react.dev/commits/main) at
b22cbc3
The following files have conflicts and may need new translations:
* [x] [package.json](/reactjs/react.dev/commits/main/package.json)
* [ ]
[src/content/blog/2020/12/21/data-fetching-with-react-server-components.md](/reactjs/react.dev/commits/main/src/content/blog/2020/12/21/data-fetching-with-react-server-components.md)
* [ ]
[src/content/blog/2021/06/08/the-plan-for-react-18.md](/reactjs/react.dev/commits/main/src/content/blog/2021/06/08/the-plan-for-react-18.md)
* [ ]
[src/content/blog/2021/12/17/react-conf-2021-recap.md](/reactjs/react.dev/commits/main/src/content/blog/2021/12/17/react-conf-2021-recap.md)
* [ ]
[src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md](/reactjs/react.dev/commits/main/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md)
* [ ]
[src/content/blog/2023/03/16/introducing-react-dev.md](/reactjs/react.dev/commits/main/src/content/blog/2023/03/16/introducing-react-dev.md)
* [ ]
[src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md](/reactjs/react.dev/commits/main/src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md)
* [ ]
[src/content/blog/2023/05/03/react-canaries.md](/reactjs/react.dev/commits/main/src/content/blog/2023/05/03/react-canaries.md)
* [ ]
[src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md](/reactjs/react.dev/commits/main/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md)
* [ ]
[src/content/community/docs-contributors.md](/reactjs/react.dev/commits/main/src/content/community/docs-contributors.md)
* [ ]
[src/content/learn/add-react-to-an-existing-project.md](/reactjs/react.dev/commits/main/src/content/learn/add-react-to-an-existing-project.md)
* [x] [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.
File tree
45 files changed
+1491
-564
lines changed- patches
- src
- components
- Icon
- Layout/Sidebar
- MDX
- Challenges
- CodeBlock
- Sandpack
- content
- blog/2024/05/22
- community
- pages
- errors
- types
- utils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
45 files changed
+1491
-564
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | 12 | | |
15 | | - | |
| 13 | + | |
16 | 14 | | |
17 | 15 | | |
18 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
20 | | - | |
| 19 | + | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
40 | | - | |
| 39 | + | |
41 | 40 | | |
42 | 41 | | |
43 | | - | |
| 42 | + | |
44 | 43 | | |
45 | | - | |
| 44 | + | |
46 | 45 | | |
47 | 46 | | |
48 | 47 | | |
| |||
58 | 57 | | |
59 | 58 | | |
60 | 59 | | |
61 | | - | |
62 | | - | |
| 60 | + | |
| 61 | + | |
63 | 62 | | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
67 | 66 | | |
68 | | - | |
| 67 | + | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
76 | 77 | | |
77 | 78 | | |
78 | 79 | | |
| |||
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
87 | | - | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | | - | |
| 107 | + | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
| 118 | + | |
| 119 | + | |
119 | 120 | | |
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | | - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
11 | 15 | | |
12 | 16 | | |
13 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | | - | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | | - | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | | - | |
8 | | - | |
9 | | - | |
| 8 | + | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
| |||
0 commit comments