Merge dev

Author: minimalsm

.all-contributorsrc

@@ -8142,6 +8142,42 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "chendatony31",
+      "name": "Tony Chen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2173383?v=4",
+      "profile": "https://tokenpocket.pro",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "metalc",
+      "name": "metalc",
+      "avatar_url": "https://avatars.githubusercontent.com/u/102876192?v=4",
+      "profile": "https://github.com/metalc",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Tuongg2312",
+      "name": "Tuongg2312",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107551539?v=4",
+      "profile": "https://github.com/Tuongg2312",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "ErikSaunier",
+      "name": "Ξrik Saunier",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1122363?v=4",
+      "profile": "https://github.com/ErikSaunier",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1305,6 +1305,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/NachoRoizman"><img src="https://avatars.githubusercontent.com/u/107893772?v=4?s=100" width="100px;" alt=""/><br /><sub><b>NachoRoizman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=NachoRoizman" title="Documentation">📖</a></td>
     <td align="center"><a href="https://linkedin.com/in/miragaya-ivan"><img src="https://avatars.githubusercontent.com/u/72365253?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Iván Miragaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=M-Ivan" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/smejak"><img src="https://avatars.githubusercontent.com/u/20759274?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Smékal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=smejak" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://tokenpocket.pro"><img src="https://avatars.githubusercontent.com/u/2173383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tony Chen</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chendatony31" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/metalc"><img src="https://avatars.githubusercontent.com/u/102876192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>metalc</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=metalc" title="Documentation">📖</a></td>
+  </tr>
+  <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>
   </tr>
 </table>
 

docs/event-tracking.md

@@ -75,14 +75,14 @@ import { trackCustomEvent } from "../utils/matomo"
 The function requires an object of event options. See the example below.
 
 ```javascript
-  const handleEvent = (): void => {
-    trackCustomEvent({
-      eventCategory: `FeedbackWidget toggled`,
-      eventAction: `Clicked`,
-      eventName: `Opened feedback widget`,
-      eventValue: `1`,
-    })
-  }
+const handleEvent = (): void => {
+  trackCustomEvent({
+    eventCategory: `FeedbackWidget toggled`,
+    eventAction: `Clicked`,
+    eventName: `Opened feedback widget`,
+    eventValue: `1`,
+  })
+}
 ```
 
 ## Hidden gem of tracking: Value

gatsby-browser.tsx

@@ -22,6 +22,7 @@ import {
   defaultLanguage,
   isLang,
 } from "./src/utils/languages"
+import { IS_DEV } from "./src/utils/env"
 import { Context } from "./src/types"
 
 // Default languages included:
@@ -42,7 +43,7 @@ export const wrapPageElement: GatsbyBrowser<
 
   // client side redirect on paths that don't have a locale in them. Most useful
   // on dev env where we don't have server redirects
