Merge pull request #1408 from argos-ci/upgrade-deps-eslint-v9

chore: upgrade deps + eslint v9
argos-ci · Oct 29, 2024 · 714e239 · 714e239
2 parents 2696ecc + 850cbbc
commit 714e239
Show file tree

Hide file tree

Showing 76 changed files with 3,431 additions and 3,497 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -176,7 +176,7 @@ jobs:
         run: pnpm run e2e:setup
 
       - name: Run Playwright tests
-        uses: docker://mcr.microsoft.com/playwright:v1.47.2-jammy
+        uses: docker://mcr.microsoft.com/playwright:v1.48.2-jammy
         with:
           # Fix for Firefox, HOME=/root is required to avoid permission issues
           # https://github.com/microsoft/playwright/issues/6500

diff --git a/.slugignore b/.slugignore
@@ -6,7 +6,7 @@
 /resources
 /tests
 .env.example
-.eslintrc.json
+eslint.config.js
 .prettierignore
 .prettierrc
 CONTRIBUTING.md

diff --git a/apps/backend/db/migrations/20170304184220_add_constraints.js b/apps/backend/db/migrations/20170304184220_add_constraints.js
@@ -1,5 +1,3 @@
-/* eslint-disable quotes */
-
 /**
  * @param {import('knex').Knex} knex
  */
@@ -44,7 +42,6 @@ export const down = async (knex) => {
     .raw(`DROP TYPE job_status`)
     .raw(`DROP TYPE service_type`)
     .table("repositories", (table) => {
-      // @ts-ignore
       table.dropForeign("organizationId");
     });
 };
diff --git a/apps/backend/db/migrations/20170306205356_new-notifications.js b/apps/backend/db/migrations/20170306205356_new-notifications.js
@@ -1,5 +1,3 @@
-/* eslint-disable quotes, max-len */
-
 /**
  * @param {import('knex').Knex} knex
  */

diff --git a/apps/backend/db/migrations/20170329213934_allow_null_baseScreenshotIds.js b/apps/backend/db/migrations/20170329213934_allow_null_baseScreenshotIds.js
@@ -1,5 +1,3 @@
-/* eslint-disable quotes */
-
 /**
  * @param {import('knex').Knex} knex
  */

diff --git a/apps/backend/db/migrations/20220919175105_nullable_compare_screenshot_id.js b/apps/backend/db/migrations/20220919175105_nullable_compare_screenshot_id.js
@@ -1,5 +1,3 @@
-/* eslint-disable quotes */
-
 /**
  * @param {import('knex').Knex} knex
  */

diff --git a/apps/backend/db/migrations/20220927074934_add_missing_accounts.js b/apps/backend/db/migrations/20220927074934_add_missing_accounts.js
@@ -52,9 +52,7 @@ export const up = async (knex) => {
  */
 export const down = async (knex) => {
   await knex.schema.alterTable("accounts", function (table) {
-    // @ts-ignore
-    table.dropUnique("userId");
-    // @ts-ignore
-    table.dropUnique("organizationId");
+    table.dropUnique(["userId"]);
+    table.dropUnique(["organizationId"]);
   });
 };
diff --git a/apps/backend/db/migrations/20221228140518_add_missing_accounts.js b/apps/backend/db/migrations/20221228140518_add_missing_accounts.js
@@ -36,9 +36,4 @@ export const up = async (knex) => {
   ]);
 };
 
-/**
- * @param {import('knex').Knex} knex
- */
-// @ts-ignore
-// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
-export const down = async (knex) => {};
+export const down = async () => {};
diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -9,7 +9,7 @@
     "setup": "pnpm run db:create && pnpm run db:load",
     "check-types": "tsc --noEmit",
     "check-format": "prettier --check --cache --ignore-path=../../.gitignore --ignore-path=../../.prettierignore .",
-    "lint": "eslint --ignore-path=../../.gitignore .",
+    "lint": "eslint .",
     "db:check-structure": "knex-scripts check-structure",
     "db:create": "knex-scripts create",
     "db:drop": "knex-scripts drop",
@@ -30,22 +30,22 @@
     "@apollo/server": "^4.11.0",
     "@argos/tsconfig": "workspace:*",
     "@argos/util": "workspace:*",
-    "@aws-sdk/client-s3": "^3.637.0",
-    "@aws-sdk/s3-request-presigner": "^3.637.0",
-    "@gitbeaker/rest": "^40.1.3",
-    "@graphql-tools/schema": "^10.0.6",
+    "@aws-sdk/client-s3": "^3.679.0",
+    "@aws-sdk/s3-request-presigner": "^3.679.0",
+    "@gitbeaker/rest": "^41.1.0",
+    "@graphql-tools/schema": "^10.0.7",
     "@octokit/auth-app": "^7.1.0",
     "@octokit/core": "^6.1.2",
     "@octokit/openapi-types": "^22.2.0",
     "@octokit/plugin-retry": "^7.1.1",
     "@octokit/rest": "^21.0.2",
     "@octokit/webhooks": "^13.3.0",
