Merge branch 'dev' into docsearch-index-update

Author: wackerow

.github/CODEOWNERS

@@ -8,4 +8,4 @@
 *       @samajammin @wackerow @corwintines @pettinarip @minimalsm @jmcook1186 @nhsz
 
 # Owners of specific files
-/src/data/consensus-bounty-hunters.csv @djrtwo @JustinDrake @asanso @fredriksvantes
+/src/data/consensus-bounty-hunters.csv @djrtwo @asanso @fredriksvantes

docs/deploy-and-review-process.md

@@ -4,7 +4,7 @@ This documentation outlines our current processes for how we deploy the latest c
 
 ## Deploy process
 
-Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Monday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
+Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Tuesday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
 
 Occasionally, we’ll also do a patch deploy to fix an urgent or widespread issue.
 

gatsby-config.ts

@@ -323,6 +323,12 @@ if (!IS_PREVIEW) {
         matomoPhpScript: "matomo.php",
         matomoJsScript: "matomo.js",
         trackLoad: false,
+        additionalTrackers: [
+          {
+            siteId: "1",
+            trackerUrl: "https://ethereumfoundation.matomo.cloud/matomo.php",
+          },
+        ],
       },
     },
   ]

i18n/config.json

@@ -271,6 +271,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "pcm",
+    "hrefLang": "pcm",
+    "name": "Nigerian Pidgin",
+    "localName": "Nigerian Pidgin",
+    "langDir": "ltr",
+    "dateFormat": "DD/MM/YYYY"
+  },
   {
     "code": "ph",
     "hrefLang": "fil",
@@ -392,9 +400,9 @@
     "dateFormat": "MM/DD/YYYY"
   },
   {
-    "code": "ur-in",
-    "hrefLang": "ur-in",
-    "name": "Urdu (India)",
+    "code": "ur",
+    "hrefLang": "ur",
+    "name": "Urdu",
     "localName": "اردو",
     "langDir": "rtl",
     "dateFormat": "MM/DD/YYYY"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.10.1",
+  "version": "7.12.2",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -104,6 +104,7 @@
     "@types/styled-system": "^5.1.15",
     "babel-loader": "^8.3.0",
     "babel-preset-gatsby": "^2.23.0",
+    "chromatic": "^6.17.4",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
     "husky": "^4.2.5",
@@ -137,6 +138,7 @@
     "type-check": "tsc --noEmit",
     "storybook": "storybook dev -p 6006 -c .storybook",
     "build-storybook": "storybook build",
+    "chromatic": "chromatic --project-token fee8e66c9916",
     "theme": "chakra-cli tokens src/@chakra-ui/gatsby-plugin/theme.ts",
     "theme:watch": "chakra-cli tokens src/@chakra-ui/gatsby-plugin/theme.ts --watch"
   },

redirects.json

@@ -287,14 +287,6 @@
     "fromPath": "/*/eth2/deposit-contract/",
     "toPath": "/:splat/staking/deposit-contract/"
   },
-  {
-    "fromPath": "/*/eth2/get-involved/medalla-data-challenge",
-    "toPath": "/:splat/community/grants/medalla-data-challenge/"
-  },
-  {
-    "fromPath": "/*/eth2/get-involved/staking-community-grants",
-    "toPath": "/:splat/community/grants/staking-community-grants/"
-  },
   {
     "fromPath": "/*/eth2",
     "toPath": "/:splat/upgrades/"
@@ -342,5 +334,9 @@
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"
+  },
+  {
+    "fromPath": "/*/writing-cohort",
+    "toPath": "https://ethereumwriterscohort.carrd.co/"
   }
 ]