Skip to content

Commit 2048a6b

Browse files
pettinarippettinarip
committed
Merge branch 'dev' into build/next-14-netlify-workaround
2 parents 0a5ddc1 + 477116f commit 2048a6b

File tree

178 files changed

+66861
-383054
lines changed

Some content is hidden

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

178 files changed

+66861
-383054
lines changed

‎.all-contributorsrc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11774,7 +11774,8 @@
1177411774
"profile": "https://github.com/HayattiQ",
1177511775
"contributions": [
1177611776
"content",
11777-
"bug"
11777+
"bug",
11778+
"maintenance"
1177811779
]
1177911780
},
1178011781
{
@@ -11948,6 +11949,15 @@
1194811949
"contributions": [
1194911950
"maintenance"
1195011951
]
11952+
},
11953+
{
11954+
"login": "sogobanwo",
11955+
"name": "sogobanwo",
11956+
"avatar_url": "https://avatars.githubusercontent.com/u/99739569?v=4",
11957+
"profile": "https://olorunsogo-portfolio-sand.vercel.app/",
11958+
"contributions": [
11959+
"maintenance"
11960+
]
1195111961
}
1195211962
],
1195311963
"contributorsPerLine": 7,

‎.github/workflows/build-crowdin.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Build Crowdin project
2+
3+
on:
4+
schedule:
5+
- cron: "20 04 1 * *" # Runs at 4:20 AM on the first day of every month
6+
workflow_dispatch:
7+
8+
jobs:
9+
create_pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 18
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Install ts-node
24+
run: yarn global add ts-node
25+
26+
- name: Run script
27+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/translations/triggerBuild.ts
28+
env:
29+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
30+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}

‎.github/workflows/generate-review-report.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Generate Crowdin translation review report
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
generate_report:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Check out code
11+
uses: actions/checkout@v3
12+
13+
- name: Set up Node.js
14+
uses: actions/setup-node@v3
15+
with:
16+
node-version: 18
17+
18+
- name: Install dependencies
19+
run: yarn install
20+
21+
- name: Install ts-node
22+
run: yarn global add ts-node
23+
24+
- name: Run script
25+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/reports/generateReviewReport.ts
26+
env:
27+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
28+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
29+
30+
- name: Upload output as artifact
31+
uses: actions/upload-artifact@v2
32+
with:
33+
name: output
34+
path: ./src/data/crowdin/bucketsAwaitingReviewReport.csv

‎.github/workflows/get-leaderboard-reports.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Update Crowdin leaderboard data
2+
3+
on:
4+
schedule:
5+
- cron: "20 16 1 * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
create_pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 18
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Install ts-node
24+
run: yarn global add ts-node
25+
26+
- name: Set up git
27+
run: |
28+
git config --global user.email "[email protected]"
29+
git config --global user.name "GitHub Action"
30+
31+
- name: Generate timestamp and readable date
32+
id: date
33+
run: |
34+
echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
35+
echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
36+
37+
- name: Fetch latest dev and create new branch
38+
run: |
39+
git fetch origin dev
40+
git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
41+
42+
- name: Run script
43+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/leaderboard/getLeaderboardReports.ts
44+
env:
45+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
46+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
47+
48+
- name: Commit and push
49+
run: |
50+
git add -A
51+
git commit -m "Update Crowdin leaderboard data"
52+
git push origin "automated-update-${{ env.TIMESTAMP }}"
53+
54+
- name: Create PR body
55+
run: |
56+
echo "This PR was automatically created to update Crowdin leaderboard data." > pr_body.txt
57+
echo "This workflows runs on the first of each month at 16:20 (UTC)." >> pr_body.txt
58+
echo "" >> pr_body.txt
59+
echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
60+
61+
- name: Create Pull Request
62+
run: |
63+
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
64+
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation leaderboard data from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

‎.github/workflows/get-translations.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Import Crowdin translations
2+
3+
on:
4+
schedule:
5+
- cron: "20 16 1 * *" # Runs at 4:20 PM on the first day of every month
6+
workflow_dispatch:
7+
8+
jobs:
9+
create_pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 18
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Install ts-node
24+
run: yarn global add ts-node
25+
26+
- name: Set up git
27+
run: |
28+
git config --global user.email "[email protected]"
29+
git config --global user.name "GitHub Action"
30+
31+
- name: Fetch latest dev
32+
run: git fetch origin dev
33+
34+
- name: Get translations
35+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/translations/getTranslations.ts
36+
env:
37+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
38+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
39+
40+
- name: Authenticate GitHub CLI
41+
run: |
42+
echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
43+
44+
- name: Process commits and post PRs by language
45+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/translations/postLangPRs.ts
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ robots.txt
5252

5353
# vscode workplace configuration
5454
.vscode
55+
56+
# Crowdin report output
57+
src/data/crowdin/bucketsAwaitingReviewReport.csv

