Merge branch 'dev' into patch-tutorial-typos

Author: corwintines

.all-contributorsrc

@@ -10713,6 +10713,159 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "tudorpintea999",
+      "name": "iwantanode",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87604944?v=4",
+      "profile": "https://github.com/tudorpintea999",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shak58",
+      "name": "shak58",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150069539?v=4",
+      "profile": "https://github.com/shak58",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Muhammad-Altabba",
+      "name": "Muhammad Altabba",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24407834?v=4",
+      "profile": "https://linkedin.com/in/muhammadaltabba",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "darigovresearch",
+      "name": "Darigov Research",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
+      "profile": "https://www.darigovresearch.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "shubhusion",
+      "name": "SHUBHAM SHARMA ",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96301987?v=4",
+      "profile": "https://github.com/shubhusion",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "paulallensuxs",
+      "name": "paulallensuxs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/114240091?v=4",
+      "profile": "https://github.com/paulallensuxs",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "pseudomata",
+      "name": "Pseudomata",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132238190?v=4",
+      "profile": "https://pseudomata.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CodeDragonVN",
+      "name": "CodeDragonVN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150457827?v=4",
+      "profile": "https://github.com/CodeDragonVN",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "SamiAlHassan",
+      "name": "SamiAlHassan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150172180?v=4",
+      "profile": "https://github.com/SamiAlHassan",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "NaijaCoderGirl",
+      "name": "NaijaCoderGirl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150683513?v=4",
+      "profile": "https://github.com/NaijaCoderGirl",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "konstantinzolotarev",
+      "name": "Konstantin Zolotarev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/286431?v=4",
+      "profile": "https://github.com/konstantinzolotarev",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "vuittont60",
+      "name": "vuittont60",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81072379?v=4",
+      "profile": "https://github.com/vuittont60",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "goldnite",
+      "name": "Golden Ite",
+      "avatar_url": "https://avatars.githubusercontent.com/u/114434414?v=4",
+      "profile": "http://goldnite.github.io",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Erlangshen219",
+      "name": "Erlangshen219",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104747507?v=4",
+      "profile": "https://github.com/Erlangshen219",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "AyDeveloper",
+      "name": "AyDeveloper",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72970379?v=4",
+      "profile": "https://oxpampam.netlify.app/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "jeremyfritzen",
+      "name": "jeremyfritzen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26802442?v=4",
+      "profile": "https://github.com/jeremyfritzen",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "fuzheng1998",
+      "name": "Zheng Fu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24203166?v=4",
+      "profile": "https://github.com/fuzheng1998",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -122,7 +122,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/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.
+- 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 [Gatsby 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`.
 
@@ -1675,6 +1675,29 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://p2p.org"><img src="https://avatars.githubusercontent.com/u/3310192?v=4?s=100" width="100px;" alt="Eugene"/><br /><sub><b>Eugene</b></sub></a><br /><a href="#content-rgb2hsl" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.danielgorbe.com"><img src="https://avatars.githubusercontent.com/u/36860942?v=4?s=100" width="100px;" alt="Dániel Görbe"/><br /><sub><b>Dániel Görbe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=g0rbe" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://blog.insubli.me"><img src="https://avatars.githubusercontent.com/u/41712656?v=4?s=100" width="100px;" alt="s-crypt"/><br /><sub><b>s-crypt</b></sub></a><br /><a href="#content-s-crypt" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tudorpintea999"><img src="https://avatars.githubusercontent.com/u/87604944?v=4?s=100" width="100px;" alt="iwantanode"/><br /><sub><b>iwantanode</b></sub></a><br /><a href="#content-tudorpintea999" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shak58"><img src="https://avatars.githubusercontent.com/u/150069539?v=4?s=100" width="100px;" alt="shak58"/><br /><sub><b>shak58</b></sub></a><br /><a href="#content-shak58" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/muhammadaltabba"><img src="https://avatars.githubusercontent.com/u/24407834?v=4?s=100" width="100px;" alt="Muhammad Altabba"/><br /><sub><b>Muhammad Altabba</b></sub></a><br /><a href="#content-Muhammad-Altabba" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhusion"><img src="https://avatars.githubusercontent.com/u/96301987?v=4?s=100" width="100px;" alt="SHUBHAM SHARMA "/><br /><sub><b>SHUBHAM SHARMA </b></sub></a><br /><a href="#ideas-shubhusion" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/paulallensuxs"><img src="https://avatars.githubusercontent.com/u/114240091?v=4?s=100" width="100px;" alt="paulallensuxs"/><br /><sub><b>paulallensuxs</b></sub></a><br /><a href="#content-paulallensuxs" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://pseudomata.com"><img src="https://avatars.githubusercontent.com/u/132238190?v=4?s=100" width="100px;" alt="Pseudomata"/><br /><sub><b>Pseudomata</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pseudomata" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/CodeDragonVN"><img src="https://avatars.githubusercontent.com/u/150457827?v=4?s=100" width="100px;" alt="CodeDragonVN"/><br /><sub><b>CodeDragonVN</b></sub></a><br /><a href="#content-CodeDragonVN" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SamiAlHassan"><img src="https://avatars.githubusercontent.com/u/150172180?v=4?s=100" width="100px;" alt="SamiAlHassan"/><br /><sub><b>SamiAlHassan</b></sub></a><br /><a href="#content-SamiAlHassan" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NaijaCoderGirl"><img src="https://avatars.githubusercontent.com/u/150683513?v=4?s=100" width="100px;" alt="NaijaCoderGirl"/><br /><sub><b>NaijaCoderGirl</b></sub></a><br /><a href="#content-NaijaCoderGirl" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/konstantinzolotarev"><img src="https://avatars.githubusercontent.com/u/286431?v=4?s=100" width="100px;" alt="Konstantin Zolotarev"/><br /><sub><b>Konstantin Zolotarev</b></sub></a><br /><a href="#content-konstantinzolotarev" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vuittont60"><img src="https://avatars.githubusercontent.com/u/81072379?v=4?s=100" width="100px;" alt="vuittont60"/><br /><sub><b>vuittont60</b></sub></a><br /><a href="#content-vuittont60" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://goldnite.github.io"><img src="https://avatars.githubusercontent.com/u/114434414?v=4?s=100" width="100px;" alt="Golden Ite"/><br /><sub><b>Golden Ite</b></sub></a><br /><a href="#content-goldnite" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Erlangshen219"><img src="https://avatars.githubusercontent.com/u/104747507?v=4?s=100" width="100px;" alt="Erlangshen219"/><br /><sub><b>Erlangshen219</b></sub></a><br /><a href="#content-Erlangshen219" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://oxpampam.netlify.app/"><img src="https://avatars.githubusercontent.com/u/72970379?v=4?s=100" width="100px;" alt="AyDeveloper"/><br /><sub><b>AyDeveloper</b></sub></a><br /><a href="#content-AyDeveloper" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jeremyfritzen"><img src="https://avatars.githubusercontent.com/u/26802442?v=4?s=100" width="100px;" alt="jeremyfritzen"/><br /><sub><b>jeremyfritzen</b></sub></a><br /><a href="#content-jeremyfritzen" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fuzheng1998"><img src="https://avatars.githubusercontent.com/u/24203166?v=4?s=100" width="100px;" alt="Zheng Fu"/><br /><sub><b>Zheng Fu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=fuzheng1998" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

i18n/config.json

@@ -295,6 +295,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "ne-np",
+    "crowdinCode": "ne-np",
+    "name": "Nepali",
+    "localName": "नेपाली",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "nl",
     "crowdinCode": "nl",

package.json

@@ -18,7 +18,7 @@
     "@mdx-js/mdx": "^1.6.5",
     "@mdx-js/react": "^1.6.5",
     "algoliasearch": "^4.3.0",
-    "axios": "^0.21.2",
+    "axios": "^1.6.0",
     "browser-lang": "^0.1.0",
     "browserslist": "^4.21.0",
     "clipboard": "^2.0.6",

plugins/gatsby-remark-fix-static-urls/index.js

@@ -19,7 +19,7 @@ const isRelativeUrl = require("is-relative-url")
 module.exports = ({ markdownNode, markdownAST }) => {
   const fileAbsoluteDir = path.dirname(markdownNode.fileAbsolutePath)
   const sourceAbsoluteDir = fileAbsoluteDir.replace(
-    /translations\/\w{2}(-\w{2})?\//,
+    /translations\/\w{2,3}(-\w{2})?\//,
     ""
   )
   const relativePath = path.relative(fileAbsoluteDir, sourceAbsoluteDir)

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

@@ -14,15 +14,53 @@ const baseStyle = defineMergeStyles(defaultBaseStyle, {
   textTransform: "uppercase",
 })
 
-const variantSecondary = defineStyle({
-  borderColor: "primary100",
-  color: "text",
-})
+const COLOR_SCHEME_MAP = {
+  purple: {
+    color: "black300",
+    background: "primary100",
+    borderColor: "primary100",
+  },
+  orange: {
+    color: "text",
+    background: "orange.100",
+    borderColor: "orange.100",
+  },
+  green: {
+    color: "white",
+    background: "green.500",
+    borderColor: "green.500",
+  },
+  blue: {
+    color: "black",
+    background: "blue.300",
+    borderColor: "blue.300",
+  },
+  red: {
+    color: "white",
+    background: "red.500",
+    borderColor: "red.500",
+  },
+  pink: {
+    color: "black",
+    background: "red.100",
+    borderColor: "red.100",
+  },
+  gray: {
+    color: "black",
+    background: "gray.300",
+    borderColor: "gray.300",
+  },
+}
 
-const variantSolid = defineStyle({
-  color: "black300",
-  background: "primary100",
-})
+const variantSecondary = defineStyle(({ colorScheme: c = "orange" }) => ({
+  ...COLOR_SCHEME_MAP[c],
+  background: "transparent",
+}))
+
+const variantSolid = defineStyle(({ colorScheme: c = "purple" }) => ({
+  ...COLOR_SCHEME_MAP[c],
+  borderColor: "transparent",
+}))
 
 export const Badge = defineStyleConfig({
   baseStyle,

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

@@ -92,6 +92,10 @@ const semanticTokens = {
       _dark: "whiteAlpha.400",
     },
     switchBackground: { _light: "gray.300", _dark: "whiteAlpha.400" },
+    hubHeroContentBg: {
+      _light: "rgba(255, 255, 255, 0.80)",
+      _dark: "rgba(34, 34, 34, 0.80)",
+    },
   },
   gradients: {
     bgMainGradient: {

src/@chakra-ui/gatsby-plugin/styles.ts

@@ -1,7 +1,5 @@
-import { mode } from "@chakra-ui/theme-tools"
-
 const styles = {
-  global: (props) => ({
+  global: {
     /**
      * THESE ARE OLD GLOBAL STYLES - carried over from old css files
      *
@@ -12,9 +10,7 @@ const styles = {
      * don't need the global styles anymore
      */
     body: {
-      // TODO: when we have Chakra v2, this should be done by overriding the
-      // native Chakra semantic tokens
-      bg: mode("white", "gray.800")(props),
+      bg: "background.base",
       lineHeight: "base",
       fontSize: "md",
     },
@@ -83,7 +79,7 @@ const styles = {
       lineHeight: "base",
       fontFamily: "monospace",
     },
-  }),
+  },
 }
 
 export default styles