diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index a67dc99b..867b89e2 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -5,7 +5,7 @@ * MIT Licensed. */ const Log = require("../../../js/logger.js"); -const ical = require("ical"); +const ical = require("node-ical"); const request = require("request"); /** diff --git a/package-lock.json b/package-lock.json index af09f179..86d9431e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4053,24 +4053,6 @@ "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==", "dev": true }, - "ical": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/ical/-/ical-0.8.0.tgz", - "integrity": "sha512-/viUSb/RGLLnlgm0lWRlPBtVeQguQRErSPYl3ugnUaKUnzQswKqOG3M8/P1v1AB5NJwlHTuvTq1cs4mpeG2rCg==", - "requires": { - "rrule": "2.4.1" - }, - "dependencies": { - "rrule": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/rrule/-/rrule-2.4.1.tgz", - "integrity": "sha512-+NcvhETefswZq13T8nkuEnnQ6YgUeZaqMqVbp+ZiFDPCbp3AVgQIwUvNVDdMNrP05bKZG9ddDULFp0qZZYDrxg==", - "requires": { - "luxon": "^1.3.3" - } - } - } - }, "iconv-lite": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", @@ -5641,6 +5623,14 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz", "integrity": "sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==" }, + "moment-timezone": { + "version": "0.5.31", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz", + "integrity": "sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==", + "requires": { + "moment": ">= 2.9.0" + } + }, "mri": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz", @@ -5714,6 +5704,17 @@ "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", "dev": true }, + "node-ical": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.0.tgz", + "integrity": "sha512-whPA/GABFAWMVzqKeTuBjzPGCfNR9eoCSWPHE6MkHyDlQqScdVfyWr0dRy50Lvfz9JCNqFqiko1GpHJ21pn8YA==", + "requires": { + "moment-timezone": "^0.5.31", + "request": "^2.88.2", + "rrule": "2.6.4", + "uuid": "^3.3.2" + } + }, "node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", diff --git a/package.json b/package.json index e968dace..701dba4b 100644 --- a/package.json +++ b/package.json @@ -75,10 +75,10 @@ "express-ipfilter": "^1.1.2", "feedme": "^1.2.0", "helmet": "^3.23.3", - "ical": "^0.8.0", - "iconv-lite": "^0.6.2", + "iconv-lite": "latest", "module-alias": "^2.2.2", - "moment": "^2.28.0", + "moment": "latest", + "node-ical": "^0.12.0", "request": "^2.88.2", "rrule": "^2.6.6", "rrule-alt": "^2.2.8",