Skip to content

Commit 46c5edc

Browse files
wackerowwackerow
committed
Merge branch 'dev' into pr/13575
2 parents 6ecf1d2 + ede3e40 commit 46c5edc

File tree

201 files changed

+3373
-1973
lines changed

Some content is hidden

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

201 files changed

+3373
-1973
lines changed

‎.all-contributorsrc

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12260,7 +12260,8 @@
1226012260
"avatar_url": "https://avatars.githubusercontent.com/u/112751524?v=4",
1226112261
"profile": "https://github.com/Shiva-Sai-ssb",
1226212262
"contributions": [
12263-
"bug"
12263+
"bug",
12264+
"maintenance"
1226412265
]
1226512266
},
1226612267
{
@@ -12343,6 +12344,51 @@
1234312344
"contributions": [
1234412345
"content"
1234512346
]
12347+
},
12348+
{
12349+
"login": "0xV4L3NT1N3",
12350+
"name": "0xV4L3NT1N3",
12351+
"avatar_url": "https://avatars.githubusercontent.com/u/33112835?v=4",
12352+
"profile": "https://github.com/0xV4L3NT1N3",
12353+
"contributions": [
12354+
"tool"
12355+
]
12356+
},
12357+
{
12358+
"login": "JoshDavisLight",
12359+
"name": "Josh Davis",
12360+
"avatar_url": "https://avatars.githubusercontent.com/u/82784104?v=4",
12361+
"profile": "https://github.com/JoshDavisLight",
12362+
"contributions": [
12363+
"content"
12364+
]
12365+
},
12366+
{
12367+
"login": "tr1sm0s1n",
12368+
"name": "Mobin Mohanan",
12369+
"avatar_url": "https://avatars.githubusercontent.com/u/47410557?v=4",
12370+
"profile": "https://github.com/tr1sm0s1n",
12371+
"contributions": [
12372+
"content"
12373+
]
12374+
},
12375+
{
12376+
"login": "Baystef",
12377+
"name": "Adebayo Steve",
12378+
"avatar_url": "https://avatars.githubusercontent.com/u/36106823?v=4",
12379+
"profile": "https://github.com/Baystef",
12380+
"contributions": [
12381+
"code"
12382+
]
12383+
},
12384+
{
12385+
"login": "sanjanaynvsdl",
12386+
"name": "Sanjana",
12387+
"avatar_url": "https://avatars.githubusercontent.com/u/142678317?v=4",
12388+
"profile": "https://github.com/sanjanaynvsdl",
12389+
"contributions": [
12390+
"bug"
12391+
]
1234612392
}
1234712393
],
1234812394
"contributorsPerLine": 7,

‎.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const ns = [
2121
"page-upgrades",
2222
"page-developers-index",
2323
"page-what-is-ethereum",
24+
"page-upgrades-index",
2425
] as const
2526
const supportedLngs = Object.keys(baseLocales)
2627

