Merge remote-tracking branch 'origin/dev' into refactor/trilemma-chak…

…ra-updates

.all-contributorsrc

@@ -10422,6 +10422,233 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "z0rats",
+      "name": "Alex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32142853?v=4",
+      "profile": "http://t.me/mevsinternet",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "mteam88",
+      "name": "Matthew",
+      "avatar_url": "https://avatars.githubusercontent.com/u/84196639?v=4",
+      "profile": "https://mteam88.github.io",
+      "contributions": [
+        "bug",
+        "doc"
+      ]
+    },
+    {
+      "login": "avalidurl",
+      "name": "gokhan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11991363?v=4",
+      "profile": "https://github.com/avalidurl",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "0xadri",
+      "name": "Adri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/738533?v=4",
+      "profile": "https://github.com/0xadri",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "DSherryD",
+      "name": "Sherry.Du",
+      "avatar_url": "https://avatars.githubusercontent.com/u/130898085?v=4",
+      "profile": "https://github.com/DSherryD",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "FrancescoXX",
+      "name": "Francesco Ciulla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18360871?v=4",
+      "profile": "http://francescociulla.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "blazingrome",
+      "name": "blazingrome",
+      "avatar_url": "https://avatars.githubusercontent.com/u/136898739?v=4",
+      "profile": "https://github.com/blazingrome",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "etan-status",
+      "name": "Etan Kissling",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89844309?v=4",
+      "profile": "https://github.com/etan-status",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "kritik-sah",
+      "name": "kritik sah",
+      "avatar_url": "https://avatars.githubusercontent.com/u/57076429?v=4",
+      "profile": "https://linktr.ee/kritik",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "Fuliggine",
+      "name": "Fuliggine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56844974?v=4",
+      "profile": "https://github.com/Fuliggine",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Omsify",
+      "name": "Omsify",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87442202?v=4",
+      "profile": "https://github.com/Omsify",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "0xMimir",
+      "name": "0xMimir",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108837858?v=4",
+      "profile": "https://github.com/0xMimir",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "bilaljawed",
+      "name": "Bilal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17548944?v=4",
+      "profile": "https://github.com/bilaljawed",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ilanolkies",
+      "name": "Ilan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36084092?v=4",
+      "profile": "https://ilanolkies.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "umededoteth",
+      "name": "umede",
+      "avatar_url": "https://avatars.githubusercontent.com/u/122288558?v=4",
+      "profile": "https://mirror.xyz/umede.eth",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "taminobaumann",
+      "name": "Tamino",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48290617?v=4",
+      "profile": "http://taminobaumann.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "keccers",
+      "name": "Katherine Champagne",
+      "avatar_url": "https://avatars.githubusercontent.com/u/770277?v=4",
+      "profile": "https://github.com/keccers",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Coderoostr",
+      "name": "Marcos González",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103231131?v=4",
+      "profile": "https://coderoostr.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "natpicone",
+      "name": "Natalino Picone",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4753402?v=4",
+      "profile": "https://chainlabo.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "hammadsaedi",
+      "name": "Hammad Saaedi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/71373419?v=4",
+      "profile": "https://github.com/hammadsaedi",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "srn08",
+      "name": "Shaunak Nagrecha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105499798?v=4",
+      "profile": "https://github.com/srn08",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "schwindtkevin",
+      "name": "Kevin Schwindt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1700789?v=4",
+      "profile": "https://github.com/schwindtkevin",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "robertkodra",
+      "name": "Robert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36516516?v=4",
+      "profile": "https://github.com/robertkodra",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "0xObsidian",
+      "name": "obsidian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/131651958?v=4",
+      "profile": "https://github.com/0xObsidian",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "MohamedFekryyy",
+      "name": "Fekry Aiad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36033065?v=4",
+      "profile": "http://www.scienft.com",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.storybook/i18next.ts

@@ -1,5 +1,6 @@
 import i18n, { Resource } from "i18next"
 import { initReactI18next } from "gatsby-plugin-react-i18next"
+import fs from "fs"
 
 export const baseLocales = {
   en: { title: "English", left: "En" },
@@ -9,7 +10,14 @@ export const baseLocales = {
 }
 
 // Only i18n files named in this array are being exposed to Storybook. Add filenames as necessary.
-const ns = ["common", "page-about", "page-upgrades", "page-developers-index"]
+const ns = [
+  "common",
+  "glossary",
+  "page-about",
+  "page-index",
+  "page-upgrades",
+  "page-developers-index",
+]
 const supportedLngs = Object.keys(baseLocales)
 
 /**
@@ -19,11 +27,22 @@ const supportedLngs = Object.keys(baseLocales)
 const resources: Resource = ns.reduce((acc, n) => {
   supportedLngs.forEach((lng) => {
     if (!acc[lng]) acc[lng] = {}
-    acc[lng] = {
-      translation: {
-        ...acc[lng].translation,
-        ...require(`../src/intl/${lng}/${n}.json`),
-      },
+    try {
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
+
+          ...require(`../src/intl/${lng}/${n}.json`),
+        },
+      }
+    } catch {
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
+
+          ...require(`../src/intl/en/${n}.json`),
+        },
+      }
     }
   })
   return acc

.storybook/preview.ts

@@ -3,6 +3,7 @@ import { action } from "@storybook/addon-actions"
 
 import i18n, { baseLocales } from "./i18next"
 import theme from "../src/@chakra-ui/gatsby-plugin/theme"
+import "../static/fonts/inter-font-face.css"
 
 const chakraBreakpointArray = Object.entries(theme.breakpoints)
 

README.md

@@ -121,7 +121,7 @@ To use an existing function locally you don't need to do anything. Just check th
 
 To create a new function, you will need to create two files:
 
-- One in `src/lambdas` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
+- One in `src/lambda` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
 - One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatbsy docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
 
 Typically, you will develop and test functions in the Gatsby context, by running `yarn start`.
@@ -175,7 +175,12 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 
 - To help with verification we request GitHub contributors connect their GitHub account with their Discord account (Discord > Settings > Connections > GitHub). Crowdin contributors will be verified directly through Crowdin by our team.
 
-- If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
+### GitPOAP
+
+- If you've made at least one contribution and that gets merged into ethereum.org, GitPOAP will also auto recognize it and let you mint a unique contributor POAP.
+  [More on GitPOAP](https://www.gitpoap.io).
+
+If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
 
 <hr style="margin-top: 3em; margin-bottom: 3em;">
 
@@ -1630,6 +1635,37 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://t.me/mevsinternet"><img src="https://avatars.githubusercontent.com/u/32142853?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=z0rats" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Az0rats" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://mteam88.github.io"><img src="https://avatars.githubusercontent.com/u/84196639?v=4?s=100" width="100px;" alt="Matthew"/><br /><sub><b>Matthew</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amteam88" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=mteam88" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/avalidurl"><img src="https://avatars.githubusercontent.com/u/11991363?v=4?s=100" width="100px;" alt="gokhan"/><br /><sub><b>gokhan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aavalidurl" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xadri"><img src="https://avatars.githubusercontent.com/u/738533?v=4?s=100" width="100px;" alt="Adri"/><br /><sub><b>Adri</b></sub></a><br /><a href="#content-0xadri" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DSherryD"><img src="https://avatars.githubusercontent.com/u/130898085?v=4?s=100" width="100px;" alt="Sherry.Du"/><br /><sub><b>Sherry.Du</b></sub></a><br /><a href="#content-DSherryD" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://francescociulla.com"><img src="https://avatars.githubusercontent.com/u/18360871?v=4?s=100" width="100px;" alt="Francesco Ciulla"/><br /><sub><b>Francesco Ciulla</b></sub></a><br /><a href="#content-FrancescoXX" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/blazingrome"><img src="https://avatars.githubusercontent.com/u/136898739?v=4?s=100" width="100px;" alt="blazingrome"/><br /><sub><b>blazingrome</b></sub></a><br /><a href="#content-blazingrome" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/etan-status"><img src="https://avatars.githubusercontent.com/u/89844309?v=4?s=100" width="100px;" alt="Etan Kissling"/><br /><sub><b>Etan Kissling</b></sub></a><br /><a href="#content-etan-status" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://linktr.ee/kritik"><img src="https://avatars.githubusercontent.com/u/57076429?v=4?s=100" width="100px;" alt="kritik sah"/><br /><sub><b>kritik sah</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akritik-sah" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuliggine"><img src="https://avatars.githubusercontent.com/u/56844974?v=4?s=100" width="100px;" alt="Fuliggine"/><br /><sub><b>Fuliggine</b></sub></a><br /><a href="#content-Fuliggine" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Omsify"><img src="https://avatars.githubusercontent.com/u/87442202?v=4?s=100" width="100px;" alt="Omsify"/><br /><sub><b>Omsify</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AOmsify" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xMimir"><img src="https://avatars.githubusercontent.com/u/108837858?v=4?s=100" width="100px;" alt="0xMimir"/><br /><sub><b>0xMimir</b></sub></a><br /><a href="#content-0xMimir" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bilaljawed"><img src="https://avatars.githubusercontent.com/u/17548944?v=4?s=100" width="100px;" alt="Bilal"/><br /><sub><b>Bilal</b></sub></a><br /><a href="#content-bilaljawed" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://ilanolkies.com"><img src="https://avatars.githubusercontent.com/u/36084092?v=4?s=100" width="100px;" alt="Ilan"/><br /><sub><b>Ilan</b></sub></a><br /><a href="#content-ilanolkies" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://taminobaumann.com"><img src="https://avatars.githubusercontent.com/u/48290617?v=4?s=100" width="100px;" alt="Tamino"/><br /><sub><b>Tamino</b></sub></a><br /><a href="#content-taminobaumann" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/keccers"><img src="https://avatars.githubusercontent.com/u/770277?v=4?s=100" width="100px;" alt="Katherine Champagne"/><br /><sub><b>Katherine Champagne</b></sub></a><br /><a href="#content-keccers" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://coderoostr.com"><img src="https://avatars.githubusercontent.com/u/103231131?v=4?s=100" width="100px;" alt="Marcos González"/><br /><sub><b>Marcos González</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Coderoostr" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://chainlabo.com"><img src="https://avatars.githubusercontent.com/u/4753402?v=4?s=100" width="100px;" alt="Natalino Picone"/><br /><sub><b>Natalino Picone</b></sub></a><br /><a href="#content-natpicone" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hammadsaedi"><img src="https://avatars.githubusercontent.com/u/71373419?v=4?s=100" width="100px;" alt="Hammad Saaedi"/><br /><sub><b>Hammad Saaedi</b></sub></a><br /><a href="#content-hammadsaedi" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/srn08"><img src="https://avatars.githubusercontent.com/u/105499798?v=4?s=100" width="100px;" alt="Shaunak Nagrecha"/><br /><sub><b>Shaunak Nagrecha</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asrn08" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/schwindtkevin"><img src="https://avatars.githubusercontent.com/u/1700789?v=4?s=100" width="100px;" alt="Kevin Schwindt"/><br /><sub><b>Kevin Schwindt</b></sub></a><br /><a href="#content-schwindtkevin" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/robertkodra"><img src="https://avatars.githubusercontent.com/u/36516516?v=4?s=100" width="100px;" alt="Robert"/><br /><sub><b>Robert</b></sub></a><br /><a href="#content-robertkodra" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xObsidian"><img src="https://avatars.githubusercontent.com/u/131651958?v=4?s=100" width="100px;" alt="obsidian"/><br /><sub><b>obsidian</b></sub></a><br /><a href="#content-0xObsidian" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.scienft.com"><img src="https://avatars.githubusercontent.com/u/36033065?v=4?s=100" width="100px;" alt="Fekry Aiad"/><br /><sub><b>Fekry Aiad</b></sub></a><br /><a href="#ideas-MohamedFekryyy" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>

docs/best-practices.md

@@ -229,3 +229,11 @@ export const query = graphql`
 `
 // These query results get passed as an object `props.data` to your component
 ```
+
+### Using custom `GatsbyImage`
+
+[GatsbyImage](https://www.gatsbyjs.com/plugins/gatsby-plugin-image/) is the component of choice to handle responsive images processed through graphql. However, we use a custom version of this component that is properly optimized with Chakra. This way we can use style props from Chakra but still be able to forward common or GatsbyImage-specific props to the Gatsby component for correct usage and rendering.
+
+```tsx
+import GatsbyImage from "./components/GatsbyImage"
+```