Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:corpus-io/dm3 into 665-bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bhupesh-mfsi
Bhupesh-mfsi committed Nov 27, 2023
2 parents 5708387 + 8c326f1 commit 820f7b1
Show file tree
Hide file tree
Showing 11 changed files with 183 additions and 96 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"packages/lib/delivery-api",
"packages/lib/offchainResolver-api",
"packages/lib/billboard-api",
"packages/billboard-client",
"packages/backend",
"packages/react",
"packages/web",
Expand Down
8 changes: 2 additions & 6 deletions packages/backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,17 @@
"dependencies": {
"axios": "^0.27.2",
"body-parser": "^1.20.1",
"connect-redis": "^6.1.3",
"dm3-lib-crypto": "workspace:^",
"dm3-lib-delivery": "workspace:^",
"dm3-lib-messaging": "workspace:^",
"dm3-lib-profile": "workspace:^",
"dm3-lib-shared": "workspace:^",
"dm3-lib-storage": "workspace:^",
"dotenv": "^16.0.1",
"eslint": "^8.17.0",
"ethers": "5.7.2",
"express": "^4.18.1",
"jayson": "^3.6.6",
"lint-staged": "^13.0.0",
"prettier": "^2.6.2",
"redis": "^4.1.0",
"socket.io": "^4.5.1",
"ts-node": "^10.9.1",
"winston": "^3.8.1",
"yaml": "^2.1.3"
},
Expand All @@ -45,8 +39,10 @@
"babel-jest": "^29.2.2",
"babel-preset-env": "^1.7.0",
"jest": "^29.2.2",
"prettier": "^2.6.2",
"superagent": "^8.0.3",
"supertest": "^6.3.1",
"ts-node": "^10.9.1",
"typescript": "^4.4.2"
}
}
9 changes: 3 additions & 6 deletions packages/billboard-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@
"dependencies": {
"axios": "^0.27.2",
"body-parser": "^1.20.1",
"connect-redis": "^6.1.3",
"cors": "^2.8.5",
"dm3-lib-delivery": "workspace:^",
"dm3-lib-messaging": "workspace:^",
"dm3-lib-profile": "workspace:^",
"dm3-lib-shared": "workspace:^",
"dotenv": "^16.0.1",
"eslint": "^8.17.0",
"ethers": "5.7.2",
"express": "^4.18.1",
"jayson": "^3.6.6",
"lint-staged": "^13.0.0",
"prettier": "^2.6.2",
"redis": "^4.1.0",
"socket.io": "^4.5.1",
"ts-node": "^10.9.1",
"winston": "^3.8.2",
"yaml": "^2.1.3"
},
Expand Down Expand Up @@ -53,11 +47,14 @@
"babel-preset-env": "^1.7.0",
"chai": "^4.3.7",
"chai-http": "^4.3.0",
"eslint": "^8.17.0",
"jest": "^29.2.2",
"lorem-ipsum": "^2.0.8",
"prettier": "^2.6.2",
"redis-mock": "^0.56.3",
"superagent": "^8.0.3",
"supertest": "^6.3.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.3"
}
}
2 changes: 0 additions & 2 deletions packages/billboard-widget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"react-dom": "^18.2.0",
"siwe": "^2.1.4",
"socket.io-client": "^4.6.1",
"uuid4": "^2.0.3",
"uuidv4": "^6.2.13",
"viem": "^0.3.36",
"wagmi": "^1.0.6"
},
Expand Down
16 changes: 3 additions & 13 deletions packages/lib/delivery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,12 @@
},
"dependencies": {
"@types/libsodium-wrappers": "^0.7.10",
"ajv": "^8.11.0",
"axios": "^0.25.0",
"dm3-lib-crypto": "workspace:^",
"dm3-lib-messaging": "workspace:^",
"dm3-lib-profile": "workspace:^",
"dm3-lib-shared": "workspace:^",
"ethers": "5.7.2",
"googleapis": "^100.0.0",
"libsodium-wrappers": "^0.7.10",
"nodemailer": "^6.9.4",
"query-string": "^7.1.1",
"safe-stable-stringify": "^2.4.1",
"socket.io": "^4.4.1",
"socket.io-client": "^4.7.1",
"uuid": "^8.3.2",
"web3.storage": "^3.5.7",
"whatwg-encoding": "^2.0.0"
"uuid": "^8.3.2"
},
"devDependencies": {
"@types/data-urls": "^3.0.1",
Expand All @@ -37,8 +27,8 @@
"@types/nodemailer": "^6.4.9",
"@types/uuid": "^8.3.4",
"@types/whatwg-encoding": "^2.0.0",
"axios-mock-adapter": "^1.21.2",
"jest": "^28.1.1",
"nodemailer": "6.9.7",
"ts-jest": "^28.0.4",
"ts-json-schema-generator": "^0.98.0",
"typescript": "^4.4.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/delivery/src/Messages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
UserProfile,
} from 'dm3-lib-profile';
import { ethers } from 'ethers';
import stringify from 'safe-stable-stringify';
import { stringify } from 'dm3-lib-shared';

import {
decryptAsymmetric,
Expand Down
3 changes: 1 addition & 2 deletions packages/lib/messaging/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"dm3-lib-crypto": "workspace:^",
"dm3-lib-profile": "workspace:^",
"dm3-lib-shared": "workspace:^",
"ethers": "5.7.2",
"safe-stable-stringify": "^2.4.1"
"ethers": "5.7.2"
},
"devDependencies": {
"axios-mock-adapter": "^1.21.2",
Expand Down
9 changes: 0 additions & 9 deletions packages/lib/profile/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,18 @@
}
},
"dependencies": {
"@types/libsodium-wrappers": "^0.7.10",
"ajv": "^8.11.0",
"axios": "^0.25.0",
"dm3-lib-crypto": "workspace:^",
"dm3-lib-shared": "workspace:^",
"ethers": "5.7.2",
"googleapis": "^100.0.0",
"libsodium-wrappers": "^0.7.10",
"query-string": "^7.1.1",
"safe-stable-stringify": "^2.4.1",
"socket.io": "^4.4.1",
"socket.io-client": "^4.4.1",
"uuid": "^8.3.2",
"web3.storage": "^3.5.7",
"whatwg-encoding": "^2.0.0"
},
"devDependencies": {
"@types/data-urls": "^3.0.1",
"@types/jest": "^28.1.1",
"@types/node": "^16.7.13",
"@types/uuid": "^8.3.4",
"@types/whatwg-encoding": "^2.0.0",
"axios-mock-adapter": "^1.21.2",
"jest": "^28.1.1",
Expand Down
4 changes: 1 addition & 3 deletions packages/lib/shared/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
}
},
"dependencies": {
"@types/libsodium-wrappers": "^0.7.10",
"ethers": "5.7.2",
"libsodium-wrappers": "^0.7.10"
"ethers": "5.7.2"
},
"devDependencies": {
"typescript": "^4.4.2"
Expand Down
5 changes: 1 addition & 4 deletions packages/lib/storage/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@
"dm3-lib-messaging": "workspace:^",
"dm3-lib-profile": "workspace:^",
"dm3-lib-shared": "workspace:^",
"ethers": "5.7.2",
"libsodium-wrappers": "^0.7.10"
"ethers": "5.7.2"
},
"devDependencies": {
"@types/libsodium-wrappers": "^0.7.10",
"jest": "^28.1.1",
"ts-jest": "^28.0.4",
"ts-json-schema-generator": "^0.98.0",
"typescript": "^4.4.2"
},
"scripts": {
Expand Down
Loading

0 comments on commit 820f7b1

Please sign in to comment.