From e8fd906aa13307a265dbcb923be2f1a2b23bf3c8 Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Tue, 22 Sep 2020 07:25:48 -0500 Subject: [PATCH 1/2] move calendar to node-ical for ms timezones and timezones in general --- modules/default/calendar/calendarfetcher.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.json b/package.json index f2e95b7c..ab83105f 100644 --- a/package.json +++ b/package.json @@ -76,11 +76,11 @@ "express-ipfilter": "^1.0.1", "feedme": "latest", "helmet": "^3.23.3", - "ical": "^0.8.0", "iconv-lite": "latest", "lodash": "^4.17.19", "module-alias": "^2.2.2", "moment": "latest", + "node-ical": "^0.12.0", "request": "^2.88.2", "rrule": "^2.6.4", "rrule-alt": "^2.2.8", From 1b47c4d16f18022195ec8876d9807272fcfc9e66 Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Tue, 22 Sep 2020 07:31:02 -0500 Subject: [PATCH 2/2] add package-lock --- package-lock.json | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index a3214e7a..57ebd753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3747,24 +3747,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", @@ -5268,6 +5250,14 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" }, + "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.5", "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.5.tgz", @@ -5343,6 +5333,17 @@ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", "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",