Skip to content

Commit 455876e

Browse files
vorujackvorujack
committed
Merge branch '109-update-rosen-dependencies' into 'dev'
Update rosen dependencies and vitest version and remove vitest related Closes #109 See merge request ergo/rosen-bridge/rosenet!72
2 parents c0ba0cb + 6b02167 commit 455876e

File tree

25 files changed

+2417
-3550
lines changed

25 files changed

+2417
-3550
lines changed

‎.changeset/plenty-insects-report.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
'@rosen-bridge/rosenet-relay': minor
3+
'@rosen-bridge/rosenet-node': minor
4+
'@rosen-bridge/dialer': minor
5+
'@rosen-bridge/rosenet-utils': minor
6+
'@rosen-bridge/relay-service': minor
7+
---
8+
9+
Update package-lock
10+
11+
Update dependencies:
12+
13+
- @rosen-bridge/abstract-logger@4.0.0
14+
- @rosen-bridge/callback-logger@2.0.0
15+
- @rosen-bridge/json-bigint@1.1.0
16+
- @rosen-bridge/winston-logger@3.0.0
17+
- @vitest/coverage-istanbul@3.1.4
18+
- vitest@3.1.4

‎.github/workflows/docker-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
platforms: ${{ matrix.platform }}
6363
labels: ${{ steps.meta.outputs.labels }}
6464
cache-from: type=gha
65-
cache-to: type=gha,mode=max
65+
cache-to: type=gha,mode=max
6666
outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
6767

6868
- name: Export digest file

‎.lintstagedrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ const runKnipConditional = (files) => {
3939

4040
export default {
4141
'*.ts': () => 'npm run type-check',
42-
'*.{js,ts}': ['eslint --fix', 'vitest related --run'],
42+
'*.{js,ts}': ['eslint --fix'],
4343
'*': ['prettier --ignore-unknown --write', runKnipConditional],
4444
};

‎package-lock.json‎

Lines changed: 2282 additions & 3435 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"type": "module",
55
"workspaces": {
66
"packages": [
7+
"packages/*",
78
"services/*",
8-
"tests/*",
9-
"packages/*"
9+
"tests/*"
1010
]
1111
},
1212
"scripts": {
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"@changesets/cli": "^2.27.1",
24-
"@rosen-bridge/changeset-formatter": "^1.1.0",
24+
"@rosen-bridge/changeset-formatter": "^2.0.1",
2525
"@typescript-eslint/eslint-plugin": "^6.19.1",
2626
"@typescript-eslint/parser": "^6.19.1",
2727
"eslint": "^8.56.0",

‎packages/dialer/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
"release": "npm run build && npm publish --access public",
1616
"type-check": "tsc --noEmit"
1717
},
18+
"dependencies": {
19+
"@rosen-bridge/abstract-logger": "^4.0.0",
20+
"@rosen-bridge/json-bigint": "^1.1.0",
21+
"@rosen-bridge/rosenet-node": "^0.3.1",
22+
"lodash-es": "^4.17.21"
23+
},
1824
"devDependencies": {
1925
"@types/lodash-es": "^4.17.12",
2026
"@types/node": "^20.11.9",
@@ -27,11 +33,5 @@
2733
},
2834
"engines": {
2935
"node": ">=20.11.0"
30-
},
31-
"dependencies": {
32-
"@rosen-bridge/abstract-logger": "^2.0.1",
33-
"@rosen-bridge/json-bigint": "^0.1.0",
34-
"@rosen-bridge/rosenet-node": "^0.3.1",
35-
"lodash-es": "^4.17.21"
3636
}
3737
}

‎packages/rosenet-node/lib/context/RoseNetNodeContext.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AbstractLogger } from '@rosen-bridge/abstract-logger';
1+
import { AbstractLogger, ConsoleLogger } from '@rosen-bridge/abstract-logger';
22
import merge from 'lodash.merge';
33

44
import { PartialRoseNetNodeConfig, RoseNetNodeConfig } from '../types';
@@ -29,7 +29,7 @@ import {
2929
} from '../constants';
3030