‎.storybook/main.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ const config: StorybookConfig = {
4747
},
4848
},
4949
webpackFinal: async (config) => {
50+
config.module = config.module || {}
51+
config.module.rules = config.module.rules || []
52+
5053
if (config.resolve) {
5154
config.resolve.plugins = [
5255
...(config.resolve.plugins || []),
@@ -55,6 +58,22 @@ const config: StorybookConfig = {
5558
}),
5659
]
5760
}
61+
62+
// This modifies the existing image rule to exclude .svg files
63+
// since you want to handle those files with @svgr/webpack
64+
const imageRule = config.module.rules.find((rule) =>
65+
rule?.["test"]?.test(".svg")
66+
)
67+
if (imageRule) {
68+
imageRule["exclude"] = /\.svg$/
69+
}
70+
71+
// Configure .svg files to be loaded with @svgr/webpack
72+
config.module.rules.push({
73+
test: /\.svg$/,
74+
use: ["@svgr/webpack"],
75+
})
76+
5877
return config
5978
},
6079
typescript: {

‎README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18731873
<td align="center" valign="top" width="14.28%"><a href="https://github.com/abonnaudet-ledger"><img src="https://avatars.githubusercontent.com/u/71646516?v=4?s=100" width="100px;" alt="abonnaudet-ledger"/><br /><sub><b>abonnaudet-ledger</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabonnaudet-ledger" title="Bug reports">🐛</a></td>
18741874
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JacobSharples"><img src="https://avatars.githubusercontent.com/u/45126111?v=4?s=100" width="100px;" alt="Jacob Sharples"/><br /><sub><b>Jacob Sharples</b></sub></a><br /><a href="#content-JacobSharples" title="Content">🖋</a></td>
18751875
<td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="#translation-omahs" title="Translation">🌍</a> <a href="#maintenance-omahs" title="Maintenance">🚧</a></td>
1876-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a></td>
1876+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a></td>
18771877
<td align="center" valign="top" width="14.28%"><a href="https://bsaurabh.xyz/"><img src="https://avatars.githubusercontent.com/u/39492927?v=4?s=100" width="100px;" alt="Saurabh Burade"/><br /><sub><b>Saurabh Burade</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=saurabhburade" title="Code">💻</a></td>
18781878
</tr>
18791879
<tr>
@@ -1887,6 +1887,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18871887
</tr>
18881888
<tr>
18891889
<td align="center" valign="top" width="14.28%"><a href="https://github.com/krishchvn"><img src="https://avatars.githubusercontent.com/u/58606754?v=4?s=100" width="100px;" alt="Krishnakumar Chavan"/><br /><sub><b>Krishnakumar Chavan</b></sub></a><br /><a href="#content-krishchvn" title="Content">🖋</a></td>
1890+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xV4L3NT1N3"><img src="https://avatars.githubusercontent.com/u/33112835?v=4?s=100" width="100px;" alt="0xV4L3NT1N3"/><br /><sub><b>0xV4L3NT1N3</b></sub></a><br /><a href="#tool-0xV4L3NT1N3" title="Tools">🔧</a></td>
1891+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JoshDavisLight"><img src="https://avatars.githubusercontent.com/u/82784104?v=4?s=100" width="100px;" alt="Josh Davis"/><br /><sub><b>Josh Davis</b></sub></a><br /><a href="#content-JoshDavisLight" title="Content">🖋</a></td>
1892+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tr1sm0s1n"><img src="https://avatars.githubusercontent.com/u/47410557?v=4?s=100" width="100px;" alt="Mobin Mohanan"/><br /><sub><b>Mobin Mohanan</b></sub></a><br /><a href="#content-tr1sm0s1n" title="Content">🖋</a></td>
1893+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Baystef"><img src="https://avatars.githubusercontent.com/u/36106823?v=4?s=100" width="100px;" alt="Adebayo Steve"/><br /><sub><b>Adebayo Steve</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Baystef" title="Code">💻</a></td>
1894+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sanjanaynvsdl"><img src="https://avatars.githubusercontent.com/u/142678317?v=4?s=100" width="100px;" alt="Sanjana"/><br /><sub><b>Sanjana</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asanjanaynvsdl" title="Bug reports">🐛</a></td>
18901895
</tr>
18911896
</tbody>
18921897
</table>

‎chromatic.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"projectId": "Project:6629cd26b1440f2cc20b94c0",
33
"zip": true,
4-
"buildScriptName": "build-storybook:chromatic"
4+
"buildScriptName": "build-storybook:chromatic",
5+
"onlyChanged": true
56
}

‎next.config.js

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,31 @@ module.exports = (phase, { defaultConfig }) => {
2727
test: /\.ya?ml$/,
2828
use: "yaml-loader",
2929
})
30-
config.module.rules.push({
31-
test: /\.svg$/,
32-
use: "@svgr/webpack",
33-
})
30+
31+
// SVG loader
32+
// Grab the existing rule that handles SVG imports
33+
const fileLoaderRule = config.module.rules.find((rule) =>
34+
rule.test?.test?.(".svg")
35+
)
36+
37+
config.module.rules.push(
38+
// Reapply the existing rule, but only for svg imports ending in ?url
39+
{
40+
...fileLoaderRule,
41+
test: /\.svg$/i,
42+
resourceQuery: /url/, // *.svg?url
43+
},
44+
// Convert all other *.svg imports to React components
45+
{
46+
test: /\.svg$/i,
47+
issuer: fileLoaderRule.issuer,
48+
resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] }, // exclude if *.svg?url
49+
use: ["@svgr/webpack"],
50+
}
51+
)
52+
53+
// Modify the file loader rule to ignore *.svg, since we have it handled now.
54+
fileLoaderRule.exclude = /\.svg$/i
3455

