Upgrade js-joda (#323)

Upgrade @js-joda/core from 4.3.1 to 5.6.2. This includes a fix for js-joda/js-joda#689, which has also been reported in #279. Upgrade @js-joda/timezone from 2.11.2 to 2.18.3. Also reduce timezone file size by not importing all the historical timezone data, see https://github.com/js-joda/js-joda/blob/main/packages/timezone/README.md#reducing-js-joda-timezone-file-size. Signed-off-by: Florian Hotze <[email protected]>
openhab · Mar 13, 2024 · a626a71 · a626a71
1 parent 308cca8
commit a626a71
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     },
     "homepage": "https://www.openhab.org/addons/automation/jsscripting/",
     "dependencies": {
-        "@js-joda/core": "^4.3.1",
-        "@js-joda/timezone": "^2.11.1",
+        "@js-joda/core": "^5.6.2",
+        "@js-joda/timezone": "^2.18.3",
         "parse-duration": "^0.1.1"
     },
     "scripts": {

diff --git a/src/time.js b/src/time.js
@@ -5,7 +5,8 @@
  * @namespace time
  */
 
-require('@js-joda/timezone');
+// reduce timezone file size, see https://github.com/js-joda/js-joda/blob/main/packages/timezone/README.md#reducing-js-joda-timezone-file-size
+require('@js-joda/timezone/dist/js-joda-timezone-10-year-range');
 const time = require('@js-joda/core');
 
 const log = require('./log')('time');

diff --git a/types/time.d.ts b/types/time.d.ts
@@ -2,7 +2,7 @@ declare const _exports: {
     toZDT: typeof toZDT;
     parseString: typeof _parseString;
     parseISO8601: typeof _parseISO8601;
-    nativeJs(date: any, zone?: time.ZoneId): time.TemporalAccessor;
+    nativeJs(date: any, zone?: time.ZoneId): time.ZonedDateTime;
     convert(temporal: time.LocalDate | time.Instant | time.ZonedDateTime | time.LocalDateTime, zone?: time.ZoneId): {
         toDate: () => Date;
         toEpochMilli: () => number;

diff --git a/types/time.d.ts.map b/types/time.d.ts.map