Remove Matomo tracking script (#277)

* Update dependencies

* Update dependencies

* Remove Matomo tracking script

Author: benface

components/Code.tsx

@@ -109,7 +109,7 @@ export const CodeBlock = ({ children, ...props }: CodeBlockProps) => {
     children as {
       props: {
         children: string
-        className: string
+        className?: string
       }
     }
   ).props

components/DocSearch.tsx

@@ -2,6 +2,7 @@ import { DocSearchModal, DocSearchProps, useDocSearchKeyboardEvents } from '@doc
 import { Global } from '@emotion/react'
 import { useCallback, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
+import { Theme } from 'theme-ui'
 import { dispatch } from 'use-bus'
 
 import {
@@ -11,7 +12,6 @@ import {
   Flex,
   FontSize,
   FontWeight,
-  GlobalTheme,
   Icon,
   Opacity,
   Spacing,
@@ -26,7 +26,7 @@ const BREAKPOINT = '751px'
 export function DocSearch(props: DocSearchProps) {
   const searchButtonRef = useRef<HTMLButtonElement>(null)
   const [isOpen, setIsOpen] = useState(false)
-  const [initialQuery, setInitialQuery] = useState<string | undefined>(props?.initialQuery || undefined)
+  const [initialQuery, setInitialQuery] = useState<string | undefined>(props.initialQuery || undefined)
 
   const onOpen = useCallback(() => {
     setIsOpen(true)
@@ -74,7 +74,7 @@ export function DocSearch(props: DocSearchProps) {
           }}
         >
           <Icon.Search size="14px" title="" sx={{ flexShrink: 0 }} />
-          <Text.P14 size="14px">{props?.translations?.button?.buttonText ?? 'Search'}</Text.P14>
+          <Text.P14 size="14px">{props.translations?.button?.buttonText ?? 'Search'}</Text.P14>
           {/* TODO: Remove `fontFamily: 'inherit'` when it's included in `@edgeandnode/components`'s global styles */}
           <Text.P14
             as="kbd"
@@ -96,15 +96,15 @@ export function DocSearch(props: DocSearchProps) {
               {...props}
               initialScrollY={window.scrollY}
               initialQuery={initialQuery}
-              translations={props?.translations?.modal}
+              translations={props.translations?.modal}
               onClose={onClose}
             />,
             document.body
           )
         : null}
 
       <Global
-        styles={(theme: GlobalTheme) => ({
+        styles={(theme: Theme) => ({
           html: {
             '--docsearch-spacing': '0 !important',
             '--docsearch-container-background': `${theme.colors!.Midnight88} !important`,

components/NavTree.tsx

@@ -1,15 +1,15 @@
 import { keyframes } from '@emotion/react'
 import * as Collapsible from '@radix-ui/react-collapsible'
-import { Context, createContext, HTMLAttributes, useContext, useState } from 'react'
+import { createContext, HTMLAttributes, useContext, useState } from 'react'
 import { SxProp } from 'theme-ui'
 
 import {
   buildTransition,
+  Divider,
   Flex,
   Icon,
   IconProps,
   Locale,
-  NewGDSDivider,
   Spacing,
   Text,
   TextProps,
@@ -180,7 +180,7 @@ const NavTreeGroupContent = ({ children, ...props }: NavTreeGroupContentProps) =
 const NavTreeDivider = (props: NavTreeDividerProps) => {
   return (
     <li aria-hidden="true" sx={{ my: Spacing['8px'] }} {...props}>
-      <NewGDSDivider />
+      <Divider />
     </li>
   )
 }

layout/MDXLayout.tsx

@@ -5,7 +5,7 @@ import { PropsWithChildren, useCallback, useMemo } from 'react'
 import { useSet } from 'react-use'
 import { ThemeUIStyleObject } from 'theme-ui'
 
-import { Flex, NewGDSDivider, NewGDSDividerProps, Spacing } from '@edgeandnode/components'
+import { Divider, DividerProps, Flex, Spacing } from '@edgeandnode/components'
 
 import {
   Blockquote,
@@ -38,7 +38,7 @@ const mdxComponents = {
   blockquote: Blockquote,
   pre: CodeBlock,
   code: CodeInline,
-  hr: (props: NewGDSDividerProps) => <NewGDSDivider sx={{ my: Spacing['32px'] }} {...props} />,
+  hr: (props: DividerProps) => <Divider sx={{ my: Spacing['32px'] }} {...props} />,
   h1: Heading.H1,
   h2: Heading.H2,
   h3: Heading.H3,

layout/MDXLayoutOutline.tsx

@@ -1,6 +1,6 @@
 import { useContext, useEffect, useState } from 'react'
 
-import { buildTransition, Flex, NewGDSDivider, Spacing, Text } from '@edgeandnode/components'
+import { buildTransition, Divider, Flex, Spacing, Text } from '@edgeandnode/components'
 
 import { EditPageLink, Link } from '@/components'
 import { useI18n } from '@/i18n'
@@ -37,7 +37,7 @@ export const MDXLayoutOutline = () => {
       <Flex.Row>
         <EditPageLink />
       </Flex.Row>
-      <NewGDSDivider sx={{ my: Spacing['32px'] }} />
+      <Divider sx={{ my: Spacing['32px'] }} />
       <nav sx={{ paddingInlineEnd: '16px' }}>
         <Text.C10 as="header" color="White64" sx={{ mb: Spacing['12px'] }}>
           {t('global.pageSections')}

layout/MDXLayoutPagination.tsx

@@ -1,6 +1,6 @@
 import { useContext } from 'react'
 
-import { buildShadow, buildTransition, Flex, Icon, NewGDSDivider, Spacing, Text } from '@edgeandnode/components'
+import { buildShadow, buildTransition, Divider, Flex, Icon, Spacing, Text } from '@edgeandnode/components'
 
 import { Link } from '@/components'
 import { useI18n } from '@/i18n'
@@ -12,7 +12,7 @@ export const MDXLayoutPagination = () => {
 
   return (
     <div>
-      <NewGDSDivider diamonds />
+      <Divider diamonds />
       <Flex.Row justify="space-between" sx={{ mt: Spacing['32px'], overflow: 'hidden' }}>
         <div>
           {previousPage ? (

navigation/navigation.ts

@@ -49,7 +49,7 @@ export const navigation = (locale: AppLocale): NavItemDefinition[] => [
     slug: 'glossary',
   },
   {
-  slug: 'tokenomics',
+    slug: 'tokenomics',
   },
   {
     divider: true,

navigation/utils.ts

@@ -33,6 +33,7 @@ export const getNavItems = async (locale: AppLocale = defaultLocale): Promise<Na
             const filePath = `${path}${path.endsWith('/') ? 'index' : ''}`
             const filesToTry = [`${locale}${filePath}.mdx`, `${locale}${filePath}.tsx`, `[locale]${filePath}.tsx`]
             let currentTry = 0
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             while (true) {
               try {
                 const fileToTry = filesToTry[currentTry]
@@ -98,7 +99,7 @@ export const getNavItems = async (locale: AppLocale = defaultLocale): Promise<Na
         items.push(await handlePromise(promise))
       }
 
-      let lastFilteredItem: NavItem | null = null
+      let lastFilteredItem = null as NavItem | null
       const filteredItems: NavItem[] = items.filter((item) => {
         // Item is a page that doesn't exist in that locale
         if (item === null) {

package.json

@@ -20,14 +20,14 @@
     "pre-push": "yarn build"
   },
   "dependencies": {
-    "@docsearch/react": "^3.3.2",
-    "@edgeandnode/components": "^24.5.0",
+    "@docsearch/react": "^3.3.3",
+    "@edgeandnode/components": "^25.1.0",
     "@emotion/react": "^11.10.5",
     "@mdx-js/loader": "^2.2.1",
     "@mdx-js/react": "^2.2.1",
     "@next/mdx": "^12.3.4",
     "@radix-ui/react-collapsible": "1.0.1",
-    "@radix-ui/react-popover": "^1.0.2",
+    "@radix-ui/react-popover": "^1.0.3",
     "@radix-ui/react-visually-hidden": "^1.0.1",
     "@reach/auto-id": "^0.18.0",
     "lodash": "^4.17.21",
@@ -43,26 +43,26 @@
     "use-bus": "^2.5.2"
   },
   "devDependencies": {
-    "@edgeandnode/eslint-config": "^1.1.0",
-    "@sindresorhus/slugify": "^2.1.1",
+    "@edgeandnode/eslint-config": "^1.3.0",
+    "@sindresorhus/slugify": "^2.2.0",
     "@svgr/webpack": "^6.5.1",
     "@types/color": "^3.0.3",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^16.18.11",
-    "@types/react": "^17.0.52",
+    "@types/node": "^16.18.12",
+    "@types/react": "^17.0.53",
     "@types/react-dom": "^17.0.18",
-    "acorn": "^8.8.1",
+    "acorn": "^8.8.2",
     "acorn-jsx": "^5.3.2",
-    "eslint": "^8.31.0",
+    "eslint": "^8.33.0",
     "husky": "^8.0.3",
     "lint-staged": "^13.1.0",
     "path": "^0.12.7",
-    "prettier": "^2.8.2",
+    "prettier": "^2.8.3",
     "remark-frontmatter": "^4.0.1",
     "remark-mdx-frontmatter": "^2.1.1",
     "serialize-as-code": "^2.0.2",
-    "typescript": "4.9.4",
-    "unist-util-visit": "^4.1.1",
+    "typescript": "4.9.5",
+    "unist-util-visit": "^4.1.2",
     "url": "^0.11.0"
   },
   "resolutions": {

pages/_document.tsx

@@ -4,7 +4,7 @@ import Script from 'next/script'
 import { defaultLocale, extractLocaleFromPath, getHtmlAttributesForLocale, Locale } from '@edgeandnode/components'
 
 type MyDocumentProps = DocumentInitialProps & {
-  locale: Locale
+  locale: Locale | null
 }
 
 export default class MyDocument extends Document {
@@ -34,14 +34,6 @@ export default class MyDocument extends Document {
         <body>
           <Main />
           <NextScript />
-          <Script id="matomo" type="module" strategy="afterInteractive">{`
-            const _paq = window._paq = window._paq || [];
-            _paq.push(['trackPageView'], ['enableLinkTracking'], ['setTrackerUrl', 'https://thegraph.matomo.cloud/matomo.php'], ['setSiteId', '1']);
-            const g = document.createElement('script');
-            g.async = true;
-            g.src = '//cdn.matomo.cloud/thegraph.matomo.cloud/matomo.js';
-            document.body.append(g);
-          `}</Script>
           <Script id="pendo" type="module" strategy="afterInteractive">{`
             (function(p,e,n,d,o){
               var v,w,x,y,z;o=p[d]=p[d]||{};o._q=o._q||[];