Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Centralize dayjs instance (#2164)

Luke Vella604242bb6379
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
index 62eae37cc..7d362ad77 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
@@ -2,17 +2,16 @@
import { Button } from "@rallly/ui/button";
import { CardFooter } from "@rallly/ui/card";
import { Form } from "@rallly/ui/form";
-import dayjs from "dayjs";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
-
import PollOptionsForm from "@/components/forms/poll-options-form";
import { useModalContext } from "@/components/modal/modal-provider";
import { useUpdatePollMutation } from "@/components/poll/mutations";
import { usePoll } from "@/components/poll-context";
import { Trans } from "@/components/trans";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { encodeDateOption } from "@/utils/date-time-utils";
const convertOptionToString = (
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
index 52ddd64b1..dd17e0c24 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
@@ -2,7 +2,6 @@
import { Badge } from "@rallly/ui/badge";
import { Icon } from "@rallly/ui/icon";
-import dayjs from "dayjs";
import { KeyIcon } from "lucide-react";
import {
EmptyState,
@@ -13,6 +12,7 @@ import {
import { Spinner } from "@/components/spinner";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
+import { dayjs } from "@/lib/dayjs";
import { trpc } from "@/trpc/client";
import { RevokeApiKeyButton } from "./revoke-api-key-button";
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
index bb46ecf85..17bcab980 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
@@ -14,14 +14,13 @@ import {
SelectTrigger,
SelectValue,
} from "@rallly/ui/select";
-import dayjs from "dayjs";
import { useForm } from "react-hook-form";
import * as z from "zod";
-
import { TimeFormatPicker } from "@/components/time-format-picker";
import { TimeZoneSelect } from "@/components/time-zone-picker/time-zone-select";
import { Trans } from "@/components/trans";
import { usePreferences } from "@/contexts/preferences";
+import { dayjs } from "@/lib/dayjs";
import { useDayjs } from "@/utils/dayjs";
const formSchema = z.object({
diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsx
index d4c953203..4c048f698 100644
--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx
@@ -9,7 +9,6 @@ import {
DialogTrigger,
} from "@rallly/ui/dialog";
import { Icon } from "@rallly/ui/icon";
-import dayjs from "dayjs";
import {
KeySquareIcon,
PaletteIcon,
@@ -44,6 +43,7 @@ import { RefreshLicenseButton } from "@/features/licensing/components/refresh-li
import { RemoveLicenseButton } from "@/features/licensing/components/remove-license-button";
import { loadInstanceLicense } from "@/features/licensing/data";
import { getTranslation } from "@/i18n/server";
+import { dayjs } from "@/lib/dayjs";
async function loadData() {
const [license] = await Promise.all([loadInstanceLicense(), requireAdmin()]);
diff --git a/apps/web/src/app/api/private/utils/time-slots.ts b/apps/web/src/app/api/private/utils/time-slots.ts
index c61726c10..fd9a9844f 100644
--- a/apps/web/src/app/api/private/utils/time-slots.ts
+++ b/apps/web/src/app/api/private/utils/time-slots.ts
@@ -1,11 +1,4 @@
-import dayjs from "dayjs";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
-
-dayjs.extend(utc);
-dayjs.extend(timezone);
-dayjs.extend(isSameOrBefore);
+import { dayjs } from "@/lib/dayjs";
export type SlotGeneratorInput = {
startDate: string;
diff --git a/apps/web/src/components/clock.tsx b/apps/web/src/components/clock.tsx
index 670860750..dd3274859 100644
--- a/apps/web/src/components/clock.tsx
+++ b/apps/web/src/components/clock.tsx
@@ -9,17 +9,16 @@ import {
DialogTrigger,
} from "@rallly/ui/dialog";
import { Label } from "@rallly/ui/label";
-import dayjs from "dayjs";
import { GlobeIcon } from "lucide-react";
import React from "react";
import { useInterval } from "react-use";
import spacetime from "spacetime";
import soft from "timezone-soft";
-
import { TimeFormatPicker } from "@/components/time-format-picker";
import { TimeZoneSelect } from "@/components/time-zone-picker/time-zone-select";
import { Trans } from "@/components/trans";
import { usePreferences } from "@/contexts/preferences";
+import { dayjs } from "@/lib/dayjs";
import { useDayjs } from "@/utils/dayjs";
export const TimePreferences = () => {
diff --git a/apps/web/src/components/date-icon.tsx b/apps/web/src/components/date-icon.tsx
index fab39aaa6..e403b8cb3 100644
--- a/apps/web/src/components/date-icon.tsx
+++ b/apps/web/src/components/date-icon.tsx
@@ -1,6 +1,7 @@
import { cn } from "@rallly/ui";
import type { Dayjs } from "dayjs";
-import dayjs from "dayjs";
+
+import { dayjs } from "@/lib/dayjs";
export const DateIconInner = (props: {
dow?: React.ReactNode;
diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/components/discussion/discussion.tsx
index f1ee7fcb5..0431983ea 100644
--- a/apps/web/src/components/discussion/discussion.tsx
+++ b/apps/web/src/components/discussion/discussion.tsx
@@ -19,7 +19,6 @@ import { Icon } from "@rallly/ui/icon";
import { Input } from "@rallly/ui/input";
import { toast } from "@rallly/ui/sonner";
import { Textarea } from "@rallly/ui/textarea";
-import dayjs from "dayjs";
import {
MessageSquareOffIcon,
MoreHorizontalIcon,
@@ -35,6 +34,7 @@ import { Trans } from "@/components/trans";
import { usePoll } from "@/contexts/poll";
import { useRole } from "@/contexts/role";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { trpc } from "@/trpc/client";
import { requiredString } from "../../utils/form-validation";
import TruncatedLinkify from "../poll/truncated-linkify";
diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsx
index 4c2fa6d3b..25d30d4db 100644
--- a/apps/web/src/components/event-card.tsx
+++ b/apps/web/src/components/event-card.tsx
@@ -2,7 +2,6 @@
import { Alert, AlertDescription, AlertTitle } from "@rallly/ui/alert";
import { Card, CardContent, CardDescription } from "@rallly/ui/card";
import { Icon } from "@rallly/ui/icon";
-import dayjs from "dayjs";
import { CircleStopIcon, DotIcon, MapPinIcon } from "lucide-react";
import TruncatedLinkify from "@/components/poll/truncated-linkify";
import VoteIcon from "@/components/poll/vote-icon";
@@ -11,6 +10,7 @@ import { RandomGradientBar } from "@/components/random-gradient-bar";
import { Trans } from "@/components/trans";
import { usePoll } from "@/contexts/poll";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
function IconGuide() {
return (
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
index 0b814b9aa..e35dcf4fc 100644
--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
@@ -8,7 +8,6 @@ import {
} from "@rallly/ui/dropdown-menu";
import { Icon } from "@rallly/ui/icon";
import { Switch } from "@rallly/ui/switch";
-import dayjs from "dayjs";
import {
CalendarIcon,
CalendarXIcon,
@@ -21,10 +20,10 @@ import {
} from "lucide-react";
import * as React from "react";
import { useFormContext } from "react-hook-form";
-
import type { NewEventData } from "@/components/forms";
import { Trans } from "@/components/trans";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import {
expectTimeOption,
getBrowserTimeZone,
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
index af84907c1..de4565c4e 100644
--- a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx
@@ -5,9 +5,9 @@ import {
SelectTrigger,
SelectValue,
} from "@rallly/ui/select";
-import dayjs from "dayjs";
import * as React from "react";
+import { dayjs } from "@/lib/dayjs";
import { getDuration } from "@/utils/date-time-utils";
export interface TimePickerProps {
diff --git a/apps/web/src/components/forms/poll-options-form/utils.ts b/apps/web/src/components/forms/poll-options-form/utils.ts
index dbfa291aa..0c08c5f55 100644
--- a/apps/web/src/components/forms/poll-options-form/utils.ts
+++ b/apps/web/src/components/forms/poll-options-form/utils.ts
@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+import { dayjs } from "@/lib/dayjs";
export const formatDateWithoutTz = (date: Date): string => {
return dayjs(date).format("YYYY-MM-DDTHH:mm:ss");
diff --git a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx b/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
index e4ca5e49d..591d4f6b5 100644
--- a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
@@ -1,12 +1,12 @@
import "react-big-calendar/lib/css/react-big-calendar.css";
import "./rbc-overrides.css";
-import dayjs from "dayjs";
import { XIcon } from "lucide-react";
import type React from "react";
import type { CalendarProps } from "react-big-calendar";
import { Calendar } from "react-big-calendar";
import { createBreakpoint } from "react-use";
+import { dayjs } from "@/lib/dayjs";
import { getDuration } from "../../../utils/date-time-utils";
import DateNavigationToolbar from "./date-navigation-toolbar";
diff --git a/apps/web/src/components/headless-date-picker.tsx b/apps/web/src/components/headless-date-picker.tsx
index c5b987d1b..48e4d1daa 100644
--- a/apps/web/src/components/headless-date-picker.tsx
+++ b/apps/web/src/components/headless-date-picker.tsx
@@ -1,6 +1,7 @@
-import dayjs from "dayjs";
import React from "react";
+import { dayjs } from "@/lib/dayjs";
+
interface DayProps {
date: Date;
day: string;
diff --git a/apps/web/src/components/poll-context.tsx b/apps/web/src/components/poll-context.tsx
index 285f9e0e7..3cb9147d3 100644
--- a/apps/web/src/components/poll-context.tsx
+++ b/apps/web/src/components/poll-context.tsx
@@ -1,10 +1,9 @@
import type { Participant, VoteType } from "@rallly/database";
-import dayjs from "dayjs";
import { keyBy } from "lodash";
import { TrashIcon } from "lucide-react";
import React from "react";
-
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import type { GetPollApiResponse, Vote } from "@/trpc/client/types";
import type {
ParsedDateOption,
diff --git a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx b/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
index 1c6d8ebbd..75fb4607c 100644
--- a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
+++ b/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
@@ -19,17 +19,16 @@ import {
FormLabel,
} from "@rallly/ui/form";
import { RadioGroup, RadioGroupItem } from "@rallly/ui/radio-group";
-import dayjs from "dayjs";
import React from "react";
import { useForm } from "react-hook-form";
import * as z from "zod";
-
import { DateIconInner } from "@/components/date-icon";
import { useParticipants } from "@/components/participants-provider";
import { ConnectedScoreSummary } from "@/components/poll/score-summary";
import { Trans } from "@/components/trans";
import { VoteSummaryProgressBar } from "@/components/vote-summary-progress-bar";
import { usePoll } from "@/contexts/poll";
+import { dayjs } from "@/lib/dayjs";
import { trpc } from "@/trpc/client";
import { useDayjs } from "@/utils/dayjs";
diff --git a/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts b/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts
index 605cd1a74..72d901fa6 100644
--- a/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts
+++ b/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts
@@ -1,7 +1,6 @@
-import dayjs from "dayjs";
-
import { useOptions, usePoll } from "@/components/poll-context";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { useParticipants } from "../../participants-provider";
diff --git a/apps/web/src/components/poll/scheduled-event.tsx b/apps/web/src/components/poll/scheduled-event.tsx
index 961a452dc..90e9e933a 100644
--- a/apps/web/src/components/poll/scheduled-event.tsx
+++ b/apps/web/src/components/poll/scheduled-event.tsx
@@ -7,6 +7,7 @@ import { ParticipantAvatarBar } from "@/components/participant-avatar-bar";
import { Trans } from "@/components/trans";
import { IfParticipantsVisible } from "@/components/visibility";
import { usePoll } from "@/contexts/poll";
+import { dayjs } from "@/lib/dayjs";
import { useDayjs } from "@/utils/dayjs";
function FinalDate({ start }: { start: Date }) {
@@ -36,7 +37,7 @@ function DateIcon({ start }: { start: Date }) {
function FinalTime({ start, duration }: { start: Date; duration: number }) {
const poll = usePoll();
- const { adjustTimeZone, dayjs } = useDayjs();
+ const { adjustTimeZone } = useDayjs();
if (duration === 0) {
return <Trans i18nKey="allDay" />;
}
diff --git a/apps/web/src/components/relative-date.tsx b/apps/web/src/components/relative-date.tsx
index 3c3cd4f58..efe23bc5d 100644
--- a/apps/web/src/components/relative-date.tsx
+++ b/apps/web/src/components/relative-date.tsx
@@ -1,5 +1,6 @@
"use client";
-import dayjs from "dayjs";
+
+import { dayjs } from "@/lib/dayjs";
export function RelativeDate({ date }: { date: Date }) {
return <>{dayjs(date).fromNow()}</>;
diff --git a/apps/web/src/components/time-zone-picker/time-zone-select.tsx b/apps/web/src/components/time-zone-picker/time-zone-select.tsx
index 76bb8c195..f4b86f54e 100644
--- a/apps/web/src/components/time-zone-picker/time-zone-select.tsx
+++ b/apps/web/src/components/time-zone-picker/time-zone-select.tsx
@@ -15,12 +15,11 @@ import {
} from "@rallly/ui/command";
import { useDialog } from "@rallly/ui/dialog";
import { Icon } from "@rallly/ui/icon";
-import dayjs from "dayjs";
import { CheckIcon, GlobeIcon } from "lucide-react";
import React from "react";
-
import { Trans } from "@/components/trans";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { groupedTimeZones } from "@/utils/grouped-time-zone";
interface TimeZoneCommandProps {
diff --git a/apps/web/src/features/billing/components/subscription-status-label.tsx b/apps/web/src/features/billing/components/subscription-status-label.tsx
index 456b179a5..4bf81a5d7 100644
--- a/apps/web/src/features/billing/components/subscription-status-label.tsx
+++ b/apps/web/src/features/billing/components/subscription-status-label.tsx
@@ -1,10 +1,9 @@
"use client";
import type { SubscriptionStatus } from "@rallly/database";
-import dayjs from "dayjs";
-
import { Trans } from "@/components/trans";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
interface SubscriptionStatusLabelProps {
status: SubscriptionStatus;
diff --git a/apps/web/src/features/quick-create/components/relative-date.tsx b/apps/web/src/features/quick-create/components/relative-date.tsx
index 7a6c55846..48d85ae61 100644
--- a/apps/web/src/features/quick-create/components/relative-date.tsx
+++ b/apps/web/src/features/quick-create/components/relative-date.tsx
@@ -1,7 +1,7 @@
"use client";
-import dayjs from "dayjs";
import { Trans } from "@/components/trans";
+import { dayjs } from "@/lib/dayjs";
export function RelativeDate({ date }: { date: Date }) {
return (
diff --git a/apps/web/src/features/scheduled-event/data.ts b/apps/web/src/features/scheduled-event/data.ts
index 3b0494663..0e9e0d1cf 100644
--- a/apps/web/src/features/scheduled-event/data.ts
+++ b/apps/web/src/features/scheduled-event/data.ts
@@ -1,12 +1,9 @@
import type { Prisma, ScheduledEventStatus } from "@rallly/database";
import { prisma } from "@rallly/database";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
import { requireSpace } from "@/auth/data";
+import { dayjs } from "@/lib/dayjs";
import type { Status } from "./schema";
-dayjs.extend(utc);
-
const mapStatus = {
upcoming: "confirmed",
unconfirmed: "unconfirmed",
diff --git a/apps/web/src/features/scheduled-event/utils.ts b/apps/web/src/features/scheduled-event/utils.ts
index 2db343944..30392586a 100644
--- a/apps/web/src/features/scheduled-event/utils.ts
+++ b/apps/web/src/features/scheduled-event/utils.ts
@@ -1,11 +1,4 @@
-import dayjs from "dayjs";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
-
-dayjs.extend(utc);
-dayjs.extend(timezone);
-dayjs.extend(advancedFormat);
+import { dayjs } from "@/lib/dayjs";
export interface FormattedEventDateTime {
date: string;
diff --git a/apps/web/src/lib/dayjs.ts b/apps/web/src/lib/dayjs.ts
new file mode 100644
index 000000000..3159a37d8
--- /dev/null
+++ b/apps/web/src/lib/dayjs.ts
@@ -0,0 +1,32 @@
+import dayjs from "dayjs";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+import calendar from "dayjs/plugin/calendar";
+import duration from "dayjs/plugin/duration";
+import isBetween from "dayjs/plugin/isBetween";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+import localeData from "dayjs/plugin/localeData";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import minMax from "dayjs/plugin/minMax";
+import relativeTime from "dayjs/plugin/relativeTime";
+import timezone from "dayjs/plugin/timezone";
+import toArray from "dayjs/plugin/toArray";
+import updateLocale from "dayjs/plugin/updateLocale";
+import utc from "dayjs/plugin/utc";
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(advancedFormat);
+dayjs.extend(calendar);
+dayjs.extend(duration);
+dayjs.extend(isBetween);
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+dayjs.extend(localeData);
+dayjs.extend(localizedFormat);
+dayjs.extend(minMax);
+dayjs.extend(relativeTime);
+dayjs.extend(toArray);
+dayjs.extend(updateLocale);
+
+export { dayjs };
diff --git a/apps/web/src/lib/timezone/client/calendar-date.tsx b/apps/web/src/lib/timezone/client/calendar-date.tsx
index fb70d8634..78a0c8881 100644
--- a/apps/web/src/lib/timezone/client/calendar-date.tsx
+++ b/apps/web/src/lib/timezone/client/calendar-date.tsx
@@ -1,16 +1,9 @@
"use client";
-import dayjs from "dayjs";
-import calendar from "dayjs/plugin/calendar";
-import localizedFormat from "dayjs/plugin/localizedFormat";
-import timezone from "dayjs/plugin/timezone";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { useTimezone } from "@/lib/timezone/client/context";
-dayjs.extend(calendar);
-dayjs.extend(localizedFormat);
-dayjs.extend(timezone);
-
export function CalendarDate({ date }: { date: string }) {
const { timezone } = useTimezone();
diff --git a/apps/web/src/lib/timezone/client/context.tsx b/apps/web/src/lib/timezone/client/context.tsx
index ba6f32040..f18d91a40 100644
--- a/apps/web/src/lib/timezone/client/context.tsx
+++ b/apps/web/src/lib/timezone/client/context.tsx
@@ -1,13 +1,10 @@
"use client";
-import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
import * as React from "react";
+import { dayjs } from "@/lib/dayjs";
import { getBrowserTimeZone } from "@/utils/date-time-utils";
-dayjs.extend(timezone);
-
interface TimezoneContextProps {
timezone: string;
setTimezone: (timezone: string) => void;
diff --git a/apps/web/src/lib/timezone/client/formatted-date-time.tsx b/apps/web/src/lib/timezone/client/formatted-date-time.tsx
index 00d6a3028..32abd2eb3 100644
--- a/apps/web/src/lib/timezone/client/formatted-date-time.tsx
+++ b/apps/web/src/lib/timezone/client/formatted-date-time.tsx
@@ -1,9 +1,10 @@
"use client";
import type { ConfigType } from "dayjs";
-import dayjs from "dayjs";
import * as React from "react";
+import { dayjs } from "@/lib/dayjs";
+
import { useFormattedDateTime } from "@/lib/timezone/hooks/use-formatted-date-time";
interface FormattedDateTimeProps extends React.HTMLAttributes<HTMLSpanElement> {
diff --git a/apps/web/src/lib/timezone/formatted-date-time-server.tsx b/apps/web/src/lib/timezone/formatted-date-time-server.tsx
index 129a6fe1f..e8e121fb7 100644
--- a/apps/web/src/lib/timezone/formatted-date-time-server.tsx
+++ b/apps/web/src/lib/timezone/formatted-date-time-server.tsx
@@ -1,8 +1,9 @@
import { cn } from "@rallly/ui";
import type { ConfigType } from "dayjs";
-import dayjs from "dayjs";
import type * as React from "react";
+import { dayjs } from "@/lib/dayjs";
+
interface FormattedDateTimeServerProps
extends Omit<React.HTMLAttributes<HTMLTimeElement>, "dateTime"> {
/** The date/time to format (Accepts Date, ISO string, Unix timestamp, Dayjs object). */
diff --git a/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts b/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
index 1b83f075c..6635b749a 100644
--- a/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
+++ b/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
@@ -1,6 +1,6 @@
import type { ConfigType } from "dayjs";
-import dayjs from "dayjs";
+import { dayjs } from "@/lib/dayjs";
import { useTimezone } from "@/lib/timezone/client/context";
interface UseFormattedDateTimeOptions {
diff --git a/apps/web/src/lib/timezone/utils.ts b/apps/web/src/lib/timezone/utils.ts
index c9ddbb2e6..61e83d09d 100644
--- a/apps/web/src/lib/timezone/utils.ts
+++ b/apps/web/src/lib/timezone/utils.ts
@@ -1,10 +1,4 @@
-import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
-
-// Initialize dayjs plugins
-dayjs.extend(utc);
-dayjs.extend(timezone);
+import { dayjs } from "@/lib/dayjs";
/**
* Get the browser's timezone
diff --git a/apps/web/src/trpc/routers/index.ts b/apps/web/src/trpc/routers/index.ts
index 8dd994bc6..f4517feac 100644
--- a/apps/web/src/trpc/routers/index.ts
+++ b/apps/web/src/trpc/routers/index.ts
@@ -1,7 +1,4 @@
-import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import toArray from "dayjs/plugin/toArray";
-import utc from "dayjs/plugin/utc";
+import "@/lib/dayjs";
import { mergeRouters, router } from "../trpc";
import { apiKeys } from "./api-keys";
@@ -11,10 +8,6 @@ import { events } from "./events";
import { polls } from "./polls";
import { user } from "./user";
-dayjs.extend(toArray); // used for creating ics
-dayjs.extend(timezone);
-dayjs.extend(utc);
-
export const appRouter = mergeRouters(
router({
apiKeys,
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index 1374750c0..4b6dc0d64 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -3,7 +3,6 @@ import { prisma } from "@rallly/database";
import { absoluteUrl, shortUrl } from "@rallly/utils/absolute-url";
import { nanoid } from "@rallly/utils/nanoid";
import { TRPCError } from "@trpc/server";
-import dayjs from "dayjs";
import { revalidatePath } from "next/cache";
import * as z from "zod";
import { getCurrentUserSpace } from "@/auth/data";
@@ -12,6 +11,7 @@ import { getPolls } from "@/features/poll/data";
import { canUserManagePoll } from "@/features/poll/helpers";
import { hasPollAdminAccess } from "@/features/poll/query";
import { formatEventDateTime } from "@/features/scheduled-event/utils";
+import { dayjs } from "@/lib/dayjs";
import { getEmailClient } from "@/utils/emails";
import { createIcsEvent } from "@/utils/ics";
import {
diff --git a/apps/web/src/utils/date-time-utilts.test.ts b/apps/web/src/utils/date-time-utils.test.ts
similarity index 90%
rename from apps/web/src/utils/date-time-utilts.test.ts
rename to apps/web/src/utils/date-time-utils.test.ts
index 8665c90b9..106e0e07b 100644
--- a/apps/web/src/utils/date-time-utilts.test.ts
+++ b/apps/web/src/utils/date-time-utils.test.ts
@@ -1,14 +1,9 @@
-import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import "@/lib/dayjs";
import { supportedTimeZones } from "@/utils/supported-time-zones";
import { normalizeTimeZone } from "./date-time-utils";
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
describe("Normalize Time Zone", () => {
it("should return same timezone when given a geographic timezone", () => {
const browserTimeZone = normalizeTimeZone("Europe/London");
diff --git a/apps/web/src/utils/date-time-utils.ts b/apps/web/src/utils/date-time-utils.ts
index 42a1e224b..1b48600d9 100644
--- a/apps/web/src/utils/date-time-utils.ts
+++ b/apps/web/src/utils/date-time-utils.ts
@@ -1,5 +1,4 @@
-import dayjs from "dayjs";
-
+import { dayjs } from "@/lib/dayjs";
import { supportedTimeZones } from "@/utils/supported-time-zones";
import type {
diff --git a/apps/web/src/utils/dayjs.tsx b/apps/web/src/utils/dayjs.tsx
index acf027234..833cac230 100644
--- a/apps/web/src/utils/dayjs.tsx
+++ b/apps/web/src/utils/dayjs.tsx
@@ -2,23 +2,11 @@
import type { TimeFormat } from "@rallly/database";
import type { SupportedLocale } from "@rallly/languages";
-import dayjs from "dayjs";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import duration from "dayjs/plugin/duration";
-import isBetween from "dayjs/plugin/isBetween";
-import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-import localeData from "dayjs/plugin/localeData";
-import localizedFormat from "dayjs/plugin/localizedFormat";
-import minMax from "dayjs/plugin/minMax";
-import relativeTime from "dayjs/plugin/relativeTime";
-import timezone from "dayjs/plugin/timezone";
-import updateLocale from "dayjs/plugin/updateLocale";
-import utc from "dayjs/plugin/utc";
import * as React from "react";
import { useAsync } from "react-use";
import { usePreferences } from "@/contexts/preferences";
import { useTranslation } from "@/i18n/client";
+import { dayjs } from "@/lib/dayjs";
import { getBrowserTimeZone, normalizeTimeZone } from "@/utils/date-time-utils";
import { useRequiredContext } from "../components/use-required-context";
@@ -122,25 +110,11 @@ const dayjsLocales: Record<
},
};
-dayjs.extend(localizedFormat);
-dayjs.extend(relativeTime);
-dayjs.extend(localeData);
-dayjs.extend(isSameOrBefore);
-dayjs.extend(isBetween);
-dayjs.extend(minMax);
-dayjs.extend(utc);
-dayjs.extend(timezone);
-dayjs.extend(duration);
-dayjs.extend(isSameOrAfter);
-dayjs.extend(updateLocale);
-dayjs.extend(advancedFormat);
-
const DayjsContext = React.createContext<{
adjustTimeZone: (
date: dayjs.ConfigType,
keepLocalTime: boolean,
) => dayjs.Dayjs;
- dayjs: (date?: dayjs.ConfigType) => dayjs.Dayjs;
locale: {
weekStart: number;
timeFormat: TimeFormat;
@@ -224,7 +198,6 @@ export const DayjsProvider: React.FunctionComponent<{
<DayjsContext.Provider
value={{
adjustTimeZone,
- dayjs,
locale: localeConfig, // locale defaults
timeZone: preferredTimeZone,
timeFormat: