Skip to content

Commit 5a806a5

Browse files
brossetti1brossetti1
committed
Merge remote-tracking branch 'upstream/dev' into aggregate-fix-links
2 parents 28977c8 + a8a753e commit 5a806a5

File tree

601 files changed

+21708
-5163
lines changed

Some content is hidden

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

601 files changed

+21708
-5163
lines changed

‎.all-contributorsrc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6239,10 +6239,10 @@
62396239
]
62406240
},
62416241
{
6242-
"login": "mradziwon",
6243-
"name": "mradziwon",
6242+
"login": "maciejrrr",
6243+
"name": "maciejrrr",
62446244
"avatar_url": "https://avatars.githubusercontent.com/u/6785984?v=4",
6245-
"profile": "http://www.linkedin.com/in/mradziwon",
6245+
"profile": "http://www.linkedin.com/in/maciejrrr",
62466246
"contributions": [
62476247
"code",
62486248
"bug"
@@ -12733,6 +12733,15 @@
1273312733
"contributions": [
1273412734
"bug"
1273512735
]
12736+
},
12737+
{
12738+
"login": "smithrashell",
12739+
"name": "Rashell Smith",
12740+
"avatar_url": "https://avatars.githubusercontent.com/u/36465023?v=4",
12741+
"profile": "https://github.com/smithrashell",
12742+
"contributions": [
12743+
"bug"
12744+
]
1273612745
}
1273712746
],
1273812747
"contributorsPerLine": 7,

‎.env.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# be careful not to expose sensitive data (e.g. your Algolia admin key)
55

66
# Algolia environment (app ID, search key and base search index name required for search)
7+
# You can use the following test keys provided by DocSearch for local development/testing:
8+
# NEXT_PUBLIC_ALGOLIA_APP_ID=R2IYF7ETH7
9+
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=599cec31baffa4868cae4e79f180729b
10+
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=docsearch
11+
# Replace insertValue with your actual keys for production builds.
712
# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
813
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
914
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ Learn more about how we review pull requests [here](docs/review-process.md).
155155

156156
> An Onchain Achievement Token (OAT) is a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). It's a proof of your contribution to the ecosystem. [More on OATs](https://medium.com/galxe-news/introducing-galaxy-oat-on-chain-achievement-token-7e89779242b4).
157157
158-
### ethereum.org 2024 Contributor OATs
158+
### ethereum.org 2025 Contributor OATs
159159

160-
- If you have committed any changes in 2024 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
160+
- If you have committed any changes in 2025 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
161161
- There are OATs for GitHub, content, design and translation contributions.
162162

163163
[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/ethereum-org)
@@ -1040,7 +1040,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
10401040
<td align="center" valign="top" width="14.28%"><a href="https://www.yashkarthik.xyz/"><img src="https://avatars.githubusercontent.com/u/52369876?v=4?s=100" width="100px;" alt="yash"/><br /><sub><b>yash</b></sub></a><br /><a href="#ideas-YashKarthik" title="Ideas, Planning, & Feedback">🤔</a></td>
10411041
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ibeale"><img src="https://avatars.githubusercontent.com/u/46497763?v=4?s=100" width="100px;" alt="Isaac Beale"/><br /><sub><b>Isaac Beale</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ibeale" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aibeale" title="Bug reports">🐛</a></td>
10421042
<td align="center" valign="top" width="14.28%"><a href="https://github.com/chrishna1"><img src="https://avatars.githubusercontent.com/u/26048398?v=4?s=100" width="100px;" alt="Bal Krishna Jha"/><br /><sub><b>Bal Krishna Jha</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chrishna1" title="Documentation">📖</a></td>
1043-
<td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/mradziwon"><img src="https://avatars.githubusercontent.com/u/6785984?v=4?s=100" width="100px;" alt="mradziwon"/><br /><sub><b>mradziwon</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mradziwon" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amradziwon" title="Bug reports">🐛</a></td>
1043+
<td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/maciejrrr"><img src="https://avatars.githubusercontent.com/u/6785984?v=4?s=100" width="100px;" alt="maciejrrr"/><br /><sub><b>maciejrrr</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=maciejrrr" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amaciejrrr" title="Bug reports">🐛</a></td>
10441044
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mmilenkovic"><img src="https://avatars.githubusercontent.com/u/2448210?v=4?s=100" width="100px;" alt="mmilenkovic"/><br /><sub><b>mmilenkovic</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mmilenkovic" title="Documentation">📖</a> <a href="#ideas-mmilenkovic" title="Ideas, Planning, & Feedback">🤔</a></td>
10451045
<td align="center" valign="top" width="14.28%"><a href="https://github.com/guevaraf"><img src="https://avatars.githubusercontent.com/u/2633129?v=4?s=100" width="100px;" alt="Fernando Guevara"/><br /><sub><b>Fernando Guevara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=guevaraf" title="Documentation">📖</a></td>
10461046
<td align="center" valign="top" width="14.28%"><a href="https://github.com/garrivjo"><img src="https://avatars.githubusercontent.com/u/31991694?v=4?s=100" width="100px;" alt="Jose Manuel Garcia Rivas"/><br /><sub><b>Jose Manuel Garcia Rivas</b></sub></a><br /><a href="#ideas-garrivjo" title="Ideas, Planning, & Feedback">🤔</a></td>
@@ -1948,6 +1948,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19481948
<tr>
19491949
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JJOptimist"><img src="https://avatars.githubusercontent.com/u/86833563?v=4?s=100" width="100px;" alt="JJOptimist"/><br /><sub><b>JJOptimist</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AJJOptimist" title="Bug reports">🐛</a></td>
19501950
<td align="center" valign="top" width="14.28%"><a href="http://pwn.xyz"><img src="https://avatars.githubusercontent.com/u/61500778?v=4?s=100" width="100px;" alt="microHoffman"/><br /><sub><b>microHoffman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AmicroHoffman" title="Bug reports">🐛</a></td>
1951+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/smithrashell"><img src="https://avatars.githubusercontent.com/u/36465023?v=4?s=100" width="100px;" alt="Rashell Smith"/><br /><sub><b>Rashell Smith</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asmithrashell" title="Bug reports">🐛</a></td>
19511952
</tr>
19521953
</tbody>
19531954
</table>