3556
return config
3657
},

‎package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@
3535
"@emotion/styled": "^11.11.0",
3636
"@hookform/resolvers": "^3.8.0",
3737
"@radix-ui/react-accordion": "^1.2.0",
38+
"@radix-ui/react-checkbox": "^1.1.1",
3839
"@radix-ui/react-navigation-menu": "^1.2.0",
3940
"@radix-ui/react-popover": "^1.1.1",
41+
"@radix-ui/react-radio-group": "^1.2.0",
4042
"@radix-ui/react-slot": "^1.1.0",
43+
"@radix-ui/react-visually-hidden": "^1.1.0",
4144
"@socialgouv/matomo-next": "^1.8.0",
4245
"chart.js": "^4.4.2",
4346
"chartjs-plugin-datalabels": "^2.2.0",
@@ -128,4 +131,4 @@
128131
"jackspeak": "2.1.1",
129132
"sharp": "0.32.6"
130133
}
131-
}
134+
}

‎public/content/community/get-involved/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ Start by reading about the ethereum.org mission and values in our [code of condu
1515
- Learn about and try Ethereum at [ethereum.org/developers/](/developers/)
1616
- Attend an [ETHGlobal](http://ethglobal.co/) hackathon near you!
1717
- Check out [projects related to your area of expertise or programming language of choice](/developers/docs/programming-languages/)
18-
- Watch or participate in the [Core Dev calls](https://www.youtube.com/@EthereumProtocol)
18+
- Watch or participate in the [Consensus and Execution Layer calls](https://www.youtube.com/@EthereumProtocol/streams)
1919
- [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - tooling, documentation, and infrastructure areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
2020
- [Web3Bridge](https://www.web3bridge.com/) - join the aspiring web3 community in their initiative to identify, train, and support hundreds of developers and community members throughout Africa
21+
- Join the [Eth R&D Discord](https://discord.com/invite/VmG7Uxc)
2122
- Join the [Ethereum Cat Herders Discord](https://discord.com/invite/Nz6rtfJ8Cu)
2223

2324
## Researchers & Academics <Emoji text=":mag:" size={1} />‍ {#researchers-and-academics}
2425

2526
Do you have a background in mathematics, cryptography, or economics? You might be interested in some of the cutting-edge work being done within the Ethereum ecosystem:
2627

28+
- Join the [Eth R&D Discord](https://discord.com/invite/VmG7Uxc)
2729
- Write or review an Ethereum Improvement Proposal
2830
- Write an EIP
2931
1. Submit your idea on [Ethereum Magicians](https://ethereum-magicians.org)

‎public/content/community/support/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ Here are some popular examples:
7373
- [ethers.js](https://discord.gg/6jyGVDK6Jx)
7474
- [web3.js](https://discord.gg/GsABYQu4sC)
7575
- [Hardhat](https://discord.gg/xtrMGhmbfZ)
76-
- [Truffle](https://discord.gg/8uKcsccEYE)
7776
- [Alchemy](http://alchemy.com/discord)
7877
- [Tenderly](https://discord.gg/fBvDJYR)
7978

‎public/content/contributing/translation-program/translatathon/details/index.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,14 @@ All translations will also be subject to a thorough review before being added to
7171
</ul>
7272
</ExpandableCard>
7373

74-
<ExpandableCard title="Which languages can I translate into?">
75-
You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all language available in Crowdin are in scope for the Translatathon.
76-
77-
If you want to translate into a language that isn't available in Crowdin, reach out to us and we will add any language per request.
74+
<ExpandableCard title="Can I compete as part of a team?">
75+
<p>No. This year, the Translatathon will only have one main individual track and there will be no team competition.</p>
76+
<p>You can still team up with your friends and translate together, however everyone will be competing in the Translatathon as an individual and only the number of your individual translated words will count towards your final score.</p>
77+
</ExpandableCard>
7878

79+
<ExpandableCard title="Which languages can I translate into?">
80+
<p>You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all language available in Crowdin are in scope for the Translatathon.</p>
81+
<p>If you want to translate into a language that isn't available in Crowdin, reach out to us and we will add any language per request.</p>
7982
</ExpandableCard>
8083

8184
<ApplyNow />

0 commit comments

Comments
 (0)