diff --git a/packages/tests/.eslintrc.cjs b/packages/tests/.eslintrc.cjs index 324f1f526d..37c79ff066 100644 --- a/packages/tests/.eslintrc.cjs +++ b/packages/tests/.eslintrc.cjs @@ -1,6 +1,6 @@ module.exports = { parserOptions: { tsconfigRootDir: __dirname, - project: "./tsconfig.dev.json", + project: "./tsconfig.json", }, }; diff --git a/packages/tests/package.json b/packages/tests/package.json index 9f7a134056..f7bbc3b112 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -41,21 +41,15 @@ "privacy" ], "scripts": { - "build": "run-s build:**", - "build:esm": "tsc", "fix": "run-s fix:*", "fix:prettier": "prettier . --write", - "fix:lint": "eslint src --ext .ts --ext .cjs --fix", + "fix:lint": "eslint tests --ext .ts --ext .cjs --fix", "check": "run-s check:*", - "check:lint": "eslint src --ext .ts", + "check:lint": "eslint tests --ext .ts", "check:prettier": "prettier . --list-different", "check:spelling": "cspell \"{README.md,src/**/*.ts}\"", - "check:tsc": "tsc -p tsconfig.dev.json", - "test": "exit 0 # Tested in @waku/core", - "proto": "exit 0 # no proto", - "doc": "exit 0", - "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build", - "release": "exit 0" + "check:tsc": "tsc -p tsconfig.json", + "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build" }, "engines": { "node": ">=16" diff --git a/packages/core/src/lib/enr/enr.node.spec.ts b/packages/tests/tests/enr.node.spec.ts similarity index 100% rename from packages/core/src/lib/enr/enr.node.spec.ts rename to packages/tests/tests/enr.node.spec.ts diff --git a/packages/core/src/lib/waku_filter/index.node.spec.ts b/packages/tests/tests/filter.node.spec.ts similarity index 100% rename from packages/core/src/lib/waku_filter/index.node.spec.ts rename to packages/tests/tests/filter.node.spec.ts diff --git a/packages/core/src/lib/waku_light_push/index.node.spec.ts b/packages/tests/tests/light_push.node.spec.ts similarity index 100% rename from packages/core/src/lib/waku_light_push/index.node.spec.ts rename to packages/tests/tests/light_push.node.spec.ts diff --git a/packages/core/src/lib/waku_relay/index.node.spec.ts b/packages/tests/tests/relay.node.spec.ts similarity index 100% rename from packages/core/src/lib/waku_relay/index.node.spec.ts rename to packages/tests/tests/relay.node.spec.ts diff --git a/packages/core/src/lib/waku_store/index.node.spec.ts b/packages/tests/tests/store.node.spec.ts similarity index 100% rename from packages/core/src/lib/waku_store/index.node.spec.ts rename to packages/tests/tests/store.node.spec.ts diff --git a/packages/core/src/lib/wait_for_remote_peer.node.spec.ts b/packages/tests/tests/wait_for_remote_peer.node.spec.ts similarity index 100% rename from packages/core/src/lib/wait_for_remote_peer.node.spec.ts rename to packages/tests/tests/wait_for_remote_peer.node.spec.ts diff --git a/packages/core/src/lib/waku.node.spec.ts b/packages/tests/tests/waku.node.spec.ts similarity index 100% rename from packages/core/src/lib/waku.node.spec.ts rename to packages/tests/tests/waku.node.spec.ts diff --git a/packages/core/src/lib/waku.spec.ts b/packages/tests/tests/waku.spec.ts similarity index 100% rename from packages/core/src/lib/waku.spec.ts rename to packages/tests/tests/waku.spec.ts diff --git a/packages/tests/tsconfig.dev.json b/packages/tests/tsconfig.dev.json deleted file mode 100644 index ffc27ef6ba..0000000000 --- a/packages/tests/tsconfig.dev.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig", - "compilerOptions": { - "module": "esnext", - "noEmit": true - }, - "exclude": [] -} diff --git a/packages/tests/tsconfig.json b/packages/tests/tsconfig.json index 7b01b30897..ae5766a55f 100644 --- a/packages/tests/tsconfig.json +++ b/packages/tests/tsconfig.json @@ -3,9 +3,10 @@ "incremental": true, "target": "es2020", "outDir": "dist/", - "rootDir": "src", + "rootDir": "tests", + "noEmit": true, "moduleResolution": "node", - "module": "es2020", + "module": "esnext", "declaration": true, "sourceMap": true, "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, @@ -45,8 +46,7 @@ "types": ["node", "mocha"], "typeRoots": ["node_modules/@types", "src/types"] }, - "include": ["src"], - "exclude": ["src/**/*.spec.ts", "src/test_utils"], + "include": ["tests"], "compileOnSave": false, "ts-node": { "files": true diff --git a/packages/tests/tsconfig.karma.json b/packages/tests/tsconfig.karma.json index c540c783ff..c945ddb239 100644 --- a/packages/tests/tsconfig.karma.json +++ b/packages/tests/tsconfig.karma.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.dev", + "extends": "./tsconfig", "compilerOptions": { "noEmit": false }