Skip to content

Commit 43849ea

Browse files
authored
deps: update deps (#122)
1 parent 9fbaffd commit 43849ea

File tree

25 files changed

+2252
-2364
lines changed

25 files changed

+2252
-2364
lines changed

.github/workflows/playwright.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@ jobs:
2828
run: pnpm install
2929
- name: build packages
3030
run: pnpm run -r build
31+
- name: Install dependencies for builded packages
32+
run: pnpm install
33+
- name: Build contract
34+
run: cd packages/webui && npm run build-contract
3135
- name: Install Playwright Browsers
3236
run: cd packages/webui && pnpm exec playwright install --with-deps
3337
- name: Build fe
34-
run: cd packages/webui && npm run build && npm run build-contract
38+
run: cd packages/webui && npm run build
3539
- name: Run Playwright tests
3640
run: cd packages/webui && pnpm exec playwright test
3741
- uses: actions/upload-artifact@v3

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ thumbs.db
1010
.leveldb
1111
__contract_code__.js
1212
.logs
13+
/bin/
1314

1415
.eslintcache
1516

package.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
"homepage": "https://github.com/chain-web/trustack#readme",
2626
"dependencies": {
2727
"@types/jest": "^29.5.3",
28-
"@types/node": "^20.4.5",
29-
"@typescript-eslint/eslint-plugin": "^5.62.0",
30-
"@typescript-eslint/parser": "^5.62.0",
31-
"eslint": "^8.46.0",
32-
"eslint-config-prettier": "^8.9.0",
33-
"eslint-define-config": "^1.22.0",
34-
"eslint-plugin-import": "^2.28.0",
28+
"@types/node": "^20.5.1",
29+
"@typescript-eslint/eslint-plugin": "^6.4.0",
30+
"@typescript-eslint/parser": "^6.4.0",
31+
"eslint": "^8.47.0",
32+
"eslint-config-prettier": "^9.0.0",
33+
"eslint-define-config": "^1.23.0",
34+
"eslint-plugin-import": "^2.28.1",
3535
"eslint-plugin-node": "^11.1.0",
36-
"eslint-plugin-prettier": "^4.2.1",
36+
"eslint-plugin-prettier": "^5.0.0",
3737
"eslint-plugin-regexp": "^1.15.0",
3838
"jest": "^29.6.2",
39-
"lint-staged": "^13.2.3",
40-
"prettier": "^2.8.8",
39+
"lint-staged": "^14.0.1",
40+
"prettier": "^3.0.2",
4141
"simple-git-hooks": "^2.9.0",
4242
"ts-jest": "^29.1.1",
4343
"typescript": "^5.1.6"
@@ -62,6 +62,11 @@
6262
"it-drain": "*"
6363
}
6464
},
65+
"@libp2p/mplex": {
66+
"dependencies": {
67+
"it-pipe": "*"
68+
}
69+
},
6570
"@deck.gl/mapbox": {
6671
"dependencies": {
6772
"@math.gl/web-mercator": "*"

packages/common/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"author": "",
2222
"license": "ISC",
2323
"dependencies": {
24-
"@libp2p/crypto": "^1.0.17",
24+
"@libp2p/crypto": "^2.0.3",
2525
"@libp2p/interface-peer-id": "^2.0.2",
26-
"@libp2p/peer-id-factory": "^2.0.4",
27-
"@protobuf-ts/runtime": "^2.9.0",
28-
"bls-eth-wasm": "^1.0.6",
29-
"multiformats": "^11.0.2",
30-
"uint8arrays": "^4.0.4"
26+
"@libp2p/peer-id-factory": "^3.0.3",
27+
"@protobuf-ts/runtime": "^2.9.1",
28+
"bls-eth-wasm": "^1.1.0",
29+
"multiformats": "^12.0.1",
30+
"uint8arrays": "^4.0.6"
3131
},
3232
"devDependencies": {
33-
"@protobuf-ts/plugin": "^2.9.0",
34-
"@protobuf-ts/protoc": "^2.9.0"
33+
"@protobuf-ts/plugin": "^2.9.1",
34+
"@protobuf-ts/protoc": "^2.9.1"
3535
}
3636
}

packages/contract/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
"author": "",
3333
"license": "ISC",
3434
"dependencies": {
35-
"@protobuf-ts/runtime": "^2.9.0",
35+
"@protobuf-ts/runtime": "^2.9.1",
3636
"@trustack/contract_builder": "workspace:^1.0.0",
3737
"@trustack/vm": "workspace:^1.0.0",
38-
"multiformats": "^11.0.2"
38+
"multiformats": "^12.0.1"
3939
},
4040
"devDependencies": {
41-
"@protobuf-ts/plugin": "^2.9.0",
42-
"@protobuf-ts/protoc": "^2.9.0"
41+
"@protobuf-ts/plugin": "^2.9.1",
42+
"@protobuf-ts/protoc": "^2.9.1"
4343
}
4444
}

