Browse Source

Merge 57344010910e3331b63fb07b6d58ca893f718d2c into e1739ac4fc7301ee3c5f6d9dc8d10e4e828e03af

renovate[bot] 1 year ago
parent
commit
f70654a5cf
3 changed files with 19 additions and 55 deletions
  1. 17 52
      server/package-lock.json
  2. 1 2
      server/package.json
  3. 1 1
      server/src/infra/repositories/job.repository.ts

+ 17 - 52
server/package-lock.json

@@ -17,7 +17,7 @@
         "@nestjs/core": "^10.2.2",
         "@nestjs/platform-express": "^10.2.2",
         "@nestjs/platform-socket.io": "^10.2.2",
-        "@nestjs/schedule": "^3.0.3",
+        "@nestjs/schedule": "^4.0.0",
         "@nestjs/swagger": "^7.1.8",
         "@nestjs/typeorm": "^10.0.0",
         "@nestjs/websockets": "^10.2.2",
@@ -62,7 +62,6 @@
         "@types/archiver": "^6.0.0",
         "@types/bcrypt": "^5.0.0",
         "@types/cookie-parser": "^1.4.3",
-        "@types/cron": "^2.0.1",
         "@types/express": "^4.17.17",
         "@types/fluent-ffmpeg": "^2.1.21",
         "@types/imagemin": "^8.0.1",
@@ -2019,11 +2018,11 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@nestjs/schedule": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-3.0.4.tgz",
-      "integrity": "sha512-uFJpuZsXfpvgx2y7/KrIZW9e1L68TLiwRodZ6+Gc8xqQiHSUzAVn+9F4YMxWFlHITZvvkjWziUFgRNCitDcTZQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-4.0.0.tgz",
+      "integrity": "sha512-zz4h54m/F/1qyQKvMJCRphmuwGqJltDAkFxUXCVqJBXEs5kbPt93Pza3heCQOcMH22MZNhGlc9DmDMLXVHmgVQ==",
       "dependencies": {
-        "cron": "2.4.3",
+        "cron": "3.1.3",
         "uuid": "9.0.1"
       },
       "peerDependencies": {
@@ -2895,16 +2894,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cron": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/cron/-/cron-2.4.0.tgz",
-      "integrity": "sha512-5bBaAkqvSFBX8JMi/xCofNzG5E594TNsApMz68dLd/sQYz/HGQqgcxGHTRjOvD4G3Y+YF1Oo3S7QdCvKt1KAJQ==",
-      "deprecated": "This is a stub types definition. cron provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "dependencies": {
-        "cron": "*"
-      }
-    },
     "node_modules/@types/docker-modem": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz",
@@ -5106,12 +5095,12 @@
       "devOptional": true
     },
     "node_modules/cron": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-2.4.3.tgz",
-      "integrity": "sha512-YBvExkQYF7w0PxyeFLRyr817YVDhGxaCi5/uRRMqa4aWD3IFKRd+uNbpW1VWMdqQy8PZ7CElc+accXJcauPKzQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.3.tgz",
+      "integrity": "sha512-KVxeKTKYj2eNzN4ElnT6nRSbjbfhyxR92O/Jdp6SH3pc05CDJws59jBrZWEMQlxevCiE6QUTrXy+Im3vC3oD3A==",
       "dependencies": {
         "@types/luxon": "~3.3.0",
-        "luxon": "~3.3.0"
+        "luxon": "~3.4.0"
       }
     },
     "node_modules/cron-parser": {
@@ -5125,14 +5114,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/cron/node_modules/luxon": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-      "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -14216,11 +14197,11 @@
       }
     },
     "@nestjs/schedule": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-3.0.4.tgz",
-      "integrity": "sha512-uFJpuZsXfpvgx2y7/KrIZW9e1L68TLiwRodZ6+Gc8xqQiHSUzAVn+9F4YMxWFlHITZvvkjWziUFgRNCitDcTZQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-4.0.0.tgz",
+      "integrity": "sha512-zz4h54m/F/1qyQKvMJCRphmuwGqJltDAkFxUXCVqJBXEs5kbPt93Pza3heCQOcMH22MZNhGlc9DmDMLXVHmgVQ==",
       "requires": {
-        "cron": "2.4.3",
+        "cron": "3.1.3",
         "uuid": "9.0.1"
       },
       "dependencies": {
@@ -14875,15 +14856,6 @@
         "@types/node": "*"
       }
     },
-    "@types/cron": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/cron/-/cron-2.4.0.tgz",
-      "integrity": "sha512-5bBaAkqvSFBX8JMi/xCofNzG5E594TNsApMz68dLd/sQYz/HGQqgcxGHTRjOvD4G3Y+YF1Oo3S7QdCvKt1KAJQ==",
-      "dev": true,
-      "requires": {
-        "cron": "*"
-      }
-    },
     "@types/docker-modem": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz",
@@ -16597,19 +16569,12 @@
       "devOptional": true
     },
     "cron": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-2.4.3.tgz",
-      "integrity": "sha512-YBvExkQYF7w0PxyeFLRyr817YVDhGxaCi5/uRRMqa4aWD3IFKRd+uNbpW1VWMdqQy8PZ7CElc+accXJcauPKzQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.3.tgz",
+      "integrity": "sha512-KVxeKTKYj2eNzN4ElnT6nRSbjbfhyxR92O/Jdp6SH3pc05CDJws59jBrZWEMQlxevCiE6QUTrXy+Im3vC3oD3A==",
       "requires": {
         "@types/luxon": "~3.3.0",
-        "luxon": "~3.3.0"
-      },
-      "dependencies": {
-        "luxon": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
-          "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg=="
-        }
+        "luxon": "~3.4.0"
       }
     },
     "cron-parser": {

+ 1 - 2
server/package.json

@@ -44,7 +44,7 @@
     "@nestjs/core": "^10.2.2",
     "@nestjs/platform-express": "^10.2.2",
     "@nestjs/platform-socket.io": "^10.2.2",
-    "@nestjs/schedule": "^3.0.3",
+    "@nestjs/schedule": "^4.0.0",
     "@nestjs/swagger": "^7.1.8",
     "@nestjs/typeorm": "^10.0.0",
     "@nestjs/websockets": "^10.2.2",
@@ -89,7 +89,6 @@
     "@types/archiver": "^6.0.0",
     "@types/bcrypt": "^5.0.0",
     "@types/cookie-parser": "^1.4.3",
-    "@types/cron": "^2.0.1",
     "@types/express": "^4.17.17",
     "@types/fluent-ffmpeg": "^2.1.21",
     "@types/imagemin": "^8.0.1",

+ 1 - 1
server/src/infra/repositories/job.repository.ts

@@ -33,7 +33,7 @@ export class JobRepository implements IJobRepository {
   }
 
   addCronJob(name: string, expression: string, onTick: () => void, start = true): void {
-    const job = new CronJob(
+    const job = new CronJob<null, null>(
       expression,
       onTick,
       // function to run onComplete