diff --git a/.eslintignore b/.eslintignore index 65a406ccc..7f3984492 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ node_modules /built /.eslintrc.js +/src/@types/**/* diff --git a/.eslintrc.js b/.eslintrc.js index a16cc90f6..3b0a1747f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -36,6 +36,7 @@ module.exports = { 'no-async-promise-executor': ['off'], 'no-useless-escape': ['off'], 'no-multi-spaces': ['warn'], + 'no-control-regex': ['warn'], '@typescript-eslint/no-inferrable-types': ['warn'], '@typescript-eslint/no-empty-function': ['off'], '@typescript-eslint/no-non-null-assertion': ['off'], diff --git a/package.json b/package.json index 7335f3569..aca744fcd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "watch-gulp": "gulp watch", "clean": "gulp clean", "cleanall": "gulp cleanall", - "lint": "eslint --quiet src/**/*.ts", + "lint": "eslint --quiet src/**/*.ts --ignore-pattern src/client/**/*.ts", "cy:open": "cypress open", "cy:run": "cypress run", "e2e": "start-server-and-test start:test http://localhost cy:run", diff --git a/src/queue/types.ts b/src/queue/types.ts index a782fc6b9..fb1a48a79 100644 --- a/src/queue/types.ts +++ b/src/queue/types.ts @@ -28,7 +28,7 @@ export type DbUserImportJobData = { fileId: DriveFile['id']; }; -export type ObjectStorageJobData = ObjectStorageFileJobData | {}; +export type ObjectStorageJobData = ObjectStorageFileJobData | Record; export type ObjectStorageFileJobData = { key: string; diff --git a/src/server/api/define.ts b/src/server/api/define.ts index 4bd8f95e3..c13cb2f3b 100644 --- a/src/server/api/define.ts +++ b/src/server/api/define.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ import * as fs from 'fs'; import { ILocalUser } from '@/models/entities/user'; import { IEndpointMeta } from './endpoints';