Merge branch 'dev' into patch-19

Author: corwintines

.all-contributorsrc

@@ -12353,6 +12353,24 @@
       "contributions": [
         "tool"
       ]
+    },
+    {
+      "login": "JoshDavisLight",
+      "name": "Josh Davis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/82784104?v=4",
+      "profile": "https://github.com/JoshDavisLight",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "tr1sm0s1n",
+      "name": "Mobin Mohanan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47410557?v=4",
+      "profile": "https://github.com/tr1sm0s1n",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.storybook/main.ts

@@ -47,6 +47,9 @@ const config: StorybookConfig = {
     },
   },
   webpackFinal: async (config) => {
+    config.module = config.module || {}
+    config.module.rules = config.module.rules || []
+
     if (config.resolve) {
       config.resolve.plugins = [
         ...(config.resolve.plugins || []),
@@ -55,6 +58,22 @@ const config: StorybookConfig = {
         }),
       ]
     }
+
+    // This modifies the existing image rule to exclude .svg files
+    // since you want to handle those files with @svgr/webpack
+    const imageRule = config.module.rules.find((rule) =>
+      rule?.["test"]?.test(".svg")
+    )
+    if (imageRule) {
+      imageRule["exclude"] = /\.svg$/
+    }
+
+    // Configure .svg files to be loaded with @svgr/webpack
+    config.module.rules.push({
+      test: /\.svg$/,
+      use: ["@svgr/webpack"],
+    })
+
     return config
   },
   typescript: {

README.md

@@ -1888,6 +1888,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/krishchvn"><img src="https://avatars.githubusercontent.com/u/58606754?v=4?s=100" width="100px;" alt="Krishnakumar Chavan"/><br /><sub><b>Krishnakumar Chavan</b></sub></a><br /><a href="#content-krishchvn" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xV4L3NT1N3"><img src="https://avatars.githubusercontent.com/u/33112835?v=4?s=100" width="100px;" alt="0xV4L3NT1N3"/><br /><sub><b>0xV4L3NT1N3</b></sub></a><br /><a href="#tool-0xV4L3NT1N3" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JoshDavisLight"><img src="https://avatars.githubusercontent.com/u/82784104?v=4?s=100" width="100px;" alt="Josh Davis"/><br /><sub><b>Josh Davis</b></sub></a><br /><a href="#content-JoshDavisLight" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tr1sm0s1n"><img src="https://avatars.githubusercontent.com/u/47410557?v=4?s=100" width="100px;" alt="Mobin Mohanan"/><br /><sub><b>Mobin Mohanan</b></sub></a><br /><a href="#content-tr1sm0s1n" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

chromatic.config.json

@@ -1,5 +1,6 @@
 {
   "projectId": "Project:6629cd26b1440f2cc20b94c0",
   "zip": true,
-  "buildScriptName": "build-storybook:chromatic"
+  "buildScriptName": "build-storybook:chromatic",
+  "onlyChanged": true
 }

next.config.js

@@ -27,10 +27,31 @@ module.exports = (phase, { defaultConfig }) => {
         test: /\.ya?ml$/,
         use: "yaml-loader",
       })
-      config.module.rules.push({
-        test: /\.svg$/,
-        use: "@svgr/webpack",
-      })
+
+      // SVG loader
+      // Grab the existing rule that handles SVG imports
+      const fileLoaderRule = config.module.rules.find((rule) =>
+        rule.test?.test?.(".svg")
+      )
+
+      config.module.rules.push(
+        // Reapply the existing rule, but only for svg imports ending in ?url
+        {
+          ...fileLoaderRule,
+          test: /\.svg$/i,
+          resourceQuery: /url/, // *.svg?url
+        },
+        // Convert all other *.svg imports to React components
+        {
+          test: /\.svg$/i,
+          issuer: fileLoaderRule.issuer,
+          resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] }, // exclude if *.svg?url
+          use: ["@svgr/webpack"],
+        }
+      )
+
+      // Modify the file loader rule to ignore *.svg, since we have it handled now.
+      fileLoaderRule.exclude = /\.svg$/i
 
       return config
     },

package.json

@@ -35,9 +35,12 @@
     "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^3.8.0",
     "@radix-ui/react-accordion": "^1.2.0",
