From 726e8bdf142b8af67129ba32202aecf8939faec5 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 5 Sep 2024 10:21:30 +0200 Subject: [PATCH 1/3] chore: temporarily remove peer cross dependencies --- packages/core/package.json | 8 ++------ packages/discovery/package.json | 8 -------- packages/enr/package.json | 5 ----- packages/message-encryption/package.json | 11 ----------- packages/message-hash/package.json | 9 --------- packages/relay/package.json | 7 ------- packages/sdk/package.json | 9 +-------- packages/utils/package.json | 8 -------- 8 files changed, 3 insertions(+), 62 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 65d8d3de99..7dfbc2e512 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -103,17 +103,13 @@ }, "peerDependencies": { "@multiformats/multiaddr": "^12.0.0", - "libp2p": "^1.8.1", - "@waku/enr": "^0.0.24", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18" + "libp2p": "^1.8.1" }, "peerDependenciesMeta": { "@multiformats/multiaddr": { "optional": true }, - "@waku/interfaces": { + "libp2p": { "optional": true } }, diff --git a/packages/discovery/package.json b/packages/discovery/package.json index 2b3825a72b..ea49a5a558 100644 --- a/packages/discovery/package.json +++ b/packages/discovery/package.json @@ -81,17 +81,9 @@ "sinon": "^18.0.0" }, "peerDependencies": { - "@waku/core": "0.0.30", - "@waku/enr": "0.0.24", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18", "@libp2p/interface": "^1.6.3" }, "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - }, "@libp2p/interface": { "optional": true } diff --git a/packages/enr/package.json b/packages/enr/package.json index 27df354102..2601e56507 100644 --- a/packages/enr/package.json +++ b/packages/enr/package.json @@ -79,14 +79,9 @@ "uint8arrays": "^5.0.1" }, "peerDependencies": { - "@waku/utils": "0.0.18", - "@waku/interfaces": "0.0.25", "@multiformats/multiaddr": "^12.0.0" }, "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - }, "@multiformats/multiaddr": { "optional": true } diff --git a/packages/message-encryption/package.json b/packages/message-encryption/package.json index b6aec4efd4..b8a9feca00 100644 --- a/packages/message-encryption/package.json +++ b/packages/message-encryption/package.json @@ -99,17 +99,6 @@ "process": "^0.11.10", "rollup": "^4.12.0" }, - "peerDependencies": { - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } - }, "files": [ "dist", "bundle", diff --git a/packages/message-hash/package.json b/packages/message-hash/package.json index 934887e7b2..6db97a402b 100644 --- a/packages/message-hash/package.json +++ b/packages/message-hash/package.json @@ -72,15 +72,6 @@ "process": "^0.11.10", "rollup": "^4.12.0" }, - "peerDependencies": { - "@waku/interfaces": "0.0.25", - "@waku/utils": "0.0.18" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } - }, "files": [ "dist", "bundle", diff --git a/packages/relay/package.json b/packages/relay/package.json index 6cc75b20f6..454cb345ad 100644 --- a/packages/relay/package.json +++ b/packages/relay/package.json @@ -68,16 +68,9 @@ "rollup": "^4.12.0" }, "peerDependencies": { - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18", "@chainsafe/libp2p-gossipsub": "^12.0.0" }, "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - }, "@chainsafe/libp2p-gossipsub": { "optional": true } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4241df2229..6c04317d83 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -83,16 +83,9 @@ "rollup": "^4.12.0" }, "peerDependencies": { - "@libp2p/bootstrap": "^10", - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/message-hash": "^0.1.14", - "@waku/utils": "0.0.18" + "@libp2p/bootstrap": "^10" }, "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - }, "@libp2p/bootstrap": { "optional": true } diff --git a/packages/utils/package.json b/packages/utils/package.json index c68838586d..5f8180aedb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -83,14 +83,6 @@ "fast-check": "^3.19.0", "rollup": "^4.12.0" }, - "peerDependencies": { - "@waku/interfaces": "0.0.25" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } - }, "files": [ "dist", "bundle", From 5d7ba6cfd7fa34eb3275f6c9c959283f055c046b Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 5 Sep 2024 17:05:52 +0200 Subject: [PATCH 2/3] up lock --- package-lock.json | 69 ++++------------------------------------------- 1 file changed, 5 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7137f28674..59006c77e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39118,17 +39118,13 @@ }, "peerDependencies": { "@multiformats/multiaddr": "^12.0.0", - "@waku/enr": "^0.0.24", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18", "libp2p": "^1.8.1" }, "peerDependenciesMeta": { "@multiformats/multiaddr": { "optional": true }, - "@waku/interfaces": { + "libp2p": { "optional": true } } @@ -39184,19 +39180,11 @@ "node": ">=20" }, "peerDependencies": { - "@libp2p/interface": "^1.6.3", - "@waku/core": "0.0.30", - "@waku/enr": "0.0.24", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18" + "@libp2p/interface": "^1.6.3" }, "peerDependenciesMeta": { "@libp2p/interface": { "optional": true - }, - "@waku/interfaces": { - "optional": true } } }, @@ -39236,16 +39224,11 @@ "node": ">=20" }, "peerDependencies": { - "@multiformats/multiaddr": "^12.0.0", - "@waku/interfaces": "0.0.25", - "@waku/utils": "0.0.18" + "@multiformats/multiaddr": "^12.0.0" }, "peerDependenciesMeta": { "@multiformats/multiaddr": { "optional": true - }, - "@waku/interfaces": { - "optional": true } } }, @@ -39298,17 +39281,6 @@ }, "engines": { "node": ">=20" - }, - "peerDependencies": { - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } } }, "packages/message-hash": { @@ -39340,15 +39312,6 @@ }, "engines": { "node": ">=20" - }, - "peerDependencies": { - "@waku/interfaces": "0.0.25", - "@waku/utils": "0.0.18" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } } }, "packages/proto": { @@ -39420,18 +39383,11 @@ "node": ">=18" }, "peerDependencies": { - "@chainsafe/libp2p-gossipsub": "^12.0.0", - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/proto": "0.0.7", - "@waku/utils": "0.0.18" + "@chainsafe/libp2p-gossipsub": "^12.0.0" }, "peerDependenciesMeta": { "@chainsafe/libp2p-gossipsub": { "optional": true - }, - "@waku/interfaces": { - "optional": true } } }, @@ -39469,18 +39425,11 @@ "node": ">=20" }, "peerDependencies": { - "@libp2p/bootstrap": "^10", - "@waku/core": "0.0.30", - "@waku/interfaces": "0.0.25", - "@waku/message-hash": "^0.1.14", - "@waku/utils": "0.0.18" + "@libp2p/bootstrap": "^10" }, "peerDependenciesMeta": { "@libp2p/bootstrap": { "optional": true - }, - "@waku/interfaces": { - "optional": true } } }, @@ -39556,14 +39505,6 @@ }, "engines": { "node": ">=20" - }, - "peerDependencies": { - "@waku/interfaces": "0.0.25" - }, - "peerDependenciesMeta": { - "@waku/interfaces": { - "optional": true - } } } } From e6c93618f896a7d272cb906b6a1c8c96fc383b39 Mon Sep 17 00:00:00 2001 From: Sasha Date: Fri, 6 Sep 2024 00:27:10 +0200 Subject: [PATCH 3/3] add missing dep --- package-lock.json | 1 + packages/sdk/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/package-lock.json b/package-lock.json index 59006c77e3..ea60aebd84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39406,6 +39406,7 @@ "@waku/core": "0.0.31", "@waku/discovery": "0.0.4", "@waku/interfaces": "0.0.26", + "@waku/message-hash": "0.1.15", "@waku/proto": "^0.0.8", "@waku/utils": "0.0.19", "libp2p": "^1.8.1" diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 6c04317d83..152730a5fa 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -69,6 +69,7 @@ "@waku/interfaces": "0.0.26", "@waku/proto": "^0.0.8", "@waku/utils": "0.0.19", + "@waku/message-hash": "0.1.15", "libp2p": "^1.8.1" }, "devDependencies": {