Skip to content

Commit 09e9bd5

Browse files
authored
chore: remove catalog usage, move viem to peer deps (#3405)
1 parent 1673ff9 commit 09e9bd5

19 files changed

Lines changed: 172 additions & 140 deletions

File tree

.changeset/modern-ravens-study.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
"@latticexyz/block-logs-stream": patch
3+
"@latticexyz/common": patch
4+
"@latticexyz/config": patch
5+
"@latticexyz/dev-tools": patch
6+
"@latticexyz/explorer": patch
7+
"@latticexyz/faucet": patch
8+
"@latticexyz/protocol-parser": patch
9+
"@latticexyz/schema-type": patch
10+
"@latticexyz/stash": patch
11+
"@latticexyz/store-indexer": patch
12+
"@latticexyz/store-sync": patch
13+
"@latticexyz/store": patch
14+
"@latticexyz/world": patch
15+
---
16+
17+
Moved viem to peer dependencies to ensure a single, consistent version is installed in downstream projects.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"package.json": "pnpm fix:package-json"
4040
},
4141
"devDependencies": {
42-
"@ark/attest": "catalog:",
42+
"@ark/attest": "0.12.1",
4343
"@changesets/cli": "^2.27.7",
4444
"@types/node": "^18.15.11",
4545
"@typescript-eslint/eslint-plugin": "7.1.1",
@@ -58,7 +58,7 @@
5858
"tsx": "4.19.0",
5959
"turbo": "^1.9.3",
6060
"typescript": "5.4.2",
61-
"viem": "catalog:",
61+
"viem": "2.21.19",
6262
"vitest": "2.1.2"
6363
},
6464
"packageManager": "pnpm@9.6.0",

packages/block-logs-stream/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@
3535
"dependencies": {
3636
"@latticexyz/common": "workspace:*",
3737
"debug": "^4.3.4",
38-
"rxjs": "7.5.5",
39-
"viem": "catalog:"
38+
"rxjs": "7.5.5"
4039
},
4140
"devDependencies": {
4241
"@types/debug": "^4.1.7",
4342
"tsup": "^6.7.0",
43+
"viem": "2.21.19",
4444
"vitest": "0.34.6"
4545
},
46+
"peerDependencies": {
47+
"viem": "2.x"
48+
},
4649
"publishConfig": {
4750
"access": "public"
4851
}

