Skip to content

Commit deb6ca6

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # package.json # yarn.lock
2 parents 7ad55eb + 1c3dcb1 commit deb6ca6

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ jspm_packages/
1111

1212
.idea/
1313
.env
14+
.npmrc

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"bull": "^3.13.0",
1414
"bullmq": "^1.8.4",
1515
"connect-ensure-login": "^0.1.1",
16-
"dotenv": "^9.0.2",
16+
"dotenv": "^10.0.0",
1717
"express": "^4.17.1",
18-
"express-session": "^1.17.1",
18+
"express-session": "^1.17.2",
1919
"morgan": "^1.10.0",
2020
"passport": "^0.4.1",
2121
"passport-local": "^1.0.0",
22-
"redis": "^3.0.2"
22+
"redis": "^3.1.2"
2323
}
2424
}

yarn.lock

+19-8
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ brace-expansion@^1.1.7:
9999
balanced-match "^1.0.0"
100100
concat-map "0.0.1"
101101

102+
bull-board@^2.0.3:
103+
version "2.0.3"
104+
resolved "https://registry.yarnpkg.com/bull-board/-/bull-board-2.0.3.tgz#2bc27e05dd3e080fb663c35c89fbd5d2395455c6"
105+
integrity sha512-3PVwZIy+CH8+Ik8y8TZRjGLz5vFMYJ5PpDuMLZoD/ZPo8GQVhIuZ+mXFhNW7TWtCos9uW6gS0rRTNBDuLvlN/g==
106+
dependencies:
107+
"@types/express" "^4.17.9"
108+
"@types/express-serve-static-core" "^4.17.14"
109+
ejs "3.1.6"
110+
express "4.17.1"
111+
redis-info "^3.0.8"
112+
102113
bull@^3.13.0:
103-
version "3.22.7"
104-
resolved "https://registry.yarnpkg.com/bull/-/bull-3.22.7.tgz#be17398edad4e17e54db9b9c7388d92381f6ea1d"
105-
integrity sha512-hrpfs1InzliuevKUOxAfGVctViic8uKP5zOkFAeNI4yVhlR5Ai3pSXFBiC78p2dl/t2AlC504pOqYJw3W9eSSA==
114+
version "3.22.5"
115+
resolved "https://registry.yarnpkg.com/bull/-/bull-3.22.5.tgz#ab42d76ecb7d8c5faba7a6a6e1d8b0ed0cde7ff5"
116+
integrity sha512-wA5CRChiqF7bQ3/mLToFRiAKujWVBJJ07Ok368aiER8N1ail0veHwHc02I4lMMUyG9WoxHCHyrCqyPQhDGrd2w==
106117
dependencies:
107118
cron-parser "^2.13.0"
108119
debuglog "^1.0.0"
@@ -259,10 +270,10 @@ destroy@~1.0.4:
259270
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
260271
integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
261272

262-
dotenv@^9.0.2:
263-
version "9.0.2"
264-
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
265-
integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
273+
dotenv@^10.0.0:
274+
version "10.0.0"
275+
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
276+
integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
266277

267278
ee-first@1.1.1:
268279
version "1.1.1"
@@ -848,7 +859,7 @@ redis-parser@^3.0.0:
848859
dependencies:
849860
redis-errors "^1.0.0"
850861

851-
redis@^3.0.2:
862+
redis@^3.1.2:
852863
version "3.1.2"
853864
resolved "https://registry.yarnpkg.com/redis/-/redis-3.1.2.tgz#766851117e80653d23e0ed536254677ab647638c"
854865
integrity sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==

0 commit comments

Comments
 (0)