Merge branch 'dev' into docsNavBug

Author: corwintines

.env.example

@@ -16,6 +16,10 @@
 # GOOGLE_API_KEY=
 # GOOGLE_CALENDAR_ID=
 
+# Matomo environment (URL and site ID required for analytics)
+NEXT_PUBLIC_MATOMO_URL=
+NEXT_PUBLIC_MATOMO_SITE_ID=
+
 # Used to avoid loading Matomo in our preview deploys
 IS_PREVIEW_DEPLOY=false
 

package.json

@@ -21,6 +21,7 @@
     "@docsearch/react": "^3.5.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@socialgouv/matomo-next": "^1.8.0",
     "clipboard": "^2.0.11",
     "embla-carousel-react": "^7.0.0",
     "ethereum-blockies-base64": "^1.0.2",

public/_redirects

@@ -1,3 +1,5 @@
+/en/ / 301!
+
 /discord https://discord.gg/ethereum-org 301!
 
 /*/discord https://discord.gg/ethereum-org 301!

src/components/BaseStories/Heading.stories.tsx

@@ -85,7 +85,7 @@ export const Heading: Story = {
               textAlign="end"
               size={obj.size}
             >
-              {obj.size || "xl"}
+              {obj.size as string|| "xl"}
             </HeadingComponent>
             <HeadingComponent flex="3" {...obj}>
               {args.children}

src/components/BaseStories/Text.stories.tsx

@@ -10,7 +10,8 @@ import {
 } from "@chakra-ui/react"
 import { Meta, StoryObj } from "@storybook/react"
 
-import components from "../../@chakra-ui/gatsby-plugin/components"
+import components from "@/@chakra-ui/components"
+
 import Translation from "../Translation"
 
 type TextType = typeof Text