Merge branch 'dev' into markdownCheckr

Author: wackerow

.all-contributorsrc

@@ -8178,6 +8178,202 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "vorot93",
+      "name": "Artem Vorotnikov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/240364?v=4",
+      "profile": "https://github.com/vorot93",
+      "contributions": [
+        "content",
+        "projectManagement",
+        "question"
+      ]
+    },
+    {
+      "login": "liam0215",
+      "name": "Liam Arzola",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8989334?v=4",
+      "profile": "https://github.com/liam0215",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "srt180",
+      "name": "shao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30768686?v=4",
+      "profile": "https://github.com/srt180",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
+    },
+    {
+      "login": "HiroyukiNaito",
+      "name": "Hiroyuki Naito",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32320988?v=4",
+      "profile": "https://crowdin.com/profile/hiroyukinaito",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AlehNat",
+      "name": "AlehN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3587775?v=4",
+      "profile": "https://github.com/AlehNat",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "varunshenoy",
+      "name": "Varun Shenoy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10859091?v=4",
+      "profile": "http://varunshenoy.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "alebaffa",
+      "name": "Alessandro Baffa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/465513?v=4",
+      "profile": "https://alebaffa.eth.link",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "johngrantuk",
+      "name": "John Grant",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4797222?v=4",
+      "profile": "https://medium.com/@johngrant",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gorondan",
+      "name": "gorondan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97026899?v=4",
+      "profile": "https://github.com/gorondan",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "pruthvirajjadhav1",
+      "name": "Pruthviraj Jadhav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73253354?v=4",
+      "profile": "https://github.com/pruthvirajjadhav1",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gndx",
+      "name": "Oscar Barajas Tavares",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10554486?v=4",
+      "profile": "https://gndx.io",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "LucidSamuel",
+      "name": "Samuel Akinosho",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39565075?v=4",
+      "profile": "http://www.samuelakinosho.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "OdairTrujillo",
+      "name": "Odair Augusto Trujillo Orozco",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45074733?v=4",
+      "profile": "https://odair.dev",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
+    },
+    {
+      "login": "Unforkable",
+      "name": "Unforkable",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86481149?v=4",
+      "profile": "https://github.com/Unforkable",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Rodrigolvc",
+      "name": "Rodrigo vasquez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108540208?v=4",
+      "profile": "https://github.com/Rodrigolvc",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
+    },
+    {
+      "login": "michaelmccallam",
+      "name": "Michael McCallam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3510607?v=4",
+      "profile": "https://github.com/michaelmccallam",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "PolinaShanti",
+      "name": "Polina G.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/110098268?v=4",
+      "profile": "https://nownodes.io/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Cerebro92",
+      "name": "Neeraj Gahlot",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13215478?v=4",
+      "profile": "https://github.com/Cerebro92",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "vrinek",
+      "name": "Kostas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81346?v=4",
+      "profile": "https://github.com/vrinek",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "rogueassasin1729",
+      "name": "rogueassasin1729",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92800000?v=4",
+      "profile": "https://github.com/rogueassasin1729",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Pandapip1",
+      "name": "Pandapip1",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45835846?v=4",
+      "profile": "https://pandapip1.com/",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintignore

@@ -0,0 +1,2 @@
+# The content is used as a code example in /src/pages/index.js
+src/data/CreateWallet.js

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
-*       @samajammin @wackerow @corwintines @pettinarip @minimalsm
+*       @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186
 
 # Owners of specific files
 /src/data/consensus-bounty-hunters.csv @djrtwo @JustinDrake @asanso @fredriksvantes

README.md

@@ -158,14 +158,14 @@ In case you want to test them as if you were in a Netlify env, you can install t
 
 > The Proof of Attendance Protocol is a dapp that distributes badges in the form of ERC-721 tokens to prove you participated in an event. [More on POAPs](https://www.poap.xyz/).
 
-### ethereum.org 2021 Contributor POAP
+### ethereum.org 2022 Contributor POAP
 
-- If you have committed any changes in 2021 so far that were merged into our repo, you have a POAP waiting!
+- If you have committed any changes in 2022 so far that were merged into our repo, you have a POAP waiting!
 - This includes our dedicated translators on Crowdin
 
   [![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/CetY6Y4)
 
-- 👆 To claim your Contributor POAP, join our Discord server and paste a link to your contribution in the #poaps-🏆 channel
+- 👆 To claim your Contributor POAP, join our Discord server and paste a link to your contribution in the `#🥇 | poaps` [channel](https://discord.com/channels/714888181740339261/804005643211898911)
 
 - A member of our team will verify the request and DM you with a personalized link to claim your own freshly minted POAP collectible!
 
@@ -1311,6 +1311,33 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/Tuongg2312"><img src="https://avatars.githubusercontent.com/u/107551539?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tuongg2312</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Tuongg2312" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/ErikSaunier"><img src="https://avatars.githubusercontent.com/u/1122363?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ξrik Saunier</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ErikSaunier" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/vorot93"><img src="https://avatars.githubusercontent.com/u/240364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Artem Vorotnikov</b></sub></a><br /><a href="#content-vorot93" title="Content">🖋</a> <a href="#projectManagement-vorot93" title="Project Management">📆</a> <a href="#question-vorot93" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/liam0215"><img src="https://avatars.githubusercontent.com/u/8989334?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Liam Arzola</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aliam0215" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/srt180"><img src="https://avatars.githubusercontent.com/u/30768686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srt180" title="Documentation">📖</a> <a href="#translation-srt180" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/AlehNat"><img src="https://avatars.githubusercontent.com/u/3587775?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AlehN</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AlehNat" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://varunshenoy.com"><img src="https://avatars.githubusercontent.com/u/10859091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Varun Shenoy</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Avarunshenoy" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://alebaffa.eth.link"><img src="https://avatars.githubusercontent.com/u/465513?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alessandro Baffa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alebaffa" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aalebaffa" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://medium.com/@johngrant"><img src="https://avatars.githubusercontent.com/u/4797222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Grant</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=johngrantuk" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gorondan"><img src="https://avatars.githubusercontent.com/u/97026899?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gorondan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gorondan" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/pruthvirajjadhav1"><img src="https://avatars.githubusercontent.com/u/73253354?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pruthviraj Jadhav</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pruthvirajjadhav1" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://gndx.io"><img src="https://avatars.githubusercontent.com/u/10554486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oscar Barajas Tavares</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gndx" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://www.samuelakinosho.com"><img src="https://avatars.githubusercontent.com/u/39565075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samuel Akinosho</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LucidSamuel" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://odair.dev"><img src="https://avatars.githubusercontent.com/u/45074733?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Odair Augusto Trujillo Orozco</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=OdairTrujillo" title="Documentation">📖</a> <a href="#ideas-OdairTrujillo" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Unforkable"><img src="https://avatars.githubusercontent.com/u/86481149?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Unforkable</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Unforkable" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Rodrigolvc"><img src="https://avatars.githubusercontent.com/u/108540208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo vasquez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Rodrigolvc" title="Documentation">📖</a> <a href="#ideas-Rodrigolvc" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/michaelmccallam"><img src="https://avatars.githubusercontent.com/u/3510607?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael McCallam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=michaelmccallam" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://nownodes.io/"><img src="https://avatars.githubusercontent.com/u/110098268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Polina G.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=PolinaShanti" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Cerebro92"><img src="https://avatars.githubusercontent.com/u/13215478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neeraj Gahlot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cerebro92" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ACerebro92" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/vrinek"><img src="https://avatars.githubusercontent.com/u/81346?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kostas</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vrinek" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/rogueassasin1729"><img src="https://avatars.githubusercontent.com/u/92800000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rogueassasin1729</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=rogueassasin1729" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://pandapip1.com/"><img src="https://avatars.githubusercontent.com/u/45835846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pandapip1</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Pandapip1" title="Documentation">📖</a></td>
   </tr>
 </table>
 

docs/typescript.md

@@ -97,3 +97,6 @@ With the release of Gatsby v4.15.0, [the config option `graphqlTypegen` has been
 - [Official Typescript website](https://www.typescriptlang.org/)
 - [GraphQL Typegen](https://www.gatsbyjs.com/docs/how-to/local-development/graphql-typegen/)
 - [Typescript Challenges](https://github.com/type-challenges/type-challenges)
+- [React TS Cheatsheet](https://react-typescript-cheatsheet.netlify.app/)
+- [Typescript Deep Dive](https://basarat.gitbook.io/typescript/)
+- [Typescript errors](https://typescript.tv/errors/)

gatsby-config.ts

@@ -255,7 +255,7 @@ const config: GatsbyConfig = {
 if (!IS_PREVIEW) {
   config.plugins = [
     ...(config.plugins || []),
-    // Matomo analtyics
+    // Matomo analytics
     {
       resolve: "gatsby-plugin-matomo",
       options: {

i18n/config.json

@@ -183,6 +183,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "kk",
+    "hrefLang": "kk",
+    "name": "Kazakh",
+    "localName": "қазақ",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "ko",
     "hrefLang": "ko",
@@ -239,6 +247,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "ph",
+    "hrefLang": "ph",
+    "name": "Filipino",
+    "localName": "Filipino",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "pl",
     "hrefLang": "pl",

overrides.d.ts

@@ -12,3 +12,8 @@ declare module "*.mp4" {
   const src: string
   export default src
 }
+
+declare module "!!raw-loader!*" {
+  const content: string
+  export default content
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "4.8.0",
+  "version": "4.10.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -74,6 +74,7 @@
   "devDependencies": {
     "@netlify/functions": "^1.0.0",
     "@types/browser-lang": "^0.1.0",
+    "@types/github-slugger": "^1.3.0",
     "@types/luxon": "^2.3.2",
     "@types/mdx-js__react": "^1.5.5",
     "@types/node": "^17.0.23",
@@ -91,6 +92,7 @@
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0",
     "react-test-renderer": "^17.0.1",
+    "ts-node": "^10.9.1",
     "typescript": "^4.6.3"
   },
   "scripts": {
@@ -101,8 +103,8 @@
     "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
     "crowdin-import": "ts-node src/scripts/crowdin-import.ts",
     "format": "prettier --write \"**/*.{js,jsx,json,md}\"",
-    "generate-heading-ids": "node src/scripts/generate-heading-ids.js",
     "markdown-checker": "node src/scripts/markdown-checker.js",
+    "generate-heading-ids": "ts-node --esm src/scripts/generateHeadingIds.mts",
     "start": "gatsby develop",
     "start:lambda": "netlify-lambda serve src/lambda",
     "start:static": "gatsby build && gatsby serve",