hotfix(typescript): some angular setups can't handle .forRoot() retur… (#6689)

lexasq · web-flow · commit b15cea22ac53 · 2024-10-17T15:07:15.000+03:00
* hotfix(typescript): some angular setups can't handle .forRoot() returning just module

* 18.1.1

* chore(version): version bumped
diff --git a/apps/ngx-bootstrap-docs/src/assets/css/style.scss b/apps/ngx-bootstrap-docs/src/assets/css/style.scss
@@ -2,7 +2,9 @@
 @import "bs-datepicker";
 
 /* HEADER */
-
+.bs-datepicker-head {
+  width: 150px;
+}
 header {
   padding: 10px 50px 10px 30px;
   height: $header-height;
diff --git a/apps/ngx-bootstrap-docs/src/assets/json/current-version.json b/apps/ngx-bootstrap-docs/src/assets/json/current-version.json
@@ -1,3 +1,3 @@
 {
-  "version": "18.1.0"
+  "version": "18.1.1"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",
diff --git a/src/accordion/accordion.module.ts b/src/accordion/accordion.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/accordion/package.json b/src/accordion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/accordion",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/alert/alert.module.ts b/src/alert/alert.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { ModuleWithProviders, NgModule } from '@angular/core';
 import { AlertComponent } from './alert.component';
 
 @NgModule({
@@ -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: []
+    };
   }
 }
diff --git a/src/alert/package.json b/src/alert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/alert",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/buttons/buttons.module.ts b/src/buttons/buttons.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/buttons/package.json b/src/buttons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/buttons",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/carousel/carousel.module.ts b/src/carousel/carousel.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/carousel/package.json b/src/carousel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/carousel",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/chronos/package.json b/src/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/chronos",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/collapse/collapse.module.ts b/src/collapse/collapse.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { ModuleWithProviders, NgModule } from '@angular/core';
 
 import { CollapseDirective } from './collapse.directive';
 
@@ -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: []
+    };
   }
 }
diff --git a/src/collapse/package.json b/src/collapse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/collapse",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/component-loader/package.json b/src/component-loader/package.json
@@ -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"
 }
diff --git a/src/datepicker/bs-datepicker.module.ts b/src/datepicker/bs-datepicker.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/datepicker/package.json b/src/datepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/datepicker",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/dropdown/bs-dropdown.module.ts b/src/dropdown/bs-dropdown.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/dropdown/package.json b/src/dropdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/dropdown",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/focus-trap/focus-trap.module.ts b/src/focus-trap/focus-trap.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/focus-trap/package.json b/src/focus-trap/package.json
@@ -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"
 }
diff --git a/src/locale/package.json b/src/locale/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/locale",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/mini-ngrx/package.json b/src/mini-ngrx/package.json
@@ -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"
 }
diff --git a/src/modal/package.json b/src/modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/modal",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/pagination/package.json b/src/pagination/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/pagination",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/pagination/pagination.module.ts b/src/pagination/pagination.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/popover/package.json b/src/popover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/popover",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/popover/popover.module.ts b/src/popover/popover.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/positioning/package.json b/src/positioning/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/positioning",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/progressbar/package.json b/src/progressbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/progressbar",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/progressbar/progressbar.module.ts b/src/progressbar/progressbar.module.ts
@@ -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';
@@ -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: []
+    };
   }
 }
diff --git a/src/rating/package.json b/src/rating/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap/rating",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "license": "MIT"
 }
diff --git a/src/rating/rating.module.ts b/src/rating/rating.module.ts
diff --git a/src/root/package.json b/src/root/package.json
diff --git a/src/schematics/package.json b/src/schematics/package.json
diff --git a/src/schematics/src/utils/current_dependency_versions.json b/src/schematics/src/utils/current_dependency_versions.json
diff --git a/src/sortable/package.json b/src/sortable/package.json
diff --git a/src/sortable/sortable.module.ts b/src/sortable/sortable.module.ts
diff --git a/src/tabs/package.json b/src/tabs/package.json
diff --git a/src/tabs/tabs.module.ts b/src/tabs/tabs.module.ts
diff --git a/src/timepicker/package.json b/src/timepicker/package.json
diff --git a/src/timepicker/timepicker.module.ts b/src/timepicker/timepicker.module.ts
diff --git a/src/tooltip/package.json b/src/tooltip/package.json
diff --git a/src/tooltip/tooltip.module.ts b/src/tooltip/tooltip.module.ts
diff --git a/src/typeahead/package.json b/src/typeahead/package.json
diff --git a/src/typeahead/typeahead.module.ts b/src/typeahead/typeahead.module.ts
diff --git a/src/utils/package.json b/src/utils/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "18.1.0"`
	`2`	`+ "version": "18.1.1"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ngx-bootstrap-base",`
`3`		`- "version": "18.1.0",`
	`3`	`+ "version": "18.1.1",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"author": "Dmitriy Shekhovtsov <[email protected]>",`
`6`	`6`	`"schematics": "./schematics/src/collection.json",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ngx-bootstrap/accordion",`
`3`		`- "version": "18.1.0",`
	`3`	`+ "version": "18.1.1",`
`4`	`4`	`"author": "Dmitriy Shekhovtsov <[email protected]>",`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ngx-bootstrap/alert",`
`3`		`- "version": "18.1.0",`
	`3`	`+ "version": "18.1.1",`
`4`	`4`	`"author": "Dmitriy Shekhovtsov <[email protected]>",`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ngx-bootstrap/buttons",`
`3`		`- "version": "18.1.0",`
	`3`	`+ "version": "18.1.1",`
`4`	`4`	`"author": "Dmitriy Shekhovtsov <[email protected]>",`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`