Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(common): fix next ver issue with moduleWithProviders #5812

Merged
merged 1 commit into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/src/assets/json/current-version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"4.0.1"}
{"version":"5.6.2"}
29 changes: 11 additions & 18 deletions demo/src/ng-api-doc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ export const ngdoc: any = {
"properties": [
{
"name": "_a",
"type": "number[]",
"type": "DateArray",
"description": "<p>DateArray [year, month, date, .....]</p>\n"
},
{
Expand Down Expand Up @@ -613,7 +613,7 @@ export const ngdoc: any = {
{
"name": "_w",
"type": "WeekParsing",
"description": "<p>date specific info\nweek</p>\n"
"description": "<p>week</p>\n"
}
]
},
Expand Down Expand Up @@ -2352,12 +2352,6 @@ export const ngdoc: any = {
}
],
"returnType": "BsModalRef"
},
{
"name": "checkScrollbar",
"description": "<p>Checks if the body is overflowing and sets scrollbar width</p>\n",
"args": [],
"returnType": "void"
}
],
"properties": []
Expand Down Expand Up @@ -2518,12 +2512,6 @@ export const ngdoc: any = {
"description": "<p>Events tricks</p>\n",
"args": [],
"returnType": "void"
},
{
"name": "checkScrollbar",
"description": "<p>Scroll bar tricks</p>\n",
"args": [],
"returnType": "void"
}
]
},
Expand Down Expand Up @@ -4013,7 +4001,12 @@ export const ngdoc: any = {
"description": "",
"selector": "typeahead-container",
"inputs": [],
"outputs": [],
"outputs": [
{
"name": "activeChange",
"description": ""
}
],
"properties": [],
"methods": []
},
Expand Down Expand Up @@ -4220,9 +4213,9 @@ export const ngdoc: any = {
],
"properties": [
{
"name": "_container",
"type": "TypeaheadContainerComponent",
"description": "<p>if false restrict model values to the ones selected from the popup only will be provided\nif false the first match automatically will not be focused as you type\nformat the ng-model result after selection\nif true automatically select an item when there is one option that exactly matches the user input\nif true select the currently highlighted match on blur\nif false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
"name": "activeDescendant",
"type": "string",
"description": "<p>if false don&#39;t focus the input element the typeahead directive is associated with on selection</p>\n"
}
],
"methods": []
Expand Down
1 change: 1 addition & 0 deletions schematics/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export function createTestApp(runner: SchematicTestRunner, appOptions = {}): any
newProjectRoot: 'projects'
});


