Merge branch 'development' into fix-build-warnings

Author: lexasq

.eslintrc.json

@@ -25,25 +25,22 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nx/typescript"],
+      "extends": ["plugin:@nx/typescript", "plugin:@nx/angular"],
       "parserOptions": {
         "project": "./tsconfig.*?.json"
       },
       "rules": {
         "semi": "off",
-        "@typescript-eslint/semi": ["error"],
-        "@typescript-eslint/no-extra-semi": "error",
         "no-extra-semi": "off",
-        "@angular-eslint/prefer-standalone": [
-          "off"
-        ]
+        "@typescript-eslint/no-unused-expressions": "off",
+        "@angular-eslint/prefer-standalone": "off",
+        "@angular-eslint/prefer-inject": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
       "rules": {
-        "@typescript-eslint/no-extra-semi": "error",
         "no-extra-semi": "off"
       }
     }

.github/workflows/on-push-or-pull.yml

@@ -60,9 +60,6 @@ jobs:
         with:
           path: ${{ env.CACHE_DIST_PATH }}
           key: dist-${{ github.run_id }}
-#      - run: |
-#          npx nx build ngx-bootstrap --runner=cloud --configuration=production
-#          npx nx build --runner=cloud --configuration=production
       - run: |
           npx nx build ngx-bootstrap --configuration=production
           npx nx prerender --configuration=production

.github/workflows/on-release.yml

@@ -51,8 +51,8 @@ jobs:
           path: dist
           key: dist-${{ github.run_id }}
       - run: |
-          npx nx build ngx-bootstrap --runner=cloud --configuration=production
-          npx nx prerender --runner=cloud --configuration=production
+          npx nx build ngx-bootstrap --configuration=production
+          npx nx prerender --configuration=production
 
   # update release notes in github
 #  update_release_draft:
@@ -89,7 +89,7 @@ jobs:
           key: dist-${{ github.run_id }}
 
       #      - run: npm run scully
-      - run: npx ts-node ./scripts/gh-pages-predeploy.ts
+      - run: npx tsx ./scripts/gh-pages-predeploy.ts
       - run: |
           cd gh-pages
           git config user.email gh-actions-${GITHUB_ACTOR}@github.com

README.md

@@ -179,6 +179,7 @@ Here is the version compatibility list:
 
 | ngx-bootstrap | Angular         | Bootstrap CSS           |
 |---------------|-----------------| ----------------------- |
+| 20.x.x        | 20.x.x          | 5.x.x or 4.x.x          |
 | 19.x.x        | 19.x.x          | 5.x.x or 4.x.x          |
 | 18.x.x        | 18.x.x          | 5.x.x or 4.x.x          |
 | 12.x.x        | 17.x.x          | 5.x.x or 4.x.x          |

apps/ngx-bootstrap-docs/.eslintrc.json

@@ -12,7 +12,6 @@
         "*.ts"
       ],
       "extends": [
-        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -37,9 +36,6 @@
             "style": "kebab-case"
           }
         ],
-        "@angular-eslint/prefer-standalone": [
-          "off"
-        ],
         "@typescript-eslint/no-explicit-any": 0,
         "@angular-eslint/component-class-suffix": 0,
         "@angular-eslint/no-output-on-prefix": 0

apps/ngx-bootstrap-docs/src/assets/json/current-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "19.0.3"
+  "version": "20.0.1"
 }

libs/common-docs/.eslintrc.json

@@ -11,7 +11,6 @@
         "*.ts"
       ],
       "extends": [
-        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -35,9 +34,6 @@
             "prefix": "ngx-bootstrap-base",
             "style": "kebab-case"
           }
-        ],
-        "@angular-eslint/prefer-standalone": [
-          "off"
         ]
       }
     },

libs/common-docs/src/lib/docs-section/docs-section.component.ts

@@ -1,7 +1,6 @@
 import { ContentSection } from '../models/content-section.model';
-import { ChangeDetectorRef, Component, Injector, Input, OnDestroy } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Router, NavigationExtras } from '@angular/router';
-import { Subscription } from 'rxjs';
+import { ChangeDetectorRef, Component, Injector, Input } from '@angular/core';
+import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
 
 const availableTabsPaths = ['overview', 'api', 'examples'] as const;
 type AvailableTabsPathsType = typeof availableTabsPaths[number];
@@ -11,7 +10,7 @@ type AvailableTabsPathsType = typeof availableTabsPaths[number];
   selector: 'docs-section',
 
   template: `
-    <ng-container *ngIf="content">
+    @if (content) {
       <tabset class="example-tabset-box">
         <tab heading="Overview" [customClass]="'example-tabset'" [active]="overview" (selectTab)="onSelect('overview')">
           <ng-container *ngComponentOutlet="content[0].outlet; injector: sectionInjections(content[0])"></ng-container>
@@ -24,14 +23,13 @@ type AvailableTabsPathsType = typeof availableTabsPaths[number];
         </tab>
       </tabset>
       <add-nav class="add-nav" [componentContent]="overview ? content[0] : api ? content[1] : content[2]"></add-nav>
-    </ng-container>
+    }
   `,
   standalone: false
 })
-export class DocsSectionComponent implements OnDestroy {
+export class DocsSectionComponent {
   @Input() content: ContentSection[] | undefined;
   _injectors = new Map<ContentSection, Injector>();
-  routeSubscription: Subscription;
   overview = false;
   api = false;
   examples = false;
@@ -42,11 +40,8 @@ export class DocsSectionComponent implements OnDestroy {
     private router: Router,
     private changeDetection: ChangeDetectorRef
   ) {
-    this.routeSubscription = this.router.events.subscribe((event) => {
-      if (event instanceof NavigationEnd) {
-        const params = this.router.parseUrl(event.url).queryParams;
-        this.initActiveTab(params['tab']?.toString());
-      }
+    this.activatedRoute.queryParamMap.subscribe((params) => {
+      this.initActiveTab(params.get('tab')?.toString());
     });
   }
 
@@ -59,7 +54,6 @@ export class DocsSectionComponent implements OnDestroy {
     }
 
     this[activeTab as AvailableTabsPathsType] = true;
-    this.changeDetection.detectChanges();
   }
 
   checkActiveTab(activeTab: string): boolean {
@@ -99,8 +93,4 @@ export class DocsSectionComponent implements OnDestroy {
     this.api = false;
     this.examples = false;
   }
-
-  ngOnDestroy() {
-    this.routeSubscription.unsubscribe();
-  }
 }

libs/doc-pages/accordion/.eslintrc.json

@@ -11,7 +11,6 @@
         "*.ts"
       ],
       "extends": [
-        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -35,9 +34,6 @@
             "prefix": "ngx-bootstrap-base",
             "style": "kebab-case"
           }
-        ],
-        "@angular-eslint/prefer-standalone": [
-          "off"
         ]
       }
     },

libs/doc-pages/alerts/.eslintrc.json

@@ -11,7 +11,6 @@
         "*.ts"
       ],
       "extends": [
-        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -35,9 +34,6 @@
             "prefix": "ngx-bootstrap-base",
             "style": "kebab-case"
           }
-        ],
-        "@angular-eslint/prefer-standalone": [
-          "off"
         ]
       }
     },