Merge branch 'dev' into pr/JoeChenJ/15054

Author: corwintines

.all-contributorsrc

@@ -6239,10 +6239,10 @@
       ]
     },
     {
-      "login": "mradziwon",
-      "name": "mradziwon",
+      "login": "maciejrrr",
+      "name": "maciejrrr",
       "avatar_url": "https://avatars.githubusercontent.com/u/6785984?v=4",
-      "profile": "http://www.linkedin.com/in/mradziwon",
+      "profile": "http://www.linkedin.com/in/maciejrrr",
       "contributions": [
         "code",
         "bug"
@@ -12715,6 +12715,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "JJOptimist",
+      "name": "JJOptimist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86833563?v=4",
+      "profile": "https://github.com/JJOptimist",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "microHoffman",
+      "name": "microHoffman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61500778?v=4",
+      "profile": "http://pwn.xyz",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -4,6 +4,11 @@
 # be careful not to expose sensitive data (e.g. your Algolia admin key)
 
 # Algolia environment (app ID, search key and base search index name required for search)
+# You can use the following test keys provided by DocSearch for local development/testing:
+# NEXT_PUBLIC_ALGOLIA_APP_ID=R2IYF7ETH7
+# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=599cec31baffa4868cae4e79f180729b
+# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=docsearch
+# Replace insertValue with your actual keys for production builds.
 # NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
 # NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
 # NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue

.github/CODEOWNERS

@@ -8,5 +8,5 @@
 *       @wackerow @corwintines @pettinarip @minimalsm
 
 # Owners of specific files
-/src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes
+/src/data/consensus-bounty-hunters.json @asanso @fredriksvantes
 /src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

.github/ISSUE_TEMPLATE/suggest_resource.yaml

@@ -0,0 +1,63 @@
+name: Suggest a resource
+description: Suggest a new resource to list on ethereum.org/resources
+title: Suggest a resource
+labels: ["resource 📚"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before suggesting a resource, make sure you've read [our listing policy](https://www.ethereum.org/en/contributing/adding-resources/).
+  - type: markdown
+    attributes:
+      value: Only continue with the issue if your resource meets the criteria listed there.
+  - type: markdown
+    attributes:
+      value: If it does, complete the following information which we need to accurately list the resource.
+  - type: markdown
+    id: resource_info
+    attributes:
+      value: "## Resource info"
+  - type: input
+    id: resource_name
+    attributes:
+      label: Name
+      description: Please provide the official name of the resource
+    validations:
+      required: true
+  - type: input
+    id: resource_url
+    attributes:
+      label: Resource URL
+      description: Please provide a URL to the resource
+    validations:
+      required: true
+  - type: textarea
+    id: resource_description
+    attributes:
+      label: Description
+      description: Please provide a short 1-2 sentence description of the resource
+    validations:
+      required: true
+  - type: textarea
+    id: resource_logo
+    attributes:
+      label: Logo
+      description: |
+        Please provide an SVG or transparent PNG
+        Tip: You can attach images by clicking this area to highlight it and then dragging files in.
+  - type: input
+    id: resource_category
+    attributes:
+      label: Category
+      description: Please specify a best fit to categorize the resource (e.g., DeFi, NFT, Scaling, etc.)
+  - type: checkboxes
+    id: resource_work_on
+    attributes:
+      label: Would you like to work on this issue?
+      options:
+        - label: "Yes"
+          required: false
+        - label: "No"
+          required: false
+    validations:
+      required: true

.gitignore

@@ -60,3 +60,4 @@ src/data/crowdin/bucketsAwaitingReviewReport.csv
 # Storybook
 build-storybook.log
 storybook-static
+

.storybook/manager.ts

@@ -1,6 +1,6 @@
 import { addons } from "@storybook/manager-api"
 
-import favicon from "../public/images/favicon.png"
+import favicon from "../public/images/eth-home-icon.png"
 
 import theme from "./theme"
 

.storybook/preview-head.html

@@ -1,5 +1,6 @@
 import isChromatic from "chromatic/isChromatic"
 import { MotionGlobalConfig } from "framer-motion"
+import { IBM_Plex_Mono, Inter } from "next/font/google"
 import type { Preview } from "@storybook/react"
 
 import ThemeProvider from "@/components/ThemeProvider"
@@ -9,11 +10,24 @@ import nextIntl, { baseLocales } from "./next-intl"
 import { withNextThemes } from "./withNextThemes"
 
 import "../src/styles/global.css"
-import "../src/styles/fonts.css"
 import "../src/styles/docsearch.css"
 
 import "@docsearch/css"
 
+const inter = Inter({
+  subsets: ["latin"],
+  display: "swap",
+  variable: "--font-inter",
+  preload: true,
+})
+
+const ibmPlexMono = IBM_Plex_Mono({
+  subsets: ["latin"],
+  weight: ["400"],
+  display: "swap",
+  variable: "--font-mono",
+})
+
 MotionGlobalConfig.skipAnimations = isChromatic()
 
 export const breakpointSet: [token: string, value: string][] = [
@@ -39,11 +53,13 @@ const preview: Preview = {
       defaultTheme: "light",
     }),
     (Story) => (
-      <ThemeProvider>
-        <TooltipProvider>
-          <Story />
-        </TooltipProvider>
-      </ThemeProvider>
+      <div className={`${inter.variable} ${ibmPlexMono.variable}`}>
+        <ThemeProvider>
+          <TooltipProvider>
+            <Story />
+          </TooltipProvider>
+        </ThemeProvider>
+      </div>
     ),
   ],
   parameters: {

.storybook/preview.tsx

@@ -155,9 +155,9 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 
 > An Onchain Achievement Token (OAT) is a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). It's a proof of your contribution to the ecosystem. [More on OATs](https://medium.com/galxe-news/introducing-galaxy-oat-on-chain-achievement-token-7e89779242b4).
 
-### ethereum.org 2024 Contributor OATs
+### ethereum.org 2025 Contributor OATs
 
-- If you have committed any changes in 2024 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
+- If you have committed any changes in 2025 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
 - There are OATs for GitHub, content, design and translation contributions.
 
   [![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)
@@ -1945,6 +1945,10 @@ 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/jenish-thapa"><img src="https://avatars.githubusercontent.com/u/141203631?v=4?s=100" width="100px;" alt="Jenish Thapa"/><br /><sub><b>Jenish Thapa</b></sub></a><br /><a href="#ideas-jenish-thapa" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://jiangxue.org/~ritsu"><img src="https://avatars.githubusercontent.com/u/57232813?v=4?s=100" width="100px;" alt="iusx"/><br /><sub><b>iusx</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=iusx" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JJOptimist"><img src="https://avatars.githubusercontent.com/u/86833563?v=4?s=100" width="100px;" alt="JJOptimist"/><br /><sub><b>JJOptimist</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AJJOptimist" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://pwn.xyz"><img src="https://avatars.githubusercontent.com/u/61500778?v=4?s=100" width="100px;" alt="microHoffman"/><br /><sub><b>microHoffman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AmicroHoffman" title="Bug reports">🐛</a></td>
+    </tr>
   </tbody>
 </table>
 

README.md

@@ -0,0 +1,133 @@
+import pick from "lodash.pick"
+import { notFound } from "next/navigation"
+import { getMessages, setRequestLocale } from "next-intl/server"
+
+import I18nProvider from "@/components/I18nProvider"
+import mdComponents from "@/components/MdComponents"
+
+import { dataLoader } from "@/lib/utils/data/dataLoader"
+import { dateToString } from "@/lib/utils/date"
+import { getPostSlugs } from "@/lib/utils/md"
+import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
+
+import { LOCALES_CODES } from "@/lib/constants"
+
+import { componentsMapping, layoutMapping } from "@/layouts"
+import { fetchGFIs } from "@/lib/api/fetchGFIs"
+import { getPageData } from "@/lib/md/data"
+import { getMdMetadata } from "@/lib/md/metadata"
+
+const loadData = dataLoader([["gfissues", fetchGFIs]])
+
+function getLayoutFromSlug(slug: string) {
+  if (slug.includes("developers/docs")) {
+    return "docs"
+  }
+
+  if (slug.includes("developers/tutorials")) {
+    return "tutorial"
+  }
+
+  return "static"
+}
+
+export default async function Page({
+  params,
+}: {
+  params: Promise<{ locale: string; slug: string[] }>
+}) {
+  const { locale, slug: slugArray } = await params
+
+  // Check if this specific path is in our valid paths
+  const validPaths = await generateStaticParams()
+  const isValidPath = validPaths.some(
+    (path) =>
+      path.locale === locale && path.slug.join("/") === slugArray.join("/")
+  )
+
+  if (!isValidPath) {
+    notFound()
+  }
+
+  // Enable static rendering
+  setRequestLocale(locale)
+
+  const [gfissues] = await loadData()
+
+  const slug = slugArray.join("/")
+
+  const {
+    content,
+    frontmatter,
+    tocItems,
+    lastEditLocaleTimestamp,
+    isTranslated,
+    contributors,
+    timeToRead,
+  } = await getPageData({
+    locale,
+    slug,
+    // TODO: Address component typing error here (flip `FC` types to prop object types)
+    // @ts-expect-error Incompatible component function signatures
+    components: { ...mdComponents, ...componentsMapping },
+    scope: {
+      gfissues,
+    },
+  })
+
+  // Determine the actual layout after we have the frontmatter
+  const layout = frontmatter.template || getLayoutFromSlug(slug)
+  const Layout = layoutMapping[layout]
+
+  // If the page has a published date, format it
+  if ("published" in frontmatter) {
+    frontmatter.published = dateToString(frontmatter.published)
+  }
+
+  // Get i18n messages
+  const allMessages = await getMessages({ locale })
+  const requiredNamespaces = getRequiredNamespacesForPage(slug, layout)
+  const messages = pick(allMessages, requiredNamespaces)
+
+  return (
+    <I18nProvider locale={locale} messages={messages}>
+      <Layout
+        slug={slug}
+        frontmatter={frontmatter}
+        tocItems={tocItems}
+        lastEditLocaleTimestamp={lastEditLocaleTimestamp}
+        contentNotTranslated={!isTranslated}
+        contributors={contributors}
+        timeToRead={Math.round(timeToRead.minutes)}
+      >
+        {content}
+      </Layout>
+    </I18nProvider>
+  )
+}
+
+export async function generateStaticParams() {
+  const slugs = await getPostSlugs("/")
+
+  return LOCALES_CODES.flatMap((locale) =>
+    slugs.map((slug) => ({
+      slug: slug.split("/").slice(1),
+      locale,
+    }))
+  )
+}
+
+export const dynamicParams = false
+
+export async function generateMetadata({
+  params,
+}: {
+  params: Promise<{ locale: string; slug: string[] }>
+}) {
+  const { locale, slug } = await params
+
+  return await getMdMetadata({
+    locale,
+    slug,
+  })
+}