Merge branch 'dev' into feedback-widget

Author: wackerow

.env.example

@@ -1,17 +1,24 @@
 # rename this file to .env and supply the values listed below
 # also make sure they are available to the build tool (e.g. Netlify)
-# warning: variables prefixed with GATSBY_ will be made available to client-side code
+# warning: variables prefixed with NEXT_PUBLIC_ will be made available to client-side code
 # be careful not to expose sensitive data (e.g. your Algolia admin key)
-# ALGOLIA_ADMIN_KEY=insertValue
+
+# Algolia environment (app ID, search key and base search index name required for search)
+# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
+# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
+# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
+# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
+
+# Etherscan API key (required for Etherscan API fetches)
 # ETHERSCAN_API_KEY=insertValue
-# GATSBY_ALGOLIA_APP_ID=insertValue
-# GATSBY_ALGOLIA_SEARCH_KEY=insertValue
-# GATSBY_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
-NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
-# GATSBY_FUNCTIONS_PATH=insertValue
 
-# Folders or files to ignore from the `public/content` folder
-IGNORE_CONTENT=**/docs,**/tutorials
+# Google API key and Calendar ID (required to fetch Calendar events)
+# 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
@@ -21,6 +28,6 @@ IS_PREVIEW_DEPLOY=false
 # Note: always include `en` as it is the default lang of the site
 BUILD_LOCALES=
 
-# If resource constraints are being hit during builds, change LIMIT_CPU to `true`
-# to limit the demand during build time
-LIMIT_CPU=false
+# If resource constraints are being hit during builds, change LIMIT_CPUS to a
+# fixed number of CPUs (e.g. 2) to limit the demand during build time
+LIMIT_CPUS=

.github/workflows/chromatic.yml

@@ -0,0 +1,42 @@
+# .github/workflows/chromatic.yml
+
+# Workflow name
+name: Chromatic Publish and Testing
+
+# Event for the workflow
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+    paths:
+      # Only run on file changes in any of these paths
+      - "src/components/**/*"
+      - "src/pages/**/*"
+      - "src/layouts/**/*"
+      - "src/@chakra-ui/**/*"
+
+# List of jobs
+jobs:
+  chromatic-deployment:
+    # Operating System
+    runs-on: ubuntu-latest
+    # Job steps
+    steps:
+      # 👇 Version 2 of the action
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # 👈 Required to retrieve git history
+      - name: Install deps
+        # 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
+        run: yarn
+      - name: Publish to Chromatic
+        # 👇 Adds Chromatic as a step in the workflow
+        uses: chromaui/action@v1
+        # Options required for Chromatic's GitHub Action
+        with:
+          projectToken: fee8e66c9916
+          # 👇 Only fail if Storybook contains stories that error
+          exitZeroOnChanges: true

.storybook/main.ts

@@ -15,20 +15,14 @@ import { propNames } from "@chakra-ui/react"
  * The primary recommendation is to upgrade to Yarn 3 if possible
  */
 
