From 864a3739b373ee872e0addec9c99ef67365e94da Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Thu, 14 Nov 2024 13:37:13 +0100 Subject: [PATCH] fix: adjust ical.js to fix import https://github.com/kewisch/ical.js/issues/329 --- src/calendarUtil.js | 3 +-- src/lib/ical.js | 2 +- test/calendarUtil.test.js | 2 +- test/test_calendars/eat_time_zone_event.ics | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/calendarUtil.js b/src/calendarUtil.js index 12eda46..651932f 100644 --- a/src/calendarUtil.js +++ b/src/calendarUtil.js @@ -1,5 +1,4 @@ -import ICAL from './lib/ical.js'; -import './lib/ical.timezones.js'; +import ICAL from './lib/ical.timezones'; import fs from 'fs'; import path from 'path'; import axios from 'axios'; diff --git a/src/lib/ical.js b/src/lib/ical.js index 2f7b937..e44a3f3 100644 --- a/src/lib/ical.js +++ b/src/lib/ical.js @@ -8,7 +8,7 @@ /* jshint ignore:start */ if (typeof module === 'object') { // CommonJS, where exports may be different each time. - ICAL = module.exports; + var ICAL = module.exports; } else if (typeof ICAL !== 'object') {/* istanbul ignore next */ /** @ignore */ this.ICAL = {}; diff --git a/test/calendarUtil.test.js b/test/calendarUtil.test.js index f5380d7..91db03b 100644 --- a/test/calendarUtil.test.js +++ b/test/calendarUtil.test.js @@ -1,4 +1,4 @@ -import ICAL from 'ical.js'; +import ICAL from '../src/lib/ical.timezones'; import fs from 'fs'; import axios from 'axios'; diff --git a/test/test_calendars/eat_time_zone_event.ics b/test/test_calendars/eat_time_zone_event.ics index efe9a67..1b5a8f1 100644 --- a/test/test_calendars/eat_time_zone_event.ics +++ b/test/test_calendars/eat_time_zone_event.ics @@ -3,9 +3,9 @@ NAME:EAT Event VERSION:2.0 BEGIN:VEVENT UID:20231108T090000+0300-001@example.com -DTSTAMP:20231108T090000+0300 -DTSTART:20231108T090000+0300 -DTEND:20231108T100000+0300 +DTSTAMP:20231101T090000+03:00 +DTSTART:20231108T090000+03:00 +DTEND:20231108T100000+03:00 SUMMARY:EAT Event END:VEVENT -END:VCALENDAR \ No newline at end of file +END:VCALENDAR