From 55192a2774c207f9fe01b5bae764fbcfc9886efd Mon Sep 17 00:00:00 2001 From: "fryorcraken.eth" Date: Thu, 3 Nov 2022 22:40:42 +1100 Subject: [PATCH] chore: fix tests test + karma tests --- packages/core/karma.conf.cjs | 26 ++++++-------------- packages/core/tsconfig.karma.json | 6 ----- packages/dns-discovery/tsconfig.karma.json | 6 ----- packages/enr/tsconfig.karma.json | 6 ----- packages/tests/package.json | 1 + packages/tests/tests/enr.node.spec.ts | 2 +- packages/tests/tests/filter.node.spec.ts | 2 +- packages/tests/tests/light_push.node.spec.ts | 2 +- packages/tests/tests/relay.node.spec.ts | 2 +- packages/tests/tests/waku.node.spec.ts | 2 +- packages/tests/tsconfig.karma.json | 6 ----- 11 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 packages/core/tsconfig.karma.json delete mode 100644 packages/dns-discovery/tsconfig.karma.json delete mode 100644 packages/enr/tsconfig.karma.json delete mode 100644 packages/tests/tsconfig.karma.json diff --git a/packages/core/karma.conf.cjs b/packages/core/karma.conf.cjs index febf1611b4..20d52e751f 100644 --- a/packages/core/karma.conf.cjs +++ b/packages/core/karma.conf.cjs @@ -18,24 +18,9 @@ module.exports = function (config) { }, }, webpack: { - mode: "production", + mode: "development", module: { - rules: [ - { - test: /\.(js|tsx?)$/, - use: [ - { - loader: "ts-loader", - options: { configFile: "tsconfig.karma.json" }, - }, - ], - exclude: /(node_modules)|(node\.spec\.ts)/, - }, - { - test: /node\.spec\.ts$/, - use: "ignore-loader", - }, - ], + rules: [{ test: /\.([cm]?ts|tsx)$/, loader: "ts-loader" }], }, plugins: [ new webpack.DefinePlugin({ @@ -46,7 +31,12 @@ module.exports = function (config) { }), ], resolve: { - extensions: [".ts", ".js"], + extensions: [".ts", ".tsx", ".js"], + extensionAlias: { + ".js": [".js", ".ts"], + ".cjs": [".cjs", ".cts"], + ".mjs": [".mjs", ".mts"], + }, }, stats: { warnings: false }, devtool: "inline-source-map", diff --git a/packages/core/tsconfig.karma.json b/packages/core/tsconfig.karma.json deleted file mode 100644 index c540c783ff..0000000000 --- a/packages/core/tsconfig.karma.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.dev", - "compilerOptions": { - "noEmit": false - } -} diff --git a/packages/dns-discovery/tsconfig.karma.json b/packages/dns-discovery/tsconfig.karma.json deleted file mode 100644 index c540c783ff..0000000000 --- a/packages/dns-discovery/tsconfig.karma.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.dev", - "compilerOptions": { - "noEmit": false - } -} diff --git a/packages/enr/tsconfig.karma.json b/packages/enr/tsconfig.karma.json deleted file mode 100644 index c540c783ff..0000000000 --- a/packages/enr/tsconfig.karma.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.dev", - "compilerOptions": { - "noEmit": false - } -} diff --git a/packages/tests/package.json b/packages/tests/package.json index 5acce960eb..1adbe1806a 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -56,6 +56,7 @@ }, "dependencies": { "@waku/core": "*", + "@waku/enr": "*", "@waku/create": "*", "@waku/interfaces": "*", "@waku/byte-utils": "*" diff --git a/packages/tests/tests/enr.node.spec.ts b/packages/tests/tests/enr.node.spec.ts index 3bfabbe2e3..1f84370f32 100644 --- a/packages/tests/tests/enr.node.spec.ts +++ b/packages/tests/tests/enr.node.spec.ts @@ -1,6 +1,6 @@ -import { ENR } from "@waku/core/lib/enr"; import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer"; import { createPrivacyNode } from "@waku/create"; +import { ENR } from "@waku/enr"; import type { WakuPrivacy } from "@waku/interfaces"; import { Protocols } from "@waku/interfaces"; import { expect } from "chai"; diff --git a/packages/tests/tests/filter.node.spec.ts b/packages/tests/tests/filter.node.spec.ts index 561e58d8b8..b5298d59de 100644 --- a/packages/tests/tests/filter.node.spec.ts +++ b/packages/tests/tests/filter.node.spec.ts @@ -1,4 +1,4 @@ -import { bytesToUtf8, utf8ToBytes } from "@waku/core/lib/utils"; +import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils"; import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer"; import { DecoderV0, EncoderV0 } from "@waku/core/lib/waku_message/version_0"; import { createFullNode } from "@waku/create"; diff --git a/packages/tests/tests/light_push.node.spec.ts b/packages/tests/tests/light_push.node.spec.ts index f937e54a22..ed098ca9f6 100644 --- a/packages/tests/tests/light_push.node.spec.ts +++ b/packages/tests/tests/light_push.node.spec.ts @@ -1,4 +1,4 @@ -import { bytesToUtf8, utf8ToBytes } from "@waku/core/lib/utils"; +import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils"; import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer"; import { EncoderV0 } from "@waku/core/lib/waku_message/version_0"; import { createFullNode } from "@waku/create"; diff --git a/packages/tests/tests/relay.node.spec.ts b/packages/tests/tests/relay.node.spec.ts index cef9e21c88..604439a503 100644 --- a/packages/tests/tests/relay.node.spec.ts +++ b/packages/tests/tests/relay.node.spec.ts @@ -1,11 +1,11 @@ import { PeerId } from "@libp2p/interface-peer-id"; +import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils"; import { DefaultPubSubTopic, generatePrivateKey, generateSymmetricKey, getPublicKey, } from "@waku/core"; -import { bytesToUtf8, utf8ToBytes } from "@waku/core/lib/utils"; import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer"; import { DecoderV0, diff --git a/packages/tests/tests/waku.node.spec.ts b/packages/tests/tests/waku.node.spec.ts index 8999460ffb..07c4e69010 100644 --- a/packages/tests/tests/waku.node.spec.ts +++ b/packages/tests/tests/waku.node.spec.ts @@ -1,7 +1,7 @@ import type { PeerId } from "@libp2p/interface-peer-id"; +import { bytesToUtf8, utf8ToBytes } from "@waku/byte-utils"; import { generateSymmetricKey } from "@waku/core"; import { PeerDiscoveryStaticPeers } from "@waku/core/lib/peer_discovery_static_list"; -import { bytesToUtf8, utf8ToBytes } from "@waku/core/lib/utils"; import { waitForRemotePeer } from "@waku/core/lib/wait_for_remote_peer"; import { SymDecoder, SymEncoder } from "@waku/core/lib/waku_message/version_1"; import { createLightNode, createPrivacyNode } from "@waku/create"; diff --git a/packages/tests/tsconfig.karma.json b/packages/tests/tsconfig.karma.json deleted file mode 100644 index c540c783ff..0000000000 --- a/packages/tests/tsconfig.karma.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.dev", - "compilerOptions": { - "noEmit": false - } -}