Merge pull request #1329 from masb0ymas/dev

Dev

Author: masb0ymas

.dockerignore

@@ -5,4 +5,3 @@ Dockerfile.dev
 /node_modules
 /dist
 /coverage
-/logs

.gitignore

@@ -1,7 +1,6 @@
 /dist
 /node_modules
 /coverage
-/logs
 /public/output
 /public/temp
 /public/uploads

Dockerfile

@@ -60,6 +60,7 @@ COPY --from=builder /temp-build/assets ./assets
 COPY --from=builder /temp-build/node_modules ./node_modules
 COPY --from=builder /temp-build/package.json ./package.json
 COPY --from=builder /temp-build/dist ./dist
+COPY --from=builder /temp-build/logs ./logs
 COPY --from=builder /temp-build/.env ./.env
 
 # initial app

Dockerfile.dev

@@ -60,6 +60,7 @@ COPY --from=builder /temp-build/assets ./assets
 COPY --from=builder /temp-build/node_modules ./node_modules
 COPY --from=builder /temp-build/package.json ./package.json
 COPY --from=builder /temp-build/dist ./dist
+COPY --from=builder /temp-build/logs ./logs
 COPY --from=builder /temp-build/.env ./.env
 
 # initial app

logs/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package.json

@@ -50,62 +50,57 @@
     "node": ">= 16.x"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.345.0",
-    "@aws-sdk/s3-request-presigner": "^3.345.0",
-    "@google-cloud/storage": "^6.10.1",
     "axios": "^1.4.0",
     "bcrypt": "^5.1.0",
-    "chalk": "4.1.2",
+    "colorette": "^2.0.20",
     "compression": "^1.7.4",
-    "concurrently": "^8.1.0",
+    "concurrently": "^8.2.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "date-fns": "^2.30.0",
-    "dotenv": "^16.1.4",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "express-async-handler": "^1.2.0",
     "express-rate-limit": "^6.7.0",
     "express-useragent": "^1.0.15",
-    "expresso-core": "^0.7.0",
-    "expresso-hooks": "^0.7.0",
-    "expresso-provider": "^0.7.0",
-    "expresso-query": "^0.7.0",
+    "expresso-core": "^0.7.4",
+    "expresso-hooks": "^0.7.4",
+    "expresso-provider": "^0.7.4",
+    "expresso-query": "^0.7.4",
     "handlebars": "^4.7.7",
     "helmet": "^7.0.0",
     "hpp": "^0.2.3",
-    "i18next": "^22.5.0",
-    "i18next-fs-backend": "^2.1.2",
-    "i18next-http-middleware": "^3.3.1",
-    "jsonwebtoken": "^9.0.0",
+    "i18next": "^22.5.1",
+    "i18next-fs-backend": "^2.1.5",
+    "i18next-http-middleware": "^3.3.2",
     "lodash": "^4.17.21",
-    "minio": "^7.1.1",
-    "module-alias": "^2.2.3",
-    "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
     "node-cron": "^3.0.2",
     "npm-run-all": "^4.1.5",
-    "pg": "^8.11.0",
+    "pg": "^8.11.1",
     "pg-hstore": "^2.3.4",
+    "pino": "^8.14.1",
+    "pino-http": "^8.3.3",
+    "pino-pretty": "^10.0.1",
     "pm2": "^5.3.0",
     "qs": "^6.11.2",
     "reflect-metadata": "^0.1.13",
     "request-ip": "^3.3.0",
-    "sequelize": "^6.32.0",
+    "sequelize": "^6.32.1",
     "sequelize-cli": "^6.6.1",
     "sequelize-typescript": "^2.1.5",
     "slugify": "^1.6.6",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^4.6.3",
     "uuid": "^9.0.0",
-    "winston": "^3.9.0",
-    "yup": "^1.2.0"
+    "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.5",
-    "@commitlint/config-conventional": "^17.6.5",
-    "@jest/globals": "^29.5.0",
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
+    "@jest/globals": "^29.6.0",
     "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.62",
+    "@swc/core": "^1.3.68",
     "@types/bcrypt": "^5.0.0",
     "@types/compression": "^1.7.2",
     "@types/cookie-parser": "^1.4.3",
@@ -114,23 +109,19 @@
     "@types/express-useragent": "^1.0.2",
     "@types/hpp": "^0.2.2",
     "@types/jest": "^29.5.2",
-    "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.14.195",
-    "@types/minio": "^7.1.0",
-    "@types/module-alias": "^2.0.1",
-    "@types/morgan": "^1.9.4",
     "@types/multer": "^1.4.7",
-    "@types/node": "^20.2.5",
-    "@types/node-cron": "^3.0.7",
+    "@types/node": "^20.4.0",
+    "@types/node-cron": "^3.0.8",
     "@types/qs": "^6.9.7",
     "@types/request-ip": "^0.0.37",
     "@types/supertest": "^2.0.12",
     "@types/swagger-jsdoc": "^6.0.1",
     "@types/swagger-ui-express": "^4.1.3",
-    "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.8",
-    "@typescript-eslint/parser": "^5.59.8",
-    "eslint": "^8.42.0",
+    "@types/uuid": "^9.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
+    "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-standard-with-typescript": "^35.0.0",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -139,17 +130,14 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.3",
-    "jest": "^29.5.0",
+    "jest": "^29.6.0",
     "nodemon": "^2.0.22",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",
     "standard-version": "^9.5.0",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.1.0",
-    "typescript": "^5.1.3"
-  },
-  "_moduleAliases": {
-    "~/*": "dist/*"
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
   },
   "jest": {
     "preset": "ts-jest",