‎app/[locale]/developers/tutorials/_components/tutorials.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import {
3434

3535
import externalTutorials from "@/data/externalTutorials.json"
3636

37+
import { DEFAULT_LOCALE } from "@/lib/constants"
38+
3739
import { useBreakpointValue } from "@/hooks/useBreakpointValue"
3840

3941
type LinkFlexProps = FlexProps & {
@@ -93,14 +95,15 @@ const TutorialPage = ({
9395
contentNotTranslated,
9496
}: TutorialPageProps) => {
9597
const locale = useLocale()
98+
const effectiveLocale = internalTutorials.length > 0 ? locale : DEFAULT_LOCALE
9699
const filteredTutorialsByLang = useMemo(
97100
() =>
98101
filterTutorialsByLang(
99102
internalTutorials,
100103
externalTutorials,
101-
locale as Lang
104+
effectiveLocale as Lang
102105
),
103-
[internalTutorials, locale]
106+
[internalTutorials, effectiveLocale]
104107
)
105108

106109
const allTags = useMemo(

‎app/[locale]/get-eth/page.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
1515

1616
import GetEthPage from "./_components/get-eth"
1717

18+
import { routing } from "@/i18n/routing"
19+
1820
export default async function Page({
1921
params,
2022
}: {
@@ -40,6 +42,10 @@ export default async function Page({
4042
)
4143
}
4244

45+
export async function generateStaticParams() {
46+
return routing.locales.map((locale) => ({ locale }))
47+
}
48+
4349
export async function generateMetadata({
4450
params,
4551
}: {

‎app/[locale]/staking/deposit-contract/_components/deposit-contract.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ const StyledFakeLink = (props: ButtonProps) => (
140140
/>
141141
)
142142

143-
const CHUNKED_ADDRESS = DEPOSIT_CONTRACT_ADDRESS.match(/.{1,3}/g)?.join(" ")
143+
const CHUNKED_ADDRESS =
144+
DEPOSIT_CONTRACT_ADDRESS.match(/(?:^0x|.{4})/g)?.join(" ")
144145

145146
const blockieSrc = makeBlockie(DEPOSIT_CONTRACT_ADDRESS)
146147

‎app/page.tsx

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎docs/stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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
1212
- [Chakra UI](https://chakra-ui.com/) - A UI library (Migration in progress)
13-
- [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./docs/ALGOLIA_DOCSEARCH.md).
13+
- [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./site-search.md).
1414
- Primary implementation: `/src/components/Search/index.ts`
1515
- [Crowdin](https://crowdin.com/) - crowdsourcing for our translation efforts (See "Translation initiative" below)
1616
- [GitHub Actions](https://github.com/features/actions) - Manages CI/CD, and issue tracking

‎middleware.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import createMiddleware from "next-intl/middleware"
2+
3+
import { routing } from "./src/i18n/routing"
4+
5+
export default createMiddleware(routing)
6+
7+
// Simplified matcher pattern
8+
export const config = {
9+
matcher: ["/((?!api|_next|_vercel|.*\\.[^/]*$).*)"],
10+
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "10.2.0",
3+
"version": "10.3.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

0 commit comments

Comments
 (0)