@bash-app/bash-common 1.14.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "1.14.0",
+  "version": "2.0.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/src/utils/dateTimeUtils.ts

@@ -1,5 +1,5 @@
 import {DateType, DateValueType} from "react-tailwindcss-datepicker";
-import dayjs from "dayjs";
+import dayjs, {Dayjs} from "dayjs";
 import dayjsUtc from "dayjs/plugin/utc";
 import dayjsTimeZone from "dayjs/plugin/timezone";
 import {DateTimeArgType} from "../definitions";
@@ -141,14 +141,13 @@ export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITi
   return correctTimeOnDate;
 }
 
-export function ensureDateTimeIsLocalDateTime(dateArg: DateType | undefined): Date {
+export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
   if (dayjs(dateArg).isUTC()) {
     const dateLocalTimeZone = dayjs(dateArg);
-    const date = dateLocalTimeZone.toDate();
-    return date;
+    return dateLocalTimeZone;
   }
   else {
-    return new Date(dateArg ?? Date.now());
+    return dayjs(dateArg ?? Date.now());
   }
 }