Merge remote-tracking branch 'origin/master' into feature/remove-v2-s…

…take-claim

.github/actions/install/action.yml

@@ -4,24 +4,12 @@ description: "Install dependencies"
 runs:
   using: "composite"
   steps:
-    - name: Set up pnpm
-      uses: pnpm/action-setup@v4
-      with:
-        version: 9.4.0
-
-    - name: Set up node
-      uses: actions/setup-node@v4
-      with:
-        cache: pnpm
-        node-version: 20
-
     - name: Set up foundry
       uses: foundry-rs/foundry-toolchain@v1
 
     # - name: Install playwright
     #   shell: bash
     #   run: npx playwright install --with-deps chromium
 
-    - name: Install dependencies
-      shell: bash
-      run: pnpm install --ignore-scripts
+    - name: Set up pnpm
+      uses: sushi-labs/actions/.github/actions/pnpm@master

.github/workflows/chromatic.yml

@@ -1,4 +1,4 @@
-name: 'Chromatic'
+name: Chromatic
 
 on:
   pull_request:
@@ -14,9 +14,9 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          submodules: true
+          submodules: 'recursive'
           fetch-depth: 0
       - name: Install dependencies
         uses: ./.github/actions/install

.github/workflows/apps-web-e2e.yml → .github/workflows/e2e.yml

@@ -1,4 +1,4 @@
-name: Sushi - apps / web
+name: E2E
 
 on:
   pull_request:
@@ -7,11 +7,8 @@ on:
       - ".github/workflows/apps-web-e2e.yml"
       - "apps/web/**"
       - "config/nextjs/**"
-      - "config/router/**"
       - "config/tailwindcss/**"
       - "config/typescript/**"
-      - "config/viem/**"
-      - "config/wagmi/**"
       - "packages/**"
   workflow_dispatch:
 
@@ -25,38 +22,22 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  e2e:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+  test:
+    runs-on: ubuntu-latest
+    # runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 15
     strategy:
       matrix:
         block-number: [61755107]
         chain-id: [137]
-        node-version: [20]
-        pnpm-version: [9.4.0]
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 2
-          submodules: true
-
-      # Has to be before setup node for caching to work
-      - uses: pnpm/action-setup@v4
-        with:
-          version: ${{ matrix.pnpm-version }}
-
-      - name: Setup Node.js
-        uses: buildjet/setup-node@v3
-        with:
-          cache: 'pnpm'
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+          submodules: 'recursive'
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile --prefer-offline
+        uses: ./.github/actions/install
 
       - name: Install Playwright Browsers
         run: pnpm playwright install --with-deps chromium

.github/workflows/verify.yml

@@ -1,12 +1,7 @@
-name: Sushi - verify
-# on:
-#   workflow_call:
-#   workflow_dispatch:
+name: Verify
 on:
   workflow_call:
   workflow_dispatch:
-  # pull_request:
-  #   types: [opened, synchronize]
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

.vscode/extensions.json

@@ -8,7 +8,6 @@
     "VisualStudioExptTeam.vscodeintellicode",
     "wix.vscode-import-cost",
     "GraphQL.vscode-graphql",
-    "mattpocock.ts-error-translator",
     "bierner.markdown-mermaid",
     "biomejs.biome"
   ]

.vscode/launch.json

@@ -2,25 +2,33 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "LOCAL: Minikube",
-      "profile": "local",
-      "type": "cloudcode.kubernetes",
+      "name": "Next.js: debug server-side",
+      "type": "node-terminal",
       "request": "launch",
-      "skaffoldConfig": "${workspaceFolder}/skaffold.yaml",
-      "watch": false,
-      "cleanUp": true,
-      "portForward": true
+      "cwd": "${workspaceFolder}/apps/web",
+      "command": "npm run dev"
     },
     {
-      "name": "STAGING: GKE",
-      "profile": "staging",
-      "type": "cloudcode.kubernetes",
+      "name": "Next.js: debug client-side",
+      "type": "chrome",
       "request": "launch",
-      "skaffoldConfig": "${workspaceFolder}/skaffold.yaml",
-      "watch": false,
-      "cleanUp": false,
-      "portForward": true,
-      "imageRegistry": "gcr.io/sushi-api-414412"
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "Next.js: debug full stack",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}/apps/web",
+      "program": "${workspaceFolder}/node_modules/.bin/next",
+      "runtimeArgs": ["--inspect"],
+      "skipFiles": ["<node_internals>/**"],
+      "serverReadyAction": {
+        "action": "debugWithEdge",
+        "killOnServerStop": true,
+        "pattern": "- Local:.+(https?://.+)",
+        "uriFormat": "%s",
+        "webRoot": "${workspaceFolder}"
+      }
     }
   ]
 }

apis/token-list/package.json

@@ -12,7 +12,6 @@
     "@vercel/node": "3.0.9"
   },
   "devDependencies": {
-    "@sushiswap/jest-config": "workspace:*",
     "@tsconfig/esm": "1.0.4",
     "@tsconfig/strictest": "2.0.2",
     "typescript": "5.5.4",

apis/tokens/package.json

@@ -32,12 +32,11 @@
     "@wagmi/core": "2.13.5",
     "drizzle-orm": "^0.29.5",
     "postgres": "^3.4.3",
-    "sushi": "4.0.2",
+    "sushi": "4.0.5",
     "viem": "2.21.4",
     "zod": "3.23.8"
   },
   "devDependencies": {
-    "@sushiswap/jest-config": "workspace:*",
     "@tsconfig/esm": "1.0.4",
     "@tsconfig/strictest": "2.0.2",
     "@types/node": "20",