Skip to content

Commit a865a89

Browse files
authored
build: update date-fns to v4 (#9868)
1 parent d578c8b commit a865a89

12 files changed

Lines changed: 14 additions & 73 deletions

File tree

components/core/time/candy-date.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
44
*/
55

6-
import differenceInCalendarMonths from 'date-fns/differenceInCalendarMonths';
6+
import { differenceInCalendarMonths } from 'date-fns';
77

88
import { CandyDate, normalizeRangeValue, SingleValue } from './candy-date';
99
import { NzSafeAny } from '../types';

components/date-picker/date-picker.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule,
2222
import { form, FormField } from '@angular/forms/signals';
2323
import { By } from '@angular/platform-browser';
2424

25-
import isSameDay from 'date-fns/isSameDay';
25+
import { isSameDay } from 'date-fns';
2626
import { enUS } from 'date-fns/locale';
2727
import { vi } from 'vitest';
2828

components/date-picker/month-picker.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
1111
import { FormsModule } from '@angular/forms';
1212
import { By } from '@angular/platform-browser';
1313

14-
import isBefore from 'date-fns/isBefore';
14+
import { isBefore } from 'date-fns';
1515
import { vi } from 'vitest';
1616

1717
import { provideNzNoAnimation } from 'ng-zorro-antd/core/animation';

components/date-picker/quarter-picker.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Component, signal } from '@angular/core';
1010
import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
1111
import { FormsModule } from '@angular/forms';
1212

13-
import isBefore from 'date-fns/isBefore';
13+
import { isBefore } from 'date-fns';
1414
import { vi } from 'vitest';
1515

1616
import { provideNzNoAnimation } from 'ng-zorro-antd/core/animation';

components/date-picker/range-picker.component.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
1212
import { FormsModule } from '@angular/forms';
1313
import { By } from '@angular/platform-browser';
1414

15-
import differenceInDays from 'date-fns/differenceInDays';
16-
import isSameDay from 'date-fns/isSameDay';
15+
import { differenceInDays, isSameDay } from 'date-fns';
1716
import { vi } from 'vitest';
1817

1918
import { provideNzNoAnimation } from 'ng-zorro-antd/core/animation';

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@angular/cdk": "^22.0.0",
3131
"@ant-design/icons-angular": "^22.0.0",
3232
"@ctrl/tinycolor": "^3.6.0",
33-
"date-fns": "^2.16.1"
33+
"date-fns": "^4.1.0"
3434
},
3535
"peerDependencies": {
3636
"@angular/common": "^22.0.0",

package-lock.json

Lines changed: 6 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": {
3232
"@angular/cdk": "^22.0.2",
3333
"@ant-design/icons-angular": "^22.0.0",
34-
"date-fns": "^2.16.1"
34+
"date-fns": "^4.1.0"
3535
},
3636
"devDependencies": {
3737
"@angular-devkit/core": "^22.0.4",

schematics/ng-add/index.spec.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,9 @@ describe('ng-add schematic', () => {
3636
const options = { ...defaultOptions };
3737
const tree = await runner.runSchematic('ng-add', options, appTree);
3838
expect(getPackageJsonDependency(tree, 'ng-zorro-antd')).not.toBeNull();
39-
expect(getPackageJsonDependency(tree, 'date-fns')).not.toBeNull();
4039
expect(runner.tasks.some(task => task.name === NodePackageName)).toBe(true);
4140
});
4241

43-
it('should not install date-fns when using native date adapter', async () => {
44-
const options = { ...defaultOptions, dateAdapter: 'native' as const };
45-
const tree = await runner.runSchematic('ng-add', options, appTree);
46-
expect(getPackageJsonDependency(tree, 'date-fns')).toBeNull();
47-
});
48-
49-
it('should not install date-fns when skipping date adapter setup', async () => {
50-
const options = { ...defaultOptions, dateAdapter: 'none' as const };
51-
const tree = await runner.runSchematic('ng-add', options, appTree);
52-
expect(getPackageJsonDependency(tree, 'date-fns')).toBeNull();
53-
});
54-
5542
it('should add hammerjs to package.json', async () => {
5643
const options = { ...defaultOptions, gestures: true };
5744
const tree = await runner.runSchematic('ng-add', options, appTree);

schematics/ng-add/index.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import { getProjectStyle } from '../utils/project-style';
1717
// @ts-ignore
1818
import { hammerjsVersion, zorroVersion } from '../utils/version-names';
1919

20-
const dateFnsVersion = '^2.16.1';
21-
2220
export default function (options: Schema): Rule {
2321
return chain([
2422
(host: Tree, context: SchematicContext) => {
@@ -33,13 +31,6 @@ export default function (options: Schema): Rule {
3331
version: zorroVersion,
3432
type: NodeDependencyType.Default
3533
});
36-
if ((options.dateAdapter || 'date-fns') === 'date-fns') {
37-
addPackageJsonDependency(host, {
38-
name: 'date-fns',
39-
version: dateFnsVersion,
40-
type: NodeDependencyType.Default
41-
});
42-
}
4334
if (options.gestures) {
4435
addPackageJsonDependency(host, {
4536
name: 'hammerjs',

0 commit comments

Comments
 (0)