packages/contract_builder/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
"license": "ISC",
1818
"dependencies": {
1919
"@rollup/plugin-commonjs": "^25.0.4",
20-
"@rollup/plugin-node-resolve": "^15.1.0",
20+
"@rollup/plugin-node-resolve": "^15.2.0",
2121
"@rollup/plugin-terser": "^0.4.3",
2222
"@rollup/plugin-typescript": "^11.1.2",
2323
"@rollup/plugin-wasm": "^6.1.3",
24-
"@swc/core": "^1.3.72",
25-
"@swc/wasm-web": "^1.3.72",
24+
"@swc/core": "^1.3.78",
25+
"@swc/wasm-web": "^1.3.78",
2626
"@trustack/vm": "workspace:^1.0.0",
2727
"cac": "^6.7.14",
2828
"chalk": "^5.3.0",
29-
"multiformats": "^11.0.2",
29+
"multiformats": "^12.0.1",
3030
"rollup": "^3.28.0",
3131
"rollup-plugin-typescript2": "^0.35.0",
32-
"tslib": "^2.6.1",
32+
"tslib": "^2.6.2",
3333
"typescript": "^5.1.6"
3434
}
3535
}

packages/docs/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"dependencies": {
1313
"@algolia/client-search": "^4.19.1",
1414
"@astrojs/partytown": "^1.2.3",
15-
"@astrojs/preact": "^2.2.1",
16-
"@astrojs/react": "^2.2.1",
17-
"@docsearch/css": "^3.5.1",
18-
"@docsearch/react": "^3.5.1",
19-
"@types/node": "^18.17.1",
20-
"@types/react": "^17.0.62",
15+
"@astrojs/preact": "^2.2.2",
16+
"@astrojs/react": "^2.3.2",
17+
"@docsearch/css": "^3.5.2",
18+
"@docsearch/react": "^3.5.2",
19+
"@types/node": "^20.5.1",
20+
"@types/react": "^18.2.20",
2121
"@types/react-dom": "^18.2.7",
22-
"astro": "^2.9.6",
23-
"preact": "^10.16.0",
22+
"astro": "^2.10.12",
23+
"preact": "^10.17.1",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0"
2626
},

