Skip to content

Commit 2d4b324

Browse files
committed
Fix express typing
1 parent 9bfc5f7 commit 2d4b324

File tree

3 files changed

+152
-6
lines changed

3 files changed

+152
-6
lines changed

apps/server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ USER node
2828
#
2929
# 🏡 Production Build
3030
#
31-
FROM node:18-alpine as build
31+
FROM node:18-alpine3.17 as build
3232

3333
WORKDIR /app
3434
RUN apk add --no-cache libc6-compat
@@ -58,7 +58,7 @@ USER node
5858
#
5959
# 🚀 Production Server
6060
#
61-
FROM node:18-alpine as prod
61+
FROM node:18-alpine3.17 as prod
6262

6363
WORKDIR /app
6464
RUN apk add --no-cache libc6-compat

apps/server/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
"@nestjs/swagger": "^7.1.8",
3333
"@prisma/client": "5.2.0",
3434
"@trpc/server": "^10.38.0",
35+
"@types/express": "^5.0.0",
3536
"bcrypt": "^5.1.1",
3637
"class-transformer": "^0.5.1",
3738
"class-validator": "^0.14.0",
3839
"cookie-parser": "^1.4.6",
40+
"express": "^4.21.2",
3941
"jwt-decode": "^4.0.0",
4042
"nestjs-config": "^1.4.11",
4143
"next-auth": "^4.24.6",
@@ -56,7 +58,7 @@
5658
"@nestjs/testing": "^10.0.0",
5759
"@types/bcrypt": "^5.0.0",
5860
"@types/cookie-parser": "^1.4.5",
59-
"@types/express": "^4.17.17",
61+
"@types/express": "^5.0.0",
6062
"@types/jest": "^29.5.2",
6163
"@types/node": "^20.8.2",
6264
"@types/passport-jwt": "^3.0.10",
@@ -67,7 +69,7 @@
6769
"eslint": "^8.48.0",
6870
"eslint-config-prettier": "^9.0.0",
6971
"eslint-plugin-prettier": "^5.0.0",
70-
"express": "^4.18.2",
72+
"express": "^4.21.2",
7173
"jest": "^29.5.0",
7274
"prettier": "^3.0.0",
7375
"source-map-support": "^0.5.21",

yarn.lock

Lines changed: 146 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4018,7 +4018,17 @@
40184018
"@types/range-parser" "*"
40194019
"@types/send" "*"
40204020

4021-
"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.17":
4021+
"@types/express-serve-static-core@^5.0.0":
4022+
version "5.0.6"
4023+
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz#41fec4ea20e9c7b22f024ab88a95c6bb288f51b8"
4024+
integrity sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==
4025+
dependencies:
4026+
"@types/node" "*"
4027+
"@types/qs" "*"
4028+
"@types/range-parser" "*"
4029+
"@types/send" "*"
4030+
4031+
"@types/express@*", "@types/express@^4.17.13":
40224032
version "4.17.17"
40234033
resolved "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"
40244034
integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
@@ -4028,6 +4038,16 @@
40284038
"@types/qs" "*"
40294039
"@types/serve-static" "*"
40304040

4041+
"@types/express@^5.0.0":
4042+
version "5.0.0"
4043+
resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c"
4044+
integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==
4045+
dependencies:
4046+
"@types/body-parser" "*"
4047+
"@types/express-serve-static-core" "^5.0.0"
4048+
"@types/qs" "*"
4049+
"@types/serve-static" "*"
4050+
40314051
"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3":
40324052
version "4.1.6"
40334053
resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"
@@ -6008,6 +6028,24 @@ body-parser@1.20.2:
60086028
type-is "~1.6.18"
60096029
unpipe "1.0.0"
60106030

6031+
body-parser@1.20.3:
6032+
version "1.20.3"
6033+
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
6034+
integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
6035+
dependencies:
6036+
bytes "3.1.2"
6037+
content-type "~1.0.5"
6038+
debug "2.6.9"
6039+
depd "2.0.0"
6040+
destroy "1.2.0"
6041+
http-errors "2.0.0"
6042+
iconv-lite "0.4.24"
6043+
on-finished "2.4.1"
6044+
qs "6.13.0"
6045+
raw-body "2.5.2"
6046+
type-is "~1.6.18"
6047+
unpipe "1.0.0"
6048+
60116049
bonjour-service@^1.0.11:
60126050
version "1.1.1"
60136051
resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
@@ -6709,6 +6747,11 @@ cookie@0.5.0, cookie@^0.5.0:
67096747
resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
67106748
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
67116749

6750+
cookie@0.7.1:
6751+
version "0.7.1"
6752+
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
6753+
integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
6754+
67126755
cookiejar@^2.1.4:
67136756
version "2.1.4"
67146757
resolved "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz"
@@ -7505,6 +7548,11 @@ encodeurl@~1.0.2:
75057548
resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
75067549
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
75077550

7551+
encodeurl@~2.0.0:
7552+
version "2.0.0"
7553+
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
7554+
integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
7555+
75087556
end-of-stream@^1.1.0, end-of-stream@^1.4.1:
75097557
version "1.4.4"
75107558
resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
@@ -8276,7 +8324,7 @@ expect@^29.0.0, expect@^29.7.0:
82768324
jest-message-util "^29.7.0"
82778325
jest-util "^29.7.0"
82788326

