From 90ac3df0d8ff8ae940dc4e084f1ae219c132dece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 8 Dec 2025 23:06:32 +0100 Subject: [PATCH] Clean-up tsconfigs for the `trackerless-network` package --- packages/sdk/tsconfig.browser.json | 3 +- packages/sdk/tsconfig.jest.json | 2 +- packages/sdk/tsconfig.node.json | 2 +- packages/trackerless-network/package.json | 6 ++-- .../trackerless-network/tsconfig.browser.json | 8 ----- .../trackerless-network/tsconfig.jest.json | 27 +++++++-------- packages/trackerless-network/tsconfig.json | 10 +++++- .../trackerless-network/tsconfig.karma.json | 15 +++++++-- .../trackerless-network/tsconfig.node.json | 33 ++++++++++--------- tsconfig.json | 6 ++++ 10 files changed, 63 insertions(+), 49 deletions(-) delete mode 100644 packages/trackerless-network/tsconfig.browser.json create mode 100644 tsconfig.json diff --git a/packages/sdk/tsconfig.browser.json b/packages/sdk/tsconfig.browser.json index e8446f523f..24c542e9cd 100644 --- a/packages/sdk/tsconfig.browser.json +++ b/packages/sdk/tsconfig.browser.json @@ -18,7 +18,6 @@ ], "exclude": ["src/exports-esm.mjs"], "references": [ - { "path": "../test-utils/tsconfig.node.json" }, - { "path": "../trackerless-network/tsconfig.browser.json" } + { "path": "../test-utils/tsconfig.node.json" } ] } diff --git a/packages/sdk/tsconfig.jest.json b/packages/sdk/tsconfig.jest.json index 5d3dcc75b6..f22e5a7bae 100644 --- a/packages/sdk/tsconfig.jest.json +++ b/packages/sdk/tsconfig.jest.json @@ -27,6 +27,6 @@ "references": [ { "path": "../test-utils/tsconfig.node.json" }, { "path": "../dht/tsconfig.node.json" }, - { "path": "../trackerless-network/tsconfig.node.json" } + { "path": "../trackerless-network" } ] } diff --git a/packages/sdk/tsconfig.node.json b/packages/sdk/tsconfig.node.json index d5fa7a540f..737ce8c5c6 100644 --- a/packages/sdk/tsconfig.node.json +++ b/packages/sdk/tsconfig.node.json @@ -20,7 +20,7 @@ ], "references": [ { "path": "../test-utils/tsconfig.node.json" }, - { "path": "../trackerless-network/tsconfig.node.json" }, + { "path": "../trackerless-network" }, { "path": "../dht/tsconfig.node.json" } ] diff --git a/packages/trackerless-network/package.json b/packages/trackerless-network/package.json index b9c5cf16a1..9b6627f6e9 100644 --- a/packages/trackerless-network/package.json +++ b/packages/trackerless-network/package.json @@ -18,10 +18,10 @@ "license": "STREAMR NETWORK OPEN SOURCE LICENSE", "author": "Streamr Network AG ", "scripts": { - "build": "tsc -b tsconfig.node.json", - "build-browser": "webpack --mode=development --progress", "prebuild": "./proto.sh", - "check": "tsc -p ./tsconfig.jest.json", + "build": "tsc -b", + "build-browser": "webpack --mode=development --progress", + "check": "tsc -p ./tsconfig.jest.json && tsc --noEmit -p ./tsconfig.node.json", "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true", "coverage": "jest --coverage", "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'", diff --git a/packages/trackerless-network/tsconfig.browser.json b/packages/trackerless-network/tsconfig.browser.json deleted file mode 100644 index 124a6dfce9..0000000000 --- a/packages/trackerless-network/tsconfig.browser.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.browser.json", - "compilerOptions": { - "outDir": "dist", - "noImplicitOverride": false - }, - "include": ["src", "generated"] -} diff --git a/packages/trackerless-network/tsconfig.jest.json b/packages/trackerless-network/tsconfig.jest.json index 947254821f..4941574da6 100644 --- a/packages/trackerless-network/tsconfig.jest.json +++ b/packages/trackerless-network/tsconfig.jest.json @@ -1,18 +1,15 @@ { - "extends": "../../tsconfig.jest.json", - "compilerOptions": { - "noEmit": true, - "types": ["node", "jest", "@streamr/test-utils/customMatcherTypes"], - "noImplicitOverride": false - }, - "include": [ - "src/**/*", - "generated/**/*", - "test/**/*", - "package.json" + "extends": "../../tsconfig.jest.json", + "compilerOptions": { + "types": [ + "node", + "jest", + "@streamr/test-utils/customMatcherTypes" ], - "references": [ - { "path": "../proto-rpc/tsconfig.node.json" }, - { "path": "../dht/tsconfig.node.json" } - ] + "noImplicitOverride": false + }, + "include": ["test"], + "references": [ + { "path": "./tsconfig.node.json" } + ] } diff --git a/packages/trackerless-network/tsconfig.json b/packages/trackerless-network/tsconfig.json index 09dd390ce2..590e4adf18 100644 --- a/packages/trackerless-network/tsconfig.json +++ b/packages/trackerless-network/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/trackerless-network/tsconfig.karma.json b/packages/trackerless-network/tsconfig.karma.json index 68c06ae5bc..5ab4a11571 100644 --- a/packages/trackerless-network/tsconfig.karma.json +++ b/packages/trackerless-network/tsconfig.karma.json @@ -1,6 +1,15 @@ { - "extends": "./tsconfig.browser.json", + "extends": "../../tsconfig.browser.json", "compilerOptions": { - "types": ["jest", "@streamr/test-utils/customMatcherTypes"] - } + "outDir": "dist", + "noImplicitOverride": false, + "types": [ + "jest", + "@streamr/test-utils/customMatcherTypes" + ] + }, + "include": [ + "src", + "generated" + ] } diff --git a/packages/trackerless-network/tsconfig.node.json b/packages/trackerless-network/tsconfig.node.json index 696af36838..60d9b4fc3a 100644 --- a/packages/trackerless-network/tsconfig.node.json +++ b/packages/trackerless-network/tsconfig.node.json @@ -1,17 +1,20 @@ { - "extends": "../../tsconfig.node.json", - "compilerOptions": { - "outDir": "dist", - "noImplicitOverride": false - }, - "include": [ - "src/**/*", - "generated/**/*", - "test/benchmark/first-message.ts", - "test/utils/utils.ts", - "package.json" - ], - "references": [ - { "path": "../dht/tsconfig.node.json" } - ] + "extends": "../../tsconfig.node.json", + "compilerOptions": { + "outDir": "dist", + "noImplicitOverride": false, + "stripInternal": false + }, + "include": [ + "src", + "generated", + "package.json" + ], + "references": [ + { "path": "../dht/tsconfig.node.json" }, + { "path": "../proto-rpc/tsconfig.node.json" }, + { "path": "../utils/tsconfig.node.json" }, + { "path": "../browser-test-runner/tsconfig.node.json" }, + { "path": "../test-utils/tsconfig.node.json" } + ] } diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000000..15b26d4632 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,6 @@ +{ + "files": [], + "references": [ + { "path": "./packages/trackerless-network" } + ] +}