Skip to content

Commit ec2f3b6

Browse files
lumirlumirlumirlumir
authored
Merge branch 'main' into docs-typo-directive-textlint
2 parents ab7c88c + ed16330 commit ec2f3b6

22 files changed

Lines changed: 363 additions & 395 deletions

‎.github/workflows/textlint_lint.yml‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
name: Textlint Lint
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- 'src/**/*.md'
9-
- 'textlint/**/*.js'
10-
- '.github/workflows/textlint_lint.yml'
11-
12-
pull_request:
13-
types:
14-
- opened
15-
- synchronize
16-
- reopened
17-
paths:
18-
- 'src/**/*.md'
19-
- 'textlint/**/*.js'
20-
- '.github/workflows/textlint_lint.yml'
21-
22-
jobs:
23-
Lint:
24-
runs-on: ubuntu-latest
25-
26-
steps:
27-
- name: Set up checkout
28-
uses: actions/checkout@v4
29-
30-
- name: Set up node
31-
uses: actions/setup-node@v4
32-
with:
33-
node-version: 20.x
34-
cache: yarn
35-
36-
- name: Set up cache
37-
uses: actions/cache@v4
38-
with:
39-
path: ~/.yarn-cache
40-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
41-
42-
- name: Install dependencies
43-
run: yarn install --frozen-lockfile
44-
# The `--frozen-lockfile` flag in Yarn ensures that dependencies are installed without modifying the `yarn.lock` file. It is useful for maintaining consistency in CI/CD environments by preventing unexpected changes to the lock file and ensuring that the same versions of dependencies are installed.
45-
46-
- name: Lint
47-
run: yarn textlint-lint
1+
name: Textlint Lint
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'src/**/*.md'
9+
- 'textlint/**/*.js'
10+
- '.github/workflows/textlint_lint.yml'
11+
12+
pull_request:
13+
types:
14+
- opened
15+
- synchronize
16+
- reopened
17+
paths:
18+
- 'src/**/*.md'
19+
- 'textlint/**/*.js'
20+
- '.github/workflows/textlint_lint.yml'
21+
22+
jobs:
23+
Lint:
24+
runs-on: ubuntu-latest
25+
26+
steps:
27+
- name: Set up checkout
28+
uses: actions/checkout@v4
29+
30+
- name: Set up node
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: 20.x
34+
cache: yarn
35+
36+
- name: Set up cache
37+
uses: actions/cache@v4
38+
with:
39+
path: ~/.yarn-cache
40+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
41+
42+
- name: Install dependencies
43+
run: yarn install --frozen-lockfile
44+
# The `--frozen-lockfile` flag in Yarn ensures that dependencies are installed without modifying the `yarn.lock` file. It is useful for maintaining consistency in CI/CD environments by preventing unexpected changes to the lock file and ensuring that the same versions of dependencies are installed.
45+
46+
- name: Lint
47+
run: yarn textlint-lint

‎.github/workflows/textlint_test.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
name: Textlint Test
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- 'textlint/**/*.js'
9-
- '.github/workflows/textlint_test.yml'
10-
11-
pull_request:
12-
types:
13-
- opened
14-
- synchronize
15-
- reopened
16-
paths:
17-
- 'textlint/**/*.js'
18-
- '.github/workflows/textlint_test.yml'
19-
20-
jobs:
21-
Test:
22-
runs-on: ubuntu-latest
23-
24-
steps:
25-
- name: Set up checkout
26-
uses: actions/checkout@v4
27-
28-
- name: Set up node
29-
uses: actions/setup-node@v4
30-
with:
31-
node-version: 20.x
32-
cache: yarn
33-
34-
- name: Set up cache
35-
uses: actions/cache@v4
36-
with:
37-
path: ~/.yarn-cache
38-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
39-
40-
- name: Install dependencies
41-
run: yarn install --frozen-lockfile
42-
# The `--frozen-lockfile` flag in Yarn ensures that dependencies are installed without modifying the `yarn.lock` file. It is useful for maintaining consistency in CI/CD environments by preventing unexpected changes to the lock file and ensuring that the same versions of dependencies are installed.
43-
44-
- name: Test
45-
run: yarn textlint-test
1+
name: Textlint Test
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'textlint/**/*.js'
9+
- '.github/workflows/textlint_test.yml'
10+
11+
pull_request:
12+
types:
13+
- opened
14+
- synchronize
15+
- reopened
16+
paths:
17+
- 'textlint/**/*.js'
18+
- '.github/workflows/textlint_test.yml'
19+
20+
jobs:
21+
Test:
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- name: Set up checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Set up node
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: 20.x
32+
cache: yarn
33+
34+
- name: Set up cache
35+
uses: actions/cache@v4
36+
with:
37+
path: ~/.yarn-cache
38+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
39+
40+
- name: Install dependencies
41+
run: yarn install --frozen-lockfile
42+
# The `--frozen-lockfile` flag in Yarn ensures that dependencies are installed without modifying the `yarn.lock` file. It is useful for maintaining consistency in CI/CD environments by preventing unexpected changes to the lock file and ensuring that the same versions of dependencies are installed.
43+
44+
- name: Test
45+
run: yarn textlint-test

