add Luxon 2 support

packages/luxon2/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@fullcalendar/luxon",
+  "name": "@fullcalendar/luxon2",
   "version": "5.10.1",
   "title": "FullCalendar Luxon Plugin",
   "description": "A connector to the Luxon date library",
@@ -9,11 +9,12 @@
     "tslib": "^2.1.0"
   },
   "peerDependencies": {
-    "luxon": "^1.12.1"
+    "luxon": "^2.0.0"
   },
   "devDependencies": {
     "@fullcalendar/core-preact": "workspace:*",
-    "luxon": "^1.12.1"
+    "@types/luxon": "^2.0.9",
+    "luxon": "^2.0.0"
   },
   "main": "main.cjs.js",
   "module": "main.js",

packages/luxon2/src/main.ts

@@ -11,6 +11,8 @@ export function toLuxonDateTime(date: Date, calendar: CalendarApi): LuxonDateTim
   return LuxonDateTime.fromJSDate(date, {
     zone: dateEnv.timeZone,
     locale: dateEnv.locale.codes[0],
+  } as {
+    zone: string // HACK to allow locale property, which IS supported
   })
 }
 
@@ -21,8 +23,7 @@ export function toLuxonDuration(duration: Duration, calendar: CalendarApi): Luxo
 
   let { dateEnv } = calendar.getCurrentData()
 
-  return LuxonDuration.fromObject({
-    ...duration,
+  return LuxonDuration.fromObject(duration, {
     locale: dateEnv.locale.codes[0],
   })
 }
@@ -89,15 +90,16 @@ function luxonToArray(datetime: LuxonDateTime): number[] {
 
 function arrayToLuxon(arr: number[], timeZone: string, locale?: string): LuxonDateTime {
   return LuxonDateTime.fromObject({
-    zone: timeZone,
-    locale,
     year: arr[0],
     month: arr[1] + 1, // convert 0-based to 1-based
     day: arr[2],
     hour: arr[3],
     minute: arr[4],
     second: arr[5],
     millisecond: arr[6],
+  }, {
+    locale,
+    zone: timeZone,
   })
 }
 

yarn.lock

@@ -2056,6 +2056,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@fullcalendar/luxon2@workspace:packages/luxon2":
+  version: 0.0.0-use.local
+  resolution: "@fullcalendar/luxon2@workspace:packages/luxon2"
+  dependencies:
+    "@fullcalendar/common": "workspace:~5.10.1"
+    "@fullcalendar/core-preact": "workspace:*"
+    "@types/luxon": ^2.0.9
+    luxon: ^2.0.0
+    tslib: ^2.1.0
+  peerDependencies:
+    luxon: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
 "@fullcalendar/luxon@workspace:packages/luxon, @fullcalendar/luxon@workspace:~5.10.1":
   version: 0.0.0-use.local
   resolution: "@fullcalendar/luxon@workspace:packages/luxon"
@@ -3784,6 +3798,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/luxon@npm:^2.0.9":
+  version: 2.0.9
+  resolution: "@types/luxon@npm:2.0.9"
+  checksum: 42416dfdb2765ad13f4d5b2d292b94a69c3709ebd6fb21bbefbd16076b5848862eb0f1121283e52209aa3e6bb57f0ddda4ac5460368af71474ee81c5cfc045aa
+  languageName: node
+  linkType: hard
+
 "@types/mdast@npm:^3.0.0":
   version: 3.0.3
   resolution: "@types/mdast@npm:3.0.3"
@@ -15799,6 +15820,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"luxon@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "luxon@npm:2.3.0"
+  checksum: b2472be1d1d14a4012ba9e36c3f9e0839e6a9e0b976ae147ece4ad9fdf393a3da8298cf8976401b6478b19764d7483bb92b1c678cff64005b7dda78d86911c92
+  languageName: node
+  linkType: hard
+
 "lz-string@npm:^1.4.4":
   version: 1.4.4
   resolution: "lz-string@npm:1.4.4"