fix:pull changes from contrib

https://github.com/kewisch/ical.js/issues/329

package-lock.json

@@ -11,16 +11,10 @@
       "dependencies": {
         "axios": "^1.7.7",
         "calendar-merger": "file:",
-        "date-fns": "^4.1.0",
-        "date-fns-tz": "^3.2.0",
         "express": "^4.17.1",
-        "ical": "^0.8.0",
-        "ical-generator": "^0.2.10",
         "ical.js": "^2.1.0",
-        "luxon": "^3.5.0",
         "node-cron": "^2.0.3",
-        "supertest": "^7.0.0",
-        "timezones-ical-library": "^1.8.3"
+        "supertest": "^7.0.0"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.26.0",
@@ -2635,7 +2629,8 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -3096,6 +3091,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -3147,7 +3143,8 @@
     "node_modules/cookiejar": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
-      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "license": "MIT"
     },
     "node_modules/core-js-compat": {
       "version": "3.38.1",
@@ -3197,23 +3194,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/date-fns": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
-      }
-    },
-    "node_modules/date-fns-tz": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-3.2.0.tgz",
-      "integrity": "sha512-sg8HqoTEulcbbbVXeg84u5UnlsQa8GS5QXMqjjYIhS4abEVVKIUwe0/l/UhrZdKaL/W5eWZNlbTeEIiOXTcsBQ==",
-      "peerDependencies": {
-        "date-fns": "^3.0.0 || ^4.0.0"
-      }
-    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3305,6 +3285,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "license": "ISC",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -3819,7 +3800,8 @@
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
     },
     "node_modules/fastq": {
       "version": "1.17.1",
@@ -4058,6 +4040,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.2.tgz",
       "integrity": "sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==",
+      "license": "MIT",
       "dependencies": {
         "dezalgo": "^1.0.4",
         "hexoid": "^2.0.0",
@@ -4290,6 +4273,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-2.0.0.tgz",
       "integrity": "sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4324,19 +4308,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/ical": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/ical/-/ical-0.8.0.tgz",
-      "integrity": "sha512-/viUSb/RGLLnlgm0lWRlPBtVeQguQRErSPYl3ugnUaKUnzQswKqOG3M8/P1v1AB5NJwlHTuvTq1cs4mpeG2rCg==",
-      "dependencies": {
-        "rrule": "2.4.1"
-      }
-    },
-    "node_modules/ical-generator": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/ical-generator/-/ical-generator-0.2.10.tgz",
-      "integrity": "sha512-q4TRRGIaG8McNeZRx9sF120vxVuZbPSAMiwn9GgI9+iRrrtUsLZnVUAO7dPP7XSXt+yrrrxP2LbQ+KEnUC6+JQ=="
-    },
     "node_modules/ical.js": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-2.1.0.tgz",
@@ -5379,14 +5350,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/luxon": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
-      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -6138,23 +6101,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rrule": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/rrule/-/rrule-2.4.1.tgz",
-      "integrity": "sha512-+NcvhETefswZq13T8nkuEnnQ6YgUeZaqMqVbp+ZiFDPCbp3AVgQIwUvNVDdMNrP05bKZG9ddDULFp0qZZYDrxg==",
-      "optionalDependencies": {
-        "luxon": "^1.3.3"
-      }
-    },
-    "node_modules/rrule/node_modules/luxon": {
-      "version": "1.28.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz",
-      "integrity": "sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6471,6 +6417,7 @@
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
       "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
+      "license": "MIT",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.4",
@@ -6490,6 +6437,7 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
       "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -6506,6 +6454,7 @@
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
       "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -6516,12 +6465,14 @@
     "node_modules/superagent/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/supertest": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.0.0.tgz",
       "integrity": "sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==",
+      "license": "MIT",
       "dependencies": {
         "methods": "^1.1.2",
         "superagent": "^9.0.1"
@@ -6574,15 +6525,6 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/timezones-ical-library": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/timezones-ical-library/-/timezones-ical-library-1.8.3.tgz",
-      "integrity": "sha512-aXpr/l5Vxfrpf2s9OUoS8Qoj+DG9ykq1YWMzWk4tG1TwxKLnrFWiAgOKrQbBtPEynVtkU1aB1TftTX/SkvSzdQ==",
-      "engines": {
-        "node": ">=18.17.0",
-        "npm": ">=9.6.7"
-      }
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",

package.json

@@ -8,16 +8,10 @@
   "dependencies": {
     "axios": "^1.7.7",
     "calendar-merger": "file:",
-    "date-fns": "^4.1.0",
-    "date-fns-tz": "^3.2.0",
     "express": "^4.17.1",
-    "ical": "^0.8.0",
-    "ical-generator": "^0.2.10",
     "ical.js": "^2.1.0",
-    "luxon": "^3.5.0",
     "node-cron": "^2.0.3",
-    "supertest": "^7.0.0",
-    "timezones-ical-library": "^1.8.3"
+    "supertest": "^7.0.0"
   },
   "description": "calmerger",
   "main": "server.js",

src/calendarUtil.js

@@ -1,5 +1,4 @@
-import ICAL from './lib/ical.js';
-import './lib/ical.timezones.js';
+import ICAL from './lib/ical.timezones.js';
 import fs from 'fs';
 import path from 'path';
 import axios from 'axios';

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 = {};

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';
 

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
+END:VCALENDAR