‎README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18061806
</tr>
18071807
<tr>
18081808
<td align="center" valign="top" width="14.28%"><a href="http://croath.com"><img src="https://avatars.githubusercontent.com/u/1398729?v=4?s=100" width="100px;" alt="Croath Liu"/><br /><sub><b>Croath Liu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Code">💻</a></td>
1809-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HayattiQ"><img src="https://avatars.githubusercontent.com/u/5105841?v=4?s=100" width="100px;" alt="Hayatti"/><br /><sub><b>Hayatti</b></sub></a><br /><a href="#content-HayattiQ" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHayattiQ" title="Bug reports">🐛</a></td>
1809+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HayattiQ"><img src="https://avatars.githubusercontent.com/u/5105841?v=4?s=100" width="100px;" alt="Hayatti"/><br /><sub><b>Hayatti</b></sub></a><br /><a href="#content-HayattiQ" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHayattiQ" title="Bug reports">🐛</a> <a href="#maintenance-HayattiQ" title="Maintenance">🚧</a></td>
18101810
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JeffreyJoel"><img src="https://avatars.githubusercontent.com/u/72028836?v=4?s=100" width="100px;" alt="Jeffrey Owoloko"/><br /><sub><b>Jeffrey Owoloko</b></sub></a><br /><a href="#maintenance-JeffreyJoel" title="Maintenance">🚧</a></td>
18111811
<td align="center" valign="top" width="14.28%"><a href="https://github.com/colmck"><img src="https://avatars.githubusercontent.com/u/73862596?v=4?s=100" width="100px;" alt="Colin McKerracher"/><br /><sub><b>Colin McKerracher</b></sub></a><br /><a href="#maintenance-colmck" title="Maintenance">🚧</a></td>
18121812
<td align="center" valign="top" width="14.28%"><a href="https://github.com/writegr"><img src="https://avatars.githubusercontent.com/u/167099595?v=4?s=100" width="100px;" alt="writegr"/><br /><sub><b>writegr</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Awritegr" title="Bug reports">🐛</a></td>
@@ -1831,6 +1831,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18311831
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AbiPrescott"><img src="https://avatars.githubusercontent.com/u/140613896?v=4?s=100" width="100px;" alt="Abi Prescott"/><br /><sub><b>Abi Prescott</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AAbiPrescott" title="Bug reports">🐛</a></td>
18321832
<td align="center" valign="top" width="14.28%"><a href="https://github.com/skyminelabs"><img src="https://avatars.githubusercontent.com/u/57817726?v=4?s=100" width="100px;" alt="skyminelabs"/><br /><sub><b>skyminelabs</b></sub></a><br /><a href="#maintenance-skyminelabs" title="Maintenance">🚧</a></td>
18331833
</tr>
1834+
<tr>
1835+
<td align="center" valign="top" width="14.28%"><a href="https://olorunsogo-portfolio-sand.vercel.app/"><img src="https://avatars.githubusercontent.com/u/99739569?v=4?s=100" width="100px;" alt="sogobanwo"/><br /><sub><b>sogobanwo</b></sub></a><br /><a href="#maintenance-sogobanwo" title="Maintenance">🚧</a></td>
1836+
</tr>
18341837
</tbody>
18351838
</table>
18361839

‎docs/stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- [NextJS](https://nextjs.org/)
66
- React framework that provides some goodies out of the box (pages router, SSG, SSR, i18n support, Image component, etc)
77
- Configurable in `next.config.js`
8-
- [NextJS Tutorial](https://nextjs.org/learn/foundations/about-nextjs)
8+
- [NextJS Tutorial](https://nextjs.org/learn)
99
- [NextJS Docs](https://nextjs.org/docs)
1010
- [React](https://reactjs.org/) - A JavaScript library for building component-based user interfaces
1111
- [Typescript](https://www.typescriptlang.org/) - TypeScript is a strongly typed programming language that builds on JavaScript

‎netlify.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@
1717
[[plugins]]
1818
package = "@netlify/plugin-nextjs"
1919

20+
[[plugins]]
21+
package = "@netlify/plugin-lighthouse"
22+
23+
[[plugins.inputs.audits]]
24+
path = "en/"
25+
[[plugins.inputs.audits]]
26+
path = "en/wallets/find-wallet/"
27+
[[plugins.inputs.audits]]
28+
path = "en/staking/"
29+
[[plugins.inputs.audits]]
30+
path = "en/whitepaper/"
31+
[[plugins.inputs.audits]]
32+
path = "en/nft/"
33+
[[plugins.inputs.audits]]
34+
path = "en/developers/docs/intro-to-ethereum/"
35+
[[plugins.inputs.audits]]
36+
path = "en/developers/tutorials/creating-a-wagmi-ui-for-your-contract/"
37+
2038
[functions]
2139

2240
[functions.___netlify-odb-handler]

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "8.5.0",
3+
"version": "8.5.1",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",
@@ -20,6 +20,7 @@
2020
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
2121
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts",
2222
"events-import": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/events-import.ts",
23+
"crowdin-needs-review": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/reports/generateReviewReport.ts",
2324
"theme": "chakra-cli tokens ./src/@chakra-ui/theme.ts",
2425
"theme:watch": "chakra-cli tokens ./src/@chakra-ui/theme.ts --watch"
2526
},
@@ -33,7 +34,6 @@
3334
"@socialgouv/matomo-next": "^1.8.0",
3435
"embla-carousel-react": "^7.0.0",
3536
"ethereum-blockies-base64": "^1.0.2",
36-
"focus-trap-react": "^10.2.3",
3737
"framer-motion": "^10.13.0",
3838
"gray-matter": "^4.0.3",
3939
"htmr": "^1.0.2",
@@ -70,11 +70,13 @@
7070
"@storybook/react": "7.6.6",
7171
"@storybook/testing-library": "0.2.2",
7272
"@svgr/webpack": "^8.1.0",
73+
"@types/decompress": "^4.2.7",
7374
"@types/hast": "^3.0.0",
7475
"@types/node": "^20.4.2",
7576
"@types/react": "18.2.57",
7677
"@types/react-dom": "18.2.19",
7778
"chromatic": "^10.5.0",
79+
"decompress": "^4.2.1",
7880
"eslint": "^8.45.0",
7981
"eslint-config-next": "^14.2.2",
8082
"eslint-config-prettier": "^9.0.0",

0 commit comments

Comments
 (0)