return runner.runExternalSchematicAsync('@schematics/angular', 'application',
{ name: 'ngx-bootstrap', ...appOptions }, workspaceTree);
}
Expand Down
2 changes: 1 addition & 1 deletion src/accordion/accordion.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { CollapseModule } from 'ngx-bootstrap/collapse';
exports: [AccordionComponent, AccordionPanelComponent]
})
export class AccordionModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<AccordionModule> {
return { ngModule: AccordionModule, providers: [AccordionConfig] };
}
}
2 changes: 1 addition & 1 deletion src/alert/alert.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AlertConfig } from './alert.config';
entryComponents: [AlertComponent]
})
export class AlertModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<AlertModule> {
return { ngModule: AlertModule, providers: [AlertConfig] };
}
}
2 changes: 1 addition & 1 deletion src/buttons/buttons.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ButtonRadioGroupDirective } from './button-radio-group.directive';
exports: [ButtonCheckboxDirective, ButtonRadioDirective, ButtonRadioGroupDirective]
})
export class ButtonsModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<ButtonsModule> {
return { ngModule: ButtonsModule, providers: [] };
}
}
2 changes: 1 addition & 1 deletion src/carousel/carousel.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { CarouselConfig } from './carousel.config';
providers: [CarouselConfig]
})
export class CarouselModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<CarouselModule> {
return { ngModule: CarouselModule, providers: [] };
}
}
2 changes: 1 addition & 1 deletion src/collapse/collapse.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { CollapseDirective } from './collapse.directive';
exports: [CollapseDirective]
})
export class CollapseModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<CollapseModule> {
return { ngModule: CollapseModule, providers: [] };
}
}
2 changes: 1 addition & 1 deletion src/datepicker/bs-datepicker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ import { BsYearsCalendarViewComponent } from './themes/bs/bs-years-calendar-view
]
})
export class BsDatepickerModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<BsDatepickerModule> {
return {
ngModule: BsDatepickerModule,
providers: [
Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/datepicker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { YearPickerComponent } from './yearpicker.component';
entryComponents: [DatePickerComponent]
})
export class DatepickerModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<DatepickerModule> {
return { ngModule: DatepickerModule, providers: [DatepickerConfig] };
}
}
2 changes: 1 addition & 1 deletion src/dropdown/bs-dropdown.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { BsDropdownState } from './bs-dropdown.state';
})
export class BsDropdownModule {
// tslint:disable-next-line:no-any
static forRoot(config?: any): ModuleWithProviders {
static forRoot(config?: any): ModuleWithProviders<BsDropdownModule> {
return {
ngModule: BsDropdownModule,
providers: [
Expand Down
4 changes: 2 additions & 2 deletions src/modal/modal.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import { BsModalService } from './bs-modal.service';
entryComponents: [ModalBackdropComponent, ModalContainerComponent]
})
export class ModalModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<ModalModule> {
return {
ngModule: ModalModule,
providers: [BsModalService, ComponentLoaderFactory, PositioningService]
};
}
static forChild(): ModuleWithProviders {
static forChild(): ModuleWithProviders<ModalModule> {
return {
ngModule: ModalModule,
providers: [BsModalService, ComponentLoaderFactory, PositioningService]
Expand Down
2 changes: 1 addition & 1 deletion src/pagination/pagination.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { PaginationComponent } from './pagination.component';
exports: [PagerComponent, PaginationComponent]
})
export class PaginationModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<PaginationModule> {
return { ngModule: PaginationModule, providers: [PaginationConfig] };
}
}
2 changes: 1 addition & 1 deletion src/popover/popover.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { PopoverContainerComponent } from './popover-container.component';
entryComponents: [PopoverContainerComponent]
})
export class PopoverModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<PopoverModule> {
return {
ngModule: PopoverModule,
providers: [PopoverConfig, ComponentLoaderFactory, PositioningService]
Expand Down
2 changes: 1 addition & 1 deletion src/progressbar/progressbar.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ProgressbarConfig } from './progressbar.config';
exports: [BarComponent, ProgressbarComponent]
})
export class ProgressbarModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<ProgressbarModule> {
return { ngModule: ProgressbarModule, providers: [ProgressbarConfig] };
}
}
2 changes: 1 addition & 1 deletion src/rating/rating.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { RatingConfig } from './rating.config';
exports: [RatingComponent]
})
export class RatingModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<RatingModule> {
return {
ngModule: RatingModule,
providers: [RatingConfig]
Expand Down
2 changes: 1 addition & 1 deletion src/sortable/sortable.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { DraggableItemService } from './draggable-item.service';
exports: [SortableComponent]
})
export class SortableModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<SortableModule> {
return { ngModule: SortableModule, providers: [DraggableItemService] };
}
}
2 changes: 1 addition & 1 deletion src/tabs/tabs.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { TabsetConfig } from './tabset.config';
]
})
export class TabsModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<TabsModule> {
return {
ngModule: TabsModule,
providers: [TabsetConfig]
Expand Down
2 changes: 1 addition & 1 deletion src/timepicker/timepicker.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { TimepickerStore } from './reducer/timepicker.store';
exports: [TimepickerComponent]
})
export class TimepickerModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<TimepickerModule> {
return {
ngModule: TimepickerModule,
providers: [TimepickerConfig, TimepickerActions, TimepickerStore]
Expand Down
2 changes: 1 addition & 1 deletion src/tooltip/tooltip.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { PositioningService } from 'ngx-bootstrap/positioning';
entryComponents: [TooltipContainerComponent]
})
export class TooltipModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<TooltipModule> {
return {
ngModule: TooltipModule,
providers: [TooltipConfig, ComponentLoaderFactory, PositioningService]
Expand Down
2 changes: 1 addition & 1 deletion src/typeahead/typeahead.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { TypeaheadConfig } from './typeahead.config';
entryComponents: [TypeaheadContainerComponent]
})
export class TypeaheadModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<TypeaheadModule> {
return {
ngModule: TypeaheadModule,
providers: [ComponentLoaderFactory, PositioningService, TypeaheadConfig]
Expand Down