Skip to content

Commit 5888467

Browse files
react-translations-botreact-translations-bot
committed
merging all conflicts
2 parents e59729e + 1697ae8 commit 5888467

29 files changed

Lines changed: 1327 additions & 1155 deletions

‎.github/workflows/analyze.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
analyze:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up node
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v3
1818
with:
1919
node-version: '20.x'
2020

2121
- name: Install dependencies
2222
uses: bahmutov/npm-install@v1.7.10
2323

2424
- name: Restore next build
25-
uses: actions/cache@v2
25+
uses: actions/cache@v3
2626
id: restore-build-cache
2727
env:
2828
cache-name: cache-next-build
@@ -41,7 +41,7 @@ jobs:
4141
run: npx -p nextjs-bundle-analysis@0.5.0 report
4242

4343
- name: Upload bundle
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v3
4545
with:
4646
path: .next/analyze/__bundle_analysis.json
4747
name: bundle_analysis.json
@@ -73,7 +73,7 @@ jobs:
7373
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
7474

7575
- name: Upload analysis comment
76-
uses: actions/upload-artifact@v2
76+
uses: actions/upload-artifact@v3
7777
with:
7878
name: analysis_comment.txt
7979
path: .next/analyze/__bundle_analysis_comment.txt
@@ -82,7 +82,7 @@ jobs:
8282
run: echo ${{ github.event.number }} > ./pr_number
8383

