Skip to content

Commit d4d3873

Browse files
mattlewis92mattlewis92
committed
feat: upgrade date-fns to v2
BREAKING CHANGE: date-fns v2 or higher is now required as a peer dependency If implementing a custom adapter, the `max` function signature has changed to accept an array of dates, instead of an infinite argument list. The date adapters no longer accept strings as input arguments. Closes #1064
1 parent 05c9a9a commit d4d3873

File tree

8 files changed

+76
-74
lines changed

8 files changed

+76
-74
lines changed

‎package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"cp-cli": "^2.0.0",
102102
"cross-env": "^5.2.0",
103103
"css-loader": "^3.2.0",
104-
"date-fns": "1.29.0",
104+
"date-fns": "^2.0.0",
105105
"del-cli": "^2.0.0",
106106
"flatpickr": "^4.6.2",
107107
"font-awesome": "^4.7.0",
@@ -150,7 +150,7 @@
150150
"dependencies": {
151151
"angular-draggable-droppable": "^4.3.2",
152152
"angular-resizable-element": "^3.2.4",
153-
"calendar-utils": "^0.3.3",
153+
"calendar-utils": "^0.5.0",
154154
"positioning": "^2.0.0"
155155
},
156156
"sideEffects": [

‎projects/angular-calendar/src/date-adapters/date-adapter.ts

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
11
import { DateAdapter as BaseDateAdapter } from 'calendar-utils/date-adapters/date-adapter';
22

33
export abstract class DateAdapter implements BaseDateAdapter {
4-
abstract addWeeks(date: Date | string | number, amount: number): Date;
4+
abstract addWeeks(date: Date | number, amount: number): Date;
55

6-
abstract addMonths(date: Date | string | number, amount: number): Date;
6+
abstract addMonths(date: Date | number, amount: number): Date;
77

8-
abstract subDays(date: Date | string | number, amount: number): Date;
8+
abstract subDays(date: Date | number, amount: number): Date;
99

10-
abstract subWeeks(date: Date | string | number, amount: number): Date;
10+
abstract subWeeks(date: Date | number, amount: number): Date;
1111

12-
abstract subMonths(date: Date | string | number, amount: number): Date;
12+
abstract subMonths(date: Date | number, amount: number): Date;
1313

14-
abstract getISOWeek(date: Date | string | number): number;
14+
abstract getISOWeek(date: Date | number): number;
1515

16-
abstract setDate(date: Date | string | number, dayOfMonth: number): Date;
16+
abstract setDate(date: Date | number, dayOfMonth: number): Date;
1717

18-
abstract setMonth(date: Date | string | number, month: number): Date;
18+
abstract setMonth(date: Date | number, month: number): Date;
1919

20-
abstract setYear(date: Date | string | number, year: number): Date;
20+
abstract setYear(date: Date | number, year: number): Date;
2121

22-
abstract getDate(date: Date | string | number): number;
22+
abstract getDate(date: Date | number): number;
2323

24-
abstract getMonth(date: Date | string | number): number;
24+
abstract getMonth(date: Date | number): number;
2525

26-
abstract getYear(date: Date | string | number): number;
26+
abstract getYear(date: Date | number): number;
2727

28-
abstract addDays(date: Date | string | number, amount: number): Date;
28+
abstract addDays(date: Date | number, amount: number): Date;
2929

30-
abstract addHours(date: Date | string | number, amount: number): Date;
30+
abstract addHours(date: Date | number, amount: number): Date;
3131

32-
abstract addMinutes(date: Date | string | number, amount: number): Date;
32+
abstract addMinutes(date: Date | number, amount: number): Date;
3333

34-
abstract addSeconds(date: Date | string | number, amount: number): Date;
34+
abstract addSeconds(date: Date | number, amount: number): Date;
3535

3636
abstract differenceInDays(
37-
dateLeft: Date | string | number,
38-
dateRight: Date | string | number
37+
dateLeft: Date | number,
38+
dateRight: Date | number
3939
): number;
4040

4141
abstract differenceInMinutes(
42-
dateLeft: Date | string | number,
43-
dateRight: Date | string | number
42+
dateLeft: Date | number,
43+
dateRight: Date | number
4444
): number;
4545

4646
abstract differenceInSeconds(
47-
dateLeft: Date | string | number,
48-
dateRight: Date | string | number
47+
dateLeft: Date | number,
48+
dateRight: Date | number
4949
): number;
5050

51-
abstract endOfDay(date: Date | string | number): Date;
51+
abstract endOfDay(date: Date | number): Date;
5252

53-
abstract endOfMonth(date: Date | string | number): Date;
53+
abstract endOfMonth(date: Date | number): Date;
5454

5555
abstract endOfWeek(
56-
date: Date | string | number,
56+
date: Date | number,
5757
options?: { weekStartsOn?: number }
5858
): Date;
5959

60-
abstract getDay(date: Date | string | number): number;
60+
abstract getDay(date: Date | number): number;
6161

6262
abstract isSameDay(
63-
dateLeft: Date | string | number,
64-
dateRight: Date | string | number
63+
dateLeft: Date | number,
64+
dateRight: Date | number
6565
): boolean;
6666

6767
abstract isSameMonth(
68-
dateLeft: Date | string | number,
69-
dateRight: Date | string | number
68+
dateLeft: Date | number,
69+
dateRight: Date | number
7070
): boolean;
7171

7272
abstract isSameSecond(
73-
dateLeft: Date | string | number,
74-
dateRight: Date | string | number
73+
dateLeft: Date | number,
74+
dateRight: Date | number
7575
): boolean;
7676

77-
abstract max(...dates: Array<Date | string | number>): Date;
77+
abstract max(dates: Array<Date | number>): Date;
7878

79-
abstract setHours(date: Date | string | number, hours: number): Date;
79+
abstract setHours(date: Date | number, hours: number): Date;
8080

81-
abstract setMinutes(date: Date | string | number, minutes: number): Date;
81+
abstract setMinutes(date: Date | number, minutes: number): Date;
8282

83-
abstract startOfDay(date: Date | string | number): Date;
83+
abstract startOfDay(date: Date | number): Date;
8484

85-
abstract startOfMinute(date: Date | string | number): Date;
85+
abstract startOfMinute(date: Date | number): Date;
8686

87-
abstract startOfMonth(date: Date | string | number): Date;
87+
abstract startOfMonth(date: Date | number): Date;
8888

8989
abstract startOfWeek(
90-
date: Date | string | number,
90+
date: Date | number,
9191
options?: { weekStartsOn?: number }
9292
): Date;
9393

94-
abstract getHours(date: Date | string | number): number;
94+
abstract getHours(date: Date | number): number;
9595

96-
abstract getMinutes(date: Date | string | number): number;
96+
abstract getMinutes(date: Date | number): number;
9797
}

‎projects/angular-calendar/src/date-adapters/date-fns/index.ts

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { adapterFactory as baseAdapterFactory } from 'calendar-utils/date-adapters/date-fns';
2-
import * as addWeeks from 'date-fns/add_weeks/index';
3-
import * as addMonths from 'date-fns/add_months/index';
4-
import * as subDays from 'date-fns/sub_days/index';
5-
import * as subWeeks from 'date-fns/sub_weeks/index';
6-
import * as subMonths from 'date-fns/sub_months/index';
7-
import * as getISOWeek from 'date-fns/get_iso_week/index';
8-
import * as setDate from 'date-fns/set_date/index';
9-
import * as setMonth from 'date-fns/set_month/index';
10-
import * as setYear from 'date-fns/set_year/index';
11-
import * as getDate from 'date-fns/get_date/index';
12-
import * as getYear from 'date-fns/get_year/index';
2+
import {
3+
addWeeks,
4+
addMonths,
5+
subDays,
6+
subWeeks,
7+
subMonths,
8+
getISOWeek,
9+
setDate,
10+
setMonth,
11+
setYear,
12+
getDate,
13+
getYear
14+
} from 'date-fns';
1315
import { DateAdapter } from '../date-adapter';
1416

1517
export function adapterFactory(): DateAdapter {

‎projects/angular-calendar/src/date-adapters/moment/index.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,63 @@ export function adapterFactory(moment): DateAdapter {
55
return {
66
...baseAdapterFactory(moment),
77

8-
addWeeks(date: Date | string | number, amount: number): Date {
8+
addWeeks(date: Date | number, amount: number): Date {
99
return moment(date)
1010
.add(amount, 'weeks')
1111
.toDate();
1212
},
1313

14-
addMonths(date: Date | string | number, amount: number): Date {
14+
addMonths(date: Date | number, amount: number): Date {
1515
return moment(date)
1616
.add(amount, 'months')
1717
.toDate();
1818
},
1919

20-
subDays(date: Date | string | number, amount: number): Date {
20+
subDays(date: Date | number, amount: number): Date {
2121
return moment(date)
2222
.subtract(amount, 'days')
2323
.toDate();
2424
},
2525

26-
subWeeks(date: Date | string | number, amount: number): Date {
26+
subWeeks(date: Date | number, amount: number): Date {
2727
return moment(date)
2828
.subtract(amount, 'weeks')
2929
.toDate();
3030
},
3131

32-
subMonths(date: Date | string | number, amount: number): Date {
32+
subMonths(date: Date | number, amount: number): Date {
3333
return moment(date)
3434
.subtract(amount, 'months')
3535
.toDate();
3636
},
3737

38-
getISOWeek(date: Date | string | number): number {
38+
getISOWeek(date: Date | number): number {
3939
return moment(date).isoWeek();
4040
},
4141

42-
setDate(date: Date | string | number, dayOfMonth: number): Date {
42+
setDate(date: Date | number, dayOfMonth: number): Date {
4343
return moment(date)
4444
.date(dayOfMonth)
4545
.toDate();
4646
},
4747

48-
setMonth(date: Date | string | number, month: number): Date {
48+
setMonth(date: Date | number, month: number): Date {
4949
return moment(date)
5050
.month(month)
5151
.toDate();
5252
},
5353

54-
setYear(date: Date | string | number, year: number): Date {
54+
setYear(date: Date | number, year: number): Date {
5555
return moment(date)
5656
.year(year)
5757
.toDate();
5858
},
5959

60-
getDate(date: Date | string | number): number {
60+
getDate(date: Date | number): number {
6161
return moment(date).date();
6262
},
6363

64-
getYear(date: Date | string | number): number {
64+
getYear(date: Date | number): number {
6565
return moment(date).year();
6666
}
6767
};

‎projects/angular-calendar/test/calendar-day-view.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ describe('CalendarDayViewComponent component', () => {
13031303
CalendarDayViewComponent
13041304
> = TestBed.createComponent(CalendarDayViewComponent);
13051305
fixture.componentInstance.events = [
1306-
{ start: '2017-01-01', title: '', color: { primary: '', secondary: '' } }
1306+
{ start: 1234, title: '', color: { primary: '', secondary: '' } }
13071307
] as any;
13081308
fixture.componentInstance.ngOnChanges({ events: {} });
13091309
fixture.detectChanges();

‎projects/angular-calendar/test/calendar-month-view.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ describe('calendarMonthView component', () => {
10141014
> = TestBed.createComponent(CalendarMonthViewComponent);
10151015
fixture.componentInstance.viewDate = new Date('2017-01-01');
10161016
fixture.componentInstance.events = [
1017-
{ start: '2017-01-01', title: '', color: { primary: '', secondary: '' } }
1017+
{ start: 1234, title: '', color: { primary: '', secondary: '' } }
10181018
] as any;
10191019
fixture.componentInstance.ngOnChanges({ events: {}, viewDate: {} });
10201020
fixture.detectChanges();

‎projects/angular-calendar/test/calendar-week-view.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ describe('calendarWeekView component', () => {
10081008
CalendarWeekViewComponent
10091009
> = TestBed.createComponent(CalendarWeekViewComponent);
10101010
fixture.componentInstance.events = [
1011-
{ start: '2017-01-01', title: '', color: { primary: '', secondary: '' } }
1011+
{ start: 1234, title: '', color: { primary: '', secondary: '' } }
10121012
] as any;
10131013
fixture.componentInstance.viewDate = new Date('2017-01-01');
10141014
fixture.componentInstance.ngOnChanges({ events: {}, viewDate: {} });

0 commit comments

Comments
 (0)