From 3680ad9a2f0f589657357fbc568fc299a0dc0ea1 Mon Sep 17 00:00:00 2001 From: bodymindarts Date: Thu, 5 Oct 2023 22:18:15 +0200 Subject: [PATCH] build: unify tsconfig.json files --- core/api/package.json | 5 ++--- core/api/tsconfig-build.json | 7 ------- core/api/tsconfig.d.json | 4 ---- core/api/tsconfig.json | 8 ++++++-- 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 core/api/tsconfig-build.json delete mode 100644 core/api/tsconfig.d.json diff --git a/core/api/package.json b/core/api/package.json index 12cf3c5ea81..380bbd67ee0 100644 --- a/core/api/package.json +++ b/core/api/package.json @@ -1,12 +1,11 @@ { "name": "galoy", "scripts": { - "tsc-check-noimplicitany": "tsc --noEmit -p tsconfig.no-implicit-any.json", - "tsc-check": "tsc --noEmit -p tsconfig.d.json && tsc --noEmit", + "tsc-check": "tsc --noEmit -p tsconfig.json && tsc --noEmit", "madge-check": "yarn madge --circular lib/servers/graphql-main-server.js", "eslint-check": "eslint \"{src,test}/**/*.ts\"", "eslint-fix": "eslint \"{src,test}/**/*.ts\" --fix", - "build": "tsc -p tsconfig-build.json && cp -R src/services/price/protos lib/services/price/ && cp -R src/services/dealer-price/proto lib/services/dealer-price/ && cp -R src/services/loopd/protos lib/services/loopd/ && cp -R src/services/bria/proto lib/services/bria/ && tscpaths --silent -p tsconfig.json -s ./src -o ./lib", + "build": "tsc -p tsconfig.json && cp -R src/services/price/protos lib/services/price/ && cp -R src/services/dealer-price/proto lib/services/dealer-price/ && cp -R src/services/loopd/protos lib/services/loopd/ && cp -R src/services/bria/proto lib/services/bria/ && tscpaths --silent -p tsconfig.json -s ./src -o ./lib", "trigger": "yarn build && node lib/servers/trigger.js | pino-pretty -c -l", "check:sdl": ". ../../.env && yarn write-sdl && if git diff --name-only | grep -q 'core/api/src/graphql/admin/schema.graphql'; then echo 'Error: core/api/src/graphql/admin/schema.graphql has changes, run `make codegen` and re-recommit' >&2; exit 1; fi && if git diff --name-only | grep -q 'core/api/src/graphql/public/schema.graphql'; then echo 'Error: core/api/src/graphql/public/schema.graphql has changes, run `make codegen` and re-recommit' >&2; exit 1; fi", "write-sdl": "yarn build && node lib/servers/write-sdl.js write-sdl.yaml && rover supergraph compose --config dev/apollo-federation/supergraph-config.yaml --elv2-license accept > dev/apollo-federation/supergraph.graphql", diff --git a/core/api/tsconfig-build.json b/core/api/tsconfig-build.json deleted file mode 100644 index aa3e79ccb06..00000000000 --- a/core/api/tsconfig-build.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["src/servers/**/*.ts", "src/**/*.d.ts"], - "compilerOptions": { - "noImplicitAny": true - } -} diff --git a/core/api/tsconfig.d.json b/core/api/tsconfig.d.json deleted file mode 100644 index a44f3ec3541..00000000000 --- 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 7d9d80f900b..ba437b3b6fc 100644 --- a/core/api/tsconfig.json +++ b/core/api/tsconfig.json @@ -5,7 +5,7 @@ "sourceMap": true, "strict": true, "target": "es2020", - "noImplicitAny": false, + "noImplicitAny": true, "esModuleInterop": true, "baseUrl": "./", "moduleResolution": "node", @@ -23,7 +23,11 @@ } }, "compileOnSave": true, - "include": ["src/**/*", "test/**/*"], + "include": [ + "src/**/*.ts", + "src/**/*.d.ts", + "test/**/*" + ], "watchOptions": { "synchronousWatchDirectory": true }