Skip to content

Commit 89de807

Browse files
authored
Merge branch 'main' into sync-6274d4fa
2 parents 76a8ed1 + 7b26e2a commit 89de807

125 files changed

Lines changed: 2545 additions & 1875 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @hg-pyun @taehwanno @simsim0709 @gnujoow @b9words @taggon @MaxKim-J @eomttt @goofcode
1+
* @hg-pyun @taehwanno @simsim0709 @gnujoow @b9words @taggon @MaxKim-J @eomttt @lumirlumir

.github/ISSUE_TEMPLATE/term.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ about: 문서에서 사용되는 용어 번역에 논의가 필요한 경우 이
44
title: ''
55
labels: discussion, term
66
assignees: ''
7-
87
---
98

10-
# 논의하고자 하는 용어
11-
9+
## 논의하고자 하는 용어
1210

13-
# 해당 용어가 등장하는 원문의 문장
11+
## 해당 용어가 등장하는 원문의 문장
1412

13+
---
1514

15+
## 논의가 완료된 후
1616

17-
---
17+
1. 아래 코드를 업데이트 해주세요.
18+
- [ ] [`/textlint/data/rules/translateGlossary.js`](https://github.com/reactjs/ko.react.dev/blob/main/textlint/data/rules/translateGlossary.js)
1819

19-
# 논의가 완료된 후에 아래 내용을 업데이트 해주세요
20-
- [ ] https://github.com/reactjs/ko.react.dev/wiki/Translate-Glossary
20+
2. 용어 사전에 업데이트된 내역이 정상 반영되었나 확인해주세요. (해당 내역은 husky의 pre-commit 훅을 통해 자동 업데이트 됩니다.)
21+
- [ ] [`/wiki/translate-glossary.md`](https://github.com/reactjs/ko.react.dev/blob/main/wiki/translate-glossary.md)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thank you for the PR! Contributors like you keep React awesome!
44
55
Please see the Contribution Guide for guidelines:
66
7-
https://github.com/reactjs/react.dev/blob/main/CONTRIBUTING.md
7+
https://github.com/reactjs/ko.react.dev/blob/main/CONTRIBUTING.md
88
99
If your PR references an existing issue, please add the issue number below
1010
@@ -13,8 +13,9 @@ If your PR references an existing issue, please add the issue number below
1313
## Progress
1414

1515
- [ ] 번역 초안 작성 (Draft translation)
16-
- [ ] [공통 스타일 가이드 확인 (Check the common style guide)](https://github.com/reactjs/ko.reactjs.org/blob/master/UNIVERSAL-STYLE-GUIDE.md)
17-
- [ ] [모범사례 확인 (Check best practices)](https://github.com/reactjs/ko.reactjs.org/wiki/Best-practices-for-translation)
18-
- [ ] [용어 확인 (Check the term)](https://github.com/reactjs/ko.reactjs.org/wiki/Translate-Glossary)
19-
- [ ] [맞춤법 검사 (Spelling check)](http://speller.cs.pusan.ac.kr/)
16+
- [ ] [공통 스타일 가이드 확인 (Check the common style guide)](https://github.com/reactjs/ko.react.dev/blob/main/wiki/universal-style-guide.md)
17+
- [ ] [모범 사례 확인 (Check best practices)](https://github.com/reactjs/ko.react.dev/blob/main/wiki/best-practices-for-translation.md)
18+
- [ ] [용어 확인 (Check the term)](https://github.com/reactjs/ko.react.dev/blob/main/wiki/translate-glossary.md)
19+
- [ ] [Textlint 가이드 확인 (Check the textlint guide)](https://github.com/reactjs/ko.react.dev/blob/main/wiki/textlint/what-is-textlint.md)
20+
- [ ] [맞춤법 검사 (Spelling check)](https://nara-speller.co.kr/speller/)
2021
- [ ] 리뷰 반영 (Resolve reviews)

.github/workflows/analyze.yml

Lines changed: 7 additions & 7 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,13 +41,13 @@ 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@v4
4545
with:
4646
path: .next/analyze/__bundle_analysis.json
4747
name: bundle_analysis.json
4848

4949
- name: Download base branch bundle stats
50-
uses: dawidd6/action-download-artifact@v2
50+
uses: dawidd6/action-download-artifact@v4
5151
if: success() && github.event.number
5252
with:
5353
workflow: analyze.yml
@@ -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@v4
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@v4
8686
with:
8787
name: pr_number
8888
path: ./pr_number
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +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
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +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

.husky/common.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +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

.husky/pre-commit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
3+
. "$(dirname "$0")/common.sh"
34

4-
yarn lint-staged
5+
yarn lint-staged

.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"editor.formatOnSave": true,
3+
"editor.formatOnPaste": true,
4+
"editor.defaultFormatter": "esbenp.prettier-vscode",
5+
"editor.codeActionsOnSave": {
6+
"source.fixAll.eslint": "always"
7+
}
8+
}

0 commit comments

Comments
 (0)