Merge branch 'dev' into gatsby-v5

Author: pettinarip

.all-contributorsrc

@@ -9855,6 +9855,151 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "qiuhaohao",
+      "name": "qiuhaohao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22148367?v=4",
+      "profile": "https://github.com/qiuhaohao",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "debeldami",
+      "name": "damilola debel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44111962?v=4",
+      "profile": "https://github.com/debeldami",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "SaratAngajalaoffl",
+      "name": "Sarat Angajala",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60383339?v=4",
+      "profile": "https://github.com/SaratAngajalaoffl",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "questions",
+      "name": "questions",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3233328?v=4",
+      "profile": "https://github.com/Questions",
+      "contributions": [
+        "projectManagement",
+        "question"
+      ]
+    },
+    {
+      "login": "machin3boy",
+      "name": "machin3boy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/78896694?v=4",
+      "profile": "https://github.com/machin3boy",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "nsexer",
+      "name": "nethan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30265113?v=4",
+      "profile": "https://github.com/nsexer",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "MrJithil",
+      "name": "Jithil P Ponnan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26359740?v=4",
+      "profile": "https://www.linkedin.com/in/jithil",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "chocolatesuit",
+      "name": "chocolatesuit",
+      "avatar_url": "https://avatars.githubusercontent.com/u/120116662?v=4",
+      "profile": "https://github.com/chocolatesuit",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "apinanyogaratnam",
+      "name": "Apinan Yogaratnam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72412733?v=4",
+      "profile": "http://apinanyogaratnam.github.io/my-personal-website-v2.0/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "trevorsc19",
+      "name": "trevorsc19",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30576577?v=4",
+      "profile": "http://trevorscanlon.eth.xyz",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "thouravi",
+      "name": "ImThour",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15676184?v=4",
+      "profile": "https://github.com/thouravi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nvitorovic",
+      "name": "Nenad Vitorović",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3808837?v=4",
+      "profile": "https://github.com/nvitorovic",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "danierod",
+      "name": "danierod",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12255235?v=4",
+      "profile": "https://github.com/danierod",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "siddtheone",
+      "name": "siddtheone",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45398971?v=4",
+      "profile": "https://github.com/siddtheone",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ShawkiS",
+      "name": "Shawki Sukkar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/57439827?v=4",
+      "profile": "http://shawkisukkar.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "therealharpaljadeja",
+      "name": "Harpal Jadeja",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38040789?v=4",
+      "profile": "https://github.com/therealharpaljadeja",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -51,45 +51,45 @@ If you're ready to contribute and create your PR, it will help to set up a local
 If this is your first time forking our repo, this is all you need to do for this step:
 
 ```sh
-$ git clone git@github.com:[your_github_handle]/ethereum-org-website.git && cd ethereum-org-website
+git clone git@github.com:[your_github_handle]/ethereum-org-website.git && cd ethereum-org-website
 ```
 
 If you've already forked the repo, you'll want to ensure your fork is configured and that it's up to date. This will save you the headache of potential merge conflicts.
 
 To [configure your fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork):
 
 ```sh
-$ git remote add upstream https://github.com/ethereum/ethereum-org-website.git
+git remote add upstream https://github.com/ethereum/ethereum-org-website.git
 ```
 
 To [sync your fork with the latest changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork):
 
 ```sh
-$ git checkout dev
-$ git fetch upstream
-$ git merge upstream/dev
+git checkout dev
+git fetch upstream
+git merge upstream/dev
 ```
 
 3. Install dependencies
 
 We recommend using a node manager to use multiple node versions in your system. We use [Volta](https://volta.sh/). In case you don't use a manager or you use `nvm`, you can check the currently supported versions under the `"volta"` section on our `package.json` file.
 
 ```sh
-$ yarn
+yarn
 ```
 
 ### 4. Make awesome changes!
 
 1. Create new branch for your changes
 
 ```sh
-$ git checkout -b new_branch_name
+git checkout -b new_branch_name
 ```
 
 2. Start developing!
 
 ```sh
-$ yarn start
+yarn start
 ```
 
 - Open this directory in your favorite text editor / IDE, and see your changes live by visiting `localhost:8000` from your browser
@@ -102,13 +102,13 @@ By default the script will build all the languages (complete list in `data/trans
 3. Commit and prepare for pull request (PR). In your PR commit message, reference the issue it resolves (see [how to link a commit message to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)).
 
 ```sh
-$ git commit -m "brief description of changes [Fixes #1234]"
+git commit -m "brief description of changes [Fixes #1234]"
 ```
 
 4. Push to your GitHub account
 
 ```sh
-$ git push
+git push
 ```
 
 ### 5. Local development with lambda functions
@@ -1546,6 +1546,26 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://dribbble.com/Liz-B"><img src="https://avatars.githubusercontent.com/u/40176275?v=4?s=100" width="100px;" alt="Elizabeth Bassey"/><br /><sub><b>Elizabeth Bassey</b></sub></a><br /><a href="#content-Dev-Liz" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mihaic01"><img src="https://avatars.githubusercontent.com/u/108999659?v=4?s=100" width="100px;" alt="mihaic01"/><br /><sub><b>mihaic01</b></sub></a><br /><a href="#content-mihaic01" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/qiuhaohao"><img src="https://avatars.githubusercontent.com/u/22148367?v=4?s=100" width="100px;" alt="qiuhaohao"/><br /><sub><b>qiuhaohao</b></sub></a><br /><a href="#content-qiuhaohao" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/debeldami"><img src="https://avatars.githubusercontent.com/u/44111962?v=4?s=100" width="100px;" alt="damilola debel"/><br /><sub><b>damilola debel</b></sub></a><br /><a href="#content-debeldami" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SaratAngajalaoffl"><img src="https://avatars.githubusercontent.com/u/60383339?v=4?s=100" width="100px;" alt="Sarat Angajala"/><br /><sub><b>Sarat Angajala</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=SaratAngajalaoffl" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Questions"><img src="https://avatars.githubusercontent.com/u/3233328?v=4?s=100" width="100px;" alt="questions"/><br /><sub><b>questions</b></sub></a><br /><a href="#projectManagement-questions" title="Project Management">📆</a> <a href="#question-questions" title="Answering Questions">💬</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/machin3boy"><img src="https://avatars.githubusercontent.com/u/78896694?v=4?s=100" width="100px;" alt="machin3boy"/><br /><sub><b>machin3boy</b></sub></a><br /><a href="#content-machin3boy" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <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>
+      <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>
+      <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>
+      <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>
+      <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/thouravi"><img src="https://avatars.githubusercontent.com/u/15676184?v=4?s=100" width="100px;" alt="ImThour"/><br /><sub><b>ImThour</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=thouravi" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nvitorovic"><img src="https://avatars.githubusercontent.com/u/3808837?v=4?s=100" width="100px;" alt="Nenad Vitorović"/><br /><sub><b>Nenad Vitorović</b></sub></a><br /><a href="#content-nvitorovic" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <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>
+      <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>
+      <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>
+      <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>
     </tr>
   </tbody>
 </table>

docs/typescript.md

@@ -1,6 +1,6 @@
 # Typescript
 
-Our codebase is rapidly increasing in size and in contributors. This brings challenges to reliably keep the code organized, avoid code duplication, and review code. To help alleviate these challenges, we’re in the process of to TypeScript across our codebase. We believe having a strongly typed language will reduce bugs, improve code quality, increase productivity and allow us to scale (both our codebase and our developer community) better in the long term.
+Our codebase is rapidly increasing in size and in contributors. This brings challenges to reliably keep the code organized, avoid code duplication, and review code. To help alleviate these challenges, we’re in the process of migrating to TypeScript across our codebase. We believe having a strongly typed language will reduce bugs, improve code quality, increase productivity and allow us to scale (both our codebase and our developer community) better in the long term.
 
 ## General considerations
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.15.0",
+  "version": "6.16.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -56,15 +56,15 @@
     "gatsby-transformer-sharp": "^5.4.0",
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.21",
-    "luxon": "^1.24.1",
+    "luxon": "^1.28.1",
     "netlify-lambda": "^2.0.3",
     "polished": "^4.1.4",
     "prism-react-renderer": "^1.1.1",
     "prismjs": "^1.27.0",
     "react": "^18.0.0",
     "react-countdown": "^2.3.2",
     "react-dom": "^18.0.0",
-    "react-emoji-render": "^1.2.4",
+    "react-emoji-render": "^2.0.1",
     "react-helmet": "^6.1.0",
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",

redirects.json

@@ -251,10 +251,6 @@
     "fromPath": "/*/about/web-developer",
     "toPath": "/:splat/about/#open-jobs"
   },
-  {
-    "fromPath": "/*/about/community-lead",
-    "toPath": "/:splat/about/#open-jobs"
-  },
   {
     "fromPath": "/*/about/product-designer",
     "toPath": "/:splat/about/#open-jobs"

src/@chakra-ui/gatsby-plugin/components/Badge.ts

@@ -0,0 +1,39 @@
+import { ComponentStyleConfig, SystemStyleObject } from "@chakra-ui/react"
+
+const variantSecondary: SystemStyleObject = {
+  borderColor: "primary100",
+  color: "text",
+}
+
+const variantSolid: SystemStyleObject = {
+  color: "black300",
+  background: "primary100",
+}
+
+export const Badge: ComponentStyleConfig = {
+  baseStyle: {
+    borderRadius: "base",
+    border: "1px solid",
+    borderColor: "transparent",
+    fontWeight: "initial",
+    py: 1,
+    px: 2,
+    textTransform: "uppercase",
+  },
+  variants: {
+    solid: variantSolid,
+    secondary: variantSecondary,
+  },
+  sizes: {
+    sm: {
+      py: 0,
+    },
+    lg: {
+      px: 3,
+    },
+  },
+  defaultProps: {
+    // Remove the default from Chakra
+    variant: "solid",
+  },
+}

src/@chakra-ui/gatsby-plugin/components/index.ts

@@ -1,3 +1,4 @@
+import { Badge } from "./Badge"
 import { Button } from "./Button"
 import { Link } from "./Link"
 import { Tag } from "./Tag"
@@ -6,6 +7,7 @@ import { Checkbox } from "./Checkbox"
 import { Tabs } from "./Tabs"
 
 export default {
+  Badge,
   Button,
   Link,
   Tag,

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

@@ -15,6 +15,7 @@ const shadows = {
     light: "0 1px 1px rgba(0, 0, 0, 0.1)",
     dark: "0 1px 1px hsla(0,0%,100%,.1)",
   },
+  tableItemBoxHover: "0 0 1px var(--eth-colors-primary)",
 }
 
 export default shadows