Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/types/jest-26.0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
gnarea authored Dec 7, 2020
2 parents 943ce0a + b9897ea commit 36da716
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 32 deletions.
62 changes: 35 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@relaycorp/ws-mock": "^1.4.8",
"@semantic-release/exec": "^5.0.0",
"@types/jest": "^26.0.16",
"@types/mongoose": "^5.10.1",
"@types/mongoose": "^5.10.2",
"@types/pkijs": "0.0.6",
"@types/split2": "^2.1.6",
"@types/verror": "^1.10.4",
Expand All @@ -43,7 +43,7 @@
"split2": "^3.2.2",
"trash-cli": "^4.0.0",
"ts-jest": "^25.5.1",
"ts-node": "^9.0.0",
"ts-node": "^9.1.0",
"ts-node-dev": "^1.0.0",
"tslint": "^5.18.0",
"typescript": "^3.9.7"
Expand Down Expand Up @@ -71,11 +71,11 @@
"@relaycorp/keystore-vault": "^1.2.0",
"@relaycorp/relaynet-core": "^1.39.2",
"@relaycorp/relaynet-pohttp": "^1.5.4",
"@typegoose/typegoose": "^7.4.2",
"@typegoose/typegoose": "^7.4.4",
"@types/pino": "^6.3.4",
"abort-controller": "^3.0.0",
"abortable-iterator": "^3.0.0",
"aws-sdk": "^2.799.0",
"aws-sdk": "^2.804.0",
"axios": "^0.21.0",
"buffer-to-arraybuffer": "0.0.5",
"env-var": "^7.0.0",
Expand All @@ -91,7 +91,7 @@
"selfsigned": "^1.10.8",
"stream-to-it": "^0.2.2",
"uuid-random": "^1.3.2",
"ws": "^7.4.0"
"ws": "^7.4.1"
},
"optionalDependencies": {
"bufferutil": "^4.0.2",
Expand Down

0 comments on commit 36da716

Please sign in to comment.