‎.husky/common.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#!/bin/sh
2-
command_exists () {
3-
command -v "$1" >/dev/null 2>&1
4-
}
5-
6-
# Windows 10, Git Bash and Yarn workaround
7-
if command_exists winpty && test -t 1; then
8-
exec < /dev/tty
9-
fi
1+
#!/bin/sh
2+
command_exists () {
3+
command -v "$1" >/dev/null 2>&1
4+
}
5+
6+
# Windows 10, Git Bash and Yarn workaround
7+
if command_exists winpty && test -t 1; then
8+
exec < /dev/tty
9+
fi

‎src/components/Layout/Feedback.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
6363
return (
6464
<div
6565
className={cn(
66-
'max-w-custom-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex',
66+
'max-w-96 w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex',
6767
{exit: isSubmitted}
6868
)}>
6969
<p className="w-full text-lg font-bold text-primary dark:text-primary-dark me-4">

‎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/content/blog/2024/04/25/react-19-upgrade-guide.md‎

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

354354
##### Please reconsider shallow rendering {/*please-reconsider-shallow-rendering*/}
355355

356-
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://callstack.github.io/react-native-testing-library/docs/getting-started).
356+
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).
357357

358358
</Note>
359359

@@ -524,7 +524,7 @@ We are deprecating `react-test-renderer` because it implements its own renderer
524524

525525
The test renderer was created before there were more viable testing strategies available like [React Testing Library](https://testing-library.com), and we now recommend using a modern testing library instead.
526526

527-
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://callstack.github.io/react-native-testing-library/docs/getting-started) for a modern and well supported testing experience.
527+
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.
528528

529529
## Notable changes {/*notable-changes*/}
530530

‎src/content/community/acknowledgements.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ React는 원래 [Jordan Walke](https://github.com/jordwalke)에 의해 만들어
5959

6060
이 목록이 전체 목록은 아닙니다.
6161

62-
수년간 지도와 지원을 주신 [Tom Occhino](https://github.com/tomocchino)와 [Adam Wolff](https://github.com/wolffiex)에게 특별한 감사를 드립니다. [React를 다른 언어로 번역한](https://translations.reactjs.org/) 모든 자원봉사자에게도 감사합니다.
62+
수년간 지도와 지원을 주신 [Tom Occhino](https://github.com/tomocchino)와 [Adam Wolff](https://github.com/wolffiex)에게 특별한 감사를 드립니다. [React를 다른 언어로 번역한](https://translations.react.dev/) 모든 자원봉사자에게도 감사합니다.
6363

6464
## 특별한 감사 인사 {/*additional-thanks*/}
6565

‎src/content/community/conferences.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ October 25 & 28, 2024. In-person in London, UK + online (hybrid event)
4545

4646
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
4747

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+
4853
### React Summit US 2024 {/*react-summit-us-2024*/}
4954
November 19 & 22, 2024. In-person in New York, USA + online (hybrid event)
5055

‎src/content/community/meetups.md‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
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/)

0 commit comments

Comments
 (0)