8484
- name: Upload PR number
85-
uses: actions/upload-artifact@v2
85+
uses: actions/upload-artifact@v3
8686
with:
8787
name: pr_number
8888
path: ./pr_number

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
},
2727
"dependencies": {
2828
"@codesandbox/sandpack-react": "2.13.5",
29-
"@docsearch/css": "3.0.0-alpha.41",
30-
"@docsearch/react": "3.0.0-alpha.41",
29+
"@docsearch/css": "^3.6.1",
30+
"@docsearch/react": "^3.6.1",
3131
"@headlessui/react": "^1.7.0",
3232
"@radix-ui/react-context-menu": "^2.1.5",
3333
"body-scroll-lock": "^3.1.3",

‎src/components/MDX/Sandpack/Preview.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export function Preview({
113113
/**
114114
* The spinner component transition might be longer than
115115
* the bundler loading, so we only show the spinner if
116-
* it takes more than 1s to load the bundler.
116+
* it takes more than 500s to load the bundler.
117117
*/
118118
timeout = setTimeout(() => {
119119
setShowLoading(true);

‎src/components/Search.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,17 @@ export function Search({
9494
onOpen,
9595
onClose,
9696
searchParameters = {
97-
hitsPerPage: 5,
97+
hitsPerPage: 30,
98+
attributesToHighlight: [
99+
'hierarchy.lvl0',
100+
'hierarchy.lvl1',
101+
'hierarchy.lvl2',
102+
'hierarchy.lvl3',
103+
'hierarchy.lvl4',
104+
'hierarchy.lvl5',
105+
'hierarchy.lvl6',
106+
'content',
107+
],
98108
},
99109
}: SearchProps) {
100110
useDocSearchKeyboardEvents({isOpen, onOpen, onClose});

‎src/content/blog/2024/04/25/react-19-upgrade-guide.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,11 @@ npm install react-shallow-renderer --save-dev
353353

354354
##### シャローレンダリングの再考を {/*please-reconsider-shallow-rendering*/}
355355

356+
<<<<<<< HEAD
356357
シャローレンダリングは React の内部構造に依存しており、将来のアップグレードの妨げとなる可能性があります。テストを [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) や [@testing-library/react-native](https://callstack.github.io/react-native-testing-library/docs/getting-started) に移行することをお勧めします。
358+
=======
359+
Shallow rendering depends on React internals and can block you from future upgrades. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://testing-library.com/docs/react-native-testing-library/intro).
360+
>>>>>>> 1697ae89a3bbafd76998dd7496754e5358bc1e9a
357361
358362
</Note>
359363

@@ -524,7 +528,11 @@ Accessing element.ref is no longer supported. ref is now a regular prop. It will
524528

525529
このテストレンダラは、[React Testing Library](https://testing-library.com) のようなより実用的なテスト戦略が利用可能になる前に作成されたものです。現在では、モダンなテストライブラリの使用が推奨されます。
526530

531+
<<<<<<< HEAD
527532
React 19 では、`react-test-renderer` は非推奨警告をログに記録するようになり、また並行レンダーに切り替わりました。モダンかつよりよくサポートされたテスト体験のためには、テストを [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) または [@testing-library/react-native](https://callstack.github.io/react-native-testing-library/docs/getting-started) に移行することを推奨します。
533+
=======
534+
In React 19, `react-test-renderer` logs a deprecation warning, and has switched to concurrent rendering. We recommend migrating your tests to [@testing-library/react](https://testing-library.com/docs/react-testing-library/intro/) or [@testing-library/react-native](https://testing-library.com/docs/react-native-testing-library/intro) for a modern and well supported testing experience.
535+
>>>>>>> 1697ae89a3bbafd76998dd7496754e5358bc1e9a
528536
529537
## 注目すべき変更点 {/*notable-changes*/}
530538

‎src/content/community/acknowledgements.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ title: 謝辞
5959

6060
このリストは全員を網羅したものではありません。
6161

62+
<<<<<<< HEAD
6263
特に、長年にわたる指導とサポートをしていただいた [Tom Occhino](https://github.com/tomocchino) と [Adam Wolff](https://github.com/wolffiex) に感謝いたします。[React を他の言語に翻訳](https://translations.reactjs.org/)してくださったボランティアの皆様にも感謝いたします。
64+
=======
65+
We'd like to give special thanks to [Tom Occhino](https://github.com/tomocchino) and [Adam Wolff](https://github.com/wolffiex) for their guidance and support over the years. We are also thankful to all the volunteers who [translated React into other languages.](https://translations.react.dev/)
66+
>>>>>>> 1697ae89a3bbafd76998dd7496754e5358bc1e9a
6367
6468
## 追加の謝辞 {/*additional-thanks*/}
6569

‎src/content/community/conferences.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,21 @@ October 18, 2024. In-person in Brussels, Belgium (hybrid event)
3535

3636
[Website](https://www.react.brussels/) - [Twitter](https://x.com/BrusselsReact)
3737

38+
### reactjsday 2024 {/*reactjsday-2024*/}
39+
October 25, 2024. In-person in Verona, Italy + online (hybrid event)
40+
41+
[Website](https://2024.reactjsday.it/) - [Twitter](https://x.com/reactjsday) - [Facebook](https://www.facebook.com/GrUSP/) - [YouTube](https://www.youtube.com/c/grusp)
42+
3843
### React Advanced London 2024 {/*react-advanced-london-2024*/}
3944
October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
4045

4146
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
4247

48+
### React Native London Conf 2024 {/*react-native-london-2024*/}
49+
November 14 & 15, 2024. In-person in London, UK
50+
51+
[Website](https://reactnativelondon.co.uk/) - [Twitter](https://x.com/RNLConf)
52+
4353
### React Summit US 2024 {/*react-summit-us-2024*/}
4454
November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
4555

‎src/content/community/meetups.md‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,8 @@ title: React ミーティング
3030
* [Belo Horizonte](https://www.meetup.com/reactbh/)
3131
* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
3232
* [Florianópolis](https://www.meetup.com/pt-br/ReactJS-Floripa/)
33-
* [Goiânia](https://www.meetup.com/pt-br/React-Goiania/)
3433
* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
35-
* [Juiz de Fora](https://www.meetup.com/pt-br/React-Juiz-de-Fora/)
36-
* [Maringá](https://www.meetup.com/pt-BR/React-Maringa/)
37-
* [Porto Alegre](https://www.meetup.com/pt-BR/React-Porto-Alegre/)
38-
* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
39-
* [Salvador](https://www.meetup.com/pt-BR/ReactSSA)
4034
* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
41-
* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/)
4235

4336
## Bolivia {/*bolivia*/}
4437
* [Bolivia](https://www.meetup.com/ReactBolivia/)
@@ -51,32 +44,20 @@ title: React ミーティング
5144
* [Saskatoon, SK](https://www.meetup.com/saskatoon-react-meetup/)
5245
* [Toronto, ON](https://www.meetup.com/Toronto-React-Native/events/)
5346

54-
## Chile {/*chile*/}
55-
* [Santiago](https://www.meetup.com/es-ES/react-santiago/)
56-
57-
## China {/*china*/}
58-
* [Beijing](https://www.meetup.com/Beijing-ReactJS-Meetup/)
59-
6047
## Colombia {/*colombia*/}
61-
* [Bogotá](https://www.meetup.com/meetup-group-iHIeHykY/)
6248
* [Medellin](https://www.meetup.com/React-Medellin/)
63-
* [Cali](https://www.meetup.com/reactcali/)
6449

6550
## Denmark {/*denmark*/}
6651
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
6752
* [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)
6853

69-
## Egypt {/*egypt*/}
70-
* [Cairo](https://www.meetup.com/react-cairo/)
71-
7254
## England (UK) {/*england-uk*/}
7355
* [Manchester](https://www.meetup.com/Manchester-React-User-Group/)
7456
* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
7557
* [React Advanced London](https://guild.host/react-advanced-london)
7658
* [React Native London](https://guild.host/RNLDN)
7759

7860
## France {/*france*/}
79-
* [Nantes](https://www.meetup.com/React-Nantes/)
8061
* [Lille](https://www.meetup.com/ReactBeerLille/)
8162
* [Paris](https://www.meetup.com/ReactJS-Paris/)
8263

@@ -93,9 +74,6 @@ title: React ミーティング
9374
* [Athens](https://www.meetup.com/React-To-React-Athens-MeetUp/)
9475
* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
9576

96-
## Hungary {/*hungary*/}
97-
* [Budapest](https://www.meetup.com/React-Budapest/)
98-
9977
## India {/*india*/}
10078
* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
10179
* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
@@ -117,6 +95,9 @@ title: React ミーティング
11795
## Italy {/*italy*/}
11896
* [Milan](https://www.meetup.com/React-JS-Milano/)
11997

98+
## Japan {/*japan*/}
99+
* [Osaka](https://react-osaka.connpass.com/)
100+
120101
## Kenya {/*kenya*/}
121102
* [Nairobi - Reactdevske](https://kommunity.com/reactjs-developer-community-kenya-reactdevske)
122103

@@ -138,12 +119,6 @@ title: React ミーティング
138119
* [Karachi](https://www.facebook.com/groups/902678696597634/)
139120
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
140121

141-
## Panama {/*panama*/}
142-
* [Panama](https://www.meetup.com/React-Panama/)
143-
144-
## Peru {/*peru*/}
145-
* [Lima](https://www.meetup.com/ReactJS-Peru/)
146-
147122
## Philippines {/*philippines*/}
148123
* [Manila](https://www.meetup.com/reactjs-developers-manila/)
149124
* [Manila - ReactJS PH](https://www.meetup.com/ReactJS-Philippines/)
@@ -160,7 +135,6 @@ title: React ミーティング
160135

161136
## Spain {/*spain*/}
162137
* [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
163-
* [Canarias](https://www.meetup.com/React-Canarias/)
164138

165139
## Sweden {/*sweden*/}
166140
* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
@@ -176,7 +150,6 @@ title: React ミーティング
176150
* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
177151

178152
## US {/*us*/}
179-
* [Ann Arbor, MI - ReactJS](https://www.meetup.com/AnnArbor-jsx/)
180153
* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
181154
* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
182155
* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
@@ -187,7 +160,6 @@ title: React ミーティング
187160
* [Cleveland, OH - ReactJS](https://www.meetup.com/Cleveland-React/)
188161
* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
189162
* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
190-
* [Dallas, TX - [Remote] React JS](https://www.meetup.com/React-JS-Group/)
191163
* [Detroit, MI - Detroit React User Group](https://www.meetup.com/Detroit-React-User-Group/)
192164
* [Indianapolis, IN - React.Indy](https://www.meetup.com/React-Indy)
193165
* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
@@ -197,27 +169,19 @@ title: React ミーティング
197169
* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)
198170
* [Los Angeles, CA - React Native](https://www.meetup.com/React-Native-Los-Angeles/)
199171
* [Miami, FL - ReactJS](https://www.meetup.com/React-Miami/)
200-
* [Nashville, TN - ReactJS](https://www.meetup.com/NashReact-Meetup/)
201172
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
202173
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
203174
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
204175
* [New York, NY - useReactNYC](https://www.meetup.com/useReactNYC/)
205176
* [New York, NY - React.NYC](https://guild.host/react-nyc)
206-
* [Omaha, NE - ReactJS/React Native](https://www.meetup.com/omaha-react-meetup-group/)
207177
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
208-
* [Philadelphia, PA - ReactJS](https://www.meetup.com/Reactadelphia/)
209178
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
210-
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
211-
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
212179
* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
213-
* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
214180
* [San Diego, CA - San Diego JS](https://www.meetup.com/sandiegojs/)
215181
* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
216182
* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
217183
* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
218-
* [San Ramon, CA - TriValley Coders](https://www.meetup.com/trivalleycoders/)
219184
* [Santa Monica, CA - ReactJS](https://www.meetup.com/Los-Angeles-ReactJS-User-Group/)
220-
* [Seattle, WA - React Native](https://www.meetup.com/Seattle-React-Native-Meetup/)
221185
* [Seattle, WA - ReactJS](https://www.meetup.com/seattle-react-js/)
222186
* [Tampa, FL - ReactJS](https://www.meetup.com/ReactJS-Tampa-Bay/)
223187
* [Tucson, AZ - ReactJS](https://www.meetup.com/Tucson-ReactJS-Meetup/)

‎src/content/learn/manipulating-the-dom-with-refs.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,35 +124,35 @@ export default function CatFriends() {
124124
<>
125125
<nav>
126126
<button onClick={handleScrollToFirstCat}>
127-
Tom
127+
Neo
128128
</button>
129129
<button onClick={handleScrollToSecondCat}>
130-
Maru
130+
Millie
131131
</button>
132132
<button onClick={handleScrollToThirdCat}>
133-
Jellylorum
133+
Bella
134134
</button>
135135
</nav>
136136
<div>
137137
<ul>
138138
<li>
139139
<img
140-
src="https://placekitten.com/g/200/200"
141-
alt="Tom"
140+
src="https://placecats.com/neo/300/200"
141+
alt="Neo"
142142
ref={firstCatRef}
143143
/>
144144
</li>
145145
<li>
146146
<img
147-
src="https://placekitten.com/g/300/200"
148-
alt="Maru"
147+
src="https://placecats.com/millie/200/200"
148+
alt="Millie"
149149
ref={secondCatRef}
150150
/>
151151
</li>
152152
<li>
153153
<img
154-
src="https://placekitten.com/g/250/200"
155-
alt="Jellylorum"
154+
src="https://placecats.com/bella/199/200"
155+
alt="Bella"
156156
ref={thirdCatRef}
157157
/>
158158
</li>
@@ -245,9 +245,9 @@ export default function CatFriends() {
245245
return (
246246
<>
247247
<nav>
248-
<button onClick={() => scrollToCat(catList[0])}>Tom</button>
249-
<button onClick={() => scrollToCat(catList[5])}>Maru</button>
250-
<button onClick={() => scrollToCat(catList[9])}>Jellylorum</button>
248+
<button onClick={() => scrollToCat(catList[0])}>Neo</button>
249+
<button onClick={() => scrollToCat(catList[5])}>Millie</button>
250+
<button onClick={() => scrollToCat(catList[9])}>Bella</button>
251251
</nav>
252252
<div>
253253
<ul>
@@ -948,7 +948,7 @@ const catList = [];
948948
for (let i = 0; i < 10; i++) {
949949
catList.push({
950950
id: i,
951-
imageUrl: 'https://placekitten.com/250/200?image=' + i
951+
imageUrl: 'https://loremflickr.com/250/200/cat?lock=' + i
952952
});
953953
}
954954

@@ -1065,7 +1065,7 @@ const catList = [];
10651065
for (let i = 0; i < 10; i++) {
10661066
catList.push({
10671067
id: i,
1068-
imageUrl: 'https://placekitten.com/250/200?image=' + i
1068+
imageUrl: 'https://loremflickr.com/250/200/cat?lock=' + i
10691069
});
10701070
}
10711071

‎src/content/learn/synchronizing-with-effects.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,11 @@ React は、開発中に意図的にコンポーネントを再マウントし
627627
628628
### React 以外のウィジェットを制御する {/*controlling-non-react-widgets*/}
629629
630+
<<<<<<< HEAD
630631
時に、React で書かれていない UI ウィジェットを追加したい場合があります。例えば、ページに地図コンポーネントを追加しようとしているとします。`setZoomLevel()` メソッドがあり、React のコード内の `zoomLevel` という state 変数と同期させたいとします。エフェクトは次のようになります。
632+
=======
633+
Sometimes you need to add UI widgets that aren't written in React. For example, let's say you're adding a map component to your page. It has a `setZoomLevel()` method, and you'd like to keep the zoom level in sync with a `zoomLevel` state variable in your React code. Your Effect would look similar to this:
634+
>>>>>>> 1697ae89a3bbafd76998dd7496754e5358bc1e9a
631635
632636
```js
633637
useEffect(() => {

0 commit comments

Comments
 (0)