packages/docs/src/components/RightSidebar/ThemeToggleButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const ThemeToggle: FunctionalComponent = () => {
3434
if (import.meta.env.SSR) {
3535
return undefined;
3636
}
37-
if (typeof localStorage !== undefined && localStorage.getItem('theme')) {
37+
if (localStorage && localStorage.getItem('theme')) {
3838
return localStorage.getItem('theme');
3939
}
4040
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {

packages/docs/src/content/docs/zh-cn/dev_log/202308.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ description: ''
99
- [x] swcpack 在 NodeJs 环境下打包仍然有问题,从 swc 主仓库看起来是相关功能还没做完,所以选择 rollup 来做合约打包
1010
- [x] rollup 打包合约成功,但是打包出来的合约文件中的代码在 vm 中运行报错(Date.now() 未定义),排查了好久复现是 vm 入口文件未引入 chrono, 并修复了这个问题
1111
- [x] 添加了合约打包的测试用例,e2e 测试用例中包含了合约打包后的代码在 vm 中运行的测试
12+
13+
### 8-22
14+
15+
- [x] 升级了所有依赖到最新版,cmd: `pnpm -r up -L`,解决升级后的问题
16+
- [x] webui测试报错,编译合约step失败,使用[act](https://github.com/nektos/act)本地调试GitHub Action

packages/land_app/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"node": ">=16.0.0"
1515
},
1616
"dependencies": {
17-
"@deck.gl/core": "^8.9.22",
18-
"@deck.gl/extensions": "^8.9.22",
19-
"@deck.gl/geo-layers": "^8.9.22",
20-
"@deck.gl/layers": "^8.9.22",
21-
"@deck.gl/mapbox": "^8.9.22",
22-
"@deck.gl/mesh-layers": "^8.9.22",
17+
"@deck.gl/core": "^8.9.25",
18+
"@deck.gl/extensions": "^8.9.25",
19+
"@deck.gl/geo-layers": "^8.9.25",
20+
"@deck.gl/layers": "^8.9.25",
21+
"@deck.gl/mapbox": "^8.9.25",
22+
"@deck.gl/mesh-layers": "^8.9.25",
2323
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
24-
"@loaders.gl/core": "^3.4.8",
25-
"@loaders.gl/gltf": "^3.4.8",
26-
"@loaders.gl/images": "^3.4.8",
24+
"@loaders.gl/core": "^3.4.11",
25+
"@loaders.gl/gltf": "^3.4.11",
26+
"@loaders.gl/images": "^3.4.11",
2727
"@luma.gl/constants": "^8.5.20",
2828
"@luma.gl/core": "^8.5.20",
2929
"@luma.gl/engine": "^8.5.20",
@@ -38,34 +38,34 @@
3838
"@trustack/node-modules-polyfill": "^0.2.5",
3939
"@trustack/rollup-plugin-node-polyfills": "^0.2.2",
4040
"@xstate/react": "^3.2.2",
41-
"antd": "^5.7.3",
41+
"antd": "^5.8.4",
4242
"buffer": "^6.0.3",
43-
"esbuild": "^0.17.19",
43+
"esbuild": "^0.19.2",
4444
"gl-matrix": "^3.4.3",
4545
"h3-js": "^4.1.0",
46-
"i18next": "^22.5.1",
46+
"i18next": "^23.4.4",
4747
"i18next-browser-languagedetector": "^7.1.0",
4848
"mapbox-gl": "^2.15.0",
4949
"mime-types": "^2.1.35",
50-
"multiformats": "^11.0.2",
50+
"multiformats": "^12.0.1",
5151
"react": "^18.2.0",
5252
"react-dom": "^18.2.0",
53-
"react-i18next": "^12.3.1",
54-
"react-router": "^6.14.2",
55-
"react-router-dom": "^6.14.2",
53+
"react-i18next": "^13.1.2",
54+
"react-router": "^6.15.0",
55+
"react-router-dom": "^6.15.0",
5656
"search-insights": "^2.7.0",
5757
"skchain": "workspace:^1.0.0",
5858
"xstate": "^4.38.2"
5959
},
6060
"devDependencies": {
61-
"@playwright/test": "^1.36.2",
61+
"@playwright/test": "^1.37.1",
6262
"@rollup/plugin-inject": "^5.0.3",
63-
"@types/mapbox-gl": "^2.7.12",
64-
"@types/react": "^18.2.17",
63+
"@types/mapbox-gl": "^2.7.13",
64+
"@types/react": "^18.2.20",
6565
"@types/react-dom": "^18.2.7",
6666
"@vitejs/plugin-react-swc": "^3.3.2",
67-
"sass": "^1.64.1",
67+
"sass": "^1.66.1",
6868
"typescript": "^5.1.6",
69-
"vite": "^4.4.7"
69+
"vite": "^4.4.9"
7070
}
7171
}

packages/land_app/src/components/intervalUpdate.hook.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/network/package.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
"author": "scc",
1515
"license": "ISC",
1616
"dependencies": {
17-
"@chainsafe/libp2p-gossipsub": "^8.0.1",
18-
"@chainsafe/libp2p-noise": "^12.0.2",
19-
"@libp2p/bootstrap": "^8.0.0",
20-
"@libp2p/interface-peer-id": "^2.0.2",
21-
"@libp2p/interface-pubsub": "^4.0.1",
22-
"@libp2p/kad-dht": "^9.3.8",
23-
"@libp2p/mdns": "^8.0.0",
24-
"@libp2p/mplex": "^8.0.4",
25-
"@libp2p/tcp": "^7.0.3",
26-
"@libp2p/webrtc": "^2.0.11",
27-
"@libp2p/websockets": "^6.0.3",
28-
"@multiformats/multiaddr": "^12.1.5",
29-
"interface-datastore": "^8.2.3",
30-
"libp2p": "^0.45.9",
31-
"uint8arrays": "^4.0.4"
17+
"@chainsafe/libp2p-gossipsub": "^10.0.0",
18+
"@chainsafe/libp2p-noise": "^13.0.0",
19+
"@libp2p/bootstrap": "^9.0.4",
20+
"@libp2p/interface": "^0.1.2",
21+
"@libp2p/kad-dht": "^10.0.4",
22+
"@libp2p/mdns": "^9.0.4",
23+
"@libp2p/mplex": "^9.0.4",
24+
"@libp2p/tcp": "^8.0.4",
25+
"@libp2p/webrtc": "^3.1.6",
26+
"@libp2p/websockets": "^7.0.4",
27+
"@multiformats/multiaddr": "^12.1.7",
28+
"interface-datastore": "^8.2.4",
29+
"libp2p": "^0.46.6",
30+
"uint8arrays": "^4.0.6"
3231
}
3332
}

packages/network/src/index.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export { Network } from './netwoek.js';
22
export { createConfig } from './config/libp2p.config.js';
3-
export type { PeerId } from '@libp2p/interface-peer-id';
3+
export type { PeerId } from '@libp2p/interface/peer-id';

packages/network/src/netwoek.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { Libp2p, Libp2pOptions } from 'libp2p';
2+
import type { PubSub } from '@libp2p/interface/pubsub';
3+
import type { PeerId } from '@libp2p/interface/peer-id';
24
import { createLibp2p } from 'libp2p';
35
import type { Datastore } from 'interface-datastore';
4-
import type { PeerId } from '@libp2p/interface-peer-id';
5-
import type { PubSub } from '@libp2p/interface-pubsub';
66
import type { CircuitRelayService } from 'libp2p/circuit-relay';
77
import type { DualKadDHT } from '@libp2p/kad-dht';
88
import type { identifyService } from 'libp2p/identify';

packages/skchain/package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,31 @@
1818
},
1919
"devDependencies": {
2020
"@types/libsodium-wrappers-sumo": "^0.7.5",
21-
"@types/lodash": "^4.14.196",
22-
"@types/node": "^20.4.5"
21+
"@types/lodash": "^4.14.197",
22+
"@types/node": "^20.5.1"
2323
},
2424
"dependencies": {
25-
"@ethereumjs/trie": "^5.1.0",
26-
"@ipld/dag-cbor": "^9.0.3",
27-
"@ipld/dag-pb": "^4.0.4",
25+
"@ethereumjs/trie": "^6.0.0",
26+
"@ethereumjs/util": "^9.0.0",
27+
"@ipld/dag-cbor": "^9.0.4",
28+
"@ipld/dag-pb": "^4.0.5",
2829
"@libp2p/interface-pubsub": "^4.0.1",
29-
"@multiformats/multiaddr": "^12.1.5",
30+
"@multiformats/multiaddr": "^12.1.7",
3031
"@trustack/common": "workspace:^1.0.0",
3132
"@trustack/contract": "workspace:^1.0.0",
3233
"@trustack/network": "workspace:^1.0.0",
3334
"abstract-level": "^1.0.3",
3435
"bitset": "^5.1.1",
35-
"blockstore-level": "^1.1.1",
36-
"datastore-core": "^9.2.0",
37-
"datastore-level": "^10.1.2",
38-
"interface-datastore": "^8.2.3",
39-
"ipfs-bitswap": "^18.0.3",
36+
"blockstore-level": "^1.1.3",
37+
"datastore-core": "^9.2.2",
38+
"datastore-level": "^10.1.3",
39+
"interface-datastore": "^8.2.4",
40+
"ipfs-bitswap": "^19.0.0",
4041
"level": "^8.0.0",
4142
"libsodium-wrappers-sumo": "^0.7.11",
4243
"lodash": "^4.17.21",
4344
"memory-level": "^1.0.0",
44-
"multiformats": "^11.0.2",
45+
"multiformats": "^12.0.1",
4546
"ts-node": "^10.9.1",
4647
"tweetnacl": "^1.0.3",
4748
"typescript": "^5.1.6",

packages/skchain/src/lib/skfs/index.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,12 @@ export class Skfs {
183183
return Promise.resolve(undefined);
184184
}
185185
const abortController = new AbortController();
186-
setTimeout(() => {
187-
abortController.abort();
188-
}, opts?.timeout || 5000);
186+
setTimeout(
187+
() => {
188+
abortController.abort();
189+
},
190+
opts?.timeout || 5000,
191+
);
189192
return new Promise((resolve) => {
190193
this.#bitswap
191194
.want(cid, { signal: abortController.signal })

0 commit comments

Comments
 (0)