packages/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"test:ci": "pnpm run test"
4040
},
4141
"dependencies": {
42-
"@ark/util": "catalog:",
42+
"@ark/util": "0.2.2",
4343
"@aws-sdk/client-kms": "^3.556.0",
4444
"@latticexyz/abi-ts": "workspace:*",
4545
"@latticexyz/block-logs-stream": "workspace:*",
@@ -53,7 +53,7 @@
5353
"@latticexyz/utils": "workspace:*",
5454
"@latticexyz/world": "workspace:*",
5555
"@latticexyz/world-module-metadata": "workspace:*",
56-
"abitype": "catalog:",
56+
"abitype": "1.0.6",
5757
"asn1.js": "^5.4.1",
5858
"chalk": "^5.0.1",
5959
"chokidar": "^3.5.3",
@@ -70,7 +70,7 @@
7070
"throttle-debounce": "^5.0.0",
7171
"toposort": "^2.0.2",
7272
"typescript": "5.4.2",
73-
"viem": "catalog:",
73+
"viem": "2.21.19",
7474
"yargs": "^17.7.1",
7575
"zod": "3.23.8",
7676
"zod-validation-error": "^1.3.0"

packages/common/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,26 @@
6868
"dependencies": {
6969
"@latticexyz/schema-type": "workspace:*",
7070
"@solidity-parser/parser": "^0.16.0",
71-
"abitype": "catalog:",
71+
"abitype": "1.0.6",
7272
"debug": "^4.3.4",
7373
"execa": "^7.0.0",
7474
"p-queue": "^7.4.1",
7575
"p-retry": "^5.1.2",
7676
"prettier": "3.2.5",
77-
"prettier-plugin-solidity": "1.3.1",
78-
"viem": "catalog:"
77+
"prettier-plugin-solidity": "1.3.1"
7978
},
8079
"devDependencies": {
8180
"@types/debug": "^4.1.7",
8281
"@types/node": "^18.15.11",
8382
"@viem/anvil": "^0.0.7",
8483
"tsup": "^6.7.0",
84+
"viem": "2.21.19",
8585
"vitest": "0.34.6"
8686
},
8787
"peerDependencies": {
8888
"@aws-sdk/client-kms": "3.x",
89-
"asn1.js": "5.x"
89+
"asn1.js": "5.x",
90+
"viem": "2.x"
9091
},
9192
"peerDependenciesMeta": {
9293
"@aws-sdk/client-kms": {

packages/config/package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,17 @@
4040
"test:ci": "pnpm run test"
4141
},
4242
"dependencies": {
43-
"@ark/util": "catalog:",
43+
"@ark/util": "0.2.2",
4444
"@latticexyz/common": "workspace:*",
4545
"@latticexyz/schema-type": "workspace:*",
4646
"esbuild": "^0.17.15",
47-
"find-up": "^6.3.0",
48-
"viem": "catalog:"
47+
"find-up": "^6.3.0"
4948
},
5049
"devDependencies": {
51-
"tsup": "^6.7.0"
50+
"tsup": "^6.7.0",
51+
"viem": "2.21.19"
52+
},
53+
"peerDependencies": {
54+
"viem": "2.x"
5255
}
5356
}

packages/dev-tools/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"rxjs": "7.5.5",
4747
"tailwind-merge": "^1.12.0",
4848
"use-local-storage-state": "^18.3.2",
49-
"viem": "catalog:",
5049
"zustand": "^4.3.7"
5150
},
5251
"devDependencies": {
@@ -57,6 +56,7 @@
5756
"postcss": "^8.4.23",
5857
"tailwindcss": "^3.3.2",
5958
"tsup": "^6.7.0",
59+
"viem": "2.21.19",
6060
"vitest": "0.34.6"
6161
},
6262
"peerDependencies": {
@@ -65,7 +65,8 @@
6565
"@latticexyz/store": "2.x",
6666
"@latticexyz/store-sync": "2.x",
6767
"@latticexyz/utils": "2.x",
68-
"@latticexyz/world": "2.x"
68+
"@latticexyz/world": "2.x",
69+
"viem": "2.x"
6970
},
7071
"publishConfig": {
7172
"access": "public"

packages/explorer/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
"sql-autocomplete": "^1.1.1",
7777
"tailwind-merge": "^1.12.0",
7878
"tsup": "^6.7.0",
79-
"viem": "catalog:",
80-
"wagmi": "catalog:",
79+
"wagmi": "2.12.11",
8180
"yargs": "^17.7.1",
8281
"zod": "3.23.8",
8382
"zustand": "^4.3.7"
@@ -96,7 +95,11 @@
9695
"prettier": "3.2.5",
9796
"prettier-plugin-tailwindcss": "^0.6.5",
9897
"tailwindcss": "^3.4.1",
99-
"tailwindcss-animate": "^1.0.7"
98+
"tailwindcss-animate": "^1.0.7",
99+
"viem": "2.21.19"
100+
},
101+
"peerDependencies": {
102+
"viem": "2.x"
100103
},
101104
"packageManager": "pnpm@9.6.0",
102105
"engines": {

packages/faucet/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@
4646
"debug": "^4.3.4",
4747
"dotenv": "^16.0.3",
4848
"fastify": "^4.21.0",
49-
"viem": "catalog:",
5049
"zod": "3.23.8"
5150
},
5251
"devDependencies": {
5352
"@types/debug": "^4.1.7",
5453
"tsup": "^6.7.0",
54+
"viem": "2.21.19",
5555
"vitest": "0.34.6"
5656
},
57+
"peerDependencies": {
58+
"viem": "2.x"
59+
},
5760
"publishConfig": {
5861
"access": "public"
5962
}

packages/protocol-parser/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@
4040
"@latticexyz/common": "workspace:*",
4141
"@latticexyz/config": "workspace:*",
4242
"@latticexyz/schema-type": "workspace:*",
43-
"abitype": "catalog:",
44-
"viem": "catalog:"
43+
"abitype": "1.0.6"
4544
},
4645
"devDependencies": {
4746
"tsup": "^6.7.0",
47+
"viem": "2.21.19",
4848
"vitest": "0.34.6"
4949
},
50+
"peerDependencies": {
51+
"viem": "2.x"
52+
},
5053
"publishConfig": {
5154
"access": "public"
5255
}

0 commit comments

Comments
 (0)