resolve conflict

Author: andrechristikan

.github/dependabot.yml

@@ -7,7 +7,7 @@ updates:
       interval: "monthly"
       day: tuesday
       time: "01:00"
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 3
     target-branch: "development"
     commit-message:
       prefix: "npm"
@@ -19,9 +19,9 @@ updates:
       interval: "monthly"
       day: tuesday
       time: "00:00"
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 3
     target-branch: "development"
     commit-message:
       prefix: "github-action"
     labels:
-      - dependabot
+      - dependabot

README.md

@@ -8,7 +8,6 @@ Fork from [ack-nestjs-boilerplate](https://github.com/andrechristikan/ack-nestjs
 
 Before run, you must to create the topics with `kafka-topics cli`. Or you can run `yarn kafka:create-topics`.
 
-
 ## Next
 
 - [ ] Kafka Transaction

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate-kafka",
-  "version": "3.3.6",
+  "version": "3.4.0",
   "description": "Ack NestJs Boilerplate Kafka",
   "repository": {
     "type": "git",
@@ -48,20 +48,20 @@
     "rollback": "yarn rollback:setting && yarn rollback:apikey"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.264.0",
+    "@aws-sdk/client-s3": "^3.266.0",
     "@faker-js/faker": "^7.6.0",
     "@joi/date": "^2.1.0",
     "@nestjs/axios": "^2.0.0",
-    "@nestjs/common": "^9.2.1",
+    "@nestjs/common": "^9.3.3",
     "@nestjs/config": "^2.3.0",
-    "@nestjs/core": "^9.2.1",
+    "@nestjs/core": "^9.3.3",
     "@nestjs/jwt": "^10.0.1",
     "@nestjs/mongoose": "^9.2.1",
-    "@nestjs/microservices": "^9.2.1",
+    "@nestjs/microservices": "^9.3.3",
     "@nestjs/passport": "^9.0.1",
-    "@nestjs/platform-express": "^9.2.1",
+    "@nestjs/platform-express": "^9.3.3",
     "@nestjs/schedule": "^2.2.0",
-    "@nestjs/swagger": "^6.1.4",
+    "@nestjs/swagger": "^6.2.1",
     "@nestjs/terminus": "^9.2.0",
     "@types/response-time": "^2.3.5",
     "bcryptjs": "^2.4.3",
@@ -74,7 +74,7 @@
     "joi": "^17.7.0",
     "kafkajs": "^2.2.3",
     "moment": "^2.29.4",
-    "mongoose": "^6.9.0",
+    "mongoose": "^6.9.1",
     "morgan": "^1.10.0",
     "nest-winston": "^1.8.0",
     "nestjs-command": "^3.1.3",
@@ -97,27 +97,27 @@
   "devDependencies": {
     "@nestjs/cli": "^9.2.0",
     "@nestjs/schematics": "^9.0.4",
-    "@nestjs/testing": "^9.2.1",
+    "@nestjs/testing": "^9.3.3",
     "@types/bcryptjs": "^2.4.2",
     "@types/bytes": "^3.1.1",
     "@types/cors": "^2.8.13",
     "@types/cron": "^2.0.0",
     "@types/crypto-js": "^4.1.1",
-    "@types/express": "^4.17.16",
+    "@types/express": "^4.17.17",
     "@types/express-rate-limit": "^6.0.0",
     "@types/jest": "^29.4.0",
     "@types/lodash": "^4.14.191",
     "@types/morgan": "^1.9.4",
     "@types/ms": "^0.7.31",
     "@types/multer": "^1.4.7",
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.11.19",
     "@types/passport-jwt": "^3.0.8",
     "@types/supertest": "^2.0.12",
     "@types/ua-parser-js": "^0.7.36",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    "cspell": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "cspell": "^6.22.0",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",