Skip to content

Commit

Permalink
feat(datepicker): add ivy support (also fix ci) (#5268)
Browse files Browse the repository at this point in the history
  • Loading branch information
Domainv authored Jun 19, 2019
1 parent 669d7e1 commit 27639ea
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 27 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ sudo: false
language: node_js
node_js: "10"

services:
- xvfb

notifications:
email: false

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

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

before_install:
- sh -e /etc/init.d/xvfb start
- rm -rf node_modules/ngx-bootstrap
- sudo apt-get install libgconf-2-4
- npm install tslint

install:
- npm ci
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci/npm-ci-key.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

echo U2FsdGVkX1+75DRt/Y01ZXdDEZzrscM41DvlkR9RMklJVK2I5PlYxYSbd0TBZ4PrMy4FPz9tJMVi2GTohxxdrg== | openssl enc -aes-128-cbc -a -d -salt -pass pass:valorkin
22 changes: 15 additions & 7 deletions src/common/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export { AlertComponent, AlertConfig, AlertModule } from 'ngx-bootstrap/alert';
export {
ButtonCheckboxDirective,
ButtonRadioDirective,
ButtonRadioGroupDirective,
ButtonsModule
} from 'ngx-bootstrap/buttons';

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

export {
BsDatepickerConfig,
BsDatepickerContainerComponent,
BsDatepickerDirective,
BsDatepickerInlineContainerComponent,
BsDatepickerInlineDirective,
BsDatepickerInputDirective,
BsDatepickerModule,
BsDaterangepickerConfig,
BsDaterangepickerContainerComponent,
BsDaterangepickerDirective,
BsDaterangepickerInputDirective,
BsLocaleService,
DateFormatter,
DatePickerComponent,
DatepickerConfig,
DatePickerInnerComponent,
DatepickerModule,
DayPickerComponent,
MonthPickerComponent,
YearPickerComponent,
BsDatepickerModule,
BsDatepickerConfig,
BsDaterangepickerConfig,
BsLocaleService,
BsDaterangepickerDirective,
BsDatepickerDirective
YearPickerComponent
} from 'ngx-bootstrap/datepicker';

export {
Expand Down
36 changes: 18 additions & 18 deletions src/datepicker/bs-datepicker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,6 @@ import { BsTimepickerViewComponent } from './themes/bs/bs-timepicker-view.compon
import { BsYearsCalendarViewComponent } from './themes/bs/bs-years-calendar-view.component';
import { BsDatepickerInlineContainerComponent } from './themes/bs/bs-datepicker-inline-container.component';

const _exports = [
BsDatepickerContainerComponent,
BsDaterangepickerContainerComponent,
BsDatepickerInlineContainerComponent,

BsDatepickerDirective,
BsDatepickerInputDirective,

BsDaterangepickerInputDirective,
BsDaterangepickerDirective,

BsDatepickerInlineDirective
];

@NgModule({
imports: [CommonModule],
Expand All @@ -50,22 +37,35 @@ const _exports = [
BsCurrentDateViewComponent,
BsDatepickerNavigationViewComponent,
BsTimepickerViewComponent,

BsCalendarLayoutComponent,
BsDaysCalendarViewComponent,
BsMonthCalendarViewComponent,
BsYearsCalendarViewComponent,

BsCustomDatesViewComponent,

..._exports
BsDatepickerContainerComponent,
BsDaterangepickerContainerComponent,
BsDatepickerInlineContainerComponent,
BsDatepickerDirective,
BsDatepickerInputDirective,
BsDaterangepickerInputDirective,
BsDaterangepickerDirective,
BsDatepickerInlineDirective
],
entryComponents: [
BsDatepickerContainerComponent,
BsDaterangepickerContainerComponent,
BsDatepickerInlineContainerComponent
],
exports: _exports
exports: [
BsDatepickerContainerComponent,
BsDaterangepickerContainerComponent,
BsDatepickerInlineContainerComponent,
BsDatepickerDirective,
BsDatepickerInputDirective,
BsDaterangepickerInputDirective,
BsDaterangepickerDirective,
BsDatepickerInlineDirective
]
})
export class BsDatepickerModule {
static forRoot(): ModuleWithProviders {
Expand Down
6 changes: 6 additions & 0 deletions src/datepicker/public_api.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
export { BsDatepickerConfig } from './bs-datepicker.config';
export { BsDatepickerContainerComponent } from './themes/bs/bs-datepicker-container.component';
export { BsDatepickerDirective } from './bs-datepicker.component';
export { BsDatepickerInlineConfig } from './bs-datepicker-inline.config';
export { BsDatepickerInlineContainerComponent } from './themes/bs/bs-datepicker-inline-container.component';
export { BsDatepickerInlineDirective } from './bs-datepicker-inline.component';
export { BsDatepickerInputDirective } from './bs-datepicker-input.directive';
export { BsDaterangepickerInputDirective } from './bs-daterangepicker-input.directive';
export { BsDatepickerModule } from './bs-datepicker.module';
export { BsDatepickerViewMode, DatepickerDateCustomClasses } from './models';
export { BsDaterangepickerConfig } from './bs-daterangepicker.config';
export { BsDaterangepickerContainerComponent } from './themes/bs/bs-daterangepicker-container.component';
export { BsDaterangepickerDirective } from './bs-daterangepicker.component';
export { BsLocaleService } from './bs-locale.service';
export { DateFormatter } from './date-formatter';
export { DatePickerComponent } from './datepicker.component';
export { DatepickerConfig } from './datepicker.config';
export { DatePickerInnerComponent } from './datepicker-inner.component';
export { DatepickerModule } from './datepicker.module';
export { DayPickerComponent } from './daypicker.component';
export { MonthPickerComponent } from './monthpicker.component';
Expand Down

0 comments on commit 27639ea

Please sign in to comment.