Merge branch 'dev' into pr/15320

Author: wackerow

.all-contributorsrc

@@ -4039,7 +4039,9 @@
       "profile": "https://github.com/lukassim",
       "contributions": [
         "content",
-        "ideas"
+        "ideas",
+        "translation",
+        "bug"
       ]
     },
     {
@@ -6239,10 +6241,10 @@
       ]
     },
     {
-      "login": "mradziwon",
-      "name": "mradziwon",
+      "login": "maciejrrr",
+      "name": "maciejrrr",
       "avatar_url": "https://avatars.githubusercontent.com/u/6785984?v=4",
-      "profile": "http://www.linkedin.com/in/mradziwon",
+      "profile": "http://www.linkedin.com/in/maciejrrr",
       "contributions": [
         "code",
         "bug"
@@ -11685,7 +11687,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/6020891?v=4",
       "profile": "http://www.edukids.cz",
       "contributions": [
-        "eventOrganizing"
+        "eventOrganizing",
+        "maintenance"
       ]
     },
     {
@@ -12715,6 +12718,88 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "JJOptimist",
+      "name": "JJOptimist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86833563?v=4",
+      "profile": "https://github.com/JJOptimist",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "hotequil",
+      "name": "João Paulo Hotequil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46814712?v=4",
+      "profile": "https://github.com/hotequil",
+      "contributions": [
+        "code",
+        "translation"
+      ]
+    },
+    {
+      "login": "microHoffman",
+      "name": "microHoffman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61500778?v=4",
+      "profile": "http://pwn.xyz",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "smithrashell",
+      "name": "Rashell Smith",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36465023?v=4",
+      "profile": "https://github.com/smithrashell",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "aolson078",
+      "name": "Alex Olson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/69769089?v=4",
+      "profile": "https://github.com/aolson078",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "adminsuci",
+      "name": "SUCI - Blockchain Hub Team",
+      "avatar_url": "https://avatars.githubusercontent.com/u/155696196?v=4",
+      "profile": "https://www.suci.io/",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Nik-EpicWeb3",
+      "name": "Nik-EpicWeb3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/214466248?v=4",
+      "profile": "https://github.com/Nik-EpicWeb3",
+      "contributions": [
+        "eventOrganizing"
+      ]
+    },
+    {
+      "login": "kichong",
+      "name": "kichong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38249409?v=4",
+      "profile": "https://github.com/kichong",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "zeevick10",
+      "name": "FT",
+      "avatar_url": "https://avatars.githubusercontent.com/u/140458077?v=4",
+      "profile": "https://github.com/zeevick10",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -4,12 +4,17 @@
 # be careful not to expose sensitive data (e.g. your Algolia admin key)
 
 # Algolia environment (app ID, search key and base search index name required for search)
+# You can use the following test keys provided by DocSearch for local development/testing:
+# NEXT_PUBLIC_ALGOLIA_APP_ID=R2IYF7ETH7
+# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=599cec31baffa4868cae4e79f180729b
+# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=docsearch
+# Replace insertValue with your actual keys for production builds.
 # NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
 # NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
 # NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue
 
 # Github token for read-only use with api functions
-# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
+# GITHUB_TOKEN_READ_ONLY=insertValue
 
 # Etherscan API key (required for Etherscan API fetches)
 # ETHERSCAN_API_KEY=insertValue

.eslintrc.json

@@ -1,16 +1,19 @@
 {
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "next/core-web-vitals",
-    "prettier",
-    "plugin:storybook/recommended"
-  ],
+  "extends": ["eslint:recommended", "next/core-web-vitals", "prettier"],
   "env": {
-    "es6": true
+    "es6": true,
+    "node": true,
+    "browser": true
   },
   "plugins": ["simple-import-sort", "@typescript-eslint", "unused-imports"],
   "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
   "rules": {
     "simple-import-sort/imports": [
       "error",
@@ -34,7 +37,7 @@
           // From the `constants` directory.
           ["^@/lib/constants"],
           // `.storybook` directory and utils files`
-          ["^@/storybook","^@/storybook-utils"],
+          ["^@/storybook", "^@/storybook-utils"],
           // Parent imports. Put `..` last.
           ["^\\.\\.(?!/?$)", "^\\.\\./?$"],
           // Other relative imports. Put same-folder imports and `.` last.
@@ -48,13 +51,6 @@
     ],
     "simple-import-sort/exports": "error",
     "no-unused-vars": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/no-explicit-any": [
-      "error",
-      {
-        "fixToUnknown": true
-      }
-    ],
     "unused-imports/no-unused-vars": [
       "error",
       {
@@ -63,6 +59,37 @@
         "varsIgnorePattern": "^_$"
       }
     ],
-    "unused-imports/no-unused-imports-ts": "warn"
-  }
+    "unused-imports/no-unused-imports": "warn"
+  },
+  "overrides": [
+    {
+      "files": ["**/*.{ts,tsx}"],
+      "extends": ["plugin:@typescript-eslint/recommended"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": [
+          "error",
+          {
+            "fixToUnknown": true
+          }
+        ]
+      }
+    },
+    {
+      "files": ["**/*.stories.@(js|jsx|ts|tsx|mdx)"],
+      "extends": ["plugin:storybook/recommended"]
+    }
+  ],
+  "ignorePatterns": [
+    "node_modules/",
+    ".next/",
+    "out/",
+    "dist/",
+    "build/",
+    ".vercel/",
+    ".netlify/",
+    "coverage/",
+    "storybook-static/",
+    "**/*.d.ts",
+    "src/intl/"
+  ]
 }

.github/CODEOWNERS

@@ -8,5 +8,5 @@
 *       @wackerow @corwintines @pettinarip @minimalsm
 
 # Owners of specific files
-/src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes
+/src/data/consensus-bounty-hunters.json @asanso @fredriksvantes
 /src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

.github/ISSUE_TEMPLATE/suggest_resource.yaml

@@ -0,0 +1,63 @@
+name: Suggest a resource
+description: Suggest a new resource to list on ethereum.org/resources
+title: Suggest a resource
+labels: ["resource 📚"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before suggesting a resource, make sure you've read [our listing policy](https://www.ethereum.org/en/contributing/adding-resources/).
+  - type: markdown
+    attributes:
+      value: Only continue with the issue if your resource meets the criteria listed there.
+  - type: markdown
+    attributes:
+      value: If it does, complete the following information which we need to accurately list the resource.
+  - type: markdown
+    id: resource_info
+    attributes:
+      value: "## Resource info"
+  - type: input
+    id: resource_name
+    attributes:
+      label: Name
+      description: Please provide the official name of the resource
+    validations:
+      required: true
+  - type: input
+    id: resource_url
+    attributes:
+      label: Resource URL
+      description: Please provide a URL to the resource
+    validations:
+      required: true
+  - type: textarea
+    id: resource_description
+    attributes:
+      label: Description
+      description: Please provide a short 1-2 sentence description of the resource
+    validations:
+      required: true
+  - type: textarea
+    id: resource_logo
+    attributes:
+      label: Logo
+      description: |
+        Please provide an SVG or transparent PNG
+        Tip: You can attach images by clicking this area to highlight it and then dragging files in.
+  - type: input
+    id: resource_category
+    attributes:
+      label: Category
+      description: Please specify a best fit to categorize the resource (e.g., DeFi, NFT, Scaling, etc.)
+  - type: checkboxes
+    id: resource_work_on
+    attributes:
+      label: Would you like to work on this issue?
+      options:
+        - label: "Yes"
+          required: false
+        - label: "No"
+          required: false
+    validations:
+      required: true

.github/labeler.yml

@@ -12,6 +12,7 @@
 "dependencies 📦":
   - package.json
   - yarn.lock
+  - pnpm-lock.yaml
 
 "config ⚙️":
   - i18n.config.json

.github/workflows/chromatic.yml

@@ -6,18 +6,8 @@ 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/**/*"
-      - ".storybook/**/*"
-      - "tailwind.config.ts"
-      - "src/styles/**/*"
+    branches: [master, staging, "test/**"]
+    types: [opened, synchronize, ready_for_review]
 
 # List of jobs
 jobs:
@@ -26,19 +16,36 @@ jobs:
     runs-on: ubuntu-latest
     # Job steps
     steps:
-      # 👇 Version 2 of the action
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # 👈 Required to retrieve git history
+          fetch-depth: 0
+          # Tells the checkout which commit hash to reference
+          ref: ${{ github.event.pull_request.head.ref }}
+        env:
+          CHROMATIC_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}
+          CHROMATIC_SHA: ${{ github.event.pull_request.head.sha || github.ref }}
+          CHROMATIC_SLUG: ${{ github.repository }}
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "pnpm"
+
       - 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
+        run: pnpm install
+
       - 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
+          onlyChanged: true # enables TurboSnap
+          zip: true