From 2ceaf4acc61ff41cbc12ebfae74f80c8cd764f59 Mon Sep 17 00:00:00 2001 From: Arvin <17693119+vindard@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:17:12 -0400 Subject: [PATCH] chore(api): unify separated no-implicit-any checks (#3559) --- core/api/Makefile | 4 +--- core/api/package.json | 1 - core/api/src/debug/websocket/package.json | 1 - core/api/src/debug/websocket/tsconfig.json | 2 +- core/api/tsconfig-build.json | 5 +---- core/api/tsconfig.d.json | 4 ---- core/api/tsconfig.json | 1 + core/api/tsconfig.no-implicit-any.json | 12 ------------ 8 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 core/api/tsconfig.d.json delete mode 100644 core/api/tsconfig.no-implicit-any.json diff --git a/core/api/Makefile b/core/api/Makefile index 71676e31ef..4711b50d3e 100644 --- a/core/api/Makefile +++ b/core/api/Makefile @@ -108,10 +108,8 @@ integration-in-ci: unit-in-ci: . ./.env && \ LOGLEVEL=warn $(BIN_DIR)/jest --config ./test/unit/jest.config.js --ci --bail --maxWorkers=50% -check-implicit: - pnpm run tsc-check-noimplicitany -check-code: check-implicit +check-code: pnpm run tsc-check pnpm run eslint-check pnpm run build diff --git a/core/api/package.json b/core/api/package.json index 619f31eab5..31d873a900 100644 --- a/core/api/package.json +++ b/core/api/package.json @@ -1,7 +1,6 @@ { "name": "api", "scripts": { - "tsc-check-noimplicitany": "tsc --noEmit -p tsconfig.no-implicit-any.json", "tsc-check": "tsc --noEmit", "madge-check": "madge --circular --extensions ts ./src", "madge-check-tests": "madge --circular --extensions ts ./test", diff --git a/core/api/src/debug/websocket/package.json b/core/api/src/debug/websocket/package.json index 34790829a1..a3f48c988e 100644 --- a/core/api/src/debug/websocket/package.json +++ b/core/api/src/debug/websocket/package.json @@ -2,7 +2,6 @@ "name": "galoy", "type": "module", "scripts": { - "tsc-check-noimplicitany": "tsc --noEmit -p tsconfig.no-implicit-any.json", "tsc-check": "tsc --noEmit", "eslint-check": "eslint \"{src,test}/**/*.ts\"", "eslint-fix": "eslint \"{src,test}/**/*.ts\" --fix", diff --git a/core/api/src/debug/websocket/tsconfig.json b/core/api/src/debug/websocket/tsconfig.json index 9b41a66e8d..6d7ab522b3 100644 --- a/core/api/src/debug/websocket/tsconfig.json +++ b/core/api/src/debug/websocket/tsconfig.json @@ -5,7 +5,7 @@ "sourceMap": true, "strict": true, "target": "es2020", - "noImplicitAny": false, + "noImplicitAny": true, "useUnknownInCatchVariables": false, "esModuleInterop": true, "baseUrl": "./", diff --git a/core/api/tsconfig-build.json b/core/api/tsconfig-build.json index aa3e79ccb0..909cc5f982 100644 --- a/core/api/tsconfig-build.json +++ b/core/api/tsconfig-build.json @@ -1,7 +1,4 @@ { "extends": "./tsconfig.json", - "include": ["src/servers/**/*.ts", "src/**/*.d.ts"], - "compilerOptions": { - "noImplicitAny": true - } + "include": ["src/servers/**/*.ts", "src/**/*.d.ts"] } diff --git a/core/api/tsconfig.d.json b/core/api/tsconfig.d.json deleted file mode 100644 index a44f3ec354..0000000000 --- a/core/api/tsconfig.d.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["src/**/*.d.ts"] -} diff --git a/core/api/tsconfig.json b/core/api/tsconfig.json index fa0828c882..fd467c8668 100644 --- a/core/api/tsconfig.json +++ b/core/api/tsconfig.json @@ -8,6 +8,7 @@ "esModuleInterop": true, "baseUrl": "./", "moduleResolution": "node", + "noImplicitAny": true, "resolveJsonModule": true, "paths": { "@/*": [ diff --git a/core/api/tsconfig.no-implicit-any.json b/core/api/tsconfig.no-implicit-any.json deleted file mode 100644 index 39d2a115b2..0000000000 --- a/core/api/tsconfig.no-implicit-any.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "./tsconfig.d.json", - "include": ["src/**/*"], - "exclude": [ - "src/debug", - "src/migrations", - "src/services/swap/providers/lightning-labs/protos" - ], - "compilerOptions": { - "noImplicitAny": true - } -}