From bf395194a9da1b34aadacfddcea11409f442a4c2 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 5 Jan 2022 17:45:53 +0100 Subject: [PATCH] [Dev] Turn on `@typescript-eslint/no-throw-literal`; Use `.eslintignore` from root folder (#1623) --- .eslintignore | 10 ++++++++++ .eslintrc | 1 - package.json | 4 ++-- src/api/gramjs/worker/provider.ts | 2 +- src/util/WorkerConnector.ts | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.eslintignore b/.eslintignore index 38f8e886e..2bff420d0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,11 @@ dev + +src/lib/rlottie/rlottie-wasm.js +src/lib/webp/webp_wasm.js + +src/lib/gramjs/tl/types-generator/template.js +src/lib/gramjs/tl/api.d.ts +src/lib/gramjs/tl/apiTl.js +src/lib/gramjs/tl/schemaTl.js +src/lib/gramjs/tl/apiTl.full.js +src/lib/gramjs/tl/schemaTl.full.js diff --git a/.eslintrc b/.eslintrc index 28eb23c2f..d976c0690 100644 --- a/.eslintrc +++ b/.eslintrc @@ -63,7 +63,6 @@ ], "@typescript-eslint/camelcase": "off", "@typescript-eslint/member-delimiter-style": "error", - "@typescript-eslint/no-throw-literal": "off", "teactn/prefer-separate-component-file": "off" }, "settings": { diff --git a/package.json b/package.json index 5e12dc7bc..65d770239 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "lint": "tsc && eslint . --ext .ts,.tsx --ignore-pattern src/lib/gramjs", "lint:fix": "npm run lint -- --fix", "gramjs:tl": "node ./src/lib/gramjs/tl/generateModules.js", - "gramjs:lint:fix": "eslint ./src/lib/gramjs --ignore-path=src/lib/gramjs/.eslintignore --fix", + "gramjs:lint:fix": "eslint ./src/lib/gramjs --fix", "test": "cross-env APP_ENV=test jest --verbose --forceExit", "prepare": "husky install" }, @@ -28,7 +28,7 @@ } }, "lint-staged": { - "*.{ts,tsx,js}": "eslint --fix --ignore-path=src/lib/gramjs/.eslintignore" + "*.{ts,tsx,js}": "eslint --fix" }, "author": "Alexander Zinchuk (alexander@zinchuk.com)", "license": "GPL-3.0-or-later", diff --git a/src/api/gramjs/worker/provider.ts b/src/api/gramjs/worker/provider.ts index 310bd4ffa..d1a4de9e1 100644 --- a/src/api/gramjs/worker/provider.ts +++ b/src/api/gramjs/worker/provider.ts @@ -90,7 +90,7 @@ function subscribeToWorker(onUpdate: OnApiUpdate) { } else if (data.type === 'methodCallback') { requestStates.get(data.messageId)?.callback?.(...data.callbackArgs); } else if (data.type === 'unhandledError') { - throw data.error; + throw new Error(data.error?.message); } }); } diff --git a/src/util/WorkerConnector.ts b/src/util/WorkerConnector.ts index 77c288356..fd3f213b0 100644 --- a/src/util/WorkerConnector.ts +++ b/src/util/WorkerConnector.ts @@ -130,7 +130,7 @@ export default class WorkerConnector { const requestState = requestStates.get(data.messageId); requestState?.callback?.(...data.callbackArgs); } else if (data.type === 'unhandledError') { - throw data.error; + throw new Error(data.error?.message); } }); }