-/**
- * Temporary list of allowed stories during migration to NextJS
- */
-const tempStoryList = ["../src/components/Buttons/**/*.stories.@(ts|tsx)"]
-
 const config: StorybookConfig = {
-  stories: tempStoryList,
+  stories: ["../src/components/**/*.stories.{ts,tsx}"],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials",
-    "@storybook/addon-onboarding",
     "@storybook/addon-interactions",
     "@chakra-ui/storybook-addon",
-    "storybook-react-i18next"
+    "storybook-react-i18next",
   ],
   staticDirs: ["../public"],
   framework: {

netlify.toml

@@ -19,7 +19,7 @@
 
 [functions]
   included_files = [
-    "!./src/data/**/*",
+    "./src/intl/**/*",
     "!./public/**/*",
-    
+    "!./node_modules/@swc/core-linux-x64-musl/**/*",
   ]

next.config.js

@@ -2,18 +2,19 @@ const { PHASE_DEVELOPMENT_SERVER } = require("next/constants")
 
 const { i18n } = require("./next-i18next.config")
 
-const experimental =
-  (process.env.LIMIT_CPU || "").toLowerCase() === "true"
-    ? {
-        // This option could be enabled in the future when flagged as stable, to speed up builds
-        // (see https://nextjs.org/docs/pages/building-your-application/configuring/mdx#using-the-rust-based-mdx-compiler-experimental)
-        // mdxRs: true,
-
-        // Reduce the number of cpus and disable parallel threads in prod envs to consume less memory
-        workerThreads: false,
-        cpus: 2,
-      }
-    : {}
+const LIMIT_CPUS = Number(process.env.LIMIT_CPUS || 2)
+
+const experimental = LIMIT_CPUS
+  ? {
+    // This option could be enabled in the future when flagged as stable, to speed up builds
+    // (see https://nextjs.org/docs/pages/building-your-application/configuring/mdx#using-the-rust-based-mdx-compiler-experimental)
+    // mdxRs: true,
+
+    // Reduce the number of cpus and disable parallel threads in prod envs to consume less memory
+    workerThreads: false,
+    cpus: LIMIT_CPUS,
+  }
+  : {}
 
 /** @type {import('next').NextConfig} */
 module.exports = (phase, { defaultConfig }) => {
@@ -29,19 +30,13 @@ module.exports = (phase, { defaultConfig }) => {
         test: /\.svg$/,
         use: "@svgr/webpack",
       })
-      config.module.rules.push({
-        test: /\.mp4$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: '[name].[ext]',
-          },
-        },
-      });
 
       return config
     },
     i18n,
+    images: {
+      deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
+    },
   }
 
   if (phase !== PHASE_DEVELOPMENT_SERVER) {

package.json

@@ -21,9 +21,10 @@
     "@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",
-    "file-loader": "^6.2.0",
     "focus-trap-react": "^10.2.3",
     "framer-motion": "^10.13.0",
     "gray-matter": "^4.0.3",
@@ -32,7 +33,7 @@
     "lodash.merge": "^4.6.2",
     "lodash.shuffle": "^4.2.0",
     "luxon": "^3.4.3",
-    "next": "^14.0.0",
+    "next": "13.4.8",
     "next-i18next": "^14.0.3",
     "next-mdx-remote": "^3.0.8",
     "next-sitemap": "^4.2.3",
@@ -44,21 +45,20 @@
     "react-i18next": "^13.3.1",
     "react-icons": "^4.10.1",
     "react-lite-youtube-embed": "^2.4.0",
-    "react-select": "^5.7.7",
+    "react-select": "^4.3.0",
     "reading-time": "^1.5.0",
     "recharts": "^2.7.3",
     "remark-gfm": "^3.0.1",
     "yaml-loader": "^0.8.0"
   },
   "devDependencies": {
     "@chakra-ui/storybook-addon": "5.1.0",
-    "@netlify/plugin-nextjs": "^4.40.2",
-    "@storybook/addon-essentials": "7.5.3",
-    "@storybook/addon-interactions": "7.5.3",
-    "@storybook/addon-links": "7.5.3",
-    "@storybook/addon-onboarding": "1.0.8",
-    "@storybook/nextjs": "7.5.3",
-    "@storybook/react": "7.5.3",
+    "@netlify/plugin-nextjs": "^4.41.3",
+    "@storybook/addon-essentials": "7.6.6",
+    "@storybook/addon-interactions": "7.6.6",
+    "@storybook/addon-links": "7.6.6",
+    "@storybook/nextjs": "7.6.6",
+    "@storybook/react": "7.6.6",
     "@storybook/testing-library": "0.2.2",
     "@svgr/webpack": "^8.1.0",
     "@types/hast": "^3.0.0",
@@ -67,7 +67,7 @@
     "@types/react": "^18.2.15",
     "@types/react-dom": "^18.2.7",
     "eslint": "^8.45.0",
-    "eslint-config-next": "^14.0.0",
+    "eslint-config-next": "^13.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-storybook": "^0.6.15",
@@ -76,7 +76,7 @@
     "minimist": "^1.2.8",
     "polished": "^4.2.2",
     "raw-loader": "^4.0.2",
-    "storybook": "7.5.3",
+    "storybook": "7.6.6",
     "storybook-react-i18next": "^2.0.9",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",

public/_redirects

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