chore: resolve conflicts

.circleci/config.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.0
+      - image: cimg/node:19.6
     steps:
       - checkout
       - *restore-cache
@@ -38,7 +38,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.0
+      - image: cimg/node:19.6
     steps:
       - checkout
       - *restore-cache

package.json

@@ -43,25 +43,25 @@
     ]
   },
   "devDependencies": {
-    "@commitlint/cli": "17.2.0",
-    "@commitlint/config-angular": "17.2.0",
-    "@commitlint/config-conventional": "17.2.0",
-    "@typescript-eslint/eslint-plugin": "5.42.1",
-    "@typescript-eslint/parser": "5.42.1",
-    "eslint": "8.27.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
-    "husky": "8.0.2",
-    "jest": "29.3.1",
-    "lerna": "6.0.3",
+    "@commitlint/cli": "17.4.2",
+    "@commitlint/config-angular": "17.4.2",
+    "@commitlint/config-conventional": "17.4.2",
+    "@typescript-eslint/eslint-plugin": "5.51.0",
+    "@typescript-eslint/parser": "5.51.0",
+    "eslint": "8.33.0",
+    "eslint-config-prettier": "8.6.0",
+    "eslint-plugin-import": "2.27.5",
+    "husky": "8.0.3",
+    "jest": "29.4.2",
+    "lerna": "6.4.1",
     "lerna-changelog": "2.2.0",
-    "lint-staged": "13.0.3",
-    "prettier": "2.7.1",
-    "rimraf": "3.0.2",
-    "sort-package-json": "2.1.0",
-    "ts-jest": "29.0.3",
+    "lint-staged": "13.1.1",
+    "prettier": "2.8.4",
+    "rimraf": "4.1.2",
+    "sort-package-json": "2.4.1",
+    "ts-jest": "29.0.5",
     "ts-node": "10.9.1",
-    "tsconfig-paths": "4.1.0",
-    "typescript": "4.8.4"
+    "tsconfig-paths": "4.1.2",
+    "typescript": "4.9.5"
   }
 }

packages/bull-shared/package.json

@@ -16,11 +16,11 @@
   "types": "dist/index.d.ts",
   "scripts": {},
   "dependencies": {
-    "tslib": "2.4.1"
+    "tslib": "2.5.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.2.0",
-    "@nestjs/core": "9.2.0"
+    "@nestjs/common": "9.3.7",
+    "@nestjs/core": "9.3.7"
   },
   "peerDependencies": {
     "@nestjs/common": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0",

packages/bull/package.json

@@ -23,20 +23,20 @@
   },
   "dependencies": {
     "@nestjs/bull-shared": "^0.1.2",
-    "tslib": "2.4.1"
+    "tslib": "2.5.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.2.0",
-    "@nestjs/core": "9.2.0",
-    "@nestjs/platform-express": "9.2.0",
-    "@nestjs/testing": "9.2.0",
+    "@nestjs/common": "9.3.7",
+    "@nestjs/core": "9.3.7",
+    "@nestjs/platform-express": "9.3.7",
+    "@nestjs/testing": "9.3.7",
     "@types/bull": "3.15.9",
-    "@types/jest": "29.2.2",
-    "@types/node": "18.11.9",
+    "@types/jest": "29.4.0",
+    "@types/node": "18.13.0",
     "@types/reflect-metadata": "0.1.0",
-    "bull": "4.10.1",
+    "bull": "4.10.3",
     "reflect-metadata": "0.1.13",
-    "rxjs": "7.5.7"
+    "rxjs": "7.8.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^6.10.11 || ^7.0.0 || ^8.0.0 || ^9.0.0",

packages/bullmq/package.json

@@ -20,19 +20,19 @@
   },
   "dependencies": {
     "@nestjs/bull-shared": "^0.1.2",
-    "tslib": "2.4.1"
+    "tslib": "2.5.0"
   },
   "devDependencies": {
-    "@nestjs/common": "9.2.0",
-    "@nestjs/core": "9.2.0",
-    "@nestjs/platform-express": "9.2.0",
-    "@nestjs/testing": "9.2.0",
-    "@types/jest": "29.2.2",
-    "@types/node": "18.11.9",
+    "@nestjs/common": "9.3.7",
+    "@nestjs/core": "9.3.7",
+    "@nestjs/platform-express": "9.3.7",
+    "@nestjs/testing": "9.3.7",
+    "@types/jest": "29.4.0",
+    "@types/node": "18.13.0",
     "@types/reflect-metadata": "0.1.0",
     "bullmq": "3.6.3",
     "reflect-metadata": "0.1.13",
-    "rxjs": "7.5.7"
+    "rxjs": "7.8.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0",