Merge branch 'dev' into data-loader

Author: pettinarip

.all-contributorsrc

@@ -12261,7 +12261,8 @@
       "profile": "https://github.com/Shiva-Sai-ssb",
       "contributions": [
         "bug",
-        "maintenance"
+        "maintenance",
+        "content"
       ]
     },
     {
@@ -12497,6 +12498,79 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "r4f4ss",
+      "name": "rafaelss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5679073?v=4",
+      "profile": "https://github.com/r4f4ss",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "preetjdp",
+      "name": "Preet Parekh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27439197?v=4",
+      "profile": "https://preetjdp.dev/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ludamad",
+      "name": "ludamad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/163993?v=4",
+      "profile": "https://www.linkedin.com/in/adamdomurad/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "MaryNfs",
+      "name": "MaryNfs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52598322?v=4",
+      "profile": "https://github.com/MaryNfs",
+      "contributions": [
+        "content",
+        "bug"
+      ]
+    },
+    {
+      "login": "Signor1",
+      "name": "Signor Dev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/94352660?v=4",
+      "profile": "https://signor.vercel.app/",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "KatrixReloaded",
+      "name": "Kartikeya Sureka",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68804269?v=4",
+      "profile": "https://github.com/KatrixReloaded",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Piyush-Tilokani",
+      "name": "Piyush Tilokani",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112542519?v=4",
+      "profile": "https://github.com/Piyush-Tilokani",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "jacobourar",
+      "name": "Jacobo Uribe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109108267?v=4",
+      "profile": "https://github.com/jacobourar",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.json

@@ -65,6 +65,17 @@
         "varsIgnorePattern": "^_$"
       }
     ],
-    "unused-imports/no-unused-imports-ts": "warn"
+    "unused-imports/no-unused-imports-ts": "warn",
+    "no-restricted-imports": [
+      "warn",
+      {
+        "paths": [
+          {
+            "name": "react-i18next",
+            "message": "Please use next-i18next instead of react-i18next."
+          }
+        ]
+      }
+    ]
   }
 }

.storybook/i18next.ts

@@ -1,4 +1,5 @@
 import i18n, { Resource } from "i18next"
