Merge branch 'dev' into ts

MonsieurDMA · May 19, 2022 · 2c08f7e · 2c08f7e
2 parents b81d89f + d465bc8
commit 2c08f7e
Show file tree

Hide file tree

Showing 464 changed files with 28,174 additions and 4,726 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -7406,6 +7406,98 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "GustavoRSSilva",
+      "name": "Gustavo Silva",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8384988?v=4",
+      "profile": "https://gustavorssilva.github.io/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "AweSamarth",
+      "name": "Samarth Saxena",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72488638?v=4",
+      "profile": "https://github.com/AweSamarth",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "byhow",
+      "name": "Baihao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25713361?v=4",
+      "profile": "https://github.com/byhow",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "stoobie",
+      "name": "Steve Goodman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39279277?v=4",
+      "profile": "https://github.com/stoobie",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "booklearner",
+      "name": "booklearner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103979114?v=4",
+      "profile": "http://booklearner.org",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "moretimeL",
+      "name": "moretimeL",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43361848?v=4",
+      "profile": "https://github.com/moretimeL",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "SuperDelphi",
+      "name": "SuperDelphi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44942598?v=4",
+      "profile": "https://github.com/SuperDelphi",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "chadlohrli",
+      "name": "chadlohrli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9952172?v=4",
+      "profile": "https://github.com/chadlohrli",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "JuliusDegesys",
+      "name": "Julius Degesys",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3232103?v=4",
+      "profile": "https://github.com/JuliusDegesys",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "nhsz",
+      "name": "Nicolás Quiroz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/948922?v=4",
+      "profile": "https://nicolasquiroz.com",
+      "contributions": [
+        "code",
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.env.example b/.env.example
@@ -16,3 +16,6 @@ GATSBY_BUILD_LANGS=
 
 # Folders or files to ignore from the `src/content` folder
 IGNORE_CONTENT=**/docs,**/tutorials
+
+# Used to avoid loading Matomo in our preview deploys
+IS_PREVIEW_DEPLOY=false
diff --git a/README.md b/README.md
@@ -1200,6 +1200,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/b17z"><img src="https://avatars.githubusercontent.com/u/3633484?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bienvenido Rodriguez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=b17z" title="Documentation">📖</a> <a href="#ideas-b17z" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/soranature"><img src="https://avatars.githubusercontent.com/u/105337203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sora Nature</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soranature" title="Documentation">📖</a></td>
     <td align="center"><a href="http://josephschiarizzi.com"><img src="https://avatars.githubusercontent.com/u/9449596?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Schiarizzi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=cupOJoseph" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://gustavorssilva.github.io/"><img src="https://avatars.githubusercontent.com/u/8384988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gustavo Silva</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AGustavoRSSilva" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/AweSamarth"><img src="https://avatars.githubusercontent.com/u/72488638?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samarth Saxena</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AweSamarth" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/byhow"><img src="https://avatars.githubusercontent.com/u/25713361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Baihao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=byhow" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abyhow" title="Bug reports">🐛</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/stoobie"><img src="https://avatars.githubusercontent.com/u/39279277?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Goodman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=stoobie" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://booklearner.org"><img src="https://avatars.githubusercontent.com/u/103979114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>booklearner</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=booklearner" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/moretimeL"><img src="https://avatars.githubusercontent.com/u/43361848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>moretimeL</b></sub></a><br /><a href="#content-moretimeL" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/SuperDelphi"><img src="https://avatars.githubusercontent.com/u/44942598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SuperDelphi</b></sub></a><br /><a href="#content-SuperDelphi" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/chadlohrli"><img src="https://avatars.githubusercontent.com/u/9952172?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chadlohrli</b></sub></a><br /><a href="#content-chadlohrli" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/JuliusDegesys"><img src="https://avatars.githubusercontent.com/u/3232103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julius Degesys</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=JuliusDegesys" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://nicolasquiroz.com"><img src="https://avatars.githubusercontent.com/u/948922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolás Quiroz</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nhsz" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Anhsz" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

diff --git a/gatsby-config.ts b/gatsby-config.ts
@@ -15,6 +15,8 @@ const ignoreContent = (process.env.IGNORE_CONTENT || "")
   .split(",")
   .filter(Boolean)
 
+const isPreviewDeploy = process.env.IS_PREVIEW_DEPLOY === "true"
+
 const ignoreTranslations = ignoreLanguages.map(
   (lang) => `**/translations\/${lang}`
 )
@@ -60,19 +62,6 @@ const config: GatsbyConfig = {
         icon: `src/assets/favicon.png`,
       },
     },