-    "@octokit/webhooks-types": "^7.5.1",
+    "@octokit/webhooks-types": "^7.6.1",
     "@react-email/components": "^0.0.25",
     "@react-email/render": "^1.0.1",
-    "@sentry/node": "^8.27.0",
+    "@sentry/node": "^8.35.0",
     "@sindresorhus/slugify": "^2.2.1",
-    "@slack/bolt": "^3.21.1",
+    "@slack/bolt": "^4.0.1",
     "ajv": "^8.17.1",
     "amqplib": "^0.10.4",
     "auth-header": "^1.0.0",
@@ -55,38 +55,38 @@
     "cookies": "^0.9.1",
     "cors": "^2.8.5",
     "dataloader": "^2.2.2",
-    "discord.js": "^14.16.0",
-    "dotenv": "^16.4.5",  
-    "express": "^4.19.2",
-    "express-rate-limit": "^7.4.0",
-    "google-auth-library": "^9.14.0",
+    "discord.js": "^14.16.3",
+    "dotenv": "^16.4.5",
+    "express": "^4.21.1",
+    "express-rate-limit": "^7.4.1",
+    "google-auth-library": "^9.14.2",
     "graphql": "^16.9.0",
     "graphql-scalars": "^1.23.0",
     "graphql-tag": "^2.12.6",
-    "helmet": "^7.1.0",
+    "helmet": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",
     "lodash-es": "^4.17.21",
-    "minimatch": "^10.0.1",
     "mime": "^4.0.4",
+    "minimatch": "^10.0.1",
     "moment": "^2.30.1",
     "morgan": "^1.10.0",
     "objection": "^3.1.4",
-    "odiff-bin": "^3.1.1",
+    "odiff-bin": "^3.1.2",
     "p-retry": "^6.2.0",
-    "p-timeout":"^6.1.2",
-    "path-to-regexp": "^8.0.0",
-    "pg": "^8.12.0",
+    "p-timeout": "^6.1.3",
+    "path-to-regexp": "^8.2.0",
+    "pg": "^8.13.1",
     "rate-limit-redis": "^4.2.0",
     "react": "^18.3.1",
     "redis": "^4.7.0",
     "resend": "^4.0.0",
     "sharp": "^0.33.5",
-    "stripe": "^16.9.0",
+    "stripe": "^17.2.1",
     "tmp": "^0.2.3",
-    "yaml": "^2.5.0",
+    "yaml": "^2.6.0",
     "zod": "^3.23.8",
