Skip to content

Commit 08c60d3

Browse files
wackerowwackerow
committed
Merge branch 'dev' into pr/9257
2 parents 8096a30 + c79a9a6 commit 08c60d3

File tree

410 files changed

+9256
-6570
lines changed

Some content is hidden

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

410 files changed

+9256
-6570
lines changed

‎.all-contributorsrc

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9917,7 +9917,8 @@
99179917
"avatar_url": "https://avatars.githubusercontent.com/u/26359740?v=4",
99189918
"profile": "https://www.linkedin.com/in/jithil",
99199919
"contributions": [
9920-
"doc"
9920+
"doc",
9921+
"code"
99219922
]
99229923
},
99239924
{
@@ -9991,6 +9992,51 @@
99919992
"contributions": [
99929993
"content"
99939994
]
9995+
},
9996+
{
9997+
"login": "therealharpaljadeja",
9998+
"name": "Harpal Jadeja",
9999+
"avatar_url": "https://avatars.githubusercontent.com/u/38040789?v=4",
10000+
"profile": "https://github.com/therealharpaljadeja",
10001+
"contributions": [
10002+
"code"
10003+
]
10004+
},
10005+
{
10006+
"login": "zlog-in",
10007+
"name": "Zion",
10008+
"avatar_url": "https://avatars.githubusercontent.com/u/67903793?v=4",
10009+
"profile": "http://www.zlog.in",
10010+
"contributions": [
10011+
"content"
10012+
]
10013+
},
10014+
{
10015+
"login": "azpwnz",
10016+
"name": "Andriy Zhuk",
10017+
"avatar_url": "https://avatars.githubusercontent.com/u/6987007?v=4",
10018+
"profile": "https://github.com/azpwnz",
10019+
"contributions": [
10020+
"content"
10021+
]
10022+
},
10023+
{
10024+
"login": "gooseri",
10025+
"name": "gooser.eth",
10026+
"avatar_url": "https://avatars.githubusercontent.com/u/121782105?v=4",
10027+
"profile": "https://etherscan.io/address/gooser.eth",
10028+
"contributions": [
10029+
"content"
10030+
]
10031+
},
10032+
{
10033+
"login": "feibowei",
10034+
"name": "feibowei",
10035+
"avatar_url": "https://avatars.githubusercontent.com/u/69777448?v=4",
10036+
"profile": "https://github.com/feibowei",
10037+
"contributions": [
10038+
"content"
10039+
]
999410040
}
999510041
],
999610042
"contributorsPerLine": 7,

‎README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15541554
</tr>
15551555
<tr>
15561556
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nsexer"><img src="https://avatars.githubusercontent.com/u/30265113?v=4?s=100" width="100px;" alt="nethan"/><br /><sub><b>nethan</b></sub></a><br /><a href="#content-nsexer" title="Content">🖋</a></td>
1557-
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/jithil"><img src="https://avatars.githubusercontent.com/u/26359740?v=4?s=100" width="100px;" alt="Jithil P Ponnan"/><br /><sub><b>Jithil P Ponnan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MrJithil" title="Documentation">📖</a></td>
1557+
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/jithil"><img src="https://avatars.githubusercontent.com/u/26359740?v=4?s=100" width="100px;" alt="Jithil P Ponnan"/><br /><sub><b>Jithil P Ponnan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MrJithil" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MrJithil" title="Code">💻</a></td>
15581558
<td align="center" valign="top" width="14.28%"><a href="https://github.com/chocolatesuit"><img src="https://avatars.githubusercontent.com/u/120116662?v=4?s=100" width="100px;" alt="chocolatesuit"/><br /><sub><b>chocolatesuit</b></sub></a><br /><a href="#content-chocolatesuit" title="Content">🖋</a></td>
15591559
<td align="center" valign="top" width="14.28%"><a href="http://apinanyogaratnam.github.io/my-personal-website-v2.0/"><img src="https://avatars.githubusercontent.com/u/72412733?v=4?s=100" width="100px;" alt="Apinan Yogaratnam"/><br /><sub><b>Apinan Yogaratnam</b></sub></a><br /><a href="#content-apinanyogaratnam" title="Content">🖋</a></td>
15601560
<td align="center" valign="top" width="14.28%"><a href="http://trevorscanlon.eth.xyz"><img src="https://avatars.githubusercontent.com/u/30576577?v=4?s=100" width="100px;" alt="trevorsc19"/><br /><sub><b>trevorsc19</b></sub></a><br /><a href="#content-trevorsc19" title="Content">🖋</a></td>
@@ -1565,6 +1565,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15651565
<td align="center" valign="top" width="14.28%"><a href="https://github.com/danierod"><img src="https://avatars.githubusercontent.com/u/12255235?v=4?s=100" width="100px;" alt="danierod"/><br /><sub><b>danierod</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=danierod" title="Code">💻</a></td>
15661566
<td align="center" valign="top" width="14.28%"><a href="https://github.com/siddtheone"><img src="https://avatars.githubusercontent.com/u/45398971?v=4?s=100" width="100px;" alt="siddtheone"/><br /><sub><b>siddtheone</b></sub></a><br /><a href="#content-siddtheone" title="Content">🖋</a></td>
15671567
<td align="center" valign="top" width="14.28%"><a href="http://shawkisukkar.com/"><img src="https://avatars.githubusercontent.com/u/57439827?v=4?s=100" width="100px;" alt="Shawki Sukkar"/><br /><sub><b>Shawki Sukkar</b></sub></a><br /><a href="#content-ShawkiS" title="Content">🖋</a></td>
1568+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/therealharpaljadeja"><img src="https://avatars.githubusercontent.com/u/38040789?v=4?s=100" width="100px;" alt="Harpal Jadeja"/><br /><sub><b>Harpal Jadeja</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=therealharpaljadeja" title="Code">💻</a></td>
1569+
<td align="center" valign="top" width="14.28%"><a href="http://www.zlog.in"><img src="https://avatars.githubusercontent.com/u/67903793?v=4?s=100" width="100px;" alt="Zion"/><br /><sub><b>Zion</b></sub></a><br /><a href="#content-zlog-in" title="Content">🖋</a></td>
1570+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/azpwnz"><img src="https://avatars.githubusercontent.com/u/6987007?v=4?s=100" width="100px;" alt="Andriy Zhuk"/><br /><sub><b>Andriy Zhuk</b></sub></a><br /><a href="#content-azpwnz" title="Content">🖋</a></td>
1571+
<td align="center" valign="top" width="14.28%"><a href="https://etherscan.io/address/gooser.eth"><img src="https://avatars.githubusercontent.com/u/121782105?v=4?s=100" width="100px;" alt="gooser.eth"/><br /><sub><b>gooser.eth</b></sub></a><br /><a href="#content-gooseri" title="Content">🖋</a></td>
1572+
</tr>
1573+
<tr>
1574+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/feibowei"><img src="https://avatars.githubusercontent.com/u/69777448?v=4?s=100" width="100px;" alt="feibowei"/><br /><sub><b>feibowei</b></sub></a><br /><a href="#content-feibowei" title="Content">🖋</a></td>
15681575
</tr>
15691576
</tbody>
15701577
</table>