-    // Matomo analtyics
-    {
-      resolve: "gatsby-plugin-matomo",
-      options: {
-        siteId: "4",
-        matomoUrl: "https://matomo.ethereum.org",
-        siteUrl,
-        matomoPhpScript: "matomo.php",
-        matomoJsScript: "matomo.js",
-        trackLoad: false,
-        // dev: true,
-      },
-    },
     // Sitemap generator (ethereum.org/sitemap.xml)
     {
       resolve: `gatsby-plugin-sitemap`,
@@ -247,4 +236,24 @@ const config: GatsbyConfig = {
   },
 }
 
+// Avoid loading Matomo in preview deploys since NODE_ENV is `production` in
+// there and it will send testing data as production otherwise
+if (!isPreviewDeploy) {
+  config.plugins = [
+    ...config.plugins,
+    // Matomo analtyics
+    {
+      resolve: "gatsby-plugin-matomo",
+      options: {
+        siteId: "4",
+        matomoUrl: "https://matomo.ethereum.org",
+        siteUrl,
+        matomoPhpScript: "matomo.php",
+        matomoJsScript: "matomo.js",
+        trackLoad: false,
+      },
+    },
+  ]
+}
+
 export default config
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "3.23.0",
+  "version": "3.25.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -17,7 +17,7 @@
     "axios": "^0.21.2",
     "babel-plugin-styled-components": "^1.10.7",
     "clipboard": "^2.0.6",
-    "cross-fetch": "^3.1.3-alpha.6",
+    "cross-fetch": "^3.1.5",
     "dotenv": "^8.2.0",
     "ethereum-blockies-base64": "^1.0.2",
     "framer-motion": "^4.1.3",

diff --git a/redirects.json b/redirects.json
@@ -199,10 +199,6 @@
     "fromPath": "/grants/",
     "toPath": "/en/community/grants/"
   },
-  {
-    "fromPath": "/*/grants/",
-    "toPath": "/:splat/community/grants"
-  },
   {
     "fromPath": "/no/*",
     "toPath": "/nb/:splat"

diff --git a/src/assets/feedback-glyph.svg b/src/assets/feedback-glyph.svg
diff --git a/src/components/ButtonDropdown.js b/src/components/ButtonDropdown.js
@@ -166,7 +166,9 @@ const ButtonDropdown = ({ list, className }) => {
               </NavLink>
             )}
             {!!callback && (
-              <NakedNavLink onClick={() => callback(idx)}>{text}</NakedNavLink>
+              <NakedNavLink onClick={() => callback(idx)}>
+                <Translation id={text} />
+              </NakedNavLink>
             )}
           </DropdownItem>
         ))}

diff --git a/src/components/ButtonLink.js b/src/components/ButtonLink.js
@@ -91,11 +91,17 @@ const ButtonLink = ({
   isSecondary,
   children,
   className,
+  hideArrow = false,
   ...props
 }) => {
   if (isSecondary) {
     return to ? (
-      <SecondaryLink to={to} hideArrow={true} className={className} {...props}>
+      <SecondaryLink
+        to={to}
+        hideArrow={hideArrow}
+        className={className}
+        {...props}
+      >
         {children}
       </SecondaryLink>
     ) : (
@@ -110,7 +116,7 @@ const ButtonLink = ({
     )
   }
   return to ? (
-    <PrimaryLink to={to} hideArrow={true} className={className} {...props}>
+    <PrimaryLink to={to} hideArrow={hideArrow} className={className} {...props}>
       {children}
     </PrimaryLink>
   ) : (

diff --git a/src/components/CardList.js b/src/components/CardList.js
@@ -36,7 +36,6 @@ const ItemLink = styled(Link)`
   padding: 1rem;
   width: 100%;
   color: #000000;
-  margin-bottom: 1rem;
   &:hover {
     border-radius: 4px;
     box-shadow: 0 0 1px ${(props) => props.theme.colors.primary};

diff --git a/src/components/Codeblock.js b/src/components/Codeblock.js
@@ -9,6 +9,9 @@ const LINES_BEFORE_COLLAPSABLE = 8
 
 const Container = styled.div`
   position: relative;
+  /* Overwrites codeblocks inheriting RTL styling in Farsi/Arabic */
+  /* Context: https://github.com/ethereum/ethereum-org-website/issues/6202 */
+  direction: ltr;
 `
 
 const HightlightContainer = styled.div`