3131
const RoseNetNodeContext = {
32-
logger: console as AbstractLogger,
32+
logger: new ConsoleLogger() as AbstractLogger,
3333
config: {} as RoseNetNodeConfig,
3434
init(config: PartialRoseNetNodeConfig) {
3535
const defaultConfig = {
@@ -67,7 +67,7 @@ const RoseNetNodeContext = {
6767
sampleSize: DEFAULT_RELAYS_COUNT_TO_CONNECT,
6868
multiaddrs: [],
6969
},
70-
logger: console,
70+
logger: new ConsoleLogger(),
7171
whitelist: [],
7272
debug: {
7373
libp2pComponents: [],

‎packages/rosenet-node/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,6 @@
1717
"test": "NODE_OPTIONS='--import tsx' vitest",
1818
"type-check": "tsc --noEmit"
1919
},
20-
"devDependencies": {
21-
"@types/lodash.merge": "^4.6.9",
22-
"@types/node": "^20.11.9",
23-
"@typescript-eslint/eslint-plugin": "^6.19.1",
24-
"@typescript-eslint/parser": "^6.19.1",
25-
"@vitest/coverage-v8": "^1.2.2",
26-
"eslint": "^8.56.0",
27-
"eslint-config-prettier": "^9.1.0",
28-
"it-stream-types": "^2.0.1",
29-
"prettier": "^3.2.4",
30-
"tsx": "^4.19.3",
31-
"typescript": "^5.3.3",
32-
"uint8arraylist": "^2.4.8",
33-
"vitest": "^1.2.2"
34-
},
35-
"engines": {
36-
"node": ">=20.11.0"
37-
},
3820
"dependencies": {
3921
"@chainsafe/libp2p-gossipsub": "^13.2.0",
4022
"@chainsafe/libp2p-noise": "^15.1.1",
@@ -50,7 +32,7 @@
5032
"@libp2p/tcp": "^9.1.5",
5133
"@libp2p/utils": "^5.4.9",
5234
"@multiformats/multiaddr": "^12.3.0",
53-
"@rosen-bridge/abstract-logger": "^3.0.1",
35+
"@rosen-bridge/abstract-logger": "^4.0.0",
5436
"@rosen-bridge/rosenet-utils": "^0.4.1",
5537
"cockatiel": "^3.2.1",
5638
"fast-shuffle": "^6.1.0",
@@ -61,5 +43,23 @@
6143
"libp2p": "^1.9.2",
6244
"lodash.merge": "^4.6.2",
6345
"public-ip": "^6.0.2"
46+
},
47+
"devDependencies": {
48+
"@types/lodash.merge": "^4.6.9",
49+
"@types/node": "^20.11.9",
50+
"@typescript-eslint/eslint-plugin": "^6.19.1",
51+
"@typescript-eslint/parser": "^6.19.1",
52+
"@vitest/coverage-istanbul": "^3.1.4",
53+
"eslint": "^8.56.0",
54+
"eslint-config-prettier": "^9.1.0",
55+
"it-stream-types": "^2.0.1",
56+
"prettier": "^3.2.4",
57+
"tsx": "^4.19.3",
58+
"typescript": "^5.3.3",
59+
"uint8arraylist": "^2.4.8",
60+
"vitest": "^3.1.4"
61+
},
62+
"engines": {
63+
"node": ">=20.11.0"
6464
}
6565
}

‎packages/rosenet-node/vitest.config.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ export default defineConfig({
44
test: {
55
coverage: {
66
all: true,
7+
provider: 'istanbul',
78
reporter: 'cobertura',
89
},
910
passWithNoTests: true,
1011
poolOptions: {
11-
threads: {
12-
singleThread: true,
12+
forks: {
13+
singleFork: true,
1314
},
1415
},
1516
},

‎packages/rosenet-relay/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,6 @@
1717
"test": "NODE_OPTIONS='--import tsx' vitest",
1818
"type-check": "tsc --noEmit"
1919
},
20-
"devDependencies": {
21-
"@types/node": "^20.11.9",
22-
"@typescript-eslint/eslint-plugin": "^6.19.1",
23-
"@typescript-eslint/parser": "^6.19.1",
24-
"@vitest/coverage-v8": "^1.2.2",
25-
"eslint": "^8.56.0",
26-
"eslint-config-prettier": "^9.1.0",
27-
"prettier": "^3.2.4",
28-
"tsx": "^4.19.3",
29-
"typescript": "^5.3.3",
30-
"vitest": "^1.2.2"
31-
},
32-
"engines": {
33-
"node": ">=20.11.0"
34-
},
3520
"dependencies": {
3621
"@chainsafe/libp2p-gossipsub": "^13.2.0",
3722
"@chainsafe/libp2p-noise": "^15.1.1",
@@ -43,8 +28,23 @@
4328
"@libp2p/pubsub-peer-discovery": "^10.0.2",
4429
"@libp2p/tcp": "^9.1.5",
4530
"@libp2p/utils": "^5.4.9",
46-
"@rosen-bridge/abstract-logger": "^2.0.1",
31+
"@rosen-bridge/abstract-logger": "^4.0.0",
4732
"@rosen-bridge/rosenet-utils": "^0.4.1",
4833
"libp2p": "^1.9.2"
34+
},
35+
"devDependencies": {
36+
"@types/node": "^20.11.9",
37+
"@typescript-eslint/eslint-plugin": "^6.19.1",
38+
"@typescript-eslint/parser": "^6.19.1",
39+
"@vitest/coverage-istanbul": "^3.1.4",
40+
"eslint": "^8.56.0",
41+
"eslint-config-prettier": "^9.1.0",
42+
"prettier": "^3.2.4",
43+
"tsx": "^4.19.3",
44+
"typescript": "^5.3.3",
45+
"vitest": "^3.1.4"
46+
},
47+
"engines": {
48+
"node": ">=20.11.0"
4949
}
5050
}

0 commit comments

Comments
 (0)