Skip to content

Commit 27639ea

Browse files
authored
feat(datepicker): add ivy support (also fix ci) (#5268)
1 parent 669d7e1 commit 27639ea

File tree

5 files changed

+48
-27
lines changed

5 files changed

+48
-27
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ sudo: false
22
language: node_js
33
node_js: "10"
44

5+
services:
6+
- xvfb
7+
58
notifications:
69
email: false
710

@@ -17,7 +20,7 @@ env:
1720
- BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
1821
- LOGS_DIR=/tmp/logs
1922
- CYPRESS_RECORD_KEY=4aa7a1c0-3a4f-444e-b324-6fc305a543a8
20-
- NPM_AUTH_TOKEN_CI_PR=c687305b-fd76-4d02-9f64-8ecdbc31d9a4
23+
- NPM_AUTH_TOKEN_CI_PR=$(./scripts/ci/npm-ci-key.sh)
2124

2225
# test cypress smoke
2326
testSmokeCy: &testSmokeCy
@@ -45,8 +48,9 @@ stages:
4548
if: branch = development AND type = push OR tag =~ ^v\d+
4649

4750
before_install:
48-
- sh -e /etc/init.d/xvfb start
4951
- rm -rf node_modules/ngx-bootstrap
52+
- sudo apt-get install libgconf-2-4
53+
- npm install tslint
5054

5155
install:
5256
- npm ci

scripts/ci/npm-ci-key.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
echo U2FsdGVkX1+75DRt/Y01ZXdDEZzrscM41DvlkR9RMklJVK2I5PlYxYSbd0TBZ4PrMy4FPz9tJMVi2GTohxxdrg== | openssl enc -aes-128-cbc -a -d -salt -pass pass:valorkin

src/common/public_api.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export { AlertComponent, AlertConfig, AlertModule } from 'ngx-bootstrap/alert';
3333
export {
3434
ButtonCheckboxDirective,
3535
ButtonRadioDirective,
36+
ButtonRadioGroupDirective,
3637
ButtonsModule
3738
} from 'ngx-bootstrap/buttons';
3839

@@ -46,19 +47,26 @@ export {
4647
export { CollapseDirective, CollapseModule } from 'ngx-bootstrap/collapse';
4748

4849
export {
50+
BsDatepickerConfig,
51+
BsDatepickerContainerComponent,
52+
BsDatepickerDirective,
53+
BsDatepickerInlineContainerComponent,
54+
BsDatepickerInlineDirective,
55+
BsDatepickerInputDirective,
56+
BsDatepickerModule,
57+
BsDaterangepickerConfig,
58+
BsDaterangepickerContainerComponent,
59+
BsDaterangepickerDirective,
60+
BsDaterangepickerInputDirective,
61+
BsLocaleService,
4962
DateFormatter,
5063
DatePickerComponent,
5164
DatepickerConfig,
65+
DatePickerInnerComponent,
5266
DatepickerModule,
5367
DayPickerComponent,
5468
MonthPickerComponent,
55-
YearPickerComponent,
56-
BsDatepickerModule,
57-
BsDatepickerConfig,
58-
BsDaterangepickerConfig,
59-
BsLocaleService,
60-
BsDaterangepickerDirective,
61-
BsDatepickerDirective
69+
YearPickerComponent
6270
} from 'ngx-bootstrap/datepicker';
6371

6472
export {

src/datepicker/bs-datepicker.module.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,6 @@ import { BsTimepickerViewComponent } from './themes/bs/bs-timepicker-view.compon
2929
import { BsYearsCalendarViewComponent } from './themes/bs/bs-years-calendar-view.component';
3030
import { BsDatepickerInlineContainerComponent } from './themes/bs/bs-datepicker-inline-container.component';
3131

32-
const _exports = [
33-
BsDatepickerContainerComponent,
34-
BsDaterangepickerContainerComponent,
35-
BsDatepickerInlineContainerComponent,
36-
37-
BsDatepickerDirective,
38-
BsDatepickerInputDirective,
39-
40-
BsDaterangepickerInputDirective,
41-
BsDaterangepickerDirective,
42-
43-
BsDatepickerInlineDirective
44-
];
4532

4633
@NgModule({
4734
imports: [CommonModule],
@@ -50,22 +37,35 @@ const _exports = [
5037
BsCurrentDateViewComponent,
5138
BsDatepickerNavigationViewComponent,
5239
BsTimepickerViewComponent,
53-
5440
BsCalendarLayoutComponent,
5541
BsDaysCalendarViewComponent,
5642
BsMonthCalendarViewComponent,
5743
BsYearsCalendarViewComponent,
58-
5944
BsCustomDatesViewComponent,
60-
61-
..._exports
45+
BsDatepickerContainerComponent,
46+
BsDaterangepickerContainerComponent,
47+
BsDatepickerInlineContainerComponent,
48+
BsDatepickerDirective,
49+
BsDatepickerInputDirective,
50+
BsDaterangepickerInputDirective,
51+
BsDaterangepickerDirective,
52+
BsDatepickerInlineDirective
6253
],
6354
entryComponents: [
6455
BsDatepickerContainerComponent,
6556
BsDaterangepickerContainerComponent,
6657
BsDatepickerInlineContainerComponent
6758
],
68-
exports: _exports
59+
exports: [
60+
BsDatepickerContainerComponent,
61+
BsDaterangepickerContainerComponent,
62+
BsDatepickerInlineContainerComponent,
63+
BsDatepickerDirective,
64+
BsDatepickerInputDirective,
65+
BsDaterangepickerInputDirective,
66+
BsDaterangepickerDirective,
67+
BsDatepickerInlineDirective
68+
]
6969
})
7070
export class BsDatepickerModule {
7171
static forRoot(): ModuleWithProviders {

src/datepicker/public_api.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
export { BsDatepickerConfig } from './bs-datepicker.config';
2+
export { BsDatepickerContainerComponent } from './themes/bs/bs-datepicker-container.component';
23
export { BsDatepickerDirective } from './bs-datepicker.component';
34
export { BsDatepickerInlineConfig } from './bs-datepicker-inline.config';
5+
export { BsDatepickerInlineContainerComponent } from './themes/bs/bs-datepicker-inline-container.component';
46
export { BsDatepickerInlineDirective } from './bs-datepicker-inline.component';
7+
export { BsDatepickerInputDirective } from './bs-datepicker-input.directive';
8+
export { BsDaterangepickerInputDirective } from './bs-daterangepicker-input.directive';
59
export { BsDatepickerModule } from './bs-datepicker.module';
610
export { BsDatepickerViewMode, DatepickerDateCustomClasses } from './models';
711
export { BsDaterangepickerConfig } from './bs-daterangepicker.config';
12+
export { BsDaterangepickerContainerComponent } from './themes/bs/bs-daterangepicker-container.component';
813
export { BsDaterangepickerDirective } from './bs-daterangepicker.component';
914
export { BsLocaleService } from './bs-locale.service';
1015
export { DateFormatter } from './date-formatter';
1116
export { DatePickerComponent } from './datepicker.component';
1217
export { DatepickerConfig } from './datepicker.config';
18+
export { DatePickerInnerComponent } from './datepicker-inner.component';
1319
export { DatepickerModule } from './datepicker.module';
1420
export { DayPickerComponent } from './daypicker.component';
1521
export { MonthPickerComponent } from './monthpicker.component';

0 commit comments

Comments
 (0)