Skip to content

Commit 746d776

Browse files
committed
core(build): fix dayjs error
1 parent 584c00f commit 746d776

File tree

10 files changed

+20
-22
lines changed

10 files changed

+20
-22
lines changed

angular.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"buildOptimizer": false,
3131
"sourceMap": true,
3232
"optimization": false,
33-
"namedChunks": true
33+
"namedChunks": true,
34+
"allowedCommonJsDependencies": [
35+
"dayjs"
36+
]
3437
},
3538
"configurations": {
3639
"production": {

demo/src/app/custom-ranges/custom-ranges.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component } from '@angular/core';
22
import { DateRange, DateRanges, TimePeriod } from '../../../../src/daterangepicker/daterangepicker.component';
3-
import { Dayjs } from 'dayjs';
4-
import dayjs from 'dayjs';
3+
import dayjs, { Dayjs } from 'dayjs/esm';
54

65
@Component({
76
// eslint-disable-next-line @angular-eslint/component-selector

demo/src/app/full/full.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit, ViewChild } from '@angular/core';
2-
import * as dayjs from 'dayjs';
2+
import dayjs from 'dayjs/esm';
33
import { DaterangepickerDirective } from '../../../../src/daterangepicker/daterangepicker.directive';
44
import { EndDate, StartDate } from '../../../../src/daterangepicker/daterangepicker.component';
55
import { LocaleConfig } from '../../../../src/daterangepicker';

demo/src/app/reactive-form/reactive-form.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '@angular/core';
2-
import * as dayjs from 'dayjs';
2+
import dayjs from 'dayjs/esm';
33
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
44
import { LocaleConfig } from '../../../../src/daterangepicker';
55

demo/src/app/simple/simple.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit, ViewChild } from '@angular/core';
2-
import * as dayjs from 'dayjs';
3-
import * as utc from 'dayjs/plugin/utc';
2+
import dayjs from 'dayjs/esm';
3+
import * as utc from 'dayjs/esm/plugin/utc';
44
dayjs.extend(utc);
55
import { DaterangepickerComponent, DaterangepickerDirective } from '../../../../src/daterangepicker';
66
import { ChosenDate, TimePeriod } from '../../../../src/daterangepicker/daterangepicker.component';

demo/src/app/single-datepicker/single-datepicker.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, OnInit } from '@angular/core';
2-
import * as dayjs from 'dayjs';
2+
import dayjs from 'dayjs/esm';
33
import 'dayjs/locale/fr';
44
import { LocaleConfig } from '../../../../src/daterangepicker';
5-
import * as weekday from 'dayjs/plugin/weekday';
6-
import { Dayjs } from 'dayjs';
5+
import weekday from 'dayjs/esm/plugin/weekday';
6+
import { Dayjs } from 'dayjs/esm';
77
dayjs.extend(weekday);
88
dayjs.locale('fr');
99

demo/src/app/timepicker/timepicker.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '@angular/core';
2-
import * as dayjs from 'dayjs';
2+
import dayjs from 'dayjs/esm';
33

44
@Component({
55
// eslint-disable-next-line @angular-eslint/component-selector

ng-package.json

-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
"lib": {
44
"entryFile": "src/daterangepicker/index.ts"
55
},
6-
"allowedNonPeerDependencies": [
7-
"dayjs"
8-
],
96
"dest": "dist"
107
}

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"zone.js": "~0.11.4"
103103
},
104104
"dependencies": {
105-
"dayjs": "^1.11.4",
106105
"tslib": "^2.0.0"
107106
},
108107
"schematics": "./schematics/collection.json"

src/daterangepicker/daterangepicker.component.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import {
1414
ViewEncapsulation
1515
} from '@angular/core';
1616
import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
17-
import dayjs, { Dayjs } from 'dayjs';
17+
import dayjs, { Dayjs } from 'dayjs/esm';
1818
import { LocaleConfig } from './daterangepicker.config';
1919
import { LocaleService } from './locale.service';
2020

21-
import localeData from 'dayjs/plugin/localeData';
22-
import LocalizedFormat from 'dayjs/plugin/localizedFormat';
23-
import isoWeek from 'dayjs/plugin/isoWeek';
24-
import week from 'dayjs/plugin/weekOfYear';
25-
import customParseFormat from 'dayjs/plugin/customParseFormat';
26-
import utc from 'dayjs/plugin/utc';
21+
import localeData from 'dayjs/esm/plugin/localeData';
22+
import LocalizedFormat from 'dayjs/esm/plugin/localizedFormat';
23+
import isoWeek from 'dayjs/esm/plugin/isoWeek';
24+
import week from 'dayjs/esm/plugin/weekOfYear';
25+
import customParseFormat from 'dayjs/esm/plugin/customParseFormat';
26+
import utc from 'dayjs/esm/plugin/utc';
2727

2828
dayjs.extend(localeData);
2929
dayjs.extend(LocalizedFormat);

0 commit comments

Comments
 (0)