From d7c8d11904a4a23c6ea369bde69ca283b041cc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 8 Dec 2025 16:47:11 +0100 Subject: [PATCH 1/2] Clean-up tsconfigs for the `geoip-location` package --- packages/dht/tsconfig.jest.json | 2 +- packages/dht/tsconfig.node.json | 2 +- packages/geoip-location/package.json | 4 ++-- packages/geoip-location/tsconfig.browser.json | 12 ----------- packages/geoip-location/tsconfig.jest.json | 13 +++++------- packages/geoip-location/tsconfig.json | 9 ++++++++- packages/geoip-location/tsconfig.node.json | 20 +++++++++---------- tsconfig.json | 6 ++++++ 8 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 packages/geoip-location/tsconfig.browser.json create mode 100644 tsconfig.json diff --git a/packages/dht/tsconfig.jest.json b/packages/dht/tsconfig.jest.json index 87227b54d0..de6e507d0f 100644 --- a/packages/dht/tsconfig.jest.json +++ b/packages/dht/tsconfig.jest.json @@ -17,6 +17,6 @@ { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json" }, { "path": "../cdn-location/tsconfig.node.json" }, - { "path": "../geoip-location/tsconfig.node.json" } + { "path": "../geoip-location" } ] } diff --git a/packages/dht/tsconfig.node.json b/packages/dht/tsconfig.node.json index 23dca9ac98..662d5defe0 100644 --- a/packages/dht/tsconfig.node.json +++ b/packages/dht/tsconfig.node.json @@ -15,6 +15,6 @@ { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json" }, { "path": "../cdn-location/tsconfig.node.json" }, - { "path": "../geoip-location/tsconfig.node.json" } + { "path": "../geoip-location" } ] } diff --git a/packages/geoip-location/package.json b/packages/geoip-location/package.json index 8475401a56..0e9d93540f 100644 --- a/packages/geoip-location/package.json +++ b/packages/geoip-location/package.json @@ -23,8 +23,8 @@ "license": "Apache-2.0", "author": "Streamr Network AG ", "scripts": { - "build": "tsc -b tsconfig.node.json", - "check": "tsc -p ./tsconfig.jest.json", + "build": "tsc -b", + "check": "tsc -p ./tsconfig.jest.json && tsc --noEmit -p ./tsconfig.node.json", "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true", "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'", "test": "jest test/unit", diff --git a/packages/geoip-location/tsconfig.browser.json b/packages/geoip-location/tsconfig.browser.json deleted file mode 100644 index 815ac97107..0000000000 --- a/packages/geoip-location/tsconfig.browser.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.browser.json", - "compilerOptions": { - "outDir": "dist", - "rootDirs": ["src", "test"], - "noImplicitOverride": false - }, - "include": [ - "src/**/*", - "test/**/*" - ] -} diff --git a/packages/geoip-location/tsconfig.jest.json b/packages/geoip-location/tsconfig.jest.json index 8021ad7fbd..deb01d41ba 100644 --- a/packages/geoip-location/tsconfig.jest.json +++ b/packages/geoip-location/tsconfig.jest.json @@ -1,10 +1,7 @@ { - "extends": "../../tsconfig.jest.json", - "include": [ - "src/**/*", - "test/**/*" - ], - "references": [ - { "path": "../utils/tsconfig.node.json" } - ] + "extends": "../../tsconfig.jest.json", + "include": ["test"], + "references": [ + { "path": "./tsconfig.node.json" } + ] } diff --git a/packages/geoip-location/tsconfig.json b/packages/geoip-location/tsconfig.json index 09dd390ce2..41dc0a8b2e 100644 --- a/packages/geoip-location/tsconfig.json +++ b/packages/geoip-location/tsconfig.json @@ -1,3 +1,10 @@ { - "extends": "./tsconfig.jest.json" + "files": [], + "compilerOptions": { + "composite": true + }, + "references": [ + { "path": "./tsconfig.jest.json" }, + { "path": "./tsconfig.node.json" } + ] } diff --git a/packages/geoip-location/tsconfig.node.json b/packages/geoip-location/tsconfig.node.json index 69d24f5f4f..567e1acbde 100644 --- a/packages/geoip-location/tsconfig.node.json +++ b/packages/geoip-location/tsconfig.node.json @@ -1,13 +1,11 @@ { - "extends": "../../tsconfig.node.json", - "compilerOptions": { - "outDir": "dist", - "noImplicitOverride": false - }, - "include": [ - "src/**/*" - ], - "references": [ - { "path": "../utils/tsconfig.node.json" }, - ] + "extends": "../../tsconfig.node.json", + "compilerOptions": { + "outDir": "dist", + "noImplicitOverride": false + }, + "include": ["src"], + "references": [ + { "path": "../utils/tsconfig.node.json" } + ] } diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000000..eba071237a --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,6 @@ +{ + "files": [], + "references": [ + { "path": "./packages/geoip-location" } + ] +} From 923d1c985a94cf4c42e66a5a97416c6b500ca150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 12:10:52 +0100 Subject: [PATCH 2/2] Drop unused root tsconfig --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 tsconfig.json diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index eba071237a..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "files": [], - "references": [ - { "path": "./packages/geoip-location" } - ] -}