Merge branch 'master' into renovate/rehype-react-6.x

and fix conflicts

website/.nvmrc

@@ -1 +1 @@
-14.2.0
+14.5.0

website/package.json

@@ -4,41 +4,41 @@
   "version": "1.0.0",
   "author": "Farhan Attamimi <farhan@sourcegraph.com>",
   "dependencies": {
-    "@types/react-helmet": "5.0.15",
+    "@types/react-helmet": "6.0.0",
     "bootstrap": "^4.5.0",
     "catch-links": "^2.0.1",
-    "gatsby": "^2.22.17",
-    "gatsby-image": "^2.4.6",
+    "gatsby": "^2.24.2",
+    "gatsby-image": "^2.4.13",
     "gatsby-plugin-advanced-sitemap": "^1.5.5",
-    "gatsby-plugin-catch-links": "^2.3.4",
-    "gatsby-plugin-feed": "^2.5.4",
-    "gatsby-plugin-google-gtag": "^2.1.3",
-    "gatsby-plugin-google-tagmanager": "^2.3.4",
-    "gatsby-plugin-react-helmet": "^3.3.3",
-    "gatsby-plugin-sass": "^2.3.3",
-    "gatsby-plugin-sharp": "^2.6.10",
-    "gatsby-plugin-typescript": "^2.4.4",
-    "gatsby-remark-autolink-headers": "^2.3.4",
-    "gatsby-remark-copy-linked-files": "^2.3.4",
-    "gatsby-remark-images": "^3.3.9",
-    "gatsby-remark-prismjs": "^3.5.3",
+    "gatsby-plugin-catch-links": "^2.3.11",
+    "gatsby-plugin-feed": "^2.5.11",
+    "gatsby-plugin-google-gtag": "^2.1.10",
+    "gatsby-plugin-google-tagmanager": "^2.3.11",
+    "gatsby-plugin-react-helmet": "^3.3.10",
+    "gatsby-plugin-sass": "^2.3.12",
+    "gatsby-plugin-sharp": "^2.6.19",
+    "gatsby-plugin-typescript": "^2.4.14",
+    "gatsby-remark-autolink-headers": "^2.3.11",
+    "gatsby-remark-copy-linked-files": "^2.3.11",
+    "gatsby-remark-images": "^3.3.18",
+    "gatsby-remark-prismjs": "^3.5.10",
     "gatsby-remark-responsive-image": "^1.0.0-beta.5-alpha.fb30fcd6",
-    "gatsby-source-filesystem": "^2.3.10",
-    "gatsby-transformer-json": "^2.4.4",
-    "gatsby-transformer-remark": "^2.8.14",
-    "gatsby-transformer-sharp": "^2.5.4",
+    "gatsby-source-filesystem": "^2.3.19",
+    "gatsby-transformer-json": "^2.4.11",
+    "gatsby-transformer-remark": "^2.8.25",
+    "gatsby-transformer-sharp": "^2.5.11",
     "lodash": "^4.17.15",
-    "mdi-react": "^5.3.0",
+    "mdi-react": "^7.3.0",
     "node-sass": "^4.14.1",
     "parse-filepath": "^1.0.2",
     "prismjs": "^1.20.0",
     "react": "^16.13.1",
     "react-bootstrap": "^1.2.2",
     "react-dom": "^16.13.1",
-    "react-helmet": "^5.2.1",
+    "react-helmet": "^6.1.0",
     "react-plx": "^1.3.15",
-    "react-router-dom": "^5.1.2",
-    "react-share": "^4.1.0",
+    "react-router-dom": "^5.2.0",
+    "react-share": "^4.2.1",
     "rehype-react": "^6.0.0",
     "ts-loader": "^7.0.5"
   },
@@ -69,14 +69,14 @@
     "@types/react-dom": "16.9.8",
     "@types/react-router-dom": "5.1.5",
     "@types/react-share": "3.0.3",
-    "gatsby-cli": "^2.12.42",
+    "gatsby-cli": "^2.12.60",
     "gatsby-plugin-tslint": "^0.0.2",
     "prettier": "^2.0.5",
     "sharp": "^0.25.4",
     "slugify": "^1.4.4",
     "stylelint": "^13.6.1",
     "stylelint-scss": "^3.18.0",
     "tslint": "^5.20.1",
-    "typescript": "^3.8.3"
+    "typescript": "^3.9.6"
   }
 }

website/src/components/Footer.tsx

@@ -1,6 +1,6 @@
 import { Link } from 'gatsby'
-import GitHubCircleIcon from 'mdi-react/GithubCircleIcon'
-import LinkedinIcon from 'mdi-react/LinkedinBoxIcon'
+import GithubIcon from 'mdi-react/GithubIcon'
+import LinkedinIcon from 'mdi-react/LinkedinIcon'
 import TwitterIcon from 'mdi-react/TwitterIcon'
 import * as React from 'react'
 
@@ -72,7 +72,7 @@ export const Footer: React.FunctionComponent<{ minimal?: boolean }> = ({ minimal
                             <ul className="nav footer__social mt-1">
                                 <li className="nav-item">
                                     <a href="https://github.com/sourcegraph" target="_blank">
-                                        <GitHubCircleIcon />
+                                        <GithubIcon />
                                     </a>
                                 </li>
                                 <li className="nav-item">

website/src/pages/contact/index.tsx

@@ -1,7 +1,7 @@
 import { Link } from 'gatsby'
 import EmailIcon from 'mdi-react/EmailIcon'
-import GithubCircleIcon from 'mdi-react/GithubCircleIcon'
-import LinkedinBoxIcon from 'mdi-react/LinkedinBoxIcon'
+import GithubIcon from 'mdi-react/GithubIcon'
+import LinkedinIcon from 'mdi-react/LinkedinIcon'
 import MapMarkerIcon from 'mdi-react/MapMarkerIcon'
 import TwitterIcon from 'mdi-react/TwitterIcon'
 import React from 'react'
@@ -31,7 +31,7 @@ export default ((props: any) => (
                                     href="https://github.com/sourcegraph/sourcegraph/issues"
                                     target="_blank"
                                 >
-                                    <GithubCircleIcon /> File a public issue
+                                    <GithubIcon /> File a public issue
                                 </a>
                                 <a
                                     className="list-group-item list-group-item-action"
@@ -88,14 +88,14 @@ export default ((props: any) => (
                                     target="_blank"
                                     href="https://github.com/sourcegraph"
                                 >
-                                    <GithubCircleIcon /> github.com/sourcegraph
+                                    <GithubIcon /> github.com/sourcegraph
                                 </a>
                                 <a
                                     className="list-group-item list-group-item-action"
                                     target="_blank"
                                     href="https://www.linkedin.com/company/sourcegraph"
                                 >
-                                    <LinkedinBoxIcon /> Sourcegraph on LinkedIn
+                                    <LinkedinIcon /> Sourcegraph on LinkedIn
                                 </a>
                                 <div className="list-group-item d-flex p-relative">
                                     <MapMarkerIcon className="mr-1" />