Merge branch 'dev' into feedback-widget

Author: wackerow

.all-contributorsrc

@@ -10830,6 +10830,69 @@
       "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"
+      ]
+    },
+    {
+      "login": "xiaolou86",
+      "name": "xiaolou86",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20718693?v=4",
+      "profile": "https://github.com/xiaolou86",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "aztecEagle22",
+      "name": "aztecEagle22",
+      "avatar_url": "https://avatars.githubusercontent.com/u/152518936?v=4",
+      "profile": "https://github.com/aztecEagle22",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Messi-Q",
+      "name": "QIAN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21357985?v=4",
+      "profile": "https://github.com/Messi-Q",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/labeler.yml

@@ -1,34 +1,42 @@
 "review needed :eyes:":
   - src/**/*
+  - public/*
 
 "documentation :book:":
   - README.md
 
 "tooling :wrench:":
   - .github/**/*
   - src/scripts/*
-  - netlify.toml
+  - src/lib/*
+  - src/hooks/*
 
 "dependencies :package:":
   - package.json
   - yarn.lock
 
 "internal :house:":
-  - gatsby-browser.js
-  - gatsby-config.js
-  - gatsby-node.js
-  - gatsby-ssr.js
   - .all-contributorsrc
+  - i18n.config.json
+  - next.config.js
+  - next-i18next.config,js
+  - next-sitemap.config.js
+  - tsconfig.json
+  - .nvmrc
+  - .eslintignore
+  - .eslintrc.json
+  - .prettierignore
+  - .prettierrc
+  - netlify.toml
 
 "translation :earth_africa:":
-  - /content/translations/**/*
-  - src/intl/*
-  - src/utils/translations.js
+  - src/content/translations/**/*
+  - src/intl/**/*
+  - src/lib/utils/translations.ts
 
 "content :fountain_pen:":
   - src/pages/*
-  - src/pages-conditional/*
-  - /content/**/*
+  - public/content/**/*
 
 "event :date:":
   - src/data/community-events.json

.gitignore

@@ -41,5 +41,8 @@ feed.xml
 # Sitemaps
 sitemap*.xml
 
+# Robots.txt
+robots.txt
+
 # Local Netlify folder
 .netlify

README.md

@@ -1,6 +1,6 @@
 [![Netlify Status](https://api.netlify.com/api/v1/badges/e8f2e766-888b-4954-8500-1b647d84db99/deploy-status)](https://app.netlify.com/sites/ethereumorg/deploys)
 [![All Contributors](https://img.shields.io/github/all-contributors/ethereum/ethereum-org-website?color=orange&style=flat-square)](#contributors-)
-[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/CetY6Y4)
+[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/ethereum-org)
 [![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://twitter.com/ethdotorg)
 [![Crowdin](https://badges.crowdin.net/ethereum-org/localized.svg)](https://crowdin.com/project/ethereum-org)
 [![gitpoap badge](https://public-api.gitpoap.io/v1/repo/ethereum/ethereum-org-website/badge)](https://www.gitpoap.io/gh/ethereum/ethereum-org-website)
@@ -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`.
 
@@ -136,7 +136,7 @@ In case you want to test them as if you were in a Netlify env, you can install t
 - Gatsby Cloud (our hosting service for build previews) deploys all PRs to a publicly accessible preview URL, e.g.:
   ![Gatsby Cloud deploy preview](./GC-preview-deploy.png)
 - _Confirm your GC preview deploy looks & functions as expected_
-- Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/CetY6Y4)?
+- Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/ethereum-org)?
 
 ### 7. Wait for review
 
@@ -167,7 +167,7 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 - 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)
+  [![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/ethereum-org)
 
 - 👆 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)
 
@@ -1692,6 +1692,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaolou86"><img src="https://avatars.githubusercontent.com/u/20718693?v=4?s=100" width="100px;" alt="xiaolou86"/><br /><sub><b>xiaolou86</b></sub></a><br /><a href="#content-xiaolou86" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aztecEagle22"><img src="https://avatars.githubusercontent.com/u/152518936?v=4?s=100" width="100px;" alt="aztecEagle22"/><br /><sub><b>aztecEagle22</b></sub></a><br /><a href="#content-aztecEagle22" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Messi-Q"><img src="https://avatars.githubusercontent.com/u/21357985?v=4?s=100" width="100px;" alt="QIAN"/><br /><sub><b>QIAN</b></sub></a><br /><a href="#content-Messi-Q" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>
@@ -1705,4 +1714,4 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 
 ### Join our Discord server
 
-We have a space to discuss all things ethereum.org – share your ideas or just say hi over [on Discord](https://discord.gg/CetY6Y4).
+We have a space to discuss all things ethereum.org – share your ideas or just say hi over [on Discord](https://discord.gg/ethereum-org).

next-sitemap.config.js

@@ -0,0 +1,18 @@
+const i18nConfig = require("./i18n.config.json")
+const locales = i18nConfig.map(({ code }) => code)
+
+/** @type {import('next-sitemap').IConfig} */
+module.exports = {
+  siteUrl: process.env.SITE_URL || "https://ethereum.org",
+  generateRobotsTxt: true,
+  transform: async (_, path) => {
+    const rootPath = path.split("/")[1]
+    if (path.endsWith("/404")) return null
+    const isDefaultLocale = !locales.includes(rootPath) || rootPath === "en"
+    return {
+      loc: path,
+      changefreq: isDefaultLocale ? "weekly" : "monthly",
+      priority: isDefaultLocale ? 0.7 : 0.5,
+    }
+  },
+}

next.config.js

@@ -23,10 +23,23 @@ module.exports = (phase, { defaultConfig }) => {
     webpack: (config) => {
       config.module.rules.push({
         test: /\.ya?ml$/,
-        use: 'yaml-loader',
+        use: "yaml-loader",
+      })
+      config.module.rules.push({
+        test: /\.svg$/,
+        use: "@svgr/webpack",
+      })
+      config.module.rules.push({
+        test: /\.mp4$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: '[name].[ext]',
+          },
+        },
       });
-  
-      return config;
+
+      return config
     },
     i18n,
   }

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
+    "postbuild": "next-sitemap",
     "start": "next start",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
@@ -21,22 +22,28 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "clipboard": "^2.0.11",
+    "ethereum-blockies-base64": "^1.0.2",
+    "file-loader": "^6.2.0",
+    "focus-trap-react": "^10.2.3",
     "framer-motion": "^10.13.0",
     "gray-matter": "^4.0.3",
     "htmr": "^1.0.2",
     "i18next": "^23.6.0",
     "lodash.merge": "^4.6.2",
+    "lodash.shuffle": "^4.2.0",
     "luxon": "^3.4.3",
     "next": "^14.0.0",
     "next-i18next": "^14.0.3",
     "next-mdx-remote": "^3.0.8",
+    "next-sitemap": "^4.2.3",
     "prism-react-renderer": "1.1.0",
     "prismjs": "^1.27.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-emoji-render": "^2.0.1",
     "react-i18next": "^13.3.1",
     "react-icons": "^4.10.1",
+    "react-lite-youtube-embed": "^2.4.0",
     "react-select": "^5.7.7",
     "reading-time": "^1.5.0",
     "recharts": "^2.7.3",
@@ -53,6 +60,7 @@
     "@storybook/nextjs": "7.5.3",
     "@storybook/react": "7.5.3",
     "@storybook/testing-library": "0.2.2",
+    "@svgr/webpack": "^8.1.0",
     "@types/hast": "^3.0.0",
     "@types/luxon": "^3.3.2",
     "@types/node": "^20.4.2",
@@ -67,6 +75,7 @@
     "mdast-util-toc": "^7.0.0",
     "minimist": "^1.2.8",
     "polished": "^4.2.2",
+    "raw-loader": "^4.0.2",
     "storybook": "7.5.3",
     "storybook-react-i18next": "^2.0.9",
     "ts-node": "^10.9.1",