Skip to content

Commit 8078681

Browse files
chore(deps): Upgrade date-fns (RocketChat#36415)
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
1 parent 3f000d7 commit 8078681

22 files changed

Lines changed: 103 additions & 146 deletions

File tree

apps/meteor/app/livechat/lib/messageTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { IOmnichannelSystemMessage } from '@rocket.chat/core-typings';
2-
import formatDistance from 'date-fns/formatDistance';
2+
import { formatDistance } from 'date-fns';
33
import moment from 'moment';
44

55
import { MessageTypes } from '../../ui-utils/lib/MessageTypes';

apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
22
import { Emitter } from '@rocket.chat/emitter';
3-
import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
3+
import { differenceInMilliseconds } from 'date-fns';
44
import { ReactiveVar } from 'meteor/reactive-var';
55
import { Tracker } from 'meteor/tracker';
66
import type { MutableRefObject } from 'react';

apps/meteor/client/hooks/usePruneWarningMessage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useSafely } from '@rocket.chat/fuselage-hooks';
33
import type { TranslationKey } from '@rocket.chat/ui-contexts';
44
import { useSetting, useTranslation, useLanguage } from '@rocket.chat/ui-contexts';
55
import { sendAt } from 'cron';
6-
import intlFormat from 'date-fns/intlFormat';
6+
import { intlFormat } from 'date-fns';
77
import { useEffect, useState } from 'react';
88

99
import { useFormattedRelativeTime } from './useFormattedRelativeTime';

apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { ILicenseV3 } from '@rocket.chat/core-typings';
22
import { Box, Card, CardBody, CardControls, CardRow, Tag } from '@rocket.chat/fuselage';
33
import { ExternalLink } from '@rocket.chat/ui-client';
4-
import differenceInDays from 'date-fns/differenceInDays';
4+
import { differenceInDays } from 'date-fns';
55
import type { ReactElement } from 'react';
66
import { Trans, useTranslation } from 'react-i18next';
77

apps/meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"cron-validator": "^1.3.1",
335335
"css-vars-ponyfill": "^2.4.9",
336336
"csv-parse": "^5.5.6",
337-
"date-fns": "^2.30.0",
337+
"date-fns": "~4.1.0",
338338
"date.js": "~0.3.3",
339339
"debug": "~4.3.7",
340340
"dompurify": "^3.2.6",

ee/packages/omnichannel-services/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@rocket.chat/string-helpers": "~0.31.25",
2525
"@rocket.chat/tools": "workspace:^",
2626
"@types/node": "~22.16.1",
27-
"date-fns": "^2.30.0",
27+
"date-fns": "~4.1.0",
2828
"ejson": "^2.2.3",
2929
"emoji-toolkit": "^7.0.1",
3030
"eventemitter3": "^5.0.1",

ee/packages/omnichannel-services/src/livechatSystemMessages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { IOmnichannelSystemMessage, MessageTypesValues } from '@rocket.chat/core-typings';
2-
import formatDistance from 'date-fns/formatDistance';
2+
import { formatDistance } from 'date-fns/formatDistance';
33
import moment from 'moment';
44

55
const livechatSystemMessagesMap = new Map<

packages/gazzodown/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"typecheck": "tsc --noEmit"
2222
},
2323
"dependencies": {
24+
"date-fns": "~4.1.0",
2425
"dompurify": "^3.2.6",
2526
"highlight.js": "11.8.0",
2627
"react-error-boundary": "^3.1.4",

packages/gazzodown/src/elements/Timestamp/index.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
/* eslint-disable @typescript-eslint/explicit-function-return-type */
21
import { Tag } from '@rocket.chat/fuselage';
32
import type * as MessageParser from '@rocket.chat/message-parser';
4-
import { format } from 'date-fns';
5-
import { useContext, useEffect, useState, type ReactElement } from 'react';
3+
import { format, intlFormatDistance } from 'date-fns';
4+
import { useContext, useEffect, useState } from 'react';
65
import { ErrorBoundary } from 'react-error-boundary';
76

8-
import { timeAgo } from './timeago';
97
import { MarkupInteractionContext } from '../../MarkupInteractionContext';
108

119
type BoldSpanProps = {
1210
children: MessageParser.Timestamp;
1311
};
1412

15-
const Timestamp = ({ format, value }: { format: 't' | 'T' | 'd' | 'D' | 'f' | 'F' | 'R'; value: Date }): ReactElement => {
13+
const Timestamp = ({ format, value }: { format: 't' | 'T' | 'd' | 'D' | 'f' | 'F' | 'R'; value: Date }) => {
1614
switch (format) {
1715
case 't': // Short time format
1816
return <ShortTime value={value} />;
@@ -37,7 +35,7 @@ const Timestamp = ({ format, value }: { format: 't' | 'T' | 'd' | 'D' | 'f' | 'F
3735
};
3836

3937
// eslint-disable-next-line react/no-multi-comp
40-
const TimestampWrapper = ({ children }: BoldSpanProps): ReactElement => {
38+
const TimestampWrapper = ({ children }: BoldSpanProps) => {
4139
const { enableTimestamp } = useContext(MarkupInteractionContext);
4240

4341
if (!enableTimestamp) {
@@ -87,12 +85,12 @@ const RelativeTime = ({ value }: { value: Date }) => {
8785
const time = value.getTime();
8886

8987
const { language } = useContext(MarkupInteractionContext);
90-
const [text, setTime] = useState(() => timeAgo(time, language ?? 'en'));
88+
const [text, setTime] = useState(() => intlFormatDistance(time, Date.now(), { locale: language ?? 'en' }));
9189
const [timeToRefresh, setTimeToRefresh] = useState(() => getTimeToRefresh(time));
9290

9391
useEffect(() => {
9492
const interval = setInterval(() => {
95-
setTime(timeAgo(value.getTime(), 'en'));
93+
setTime(intlFormatDistance(value.getTime(), Date.now(), { locale: 'en' }));
9694
setTimeToRefresh(getTimeToRefresh(time));
9795
}, timeToRefresh);
9896

packages/gazzodown/src/elements/Timestamp/timeago.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)