From 06b714550586a61386721ddd089e58c1308abf76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20D=C4=85browski?= Date: Mon, 20 Jan 2025 20:40:54 +0100 Subject: [PATCH] fix: adjust date-fns imports to use a single entrypoint --- src/date_utils.ts | 147 ++++++++++++++++--------------- src/test/calendar_test.test.tsx | 11 ++- src/test/date_utils_test.test.ts | 11 ++- src/test/month_test.test.tsx | 2 +- 4 files changed, 91 insertions(+), 80 deletions(-) diff --git a/src/date_utils.ts b/src/date_utils.ts index 3ab13719e5..f74ddc8299 100644 --- a/src/date_utils.ts +++ b/src/date_utils.ts @@ -1,64 +1,67 @@ -import { addDays } from "date-fns/addDays"; -import { addHours } from "date-fns/addHours"; -import { addMinutes } from "date-fns/addMinutes"; -import { addMonths } from "date-fns/addMonths"; -import { addQuarters } from "date-fns/addQuarters"; -import { addSeconds } from "date-fns/addSeconds"; -import { addWeeks } from "date-fns/addWeeks"; -import { addYears } from "date-fns/addYears"; -import { differenceInCalendarDays } from "date-fns/differenceInCalendarDays"; -import { differenceInCalendarMonths } from "date-fns/differenceInCalendarMonths"; -import { differenceInCalendarQuarters } from "date-fns/differenceInCalendarQuarters"; -import { differenceInCalendarYears } from "date-fns/differenceInCalendarYears"; -import { endOfDay } from "date-fns/endOfDay"; -import { endOfMonth } from "date-fns/endOfMonth"; -import { endOfWeek } from "date-fns/endOfWeek"; -import { endOfYear } from "date-fns/endOfYear"; -import { format, longFormatters } from "date-fns/format"; -import { getDate } from "date-fns/getDate"; -import { getDay } from "date-fns/getDay"; -import { getHours } from "date-fns/getHours"; -import { getISOWeek } from "date-fns/getISOWeek"; -import { getMinutes } from "date-fns/getMinutes"; -import { getMonth } from "date-fns/getMonth"; -import { getQuarter } from "date-fns/getQuarter"; -import { getSeconds } from "date-fns/getSeconds"; -import { getTime } from "date-fns/getTime"; -import { getYear } from "date-fns/getYear"; -import { isAfter } from "date-fns/isAfter"; -import { isBefore } from "date-fns/isBefore"; -import { isDate } from "date-fns/isDate"; -import { isEqual as dfIsEqual } from "date-fns/isEqual"; -import { isSameDay as dfIsSameDay } from "date-fns/isSameDay"; -import { isSameMonth as dfIsSameMonth } from "date-fns/isSameMonth"; -import { isSameQuarter as dfIsSameQuarter } from "date-fns/isSameQuarter"; -import { isSameYear as dfIsSameYear } from "date-fns/isSameYear"; -import { isValid as isValidDate } from "date-fns/isValid"; -import { isWithinInterval } from "date-fns/isWithinInterval"; -import { max } from "date-fns/max"; -import { min } from "date-fns/min"; -import { parse } from "date-fns/parse"; -import { parseISO } from "date-fns/parseISO"; -import { set } from "date-fns/set"; -import { setHours } from "date-fns/setHours"; -import { setMinutes } from "date-fns/setMinutes"; -import { setMonth } from "date-fns/setMonth"; -import { setQuarter } from "date-fns/setQuarter"; -import { setSeconds } from "date-fns/setSeconds"; -import { setYear } from "date-fns/setYear"; -import { startOfDay } from "date-fns/startOfDay"; -import { startOfMonth } from "date-fns/startOfMonth"; -import { startOfQuarter } from "date-fns/startOfQuarter"; -import { startOfWeek } from "date-fns/startOfWeek"; -import { startOfYear } from "date-fns/startOfYear"; -import { subDays } from "date-fns/subDays"; -import { subMonths } from "date-fns/subMonths"; -import { subQuarters } from "date-fns/subQuarters"; -import { subWeeks } from "date-fns/subWeeks"; -import { subYears } from "date-fns/subYears"; -import { toDate } from "date-fns/toDate"; - -import type { Day, Locale as DateFnsLocale } from "date-fns"; +import { + addDays, + addHours, + addMinutes, + addMonths, + addQuarters, + addSeconds, + addWeeks, + addYears, + isEqual as dfIsEqual, + isSameDay as dfIsSameDay, + isSameMonth as dfIsSameMonth, + isSameQuarter as dfIsSameQuarter, + isSameYear as dfIsSameYear, + differenceInCalendarDays, + differenceInCalendarMonths, + differenceInCalendarQuarters, + differenceInCalendarYears, + endOfDay, + endOfMonth, + endOfWeek, + endOfYear, + format, + getDate, + getDay, + getHours, + getISOWeek, + getMinutes, + getMonth, + getQuarter, + getSeconds, + getTime, + getYear, + isAfter, + isBefore, + isDate, + isValid as isValidDate, + isWithinInterval, + longFormatters, + max, + min, + parse, + parseISO, + set, + setHours, + setMinutes, + setMonth, + setQuarter, + setSeconds, + setYear, + startOfDay, + startOfMonth, + startOfQuarter, + startOfWeek, + startOfYear, + subDays, + subMonths, + subQuarters, + subWeeks, + subYears, + toDate, +} from "date-fns"; + +import type { Locale as DateFnsLocale, Day } from "date-fns"; export type DateNumberType = Day; interface LocaleObj @@ -340,21 +343,21 @@ export function setTime( return setHours(setMinutes(setSeconds(date, second), minute), hour); } -export { setMinutes, setHours, setMonth, setQuarter, setYear }; +export { setHours, setMinutes, setMonth, setQuarter, setYear }; // ** Date Getters ** // getDay Returns day of week, getDate returns day of month export { - getSeconds, - getMinutes, + getDate, + getDay, getHours, + getMinutes, getMonth, getQuarter, - getYear, - getDay, - getDate, + getSeconds, getTime, + getYear, }; /** @@ -487,22 +490,22 @@ export function getEndOfMonth(date: Date): Date { // *** Addition *** export { - addSeconds, - addMinutes, addDays, - addWeeks, + addMinutes, addMonths, addQuarters, + addSeconds, + addWeeks, addYears, }; // *** Subtraction *** -export { addHours, subDays, subWeeks, subMonths, subQuarters, subYears }; +export { addHours, subDays, subMonths, subQuarters, subWeeks, subYears }; // ** Date Comparison ** -export { isBefore, isAfter }; +export { isAfter, isBefore }; /** * Checks if two dates are in the same year. diff --git a/src/test/calendar_test.test.tsx b/src/test/calendar_test.test.tsx index 5669aa6c60..5c31b3700a 100644 --- a/src/test/calendar_test.test.tsx +++ b/src/test/calendar_test.test.tsx @@ -3,9 +3,14 @@ */ import { render, fireEvent, act, waitFor } from "@testing-library/react"; -import { setDate, startOfMonth, eachDayOfInterval, endOfMonth } from "date-fns"; -import { endOfYear } from "date-fns/endOfYear"; -import { isSunday } from "date-fns/isSunday"; +import { + setDate, + startOfMonth, + eachDayOfInterval, + endOfMonth, + endOfYear, + isSunday, +} from "date-fns"; import { eo } from "date-fns/locale/eo"; import { fi } from "date-fns/locale/fi"; import React from "react"; diff --git a/src/test/date_utils_test.test.ts b/src/test/date_utils_test.test.ts index a3d5c25117..19d504e74a 100644 --- a/src/test/date_utils_test.test.ts +++ b/src/test/date_utils_test.test.ts @@ -1,8 +1,11 @@ -import { addYears, setSeconds } from "date-fns"; -import { addQuarters } from "date-fns/addQuarters"; +import { + addYears, + setSeconds, + addQuarters, + setHours, + setMinutes, +} from "date-fns"; import { ptBR } from "date-fns/locale/pt-BR"; -import { setHours } from "date-fns/setHours"; -import { setMinutes } from "date-fns/setMinutes"; import { newDate, diff --git a/src/test/month_test.test.tsx b/src/test/month_test.test.tsx index 22bc184aa1..fba4b839ec 100644 --- a/src/test/month_test.test.tsx +++ b/src/test/month_test.test.tsx @@ -1,6 +1,6 @@ /* eslint jest/expect-expect: ["error", { "assertFunctionNames": ["expect", "assertDateRangeInclusive", "runAxe"] }] */ import { render, fireEvent } from "@testing-library/react"; -import { es } from "date-fns/locale"; +import { es } from "date-fns/locale/es"; import React from "react"; import DatePicker from "../";