From 5aad705355b26a6045efd974c6beab29feab33c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 8 Dec 2025 23:15:44 +0100 Subject: [PATCH 1/2] Clean-up tsconfigs for the `utils` package --- packages/autocertifier-client/tsconfig.jest.json | 2 +- packages/autocertifier-client/tsconfig.node.json | 2 +- packages/autocertifier-server/tsconfig.jest.json | 2 +- packages/autocertifier-server/tsconfig.node.json | 2 +- packages/cdn-location/tsconfig.jest.json | 2 +- packages/cdn-location/tsconfig.node.json | 2 +- packages/cli-tools/tsconfig.node.json | 2 +- packages/dht/tsconfig.jest.json | 2 +- packages/dht/tsconfig.node.json | 2 +- packages/geoip-location/tsconfig.jest.json | 2 +- packages/geoip-location/tsconfig.node.json | 2 +- packages/node/tsconfig.jest.json | 2 +- packages/node/tsconfig.node.json | 2 +- packages/proto-rpc/tsconfig.jest.json | 2 +- packages/proto-rpc/tsconfig.node.json | 2 +- packages/test-utils/tsconfig.jest.json | 2 +- packages/test-utils/tsconfig.node.json | 2 +- packages/utils/package.json | 4 ++-- packages/utils/tsconfig.jest.json | 6 +++--- packages/utils/tsconfig.json | 10 +++++++++- packages/utils/tsconfig.karma.json | 12 +++++++++--- packages/utils/tsconfig.node.json | 5 ++--- tsconfig.json | 6 ++++++ 23 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 tsconfig.json diff --git a/packages/autocertifier-client/tsconfig.jest.json b/packages/autocertifier-client/tsconfig.jest.json index 1357eb63b0..761404dda1 100644 --- a/packages/autocertifier-client/tsconfig.jest.json +++ b/packages/autocertifier-client/tsconfig.jest.json @@ -6,6 +6,6 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/autocertifier-client/tsconfig.node.json b/packages/autocertifier-client/tsconfig.node.json index aebf4dfcac..5ad70c261c 100644 --- a/packages/autocertifier-client/tsconfig.node.json +++ b/packages/autocertifier-client/tsconfig.node.json @@ -9,6 +9,6 @@ "generated/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/autocertifier-server/tsconfig.jest.json b/packages/autocertifier-server/tsconfig.jest.json index 93d50ba1fe..e4e5916aa8 100644 --- a/packages/autocertifier-server/tsconfig.jest.json +++ b/packages/autocertifier-server/tsconfig.jest.json @@ -6,7 +6,7 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json"} diff --git a/packages/autocertifier-server/tsconfig.node.json b/packages/autocertifier-server/tsconfig.node.json index 3d1159742f..667e76653b 100644 --- a/packages/autocertifier-server/tsconfig.node.json +++ b/packages/autocertifier-server/tsconfig.node.json @@ -9,7 +9,7 @@ "bin/**/*", ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../dht/tsconfig.node.json"} diff --git a/packages/cdn-location/tsconfig.jest.json b/packages/cdn-location/tsconfig.jest.json index 6f891a1ed0..3b5af50ce6 100644 --- a/packages/cdn-location/tsconfig.jest.json +++ b/packages/cdn-location/tsconfig.jest.json @@ -6,7 +6,7 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json"} diff --git a/packages/cdn-location/tsconfig.node.json b/packages/cdn-location/tsconfig.node.json index 804c7ec519..b617664d7e 100644 --- a/packages/cdn-location/tsconfig.node.json +++ b/packages/cdn-location/tsconfig.node.json @@ -8,7 +8,7 @@ "src/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" } ] } diff --git a/packages/cli-tools/tsconfig.node.json b/packages/cli-tools/tsconfig.node.json index be650092e1..3b87013ba2 100644 --- a/packages/cli-tools/tsconfig.node.json +++ b/packages/cli-tools/tsconfig.node.json @@ -10,7 +10,7 @@ "bin/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../sdk/tsconfig.node.json" } ] } diff --git a/packages/dht/tsconfig.jest.json b/packages/dht/tsconfig.jest.json index 87227b54d0..71e084119b 100644 --- a/packages/dht/tsconfig.jest.json +++ b/packages/dht/tsconfig.jest.json @@ -12,7 +12,7 @@ "scripts" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json" }, diff --git a/packages/dht/tsconfig.node.json b/packages/dht/tsconfig.node.json index 23dca9ac98..9bdb354f31 100644 --- a/packages/dht/tsconfig.node.json +++ b/packages/dht/tsconfig.node.json @@ -10,7 +10,7 @@ "package.json" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../proto-rpc/tsconfig.node.json" }, { "path": "../autocertifier-client/tsconfig.node.json" }, diff --git a/packages/geoip-location/tsconfig.jest.json b/packages/geoip-location/tsconfig.jest.json index 8021ad7fbd..14db9e5ba2 100644 --- a/packages/geoip-location/tsconfig.jest.json +++ b/packages/geoip-location/tsconfig.jest.json @@ -5,6 +5,6 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/geoip-location/tsconfig.node.json b/packages/geoip-location/tsconfig.node.json index 69d24f5f4f..3c0d204b62 100644 --- a/packages/geoip-location/tsconfig.node.json +++ b/packages/geoip-location/tsconfig.node.json @@ -8,6 +8,6 @@ "src/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" } ] } diff --git a/packages/node/tsconfig.jest.json b/packages/node/tsconfig.jest.json index 2a21c5c8b5..1593f7985f 100644 --- a/packages/node/tsconfig.jest.json +++ b/packages/node/tsconfig.jest.json @@ -8,7 +8,7 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../sdk/tsconfig.node.json" } ] diff --git a/packages/node/tsconfig.node.json b/packages/node/tsconfig.node.json index 94448457eb..d53e6a6169 100644 --- a/packages/node/tsconfig.node.json +++ b/packages/node/tsconfig.node.json @@ -10,7 +10,7 @@ "package.json" ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" }, { "path": "../sdk/tsconfig.node.json" } ] diff --git a/packages/proto-rpc/tsconfig.jest.json b/packages/proto-rpc/tsconfig.jest.json index 57b0c88b4a..89c13fb269 100644 --- a/packages/proto-rpc/tsconfig.jest.json +++ b/packages/proto-rpc/tsconfig.jest.json @@ -10,7 +10,7 @@ "test/**/*", ], "references": [ - { "path": "../utils/tsconfig.node.json" }, + { "path": "../utils" }, { "path": "../test-utils/tsconfig.node.json" } ] } diff --git a/packages/proto-rpc/tsconfig.node.json b/packages/proto-rpc/tsconfig.node.json index aebf4dfcac..5ad70c261c 100644 --- a/packages/proto-rpc/tsconfig.node.json +++ b/packages/proto-rpc/tsconfig.node.json @@ -9,6 +9,6 @@ "generated/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/test-utils/tsconfig.jest.json b/packages/test-utils/tsconfig.jest.json index 8021ad7fbd..14db9e5ba2 100644 --- a/packages/test-utils/tsconfig.jest.json +++ b/packages/test-utils/tsconfig.jest.json @@ -5,6 +5,6 @@ "test/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/test-utils/tsconfig.node.json b/packages/test-utils/tsconfig.node.json index af9c79d535..faa2a3f071 100644 --- a/packages/test-utils/tsconfig.node.json +++ b/packages/test-utils/tsconfig.node.json @@ -8,6 +8,6 @@ "src/**/*" ], "references": [ - { "path": "../utils/tsconfig.node.json" } + { "path": "../utils" } ] } diff --git a/packages/utils/package.json b/packages/utils/package.json index 965dfc54d3..ea7748af2b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -16,8 +16,8 @@ "LICENSE" ], "scripts": { - "build": "tsc --build 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", diff --git a/packages/utils/tsconfig.jest.json b/packages/utils/tsconfig.jest.json index 1d18c5b846..deb01d41ba 100644 --- a/packages/utils/tsconfig.jest.json +++ b/packages/utils/tsconfig.jest.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.jest.json", - "include": [ - "src/**/*", - "test/**/*" + "include": ["test"], + "references": [ + { "path": "./tsconfig.node.json" } ] } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 09dd390ce2..590e4adf18 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,3 +1,11 @@ { - "extends": "./tsconfig.jest.json" + "files": [], + "compilerOptions": { + "composite": true + }, + "references": [ + { "path": "./tsconfig.jest.json" }, + { "path": "./tsconfig.node.json" }, + { "path": "./tsconfig.karma.json" } + ] } diff --git a/packages/utils/tsconfig.karma.json b/packages/utils/tsconfig.karma.json index 37798059c7..387e9726d5 100644 --- a/packages/utils/tsconfig.karma.json +++ b/packages/utils/tsconfig.karma.json @@ -1,6 +1,12 @@ { - "extends": "./tsconfig.browser.json", + "extends": "../../tsconfig.browser.json", "compilerOptions": { - "types": ["jest", "jest-extended"] - } + "outDir": "dist", + "noImplicitOverride": false, + "types": [ + "jest", + "jest-extended" + ] + }, + "include": ["src"] } diff --git a/packages/utils/tsconfig.node.json b/packages/utils/tsconfig.node.json index 204b86fc14..2f81cb1b0b 100644 --- a/packages/utils/tsconfig.node.json +++ b/packages/utils/tsconfig.node.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.node.json", "compilerOptions": { + "stripInternal": false, "outDir": "dist" }, - "include": [ - "src/**/*" - ] + "include": ["src"] } diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000000..051f3ef756 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,6 @@ +{ + "files": [], + "references": [ + { "path": "./packages/utils" } + ] +} From 23ed4e7dcf3667c9ceb3c03def57b01da8ed9728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 8 Dec 2025 23:46:19 +0100 Subject: [PATCH 2/2] Drop browser tsconfig --- packages/utils/tsconfig.browser.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 packages/utils/tsconfig.browser.json diff --git a/packages/utils/tsconfig.browser.json b/packages/utils/tsconfig.browser.json deleted file mode 100644 index a75b3faae2..0000000000 --- a/packages/utils/tsconfig.browser.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.browser.json", - "compilerOptions": { - "outDir": "dist", - "noImplicitOverride": false - }, - "include": ["src"] -}