+    "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-navigation-menu": "^1.2.0",
     "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-radio-group": "^1.2.0",
     "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-visually-hidden": "^1.1.0",
     "@socialgouv/matomo-next": "^1.8.0",
     "chart.js": "^4.4.2",
     "chartjs-plugin-datalabels": "^2.2.0",
@@ -128,4 +131,4 @@
     "jackspeak": "2.1.1",
     "sharp": "0.32.6"
   }
-}
+}

public/content/community/get-involved/index.md

@@ -15,15 +15,17 @@ Start by reading about the ethereum.org mission and values in our [code of condu
 - Learn about and try Ethereum at [ethereum.org/developers/](/developers/)
 - Attend an [ETHGlobal](http://ethglobal.co/) hackathon near you!
 - Check out [projects related to your area of expertise or programming language of choice](/developers/docs/programming-languages/)
-- Watch or participate in the [Core Dev calls](https://www.youtube.com/@EthereumProtocol)
+- Watch or participate in the [Consensus and Execution Layer calls](https://www.youtube.com/@EthereumProtocol/streams)
 - [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - tooling, documentation, and infrastructure areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
 - [Web3Bridge](https://www.web3bridge.com/) - join the aspiring web3 community in their initiative to identify, train, and support hundreds of developers and community members throughout Africa
+- Join the [Eth R&D Discord](https://discord.com/invite/VmG7Uxc)
 - Join the [Ethereum Cat Herders Discord](https://discord.com/invite/Nz6rtfJ8Cu)
 
 ## Researchers & Academics <Emoji text=":mag:" size={1} />‍ {#researchers-and-academics}
 
 Do you have a background in mathematics, cryptography, or economics? You might be interested in some of the cutting-edge work being done within the Ethereum ecosystem:
 
+- Join the [Eth R&D Discord](https://discord.com/invite/VmG7Uxc)
 - Write or review an Ethereum Improvement Proposal
   - Write an EIP
     1. Submit your idea on [Ethereum Magicians](https://ethereum-magicians.org)

public/content/community/support/index.md

@@ -73,7 +73,6 @@ Here are some popular examples:
 - [ethers.js](https://discord.gg/6jyGVDK6Jx)
 - [web3.js](https://discord.gg/GsABYQu4sC)
 - [Hardhat](https://discord.gg/xtrMGhmbfZ)
-- [Truffle](https://discord.gg/8uKcsccEYE)
 - [Alchemy](http://alchemy.com/discord)
 - [Tenderly](https://discord.gg/fBvDJYR)
 

public/content/contributing/translation-program/translatathon/details/index.md

@@ -71,11 +71,14 @@ All translations will also be subject to a thorough review before being added to
   </ul>
 </ExpandableCard>
 
-<ExpandableCard title="Which languages can I translate into?">
-    You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all language available in Crowdin are in scope for the Translatathon.
-
-    If you want to translate into a language that isn't available in Crowdin, reach out to us and we will add any language per request.
+<ExpandableCard title="Can I compete as part of a team?">
+    <p>No. This year, the Translatathon will only have one main individual track and there will be no team competition.</p>
+    <p>You can still team up with your friends and translate together, however everyone will be competing in the Translatathon as an individual and only the number of your individual translated words will count towards your final score.</p>
+</ExpandableCard>
 
+<ExpandableCard title="Which languages can I translate into?">
+    <p>You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all language available in Crowdin are in scope for the Translatathon.</p>
+    <p>If you want to translate into a language that isn't available in Crowdin, reach out to us and we will add any language per request.</p>
 </ExpandableCard>
 
 <ApplyNow />

public/content/contributing/translation-program/translatathon/index.md

@@ -79,16 +79,17 @@ For more details, [see the full Terms & conditions](/contributing/translation-pr
 
 <StepByStepInstructions />
 
+## Prizes
+
+<TranslatathonPrizes />
+
 ## Stay up to date
 
-<!-- TODO: Uncomment when the hubs page is ready -->
-<!-- <TranslationHubCallout>
+<TranslationHubCallout>
   <h3 style={{margin:0}}>Translataton hubs</h3>
 
-  THis year we bring IRL community hugs to join local communities and help translate.
-
-  this hubs are located all over the world, find out if there is one close to you and join the community
-</TranslationHubCallout> -->
+  This year we bring IRL community hugs to join local communities and help translate. These hubs are located all over the world, find out if there is one close to you and join the community!
+</TranslationHubCallout>
 
 <TranslatathonCalendar />