Skip to content

Commit

Permalink
hotfix(typescript): some angular setups can't handle .forRoot() retur… (
Browse files Browse the repository at this point in the history
#6689)

* hotfix(typescript): some angular setups can't handle .forRoot() returning just module

* 18.1.1

* chore(version): version bumped
  • Loading branch information
lexasq authored Oct 17, 2024
1 parent 2c7d6f0 commit b15cea2
Show file tree
Hide file tree
Showing 48 changed files with 135 additions and 82 deletions.
4 changes: 3 additions & 1 deletion apps/ngx-bootstrap-docs/src/assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
@import "bs-datepicker";

/* HEADER */

.bs-datepicker-head {
width: 150px;
}
header {
padding: 10px 50px 10px 30px;
height: $header-height;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "18.1.0"
"version": "18.1.1"
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap-base",
"version": "18.1.0",
"version": "18.1.1",
"license": "MIT",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"schematics": "./schematics/src/collection.json",
Expand Down
9 changes: 6 additions & 3 deletions src/accordion/accordion.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { AccordionComponent } from './accordion.component';
import { AccordionPanelComponent } from './accordion-group.component';
Expand All @@ -9,7 +9,10 @@ import { AccordionPanelComponent } from './accordion-group.component';
})
export class AccordionModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return AccordionModule;
static forRoot(): ModuleWithProviders<AccordionModule> {
return {
ngModule: AccordionModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/accordion",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/alert/alert.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';
import { AlertComponent } from './alert.component';

@NgModule({
Expand All @@ -7,7 +7,10 @@ import { AlertComponent } from './alert.component';
})
export class AlertModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return AlertModule;
static forRoot(): ModuleWithProviders<AlertModule> {
return {
ngModule: AlertModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/alert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/alert",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/buttons/buttons.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { ButtonCheckboxDirective } from './button-checkbox.directive';
import { ButtonRadioDirective } from './button-radio.directive';
Expand All @@ -10,7 +10,10 @@ import { ButtonRadioGroupDirective } from './button-radio-group.directive';
})
export class ButtonsModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return ButtonsModule;
static forRoot(): ModuleWithProviders<ButtonsModule> {
return {
ngModule: ButtonsModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/buttons",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/carousel/carousel.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { CarouselComponent } from './carousel.component';
import { SlideComponent } from './slide.component';
Expand All @@ -9,7 +9,10 @@ import { SlideComponent } from './slide.component';
})
export class CarouselModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return CarouselModule;
static forRoot(): ModuleWithProviders<CarouselModule> {
return {
ngModule: CarouselModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/carousel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/carousel",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/chronos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/chronos",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/collapse/collapse.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { CollapseDirective } from './collapse.directive';

Expand All @@ -8,7 +8,10 @@ import { CollapseDirective } from './collapse.directive';
})
export class CollapseModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return CollapseModule;
static forRoot(): ModuleWithProviders<CollapseModule> {
return {
ngModule: CollapseModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/collapse/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/collapse",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/component-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/component-loader",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/datepicker/bs-datepicker.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { TimepickerModule } from 'ngx-bootstrap/timepicker';
Expand Down Expand Up @@ -64,7 +64,10 @@ import { BsYearsCalendarViewComponent } from './themes/bs/bs-years-calendar-view
})
export class BsDatepickerModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return BsDatepickerModule;
static forRoot(): ModuleWithProviders<BsDatepickerModule> {
return {
ngModule: BsDatepickerModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/datepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/datepicker",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/dropdown/bs-dropdown.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { BsDropdownContainerComponent } from './bs-dropdown-container.component';
import { BsDropdownMenuDirective } from './bs-dropdown-menu.directive';
Expand All @@ -21,7 +21,10 @@ import { BsDropdownDirective } from './bs-dropdown.directive';
})
export class BsDropdownModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return BsDropdownModule;
static forRoot(): ModuleWithProviders<BsDropdownModule> {
return {
ngModule: BsDropdownModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/dropdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/dropdown",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/focus-trap/focus-trap.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { FocusTrapDirective } from './focus-trap';
Expand All @@ -9,7 +9,10 @@ import { FocusTrapDirective } from './focus-trap';
})
export class FocusTrapModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return FocusTrapModule;
static forRoot(): ModuleWithProviders<FocusTrapModule> {
return {
ngModule: FocusTrapModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/focus-trap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/focus-trap",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/locale/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/locale",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/mini-ngrx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/mini-ngrx",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/modal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/modal",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/pagination/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/pagination",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/pagination/pagination.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { PagerComponent } from './pager.component';
import { PaginationComponent } from './pagination.component';
Expand All @@ -10,7 +10,10 @@ import { PaginationComponent } from './pagination.component';
})
export class PaginationModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return PaginationModule;
static forRoot(): ModuleWithProviders<PaginationModule> {
return {
ngModule: PaginationModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/popover/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/popover",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/popover/popover.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { PopoverDirective } from './popover.directive';
Expand All @@ -10,7 +10,10 @@ import { PopoverContainerComponent } from './popover-container.component';
})
export class PopoverModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return PopoverModule;
static forRoot(): ModuleWithProviders<PopoverModule> {
return {
ngModule: PopoverModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/positioning/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/positioning",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion src/progressbar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/progressbar",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
9 changes: 6 additions & 3 deletions src/progressbar/progressbar.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { BarComponent } from './bar.component';
import { ProgressbarComponent } from './progressbar.component';
Expand All @@ -9,7 +9,10 @@ import { ProgressbarComponent } from './progressbar.component';
})
export class ProgressbarModule {
// @deprecated method not required anymore, will be deleted in v19.0.0
static forRoot() {
return ProgressbarModule;
static forRoot(): ModuleWithProviders<ProgressbarModule> {
return {
ngModule: ProgressbarModule,
providers: []
};
}
}
2 changes: 1 addition & 1 deletion src/rating/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-bootstrap/rating",
"version": "18.1.0",
"version": "18.1.1",
"author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
"license": "MIT"
}
Loading

0 comments on commit b15cea2

Please sign in to comment.