‎docs/applying-storybook.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
StorybookJS is a UI tool for isolating UI components to visually test their styles and states.
66

7-
This is great for checking the various iterations of a component in a sandbox versus scowering all the pages in a large scale project it is used to verify that the component is rendering properly.
7+
This is great for checking the various iterations of a component in a sandbox versus scouring all the pages in a large scale project it is used to verify that the component is rendering properly.
88

99
You can also render pages if you need that level of visual testing.
1010

@@ -18,7 +18,7 @@ It's as easy as running `yarn storybook` to boot up a dedicated localhost to see
1818

1919
## Setting up a component's stories
2020

21-
A Storybook "story" is an instance of a component in a certain state or with certain paramaters applied to show an alternative version of the component.
21+
A Storybook "story" is an instance of a component in a certain state or with certain parameters applied to show an alternative version of the component.
2222

2323
Each component will only need one file containing all the stories, and should follow the naming convention of the component.
2424

@@ -91,4 +91,4 @@ export const Variants = () => (
9191
)
9292
```
9393

94-
As you go and make adjustments to the component itself or it's variant styles, Storybook will hot reload and those changes will appear in the stories that emphazise them.
94+
As you go and make adjustments to the component itself or it's variant styles, Storybook will hot reload and those changes will appear in the stories that emphasize them.

‎gatsby-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const config: GatsbyConfig = {
7070
{
7171
resolve: `gatsby-plugin-sitemap`,
7272
options: {
73+
output: "/sitemap",
7374
query: `{
7475
site {
7576
siteMetadata {

‎package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "6.15.3",
3+
"version": "7.3.0",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -28,35 +28,35 @@
2828
"ethereum-blockies-base64": "^1.0.2",
2929
"focus-trap-react": "^10.0.0",
3030
"framer-motion": "^6.5.1",
31-
"gatsby": "^4.21.1",
32-
"gatsby-plugin-emotion": "^7.19.0",
33-
"gatsby-plugin-gatsby-cloud": "^4.20.0",
34-
"gatsby-plugin-image": "^2.21.0",
35-
"gatsby-plugin-manifest": "^4.21.0",
36-
"gatsby-plugin-matomo": "^0.9.0",
31+
"gatsby": "^5.4.1",
32+
"gatsby-plugin-emotion": "^8.4.0",
33+
"gatsby-plugin-gatsby-cloud": "^5.4.0",
34+
"gatsby-plugin-image": "^3.4.0",
35+
"gatsby-plugin-manifest": "^5.4.0",
36+
"gatsby-plugin-matomo": "^0.14.0",
3737
"gatsby-plugin-mdx": "^3.0.0",
38-
"gatsby-plugin-netlify": "^5.0.1",
39-
"gatsby-plugin-react-helmet": "^5.0.0",
38+
"gatsby-plugin-netlify": "^5.1.0",
39+
"gatsby-plugin-react-helmet": "^6.4.0",
4040
"gatsby-plugin-react-helmet-canonical-urls": "^1.4.0",
41-
"gatsby-plugin-react-svg": "^3.1.0",
42-
"gatsby-plugin-robots-txt": "^1.7.1",
43-
"gatsby-plugin-sharp": "^4.21.0",
44-
"gatsby-plugin-sitemap": "^5.21.0",
41+
"gatsby-plugin-react-svg": "^3.3.0",
42+
"gatsby-plugin-robots-txt": "^1.8.0",
43+
"gatsby-plugin-sharp": "^5.4.0",
44+
"gatsby-plugin-sitemap": "^6.4.0",
4545
"gatsby-remark-autolink-headers": "^5.21.0",
4646
"gatsby-remark-copy-linked-files": "^5.21.0",
4747
"gatsby-remark-images": "^6.21.0",
4848
"gatsby-remark-reading-time": "^1.1.0",
49-
"gatsby-source-filesystem": "^4.21.1",
49+
"gatsby-source-filesystem": "^5.4.0",
5050
"gatsby-theme-i18n": "^3.0.0",
5151
"gatsby-theme-i18n-react-intl": "^3.0.0",
52-
"gatsby-transformer-csv": "^4.0.0",
52+
"gatsby-transformer-csv": "^5.4.0",
5353
"gatsby-transformer-gitinfo": "^1.1.0",
54-
"gatsby-transformer-json": "^4.11.0",
55-
"gatsby-transformer-remark": "^5.25.1",
56-
"gatsby-transformer-sharp": "^4.21.0",
54+
"gatsby-transformer-json": "^5.4.0",
55+
"gatsby-transformer-remark": "^6.4.0",
56+
"gatsby-transformer-sharp": "^5.4.0",
5757
"is-relative-url": "^3.0.0",
5858
"lodash": "^4.17.21",
59-
"luxon": "^1.24.1",
59+
"luxon": "^1.28.1",
6060
"netlify-lambda": "^2.0.3",
6161
"polished": "^4.1.4",
6262
"prism-react-renderer": "^1.1.1",
@@ -110,14 +110,14 @@
110110
},
111111
"scripts": {
112112
"build": "gatsby build",
113-
"build:lambda": "netlify-lambda build src/lambda --config=./webpack.lambda.js",
113+
"build:lambda": "NODE_OPTIONS=--openssl-legacy-provider netlify-lambda build src/lambda --config=./webpack.lambda.js",
114114
"build:10gb": "NODE_OPTIONS=--max-old-space-size=10240 gatsby build",
115115
"clean": "gatsby clean",
116116
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
117117
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
118118
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
119119
"markdown-checker": "node src/scripts/markdown-checker.js",
120-
"generate-heading-ids": "ts-node --esm src/scripts/generateHeadingIds.mts",
120+
"generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
121121
"start": "gatsby develop",
122122
"start:lambda": "netlify-lambda serve src/lambda",
123123
"start:static": "gatsby build && gatsby serve",
@@ -132,7 +132,7 @@
132132
}
133133
},
134134
"volta": {
135-
"node": "16.15.0",
135+
"node": "18.13.0",
136136
"npm": "8.5.5",
137137
"yarn": "1.22.18"
138138
}

‎redirects.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,5 +274,13 @@
274274
{
275275
"fromPath": "/*/developers/docs/smart-contracts/upgrading-smart-contracts/",
276276
"toPath": "/:splat/developers/docs/smart-contracts/upgrading/"
277+
},
278+
{
279+
"fromPath": "/staking/withdraws",
280+
"toPath": "/en/staking/withdrawals/"
281+
},
282+
{
283+
"fromPath": "/*/staking/withdraws",
284+
"toPath": "/:splat/staking/withdrawals/"
277285
}
278286
]

‎src/@chakra-ui/gatsby-plugin/foundations/shadows.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const shadows = {
1515
light: "0 1px 1px rgba(0, 0, 0, 0.1)",
1616
dark: "0 1px 1px hsla(0,0%,100%,.1)",
1717
},
18+
tableItemBoxHover: "0 0 1px var(--eth-colors-primary)",
1819
}
1920

2021
export default shadows

‎src/@chakra-ui/gatsby-plugin/semanticTokens.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const semanticTokens = {
4646
error: "red.500",
4747
errorNeutral: { _light: "red.100", _dark: "red.900" },
4848
attention: "yellow.200",
49+
switchBackground: { _light: "gray.300", _dark: "whiteAlpha.400" },
4950
},
5051
}
5152

‎src/assets/dev-tools/alchemyuniversity.png

256 KB
Loading

‎src/assets/dev-tools/chainIDE.png

5.66 KB
Loading

0 commit comments

Comments
 (0)