Merge remote-tracking branch 'upstream/dev' into refactor/shadcn-quiz-widget

Author: TylerAPfledderer

.all-contributorsrc

@@ -12488,6 +12488,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "chenjiali-april",
+      "name": "april",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132745538?v=4",
+      "profile": "https://github.com/chenjiali-april",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -35,9 +35,5 @@ BUILD_LOCALES=
 # fixed number of CPUs (e.g. 2) to limit the demand during build time
 LIMIT_CPUS=
 
-# Sentry auth token required for error tracking
-SENTRY_AUTH_TOKEN=
-NEXT_PUBLIC_SENTRY_DSN=
-
 # Enables the bundle analyzer
 ANALYZE=false

.storybook/modes.ts

@@ -1,3 +1,5 @@
+import pickBy from "lodash/pickBy"
+
 import { baseLocales } from "./i18next"
 import { breakpointSet } from "./preview"
 
@@ -12,7 +14,9 @@ export const viewportModes = breakpointSet.reduce<{
   }
 }, {})
 
-export const langModes = Object.keys(baseLocales).reduce<{
+const localesToTest = ["en", "fa"]
+const locales = pickBy(baseLocales, (_, key) => localesToTest.includes(key))
+export const langModes = Object.keys(locales).reduce<{
   [locale: string]: { locale: string }
 }>((arr, curr) => {
   return {

README.md

@@ -119,7 +119,7 @@ git push
 - In your PR description, reference the issue it resolves (see [linking a pull request to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
   - ex. `Updates out of date content [Fixes #1234]`
 - Netlify (our hosting service for build previews) deploys all PRs to a publicly accessible preview URL, e.g.: ![Netlify deploy preview](public/images/preview-deploy.png)
-- _Confirm your Netlify preview deploy looks & functions as expected_
+- _Confirm that your Netlify preview deploy looks and functions as expected_
 - Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/ethereum-org)?
 
 ### 6. Wait for review
@@ -1909,6 +1909,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://v2eth.com/"><img src="https://avatars.githubusercontent.com/u/7024451?v=4?s=100" width="100px;" alt="Mako Shan"/><br /><sub><b>Mako Shan</b></sub></a><br /><a href="#content-makoshan" title="Content">🖋</a></td>
       <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>
     </tr>
   </tbody>
 </table>

instrumentation.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { PHASE_DEVELOPMENT_SERVER } = require("next/constants")
-const { withSentryConfig } = require("@sentry/nextjs")
 
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
@@ -27,7 +26,7 @@ module.exports = (phase, { defaultConfig }) => {
   let nextConfig = {
     ...defaultConfig,
     reactStrictMode: true,
-    webpack: (config, { webpack }) => {
+    webpack: (config) => {
       config.module.rules.push({
         test: /\.ya?ml$/,
         use: "yaml-loader",
@@ -58,30 +57,13 @@ module.exports = (phase, { defaultConfig }) => {
       // Modify the file loader rule to ignore *.svg, since we have it handled now.
       fileLoaderRule.exclude = /\.svg$/i
 
-      // Tree shake Sentry debug code
-      // ref. https://docs.sentry.io/platforms/javascript/guides/nextjs/configuration/tree-shaking/#tree-shaking-with-nextjs
-      config.plugins.push(
-        new webpack.DefinePlugin({
-          __SENTRY_DEBUG__: false,
-          __RRWEB_EXCLUDE_IFRAME__: true,
-          __RRWEB_EXCLUDE_SHADOW_DOM__: true,
-          __SENTRY_EXCLUDE_REPLAY_WORKER__: true,
-        })
-      )
-
       return config
     },
     i18n,
     trailingSlash: true,
     images: {
       deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
     },
-    env: {
-      NEXT_PUBLIC_CONTEXT: process.env.CONTEXT,
-    },
-    experimental: {
-      instrumentationHook: true,
-    },
   }
 
   if (phase !== PHASE_DEVELOPMENT_SERVER) {
@@ -110,15 +92,5 @@ module.exports = (phase, { defaultConfig }) => {
     }
   }
 
-  return withBundleAnalyzer(
-    withSentryConfig(nextConfig, {
-      // TODO: temp config, update this to the correct org & project
-      org: "ethereumorg-ow",
-      project: "javascript-nextjs",
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-      release: `${process.env.BUILD_ID}_${process.env.REVIEW_ID}`,
-      disableLogger: true,
-      silent: true,
-    })
-  )
+  return withBundleAnalyzer(nextConfig)
 }

next.config.js

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "8.10.1",
+  "version": "9.0.0",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -39,23 +39,23 @@
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-compose-refs": "^1.1.0",
     "@radix-ui/react-dialog": "^1.1.1",
+    "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-navigation-menu": "^1.2.0",
     "@radix-ui/react-popover": "^1.1.1",
     "@radix-ui/react-portal": "^1.1.1",
     "@radix-ui/react-progress": "^1.1.0",
     "@radix-ui/react-radio-group": "^1.2.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.2",
     "@radix-ui/react-visually-hidden": "^1.1.0",
-    "@sentry/nextjs": "^8.19.0",
     "@socialgouv/matomo-next": "^1.8.0",
     "chart.js": "^4.4.2",
     "chartjs-plugin-datalabels": "^2.2.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
-    "embla-carousel-react": "^7.0.0",
     "ethereum-blockies-base64": "^1.0.2",
     "framer-motion": "^10.13.0",
     "gray-matter": "^4.0.3",
@@ -64,7 +64,7 @@
     "lodash.merge": "^4.6.2",
     "lodash.shuffle": "^4.2.0",
     "lodash.union": "^4.6.0",
-    "next": "^14.2.3",
+    "next": "^14.2.10",
     "next-i18next": "^14.0.3",
     "next-mdx-remote": "^3.0.8",
     "next-sitemap": "^4.2.3",

package.json

@@ -8,6 +8,8 @@ lang: en
 
 ethereum.org is a public, open-source resource for the Ethereum community that anyone can contribute to. We have a small core team dedicated to maintaining and developing the site with contributions from thousands of community members across the globe.
 
+**Nobody from ethereum.org will ever contact you. Do not respond.**
+
 ## A note on names {#a-note-on-names}
 
 It's common for people to confuse names within the Ethereum landscape, which can lead to poor mental models about how Ethereum works. Here's a quick explainer to clear things up:

public/content/about/index.md

@@ -10,7 +10,7 @@ lang: en
 
 Are you looking for the official Ethereum support? The first thing you should know is that Ethereum is decentralized. This means no central organization, entity, or person owns Ethereum, and because of this, no official support channels exist.
 
-Understanding the decentralized nature of Ethereum is vital because anyone claiming to be official support for Ethereum is probably trying to scam you! The best protection against scammers is educating yourself and taking security seriously.
+Understanding the decentralized nature of Ethereum is vital because **anyone claiming to be official support for Ethereum is probably trying to scam you!** The best protection against scammers is educating yourself and taking security seriously.
 
 <DocLink href="/security/">
   Ethereum security and scam prevention

public/content/community/support/index.md

@@ -1,5 +1,5 @@
 ---
-title: What is a DAO? | Decentralized Autonomous Organizations
+title: Decentralized autonomous organizations (DAOs)
 description: An overview of DAOs on Ethereum
 lang: en
 template: use-cases