+// eslint-disable-next-line no-restricted-imports
 import { initReactI18next } from "react-i18next"
 
 export const baseLocales = {

.storybook/utils.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { getI18n } from "react-i18next"
 
 import { ns as exposedNs } from "./i18next"

CODE_OF_CONDUCT.md

@@ -0,0 +1,71 @@
+# Code of conduct
+
+## Mission
+
+To develop and maintain the most comprehensive and accessible knowledge hub for Ethereum.
+
+## Values
+
+The ethereum.org community strives to be:
+
+- educational, intended to help everyone to understand Ethereum
+- inclusive
+- accessible
+- community-driven
+- focused on Ethereum’s underlying technology and use-cases
+- focused on Ethereum concepts and design principles
+
+## What we are not
+
+- The Ethereum Foundation website
+- A platform for promoting investments or profiteering of any kind
+- A platform for elevating or endorsing individual projects or organizations
+- A DEX, CEX or any other form of financial platform
+- A platform that gives financial or legal advice of any kind
+
+## Code of conduct
+
+### Pledge
+
+Open participation is core to the ethereum.org ethos. We are a website and community maintained by thousands of contributors, and this is only possible if we maintain a welcoming, participatory environment. To this end, contributors to this site pledge to maintain a harassment-free environment for all participants across all ethereum.org platforms and community spaces. The ethereum.org community welcomes and values anyone who wants to participate in a constructive and friendly way, regardless of age, disability, ethnicity, sex characteristics, gender identity, level of experience, area of expertise, education, socio-economic status, nationality, personal appearance, race, religion or any other dimension of diversity.
+
+### Scope
+
+This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma, Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.
+
+### Our standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting and/or empathetically providing constructive criticism
+- Acting calmly and professionally when resolving conflicts or disagreements
+- Showing empathy and tolerance towards other community members
+- Encouraging and amplifying new voices in the community
+
+Examples of unacceptable behavior by participants include:
+
+- Physical violence, threatening physical violence or encouraging of physical violence of any kind
+- Using sexualized language or imagery or imposing unwelcome sexual attention
+- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Harassing other community members in public or private channels
+- Publishing others’ private information, such as a physical or electronic address, without explicit permission
+- Social engineering, scamming or otherwise manipulating other community members
+- Promoting investments, tokens, projects or anything else for personal monetary or non-monetary gain
+- Spamming servers with off-topic content
+- Disregarding requests or warnings from community moderators
+- Engaging in other conduct which could reasonably be considered inappropriate in a professional setting
+
+### Reporting
+
+Violations of the code of conduct will normally be visible to the community as we try to do everything in open, public channels, allowing community members to self-police.
+
+However, if something happens that you feel needs attention, you can raise it with someone who has a moderation role (e.g. discord guide) so that they can help investigate and execute the appropriate response.
+
+When reporting, please include as much detail as possible, including specific examples and timestamps. This will help to ensure a fair outcome.
+
+### Enforcement
+
+Depending on the severity, people who violate the code of conduct can receive warnings, temporary bans or permanent bans from ethereum.org communities.

README.md

@@ -1875,7 +1875,7 @@ 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/abonnaudet-ledger"><img src="https://avatars.githubusercontent.com/u/71646516?v=4?s=100" width="100px;" alt="abonnaudet-ledger"/><br /><sub><b>abonnaudet-ledger</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabonnaudet-ledger" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/JacobSharples"><img src="https://avatars.githubusercontent.com/u/45126111?v=4?s=100" width="100px;" alt="Jacob Sharples"/><br /><sub><b>Jacob Sharples</b></sub></a><br /><a href="#content-JacobSharples" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="#translation-omahs" title="Translation">🌍</a> <a href="#maintenance-omahs" title="Maintenance">🚧</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a> <a href="#content-Shiva-Sai-ssb" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://bsaurabh.xyz/"><img src="https://avatars.githubusercontent.com/u/39492927?v=4?s=100" width="100px;" alt="Saurabh Burade"/><br /><sub><b>Saurabh Burade</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=saurabhburade" title="Code">💻</a></td>
     </tr>
     <tr>
@@ -1910,6 +1910,16 @@ 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/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nipunh"><img src="https://avatars.githubusercontent.com/u/26524611?v=4?s=100" width="100px;" alt="Nipun Hedaoo"/><br /><sub><b>Nipun Hedaoo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nipunh" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/chenjiali-april"><img src="https://avatars.githubusercontent.com/u/132745538?v=4?s=100" width="100px;" alt="april"/><br /><sub><b>april</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chenjiali-april" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/r4f4ss"><img src="https://avatars.githubusercontent.com/u/5679073?v=4?s=100" width="100px;" alt="rafaelss"/><br /><sub><b>rafaelss</b></sub></a><br /><a href="#content-r4f4ss" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://preetjdp.dev/"><img src="https://avatars.githubusercontent.com/u/27439197?v=4?s=100" width="100px;" alt="Preet Parekh"/><br /><sub><b>Preet Parekh</b></sub></a><br /><a href="#content-preetjdp" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adamdomurad/"><img src="https://avatars.githubusercontent.com/u/163993?v=4?s=100" width="100px;" alt="ludamad"/><br /><sub><b>ludamad</b></sub></a><br /><a href="#content-ludamad" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MaryNfs"><img src="https://avatars.githubusercontent.com/u/52598322?v=4?s=100" width="100px;" alt="MaryNfs"/><br /><sub><b>MaryNfs</b></sub></a><br /><a href="#content-MaryNfs" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMaryNfs" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://signor.vercel.app/"><img src="https://avatars.githubusercontent.com/u/94352660?v=4?s=100" width="100px;" alt="Signor Dev"/><br /><sub><b>Signor Dev</b></sub></a><br /><a href="#maintenance-Signor1" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KatrixReloaded"><img src="https://avatars.githubusercontent.com/u/68804269?v=4?s=100" width="100px;" alt="Kartikeya Sureka"/><br /><sub><b>Kartikeya Sureka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=KatrixReloaded" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Piyush-Tilokani"><img src="https://avatars.githubusercontent.com/u/112542519?v=4?s=100" width="100px;" alt="Piyush Tilokani"/><br /><sub><b>Piyush Tilokani</b></sub></a><br /><a href="#content-Piyush-Tilokani" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jacobourar"><img src="https://avatars.githubusercontent.com/u/109108267?v=4?s=100" width="100px;" alt="Jacobo Uribe"/><br /><sub><b>Jacobo Uribe</b></sub></a><br /><a href="#content-jacobourar" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

next-i18next.config.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const path = require("path")
 const i18nConfig = require("./i18n.config.json")
 
 const BUILD_LOCALES = process.env.BUILD_LOCALES
@@ -17,7 +19,8 @@ module.exports = {
     localeDetection: false,
   },
   // define custom location for intl files, otherwise default to public/locales (https://github.com/i18next/next-i18next#2-translation-content)
-  localePath: "./src/intl",
+  // use path.resolve to work with Netlify (https://github.com/i18next/next-i18next/issues/1552#issuecomment-1538452722)
+  localePath: path.resolve("./src/intl"),
   // see updates to your translation JSON files without having to restart your development server each time
   reloadOnPrerender: true,
   // Language codes to lookup, given set language is 'en-US': 'all' --> ['en-US', 'en', 'dev'], 'currentOnly' --> 'en-US', 'languageOnly' --> 'en'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -92,7 +92,7 @@
   "devDependencies": {
     "@chakra-ui/cli": "^2.4.1",
     "@chromatic-com/storybook": "1.5.0",
-    "@netlify/plugin-nextjs": "^5.5.1",
+    "@netlify/plugin-nextjs": "^5.8.0",
     "@storybook/addon-essentials": "8.1.10",
     "@storybook/addon-interactions": "8.1.10",
     "@storybook/addon-links": "8.1.10",

public/_redirects

@@ -173,3 +173,5 @@
 /*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
 
 /*/deprecated-software /:splat/dapps/ 301!
+
+/*/enterprise/private-ethereum/ /:splat/enterprise/ 301!

public/content/community/online/index.md

@@ -8,6 +8,31 @@ lang: en
 
 Hundreds of thousands of Ethereum enthusiasts gather in these online forums to share news, talk about recent developments, debate technical issues, and imagine the future.
 
+## Listing Policy {#listing-policy}
+
+To maintain the integrity and value of the listed communities, ethereum.org follows a strict policy for determining eligibility:
+
+### Eligibility Criteria {#eligibility-criteria}
+
+- **Relevance**: The community must be directly related to Ethereum and its ecosystem.
+- **Activity Level**: The community should be active, with regular interactions, posts, or discussions. Dormant or inactive communities may be removed.
+- **Inclusivity**: The community should foster a welcoming environment that respects diversity and encourages participation from people of all backgrounds.
+- **Non-commercial Focus**: Listings are intended for community-driven spaces rather than commercial or promotional platforms.
+
+### Content Guidelines {#content-guidelines}
+
+- **Appropriate Content**: Communities must have their own moderation guidelines, avoiding spam, hate speech, harassment, or any content that promotes illegal activities.
+- **Language**: While English is the primary language, communities in other languages are encouraged to submit as long as they maintain an inclusive and respectful atmosphere.
+- **Transparency**: Clear information about the community’s purpose, rules, and moderators should be available to members.
+
+### Other Recommendations {#other-recommendations}
+
+- **Accessibility**: Community forums should be accessible for everyone to read without requiring a sign-up or registration.
+- **Discord Server Invites**: It is recommended that only reliable Discord server invites be added to ethereum.org. Ideally, these invites should link to a community page on the website (e.g., [ethglobal.com/discord](https://ethglobal.com/discord)) or be from an official URL (e.g., [discord.gg/ethstaker](https://discord.gg/ethstaker) or [discord.com/invite/ethstaker](https://discord.com/invite/ethstaker)).
+
+If you believe a community should be added or removed based on these guidelines, please [open an issue on our GitHub repository](https://github.com/ethereum/ethereum-org-website/issues).
+
+
 ## Forums {#forums}
 
 <SocialListItem socialIcon="reddit"><Link href="https://www.reddit.com/r/ethereum">r/ethereum</Link> - all things Ethereum</SocialListItem>