Skip to content

Commit 9902f7e

Browse files
vlio20vlio20
authored
testing new build (#351)
1 parent 42fed3f commit 9902f7e

21 files changed

+772
-99
lines changed

‎npm-shrinkwrap.json

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

‎package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ng2-date-picker",
33
"author": "Vlad Ioffe",
4-
"version": "2.7.3",
4+
"version": "2.6.2",
55
"license": "MIT",
66
"main": "index.js",
77
"scripts": {
@@ -12,9 +12,9 @@
1212
"lint": "ng lint",
1313
"e2e": "ng e2e",
1414
"e2e:headless": "ng e2e -- headless",
15-
"build:demo": "rm -rf dist/ && ng build --prod --aot=false --bh /angular-datepicker/ && npm run build:index",
1615
"build:index": "cd build-helpers && node index-maker.js",
17-
"build:prod": "node build.js && ngc && cp package.json bin",
16+
"build:demo": "rm -rf dist/ && ng build --prod --aot=false --bh /angular-datepicker/ && npm run build:index",
17+
"build:prod": "ng-packagr -p package.json",
1818
"release": "npm run build:prod && npm publish bin",
1919
"pack": "cd bin && npm pack",
2020
"postinstall": "opencollective postinstall"
@@ -65,6 +65,7 @@
6565
"karma-jasmine-html-reporter": "^0.2.2",
6666
"less": "^2.7.2",
6767
"ncp": "^2.0.0",
68+
"ng-packagr": "^1.6.0",
6869
"protractor": "~5.1.0",
6970
"rimraf": "^2.6.1",
7071
"rxjs": "^5.1.0",
@@ -79,9 +80,13 @@
7980
"skipTemplateCodegen": true,
8081
"strictMetadataEmit": true
8182
},
82-
"collective": {
83-
"type": "opencollective",
84-
"url": "https://opencollective.com/angular-datepicker",
85-
"logo": "https://opencollective.com/opencollective/logo.txt"
83+
"ngPackage": {
84+
"lib": {
85+
"entryFile": "src/app/index.ts",
86+
"externals": {
87+
"moment": "moment"
88+
}
89+
},
90+
"dest": "bin"
8691
}
8792
}

‎src/app/common/services/utils/utils.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import {inject, TestBed} from '@angular/core/testing';
22
import {UtilsService} from './utils.service';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {IDate} from '../../models/date.model';
5+
const moment = momentNs;
56

67
describe('Service: ObUtilsService', () => {
78
beforeEach(() => {

‎src/app/common/services/utils/utils.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import {ECalendarValue} from '../../types/calendar-value-enum';
22
import {SingleCalendarValue} from '../../types/single-calendar-value';
33
import {Injectable} from '@angular/core';
4-
import * as moment from 'moment';
4+
import * as momentNs from 'moment';
55
import {Moment, unitOfTime} from 'moment';
66
import {CalendarValue} from '../../types/calendar-value';
77
import {IDate} from '../../models/date.model';
88
import {CalendarMode} from '../../types/calendar-mode';
99
import {DateValidator} from '../../types/validator.type';
1010
import {ICalendarInternal} from '../../models/calendar.model';
11-
import {forEach} from '@angular/router/src/utils/collection';
11+
const moment = momentNs;
1212

1313
export interface DateLimits {
1414
minDate?: SingleCalendarValue;

‎src/app/date-picker/date-picker.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import {inject, TestBed} from '@angular/core/testing';
22
import {DatePickerService} from './date-picker.service';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {Moment} from 'moment';
55
import {UtilsService} from '../common/services/utils/utils.service';
66
import {DayTimeCalendarService} from '../day-time-calendar/day-time-calendar.service';
77
import {DayCalendarService} from '../day-calendar/day-calendar.service';
88
import {TimeSelectService} from '../time-select/time-select.service';
9+
const moment = momentNs;
910

1011
describe('Service: DatePicker', () => {
1112
beforeEach(() => {

‎src/app/date-picker/date-picker.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import {EventEmitter, Injectable} from '@angular/core';
22
import {IDatePickerConfig, IDatePickerConfigInternal} from './date-picker-config.model';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {Moment} from 'moment';
55
import {UtilsService} from '../common/services/utils/utils.service';
66
import {IDayCalendarConfig} from '../day-calendar/day-calendar-config.model';
77
import {TimeSelectService} from '../time-select/time-select.service';
88
import {DayTimeCalendarService} from '../day-time-calendar/day-time-calendar.service';
99
import {ITimeSelectConfig} from '../time-select/time-select-config.model';
1010
import {CalendarMode} from '../common/types/calendar-mode';
11+
const moment = momentNs;
1112

1213
@Injectable()
1314
export class DatePickerService {

‎src/app/day-calendar/day-calendar.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {UtilsService} from '../common/services/utils/utils.service';
33
import {CalendarNavComponent} from '../calendar-nav/calendar-nav.component';
4-
import * as moment from 'moment';
4+
import * as momentNs from 'moment';
55
import {Moment} from 'moment';
66
import {DayCalendarComponent} from './day-calendar.component';
77
import {DayCalendarService} from './day-calendar.service';
88
import {MonthCalendarComponent} from '../month-calendar/month-calendar.component';
99
import {IDay} from './day.model';
10+
const moment = momentNs;
1011

1112
describe('Component: DayCalendarComponent', () => {
1213
let component: DayCalendarComponent;

‎src/app/day-calendar/day-calendar.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import {
1717
ViewEncapsulation
1818
} from '@angular/core';
1919
import {DayCalendarService} from './day-calendar.service';
20-
import * as moment from 'moment';
21-
import {Moment} from 'moment';
20+
import * as momentNs from 'moment';
21+
import {Moment, unitOfTime} from 'moment';
2222
import {IDayCalendarConfig, IDayCalendarConfigInternal} from './day-calendar-config.model';
2323
import {IDay} from './day.model';
2424
import {
@@ -35,6 +35,7 @@ import {IMonthCalendarConfig} from '../month-calendar/month-calendar-config';
3535
import {IMonth} from '../month-calendar/month.model';
3636
import {DateValidator} from '../common/types/validator.type';
3737
import {INavEvent} from '../common/models/navigation-event.model';
38+
const moment = momentNs;
3839

3940
@Component({
4041
selector: 'dp-day-calendar',
@@ -298,7 +299,7 @@ export class DayCalendarComponent implements OnInit, OnChanges, ControlValueAcce
298299
this.onMonthSelect.emit(month);
299300
}
300301

301-
moveCalendarsBy(current: Moment, amount: number, granularity: moment.unitOfTime.Base = 'month') {
302+
moveCalendarsBy(current: Moment, amount: number, granularity: unitOfTime.Base = 'month') {
302303
this.currentDateView = current.clone().add(amount, granularity);
303304
this.cd.markForCheck();
304305
}

‎src/app/day-calendar/day-calendar.service.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import {inject, TestBed} from '@angular/core/testing';
22
import {DayCalendarService} from './day-calendar.service';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {Moment} from 'moment';
55
import {UtilsService} from '../common/services/utils/utils.service';
6-
import {IDayCalendarConfig, IDayCalendarConfigInternal} from './day-calendar-config.model';
6+
import {IDayCalendarConfigInternal} from './day-calendar-config.model';
7+
const moment = momentNs;
78

89
describe('Service: Calendar', () => {
910
beforeEach(() => {

‎src/app/day-calendar/day-calendar.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import {Injectable} from '@angular/core';
2-
import * as moment from 'moment';
2+
import * as momentNs from 'moment';
33
import {Moment} from 'moment';
44
import {WeekDays} from '../common/types/week-days.type';
55
import {UtilsService} from '../common/services/utils/utils.service';
66
import {IDay} from './day.model';
77
import {IDayCalendarConfig, IDayCalendarConfigInternal} from './day-calendar-config.model';
88
import {IMonthCalendarConfig} from '../month-calendar/month-calendar-config';
9+
const moment = momentNs;
910

1011
@Injectable()
1112
export class DayCalendarService {

‎src/app/day-time-calendar/day-time-calendar.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import {inject, TestBed} from '@angular/core/testing';
22
import {DayTimeCalendarService} from './day-time-calendar.service';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {UtilsService} from '../common/services/utils/utils.service';
55
import {DayCalendarService} from '../day-calendar/day-calendar.service';
66
import {TimeSelectService} from '../time-select/time-select.service';
77
import {IDayCalendarConfigInternal} from '../day-calendar/day-calendar-config.model';
8+
const moment = momentNs;
89

910
const DAY_FORMAT = 'YYYYMMDD';
1011
const TIME_FORMAT = 'HH:mm:ss';

‎src/app/day-time-calendar/day-time-calendar.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import {Injectable} from '@angular/core';
2-
import * as moment from 'moment';
2+
import * as momentNs from 'moment';
33
import {Moment} from 'moment';
44

55
import {UtilsService} from '../common/services/utils/utils.service';
66
import {DayCalendarService} from '../day-calendar/day-calendar.service';
77
import {TimeSelectService} from '../time-select/time-select.service';
88
import {IDayTimeCalendarConfig} from './day-time-calendar-config.model';
9+
const moment = momentNs;
910

1011
const DAY_FORMAT = 'YYYYMMDD';
1112
const TIME_FORMAT = 'HH:mm:ss';

‎src/app/demo/demo/demo.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import debounce from '../../common/decorators/decorators';
22
import {IDatePickerConfig} from '../../date-picker/date-picker-config.model';
33
import {DatePickerComponent} from '../../date-picker/date-picker.component';
44
import {DatePickerDirective} from '../../date-picker/date-picker.directive';
5-
import {Component, ContentChild, HostListener, ViewChild} from '@angular/core';
5+
import {Component, HostListener, ViewChild} from '@angular/core';
66
import {FormControl, FormGroup, Validators} from '@angular/forms';
7-
import * as moment from 'moment';
7+
import * as momentNs from 'moment';
88
import {Moment} from 'moment';
99
import {GaService} from '../services/ga/ga.service';
1010
import {ECalendarValue} from '../../common/types/calendar-value-enum';
1111
import {INavEvent} from '../../common/models/navigation-event.model';
12+
const moment = momentNs;
1213

1314
const GLOBAL_OPTION_KEYS = [
1415
'theme',

‎src/app/month-calendar/month-calendar.component.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import {MonthCalendarComponent} from './month-calendar.component';
33
import {UtilsService} from '../common/services/utils/utils.service';
44
import {CalendarNavComponent} from '../calendar-nav/calendar-nav.component';
55
import {MonthCalendarService} from './month-calendar.service';
6-
import * as moment from 'moment';
7-
import {IMonth} from './month.model';
6+
import * as momentNs from 'moment';
87
import {Moment} from 'moment';
8+
import {IMonth} from './month.model';
9+
const moment = momentNs;
910

1011
describe('Component: MonthCalendarComponent', () => {
1112
let component: MonthCalendarComponent;
@@ -37,7 +38,7 @@ describe('Component: MonthCalendarComponent', () => {
3738
disabled: false,
3839
text: ''
3940
};
40-
const defaultCssClasses: { [klass: string]: boolean } = {
41+
const defaultCssClasses: {[klass: string]: boolean} = {
4142
'dp-selected': false,
4243
'dp-current-month': false
4344
};

‎src/app/month-calendar/month-calendar.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
} from '@angular/core';
1717
import {IMonth} from './month.model';
1818
import {MonthCalendarService} from './month-calendar.service';
19-
import * as moment from 'moment';
19+
import * as momentNs from 'moment';
2020
import {Moment} from 'moment';
2121
import {IMonthCalendarConfig, IMonthCalendarConfigInternal} from './month-calendar-config';
2222
import {
@@ -32,6 +32,7 @@ import {UtilsService} from '../common/services/utils/utils.service';
3232
import {DateValidator} from '../common/types/validator.type';
3333
import {SingleCalendarValue} from '../common/types/single-calendar-value';
3434
import {INavEvent} from '../common/models/navigation-event.model';
35+
const moment = momentNs;
3536

3637
@Component({
3738
selector: 'dp-month-calendar',

‎src/app/month-calendar/month-calendar.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import {inject, TestBed} from '@angular/core/testing';
2-
import * as moment from 'moment';
2+
import * as momentNs from 'moment';
33
import {UtilsService} from '../common/services/utils/utils.service';
44
import {MonthCalendarService} from './month-calendar.service';
55
import {IMonth} from './month.model';
6+
const moment = momentNs;
67

78
describe('Service: MonthCalendarService', () => {
89
beforeEach(() => {

‎src/app/month-calendar/month-calendar.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import {Injectable} from '@angular/core';
2-
import * as moment from 'moment';
2+
import * as momentNs from 'moment';
33
import {Moment} from 'moment';
44
import {UtilsService} from '../common/services/utils/utils.service';
55
import {IMonth} from './month.model';
66
import {IMonthCalendarConfig, IMonthCalendarConfigInternal} from './month-calendar-config';
7+
const moment = momentNs;
78

89
@Injectable()
910
export class MonthCalendarService {

‎src/app/time-select/time-select.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {UtilsService} from '../common/services/utils/utils.service';
33
import {CalendarNavComponent} from '../calendar-nav/calendar-nav.component';
4-
import * as moment from 'moment';
4+
import * as momentNs from 'moment';
55
import {TimeSelectComponent} from './time-select.component';
66
import {TimeSelectService} from './time-select.service';
77
import {MonthCalendarComponent} from '../month-calendar/month-calendar.component';
8+
const moment = momentNs;
89

910
describe('Component: TimeSelectComponent', () => {
1011
let component: TimeSelectComponent;

‎src/app/time-select/time-select.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ViewEncapsulation
1616
} from '@angular/core';
1717
import {TimeSelectService, TimeUnit} from './time-select.service';
18-
import * as moment from 'moment';
18+
import * as momentNs from 'moment';
1919
import {Moment} from 'moment';
2020
import {ITimeSelectConfig, ITimeSelectConfigInternal} from './time-select-config.model';
2121
import {
@@ -30,6 +30,7 @@ import {CalendarValue} from '../common/types/calendar-value';
3030
import {UtilsService} from '../common/services/utils/utils.service';
3131
import {IDate} from '../common/models/date.model';
3232
import {DateValidator} from '../common/types/validator.type';
33+
const moment = momentNs;
3334

3435
@Component({
3536
selector: 'dp-time-select',

‎src/app/time-select/time-select.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import {inject, TestBed} from '@angular/core/testing';
22
import {TimeSelectService} from './time-select.service';
3-
import * as moment from 'moment';
3+
import * as momentNs from 'moment';
44
import {UtilsService} from '../common/services/utils/utils.service';
55
import {ITimeSelectConfigInternal} from './time-select-config.model';
6+
const moment = momentNs;
67

78
describe('Service: TimeSelectService', () => {
89
beforeEach(() => {

‎src/app/time-select/time-select.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import {Injectable} from '@angular/core';
2-
import * as moment from 'moment';
2+
import * as momentNs from 'moment';
33
import {Moment} from 'moment';
44
import {UtilsService} from '../common/services/utils/utils.service';
55
import {ITimeSelectConfig, ITimeSelectConfigInternal} from './time-select-config.model';
6+
const moment = momentNs;
67

78
export type TimeUnit = 'hour' | 'minute' | 'second';
89
export const FIRST_PM_HOUR = 12;

0 commit comments

Comments
 (0)