Merge remote-tracking branch 'origin/jaeyeoniiiiii' into seoyeon2
| W: | H:
| W: | H:
... | @@ -9,7 +9,11 @@ | ... | @@ -9,7 +9,11 @@ |
"build": "tsc -p ." | "build": "tsc -p ." | ||
}, | }, | ||
"nodemonConfig": { | "nodemonConfig": { | ||
"ignore": ["test/*", "docs/*", "client/*"] | "ignore": [ | ||
"test/*", | |||
"docs/*", | |||
"client/*" | |||
] | |||
}, | }, | ||
"repository": { | "repository": { | ||
"type": "git", | "type": "git", | ||
... | @@ -27,6 +31,7 @@ | ... | @@ -27,6 +31,7 @@ |
"express": "4.17.1", | "express": "4.17.1", | ||
"http": "0.0.1-security", | "http": "0.0.1-security", | ||
"jsonwebtoken": "^8.5.1", | "jsonwebtoken": "^8.5.1", | ||
"multer": "^1.4.2", | |||
"nanoid": "^3.1.23", | "nanoid": "^3.1.23", | ||
"nodemon": "^2.0.7", | "nodemon": "^2.0.7", | ||
"pg": "^8.6.0", | "pg": "^8.6.0", | ||
... | ... |