-  if (!isLang(pathLocale)) {
+  if (IS_DEV && !isLang(pathLocale)) {
     let detected =
       window.localStorage.getItem("eth-org-language") ||
       browserLang({

gatsby-config.ts

@@ -230,9 +230,19 @@ const config: GatsbyConfig = {
       },
     },
     // Needed for Gatsby Cloud redirect support
-    `gatsby-plugin-gatsby-cloud`,
+    {
+      resolve: `gatsby-plugin-gatsby-cloud`,
+      options: {
+        generateMatchPathRewrites: false,
+      },
+    },
     // Creates `_redirects` & `_headers` build files for Netlify
-    `gatsby-plugin-netlify`,
+    {
+      resolve: `gatsby-plugin-netlify`,
+      options: {
+        generateMatchPathRewrites: false,
+      },
+    },
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {

gatsby-node.ts

@@ -23,6 +23,12 @@ import redirects from "./redirects.json"
 
 const exec = util.promisify(child_process.exec)
 
+const commonRedirectProps = {
+  isPermanent: true,
+  ignoreCase: true,
+  force: true,
+}
+
 /**
  * Markdown isOutdated check
  * Parse header ids in markdown file (both translated and english) and compare their info structure.
@@ -190,13 +196,11 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
 }) => {
   const { createPage, createRedirect } = actions
 
-  // server side redirects
+  // custom redirects defined in `redirects.json`
   redirects.forEach((redirect) => {
     createRedirect({
+      ...commonRedirectProps,
       ...redirect,
-      isPermanent: true,
-      ignoreCase: true,
-      force: true,
     })
   })
 
@@ -260,6 +264,12 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
     // e.g. English file: "src/content/community/index.md"
     // e.g. corresponding German file: "src/content/translations/de/community/index.md"
     if (language === defaultLanguage) {
+      createRedirect({
+        ...commonRedirectProps,
+        fromPath: slug.slice(3),
+        toPath: slug,
+      })
+
       for (const lang of supportedLanguages) {
         const splitPath = relativePath.split("/")
         splitPath.splice(2, 0, `translations/${lang}`)
@@ -315,6 +325,14 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
   // we can remove this logic and the `/pages-conditional/` directory.
   const outdatedMarkdown = [`eth`, `dapps`, `wallets`, `what-is-ethereum`]
   outdatedMarkdown.forEach((page) => {
+    const originalPath = `/${page}/`
+
+    createRedirect({
+      ...commonRedirectProps,
+      fromPath: originalPath,
+      toPath: `/${defaultLanguage}${originalPath}`,
+    })
+
     supportedLanguages.forEach(async (lang) => {
       const markdownPath = path.resolve(
         `src/content/translations/${lang}/${page}/index.md`
@@ -326,7 +344,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
           page,
           lang
         )
-        const originalPath = `/${page}/`
+
         const slug = `/${lang}${originalPath}`
 
         createPage<Context>({
@@ -356,14 +374,29 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
   page,
   actions,
 }) => {
-  const { createPage, deletePage } = actions
+  const { createPage, deletePage, createRedirect } = actions
 
-  // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
-  // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
-  // getting a 404 since we don't have server side redirects
-  if (IS_DEV && page.path.startsWith(`/${defaultLanguage}`)) {
+  const isDefaultLang = page.path.startsWith(`/${defaultLanguage}`)
+
+  if (isDefaultLang) {
     const path = page.path.slice(3)
-    createPage({ ...page, path })
+
+    if (IS_DEV) {
+      // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
+      // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
+      // getting a 404 since we don't have server side redirects
+      createPage({ ...page, path })
+    }
+
+    if (!IS_DEV && !path.match(/^\/404(\/|.html)$/)) {
+      // on prod, indicate our servers to redirect the root paths to the
+      // `/{defaultLang}/{path}`
+      createRedirect({
+        ...commonRedirectProps,
+        fromPath: path,
+        toPath: page.path,
+      })
+    }
   }
 
   const isTranslated = page.context.locale !== defaultLanguage
@@ -387,6 +420,20 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
   }
 }
 
+export const onPostBootstrap: GatsbyNode["onPostBootstrap"] = ({ actions }) => {
+  const { createRedirect } = actions
+
+  supportedLanguages.forEach((lang) => {
+    createRedirect({
+      ...commonRedirectProps,
+      fromPath: `/${lang}/*`,
+      toPath: `/${lang}/404`,
+      statusCode: 404,
+      force: false,
+    })
+  })
+}
+
 export const createSchemaCustomization: GatsbyNode["createSchemaCustomization"] =
   ({ actions, schema }) => {
     const { createTypes } = actions

package.json

@@ -79,6 +79,7 @@
     "@types/node": "^17.0.23",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
+    "@types/react-instantsearch-dom": "^6.12.3",
     "@types/styled-components": "^5.1.25",
     "@types/styled-system": "^5.1.15",
     "babel-preset-gatsby": "^2.14.0",

redirects.json

@@ -47,94 +47,14 @@
     "fromPath": "/beginners",
     "toPath": "/en/what-is-ethereum/"
   },
-  {
-    "fromPath": "/",
-    "toPath": "/en/"
-  },
-  {
-    "fromPath": "/what-is-ethereum/",
-    "toPath": "/en/what-is-ethereum/"
-  },
-  {
-    "fromPath": "/eth/",
-    "toPath": "/en/eth/"
-  },
-  {
-    "fromPath": "/dapps/",
-    "toPath": "/en/dapps/"
-  },
-  {
-    "fromPath": "/wallets/",
-    "toPath": "/en/wallets/"
-  },
   {
     "fromPath": "/eth2/",
     "toPath": "/en/upgrades/"
   },
-  {
-    "fromPath": "/upgrades/",
-    "toPath": "/en/upgrades/"
-  },
-  {
-    "fromPath": "/staking/",
-    "toPath": "/en/staking/"
-  },
-  {
-    "fromPath": "/learn/",
-    "toPath": "/en/learn/"
-  },
-  {
-    "fromPath": "/community/",
-    "toPath": "/en/community/"
-  },
   {
     "fromPath": "/build/",
     "toPath": "/en/developers/learning-tools/"
   },
-  {
-    "fromPath": "/developers/",
-    "toPath": "/en/developers/"
-  },
-  {
-    "fromPath": "/enterprise/",
-    "toPath": "/en/enterprise/"
-  },
-  {
-    "fromPath": "/whitepaper/",
-    "toPath": "/en/whitepaper/"
-  },
-  {
-    "fromPath": "/foundation/",
-    "toPath": "/en/foundation/"
-  },
-  {
-    "fromPath": "/eips/",
-    "toPath": "/en/eips/"
-  },
-  {
-    "fromPath": "/about/",
-    "toPath": "/en/about/"
-  },
-  {
-    "fromPath": "/privacy-policy/",
-    "toPath": "/en/privacy-policy/"
-  },
-  {
-    "fromPath": "/terms-of-use/",
-    "toPath": "/en/terms-of-use/"
-  },
-  {
-    "fromPath": "/cookie-policy/",
-    "toPath": "/en/cookie-policy/"
-  },
-  {
-    "fromPath": "/languages/",
-    "toPath": "/en/languages/"
-  },
-  {
-    "fromPath": "/enterprise/",
-    "toPath": "/en/enterprise/"
-  },
   {
     "fromPath": "/java/",
     "toPath": "/en/developers/docs/programming-languages/java/"
@@ -167,26 +87,14 @@
     "fromPath": "/dart/",
     "toPath": "/en/developers/docs/programming-languages/dart/"
   },
-  {
-    "fromPath": "/nft/",
-    "toPath": "/en/nft/"
-  },
   {
     "fromPath": "/nfts/",
     "toPath": "/en/nft/"
   },
-  {
-    "fromPath": "/dao/",
-    "toPath": "/en/dao/"
-  },
   {
     "fromPath": "/daos/",
     "toPath": "/en/dao/"
   },
-  {
-    "fromPath": "/defi/",
-    "toPath": "/en/defi/"
-  },
   {
     "fromPath": "/layer2/",
     "toPath": "/en/layer-2/"
@@ -362,5 +270,13 @@
   {
     "fromPath": "/*/contributing/translation-program/content-versions/",
     "toPath": "/:splat/contributing/translation-program/content-buckets/"
+  },
+  {
+    "fromPath": "/*/developers/docs/smart-contracts/source-code-verification/",
+    "toPath": "/:splat/developers/docs/smart-contracts/verifying/"
+  },
+  {
+    "fromPath": "/*/developers/docs/smart-contracts/upgrading-smart-contracts/",
+    "toPath": "/:splat/developers/docs/smart-contracts/upgrading/"
   }
 ]

src/assets/wallets/tokenpocket.png

@@ -26,7 +26,7 @@ interface IPropsWithSVG extends IPropsBase {
 }
 interface IPropsWithImage extends IPropsBase {
   svg?: never
-  image: string
+  image: any
 }
 
 export type IProps = IPropsWithImage | IPropsWithSVG