-    "zod-openapi": "^2.19.0"
+    "zod-openapi": "^3.2.0"
   },
   "devDependencies": {
     "@types/amqplib": "^0.10.5",
@@ -95,14 +95,14 @@
     "@types/convict": "^6.1.6",
     "@types/cookies": "^0.9.0",
     "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
+    "@types/express": "^4.0.0",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/morgan": "^1.9.9",
-    "@types/react": "^18.3.5",
+    "@types/react": "^18.3.12",
     "@types/supertest": "^6.0.2",
     "@types/tmp": "^0.2.6",
-    "concurrently": "^8.2.2",
+    "concurrently": "^9.0.1",
     "factory-girl-ts": "^2.3.1",
     "knex-scripts": "^0.3.6",
     "moment": "^2.30.1",

diff --git a/apps/backend/src/api/index.ts b/apps/backend/src/api/index.ts
@@ -10,7 +10,7 @@ import { updateBuild } from "./handlers/updateBuild.js";
 import { schema } from "./schema.js";
 import { errorHandler, registerHandler } from "./util.js";
 
-const router = Router();
+const router: Router = Router();
 
 // CORS
 router.use(

diff --git a/apps/backend/src/api/test-util.ts b/apps/backend/src/api/test-util.ts
@@ -1,4 +1,4 @@
-import { Router } from "express";
+import { Express, Router } from "express";
 
 import { createTestApp } from "@/web/test-util.js";
 
@@ -7,7 +7,7 @@ import { CreateAPIHandler, registerHandler } from "./util";
 /**
  * Create a test app with the given handler.
  */
-export function createTestHandlerApp(create: CreateAPIHandler) {
+export function createTestHandlerApp(create: CreateAPIHandler): Express {
   const router = Router();
   registerHandler(router, create);
   return createTestApp(router);

diff --git a/apps/backend/src/api/util.ts b/apps/backend/src/api/util.ts
@@ -7,14 +7,14 @@ import type {
   Response,
   Router,
 } from "express";
-import express from "express";
+import { json } from "express";
 import { z, ZodError, ZodType } from "zod";
 import {
   ZodOpenApiOperationObject,
   ZodOpenApiPathItemObject,
 } from "zod-openapi";
 
-import { asyncHandler } from "@/web/util.js";
+import { asyncHandler, boom } from "@/web/util.js";
 
 import { zodSchema } from "./schema.js";
 
@@ -90,23 +90,31 @@ function convertPath(path: string) {
   return path.replace(/{([^}]+)}/g, ":$1");
 }
 
+const DetailsSchema = z.array(z.object({ message: z.string() }));
+
 export const errorHandler: ErrorRequestHandler = (
   error: unknown,
   _req,
   res,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _next,
 ) => {
-  if (
+  const details =
+    error instanceof Error && "details" in error
+      ? DetailsSchema.safeParse(error.details).data
+      : undefined;
+
+  const statusCode =
     error instanceof Error &&
     "statusCode" in error &&
     typeof error.statusCode === "number"
-  ) {
-    res.status(error.statusCode).json({ error: error.message });
-    return;
-  }
+      ? error.statusCode
+      : 500;
 
-  res.status(500).json({ error: "Internal server error" });
+  const message =
+    error instanceof Error ? error.message : "Internal server error";
+
+  res.status(statusCode).json({ error: message, details });
 };
 
 type HandlerParams<T> = (T | T[])[];
@@ -148,8 +156,8 @@ function handler<TMethod extends "get" | "post" | "put">(
       convertPath(path),
       // Temporary increase the limit
       // we should find a way to split the upload in several requests
-      express.json({ limit: "3mb" }),
-      asyncHandler((req, res, next) => {
+      json({ limit: "3mb" }),
+      asyncHandler((req, _res, next) => {
         const ctx: RequestCtx<ZodOpenApiOperationObject> = {
           params: null,
           query: null,
@@ -180,30 +188,18 @@ function handler<TMethod extends "get" | "post" | "put">(
             const errorMessages = error.errors.map((issue: any) => ({
               message: `${issue.path.join(".")} is ${issue.message}`,
             }));
-            res
-              .status(400)
-              .json({ error: "Invalid request", details: errorMessages });
-            return;
+            throw boom(400, "Invalid request", {
+              cause: error,
+              details: errorMessages,
+            });
           }
           throw error;
         }
 
         next();
       }),
       ...wrappedHandlers,
-      Sentry.expressErrorHandler({
-        // shouldHandleError: (error: unknown) => {
-        //   if (
-        //     error instanceof Error &&
-        //     "statusCode" in error &&
-        //     typeof error.statusCode === "number" &&
-        //     error.statusCode < 500
-        //   ) {
-        //     return false;
-        //   }
-        //   return true;
-        // },
-      }),
+      Sentry.expressErrorHandler(),
       errorHandler,
     );
   };

diff --git a/apps/backend/src/build/createBuildDiffs.e2e.test.ts b/apps/backend/src/build/createBuildDiffs.e2e.test.ts
@@ -74,7 +74,6 @@ describe("#createBuildDiffs", () => {
       await build
         .$query()
         .patchAndFetch({ baseScreenshotBucketId: baseBucket.id });
-      // @ts-ignore
       [
         classicDiffBaseScreenshot,
         classicDiffCompareScreenshot,

diff --git a/apps/backend/src/build/label.ts b/apps/backend/src/build/label.ts
@@ -45,7 +45,6 @@ export function getBuildLabel(
     case "check": {
       return getBuildStatusLabel(status);
     }
-    // eslint-disable-next-line no-fallthrough
     case null:
     case undefined:
       return getBuildStatusLabel(status);

diff --git a/apps/backend/src/build/strategy/strategies/ci/strategies/github.ts b/apps/backend/src/build/strategy/strategies/ci/strategies/github.ts
@@ -95,8 +95,7 @@ export const GithubStrategy: MergeBaseStrategy<{
       if (checkErrorStatus(404, error)) {
         const notFoundError = new Error(
           `"${args.sha}" not found on repository "${args.ctx.repo}"`,
-        );
-        // @ts-ignore
+        ) as Error & { retryable: boolean };
         notFoundError.retryable = false;
         throw notFoundError;
       }

diff --git a/apps/backend/src/config/index.ts b/apps/backend/src/config/index.ts
@@ -210,7 +210,7 @@ const config = convict({
     apiKey: {
       doc: "Stripe API key",
       format: String,
-      default: "",
+      default: "no-api-key",
       env: "STRIPE_API_KEY",
     },
     pricingTableId: {

diff --git a/apps/backend/src/database/models/Build.ts b/apps/backend/src/database/models/Build.ts
@@ -229,9 +229,8 @@ export class Build extends Model {
     }
   }
 
-  override $toDatabaseJson(...args: any[]) {
-    // @ts-ignore
-    const json = super.$toDatabaseJson(...args);
+  override $formatDatabaseJson(json: Pojo): Pojo {
+    json = super.$formatDatabaseJson(json);
     if (json["number"] === -1) {
       json["number"] = this.$knex().raw(
         '(select coalesce(max(number),0) + 1 as number from builds where "projectId" = ?)',