Skip to content

Commit 2987a66

Browse files
smmoosavismmoosavi
authored
chore(deps): use date-fns-jalali v3 (#669)
* install date-fns-jalali-v3 * use date-fns-jalali-v3
1 parent 634ae73 commit 2987a66

File tree

3 files changed

+61
-63
lines changed

3 files changed

+61
-63
lines changed

‎packages/date-fns-jalali/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"license": "MIT",
3434
"peerDependencies": {
35-
"date-fns-jalali": "^2.13.0-0"
35+
"date-fns-jalali": "^3.2.0-0"
3636
},
3737
"peerDependenciesMeta": {
3838
"date-fns-jalali": {
@@ -43,7 +43,7 @@
4343
"@date-io/core": "^3.0.0"
4444
},
4545
"devDependencies": {
46-
"date-fns-jalali": "^2.19.0-2",
46+
"date-fns-jalali": "^3.2.0-0",
4747
"rollup": "^2.0.2",
4848
"typescript": "^5.0.0"
4949
},

‎packages/date-fns-jalali/src/date-fns-jalali-utils.ts‎

Lines changed: 55 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,57 @@
1-
import addSeconds from "date-fns-jalali/addSeconds";
2-
import addMinutes from "date-fns-jalali/addMinutes";
3-
import addHours from "date-fns-jalali/addHours";
4-
import addDays from "date-fns-jalali/addDays";
5-
import addWeeks from "date-fns-jalali/addWeeks";
6-
import addMonths from "date-fns-jalali/addMonths";
7-
import addYears from "date-fns-jalali/addYears";
8-
import differenceInYears from "date-fns-jalali/differenceInYears";
9-
import differenceInQuarters from "date-fns-jalali/differenceInQuarters";
10-
import differenceInMonths from "date-fns-jalali/differenceInMonths";
11-
import differenceInWeeks from "date-fns-jalali/differenceInWeeks";
12-
import differenceInDays from "date-fns-jalali/differenceInDays";
13-
import differenceInHours from "date-fns-jalali/differenceInHours";
14-
import differenceInMinutes from "date-fns-jalali/differenceInMinutes";
15-
import differenceInSeconds from "date-fns-jalali/differenceInSeconds";
16-
import differenceInMilliseconds from "date-fns-jalali/differenceInMilliseconds";
17-
import eachDayOfInterval from "date-fns-jalali/eachDayOfInterval";
18-
import endOfDay from "date-fns-jalali/endOfDay";
19-
import endOfWeek from "date-fns-jalali/endOfWeek";
20-
import endOfYear from "date-fns-jalali/endOfYear";
21-
import format from "date-fns-jalali/format";
22-
import formatISO from "date-fns-jalali/formatISO";
23-
import getHours from "date-fns-jalali/getHours";
24-
import getSeconds from "date-fns-jalali/getSeconds";
25-
import getYear from "date-fns-jalali/getYear";
26-
import getMonth from "date-fns-jalali/getMonth";
27-
import getDate from "date-fns-jalali/getDate";
28-
import getDay from "date-fns-jalali/getDay";
29-
import getDaysInMonth from "date-fns-jalali/getDaysInMonth";
30-
import getMinutes from "date-fns-jalali/getMinutes";
31-
import isAfter from "date-fns-jalali/isAfter";
32-
import isBefore from "date-fns-jalali/isBefore";
33-
import isEqual from "date-fns-jalali/isEqual";
34-
import isSameDay from "date-fns-jalali/isSameDay";
35-
import isSameYear from "date-fns-jalali/isSameYear";
36-
import isSameMonth from "date-fns-jalali/isSameMonth";
37-
import isSameHour from "date-fns-jalali/isSameHour";
38-
import isValid from "date-fns-jalali/isValid";
39-
import dateFnsParse from "date-fns-jalali/parse";
40-
import parseISO from "date-fns-jalali/parseISO";
41-
import setDate from "date-fns-jalali/setDate";
42-
import setHours from "date-fns-jalali/setHours";
43-
import setMinutes from "date-fns-jalali/setMinutes";
44-
import setMonth from "date-fns-jalali/setMonth";
45-
import setSeconds from "date-fns-jalali/setSeconds";
46-
import setYear from "date-fns-jalali/setYear";
47-
import startOfDay from "date-fns-jalali/startOfDay";
48-
import startOfMonth from "date-fns-jalali/startOfMonth";
49-
import endOfMonth from "date-fns-jalali/endOfMonth";
50-
import startOfWeek from "date-fns-jalali/startOfWeek";
51-
import startOfYear from "date-fns-jalali/startOfYear";
1+
import { addSeconds } from "date-fns-jalali/addSeconds";
2+
import { addMinutes } from "date-fns-jalali/addMinutes";
3+
import { addHours } from "date-fns-jalali/addHours";
4+
import { addDays } from "date-fns-jalali/addDays";
5+
import { addWeeks } from "date-fns-jalali/addWeeks";
6+
import { addMonths } from "date-fns-jalali/addMonths";
7+
import { addYears } from "date-fns-jalali/addYears";
8+
import { differenceInYears } from "date-fns-jalali/differenceInYears";
9+
import { differenceInQuarters } from "date-fns-jalali/differenceInQuarters";
10+
import { differenceInMonths } from "date-fns-jalali/differenceInMonths";
11+
import { differenceInWeeks } from "date-fns-jalali/differenceInWeeks";
12+
import { differenceInDays } from "date-fns-jalali/differenceInDays";
13+
import { differenceInHours } from "date-fns-jalali/differenceInHours";
14+
import { differenceInMinutes } from "date-fns-jalali/differenceInMinutes";
15+
import { differenceInSeconds } from "date-fns-jalali/differenceInSeconds";
16+
import { differenceInMilliseconds } from "date-fns-jalali/differenceInMilliseconds";
17+
import { eachDayOfInterval } from "date-fns-jalali/eachDayOfInterval";
18+
import { endOfDay } from "date-fns-jalali/endOfDay";
19+
import { endOfWeek } from "date-fns-jalali/endOfWeek";
20+
import { endOfYear } from "date-fns-jalali/endOfYear";
21+
import { format, longFormatters } from "date-fns-jalali/format";
22+
import { formatISO } from "date-fns-jalali/formatISO";
23+
import { getHours } from "date-fns-jalali/getHours";
24+
import { getSeconds } from "date-fns-jalali/getSeconds";
25+
import { getYear } from "date-fns-jalali/getYear";
26+
import { getMonth } from "date-fns-jalali/getMonth";
27+
import { getDate } from "date-fns-jalali/getDate";
28+
import { getDay } from "date-fns-jalali/getDay";
29+
import { getDaysInMonth } from "date-fns-jalali/getDaysInMonth";
30+
import { getMinutes } from "date-fns-jalali/getMinutes";
31+
import { isAfter } from "date-fns-jalali/isAfter";
32+
import { isBefore } from "date-fns-jalali/isBefore";
33+
import { isEqual } from "date-fns-jalali/isEqual";
34+
import { isSameDay } from "date-fns-jalali/isSameDay";
35+
import { isSameYear } from "date-fns-jalali/isSameYear";
36+
import { isSameMonth } from "date-fns-jalali/isSameMonth";
37+
import { isSameHour } from "date-fns-jalali/isSameHour";
38+
import { isValid } from "date-fns-jalali/isValid";
39+
import { parse as dateFnsParse } from "date-fns-jalali/parse";
40+
import { parseISO } from "date-fns-jalali/parseISO";
41+
import { setDate } from "date-fns-jalali/setDate";
42+
import { setHours } from "date-fns-jalali/setHours";
43+
import { setMinutes } from "date-fns-jalali/setMinutes";
44+
import { setMonth } from "date-fns-jalali/setMonth";
45+
import { setSeconds } from "date-fns-jalali/setSeconds";
46+
import { setYear } from "date-fns-jalali/setYear";
47+
import { startOfDay } from "date-fns-jalali/startOfDay";
48+
import { startOfMonth } from "date-fns-jalali/startOfMonth";
49+
import { endOfMonth } from "date-fns-jalali/endOfMonth";
50+
import { startOfWeek } from "date-fns-jalali/startOfWeek";
51+
import { startOfYear } from "date-fns-jalali/startOfYear";
5252
import { IUtils, DateIOFormats, Unit } from "@date-io/core/IUtils";
53-
import isWithinInterval from "date-fns-jalali/isWithinInterval";
54-
// @ts-ignore
55-
import longFormatters from "date-fns-jalali/_lib/format/longFormatters";
56-
import defaultLocale from "date-fns-jalali/locale/fa-IR";
53+
import { isWithinInterval } from "date-fns-jalali/isWithinInterval";
54+
import { faIR as defaultLocale } from "date-fns-jalali/locale/fa-IR";
5755

5856
type Locale = typeof defaultLocale;
5957

@@ -117,7 +115,7 @@ export default class DateFnsJalaliUtils implements IUtils<Date, Locale> {
117115
// strict signature and delegate to the more lenient signature. Otherwise, we have downstream type errors upon usage.
118116
public is12HourCycleInCurrentLocale = () => {
119117
if (this.locale) {
120-
return /a/.test(this.locale.formatLong?.time());
118+
return /a/.test(this.locale.formatLong?.time({}));
121119
}
122120

123121
// By default date-fns-jalali is using fa-IR locale with am/pm enabled
@@ -136,7 +134,7 @@ export default class DateFnsJalaliUtils implements IUtils<Date, Locale> {
136134
const firstCharacter = token[0];
137135
if (firstCharacter === "p" || firstCharacter === "P") {
138136
const longFormatter = longFormatters[firstCharacter];
139-
return longFormatter(token, locale.formatLong, {});
137+
return longFormatter(token, locale.formatLong);
140138
}
141139
return token;
142140
})

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,10 +2736,10 @@ dashdash@^1.12.0:
27362736
dependencies:
27372737
assert-plus "^1.0.0"
27382738

2739-
date-fns-jalali@^2.19.0-2:
2740-
version "2.19.0-2"
2741-
resolved "https://registry.yarnpkg.com/date-fns-jalali/-/date-fns-jalali-2.19.0-2.tgz#69d35c6505749e9bce485c0e392604936e20cb2a"
2742-
integrity sha512-ajgQt3lNFKPN7+mkXpWRJP+NyTVyHRJFVXUV8uc7d9pduVrDn/eeRMT5w1PemXqQRoNqQmuHyKWcrmNPmTRoPA==
2739+
date-fns-jalali@^3.2.0-0:
2740+
version "3.2.0-0"
2741+
resolved "https://registry.yarnpkg.com/date-fns-jalali/-/date-fns-jalali-3.2.0-0.tgz#5ab00c60ed491bd46e4996b19f3a21ab3ca8bb68"
2742+
integrity sha512-ufksQntsttjzp5mA8yyVEI0PGMlA6iEoBktbbDUbNs9NoDBbjwfW2IygZoENJz4K0BHMOpINfgaUSUkskYd8xg==
27432743

27442744
date-fns@^3.2.0:
27452745
version "3.4.0"

0 commit comments

Comments
 (0)