8279-
express@4.18.2, express@^4.17.3, express@^4.18.2:
8327+
express@4.18.2, express@^4.17.3:
82808328
version "4.18.2"
82818329
resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
82828330
integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
@@ -8313,6 +8361,43 @@ express@4.18.2, express@^4.17.3, express@^4.18.2:
83138361
utils-merge "1.0.1"
83148362
vary "~1.1.2"
83158363

8364+
express@^4.21.2:
8365+
version "4.21.2"
8366+
resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
8367+
integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
8368+
dependencies:
8369+
accepts "~1.3.8"
8370+
array-flatten "1.1.1"
8371+
body-parser "1.20.3"
8372+
content-disposition "0.5.4"
8373+
content-type "~1.0.4"
8374+
cookie "0.7.1"
8375+
cookie-signature "1.0.6"
8376+
debug "2.6.9"
8377+
depd "2.0.0"
8378+
encodeurl "~2.0.0"
8379+
escape-html "~1.0.3"
8380+
etag "~1.8.1"
8381+
finalhandler "1.3.1"
8382+
fresh "0.5.2"
8383+
http-errors "2.0.0"
8384+
merge-descriptors "1.0.3"
8385+
methods "~1.1.2"
8386+
on-finished "2.4.1"
8387+
parseurl "~1.3.3"
8388+
path-to-regexp "0.1.12"
8389+
proxy-addr "~2.0.7"
8390+
qs "6.13.0"
8391+
range-parser "~1.2.1"
8392+
safe-buffer "5.2.1"
8393+
send "0.19.0"
8394+
serve-static "1.16.2"
8395+
setprototypeof "1.2.0"
8396+
statuses "2.0.1"
8397+
type-is "~1.6.18"
8398+
utils-merge "1.0.1"
8399+
vary "~1.1.2"
8400+
83168401
external-editor@^3.0.3:
83178402
version "3.1.0"
83188403
resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
@@ -8450,6 +8535,19 @@ finalhandler@1.2.0:
84508535
statuses "2.0.1"
84518536
unpipe "~1.0.0"
84528537

8538+
finalhandler@1.3.1:
8539+
version "1.3.1"
8540+
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
8541+
integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
8542+
dependencies:
8543+
debug "2.6.9"
8544+
encodeurl "~2.0.0"
8545+
escape-html "~1.0.3"
8546+
on-finished "2.4.1"
8547+
parseurl "~1.3.3"
8548+
statuses "2.0.1"
8549+
unpipe "~1.0.0"
8550+
84538551
find-cache-dir@^3.3.1:
84548552
version "3.3.2"
84558553
resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
@@ -11402,6 +11500,11 @@ merge-descriptors@1.0.1:
1140211500
resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
1140311501
integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
1140411502

11503+
merge-descriptors@1.0.3:
11504+
version "1.0.3"
11505+
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
11506+
integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
11507+
1140511508
merge-refs@^1.2.1:
1140611509
version "1.3.0"
1140711510
resolved "https://registry.npmjs.org/merge-refs/-/merge-refs-1.3.0.tgz"
@@ -12322,6 +12425,11 @@ path-scurry@^1.6.1:
1232212425
lru-cache "^9.1.1 || ^10.0.0"
1232312426
minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
1232412427

12428+
path-to-regexp@0.1.12:
12429+
version "0.1.12"
12430+
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
12431+
integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
12432+
1232512433
path-to-regexp@0.1.7:
1232612434
version "0.1.7"
1232712435
resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
@@ -13164,6 +13272,13 @@ qs@6.11.0:
1316413272
dependencies:
1316513273
side-channel "^1.0.4"
1316613274

13275+
qs@6.13.0:
13276+
version "6.13.0"
13277+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
13278+
integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
13279+
dependencies:
13280+
side-channel "^1.0.6"
13281+
1316713282
qs@^6.11.0:
1316813283
version "6.11.2"
1316913284
resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"
@@ -14087,6 +14202,25 @@ send@0.18.0:
1408714202
range-parser "~1.2.1"
1408814203
statuses "2.0.1"
1408914204

14205+
send@0.19.0:
14206+
version "0.19.0"
14207+
resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
14208+
integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
14209+
dependencies:
14210+
debug "2.6.9"
14211+
depd "2.0.0"
14212+
destroy "1.2.0"
14213+
encodeurl "~1.0.2"
14214+
escape-html "~1.0.3"
14215+
etag "~1.8.1"
14216+
fresh "0.5.2"
14217+
http-errors "2.0.0"
14218+
mime "1.6.0"
14219+
ms "2.1.3"
14220+
on-finished "2.4.1"
14221+
range-parser "~1.2.1"
14222+
statuses "2.0.1"
14223+
1409014224
serialize-javascript@^4.0.0:
1409114225
version "4.0.0"
1409214226
resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
@@ -14124,6 +14258,16 @@ serve-static@1.15.0:
1412414258
parseurl "~1.3.3"
1412514259
send "0.18.0"
1412614260

14261+
serve-static@1.16.2:
14262+
version "1.16.2"
14263+
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
14264+
integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
14265+
dependencies:
14266+
encodeurl "~2.0.0"
14267+
escape-html "~1.0.3"
14268+
parseurl "~1.3.3"
14269+
send "0.19.0"
14270+
1412714271
set-blocking@^2.0.0:
1412814272
version "2.0.0"
1412914273
resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"

0 commit comments

Comments
 (0)