Merge branch 'development' into patch-3

Author: coliff

.eslintrc.json

@@ -33,7 +33,10 @@
         "semi": "off",
         "@typescript-eslint/semi": ["error"],
         "@typescript-eslint/no-extra-semi": "error",
-        "no-extra-semi": "off"
+        "no-extra-semi": "off",
+        "@angular-eslint/prefer-standalone": [
+          "off"
+        ]
       }
     },
     {

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

@@ -26,7 +26,7 @@ env:
 jobs:
   # one run
   one_run:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -35,7 +35,7 @@ jobs:
 
   # install dependencies
   install:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: one_run
     steps:
       - uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
   # build ngx-bootstrap
   build:
     needs: install
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
@@ -61,14 +61,17 @@ 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 --runner=cloud --configuration=production
-          npx nx build --runner=cloud --configuration=production
+          npx nx build ngx-bootstrap --configuration=production
+          npx nx prerender --configuration=production
 
 
   # run unit tests
   unit_tests_with_coverage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
     steps:
       - uses: actions/checkout@v3
@@ -80,25 +83,27 @@ jobs:
         with:
           path: ${{ env.CACHE_DIST_PATH }}
           key: dist-${{ github.run_id }}
-      - run: npm test -- --runner=cloud --codeCoverage
+#      - run: npm test -- --runner=cloud --codeCoverage
+      - run: npm test -- --codeCoverage
       - run: npx codecov ./coverage/
         continue-on-error: true
 
   # run linting
   linting:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: install
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
           path: ${{ env.CACHE_NODE_MODULES_PATH }}
           key: node_modules-${{ hashFiles('**/package-lock.json') }}
-      - run: npm run lint -- --runner=cloud
+#      - run: npm run lint -- --runner=cloud
+      - run: npm run lint --
 
   # firebase deploy preview
   firebase_preview:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
     outputs:
       output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
@@ -121,7 +126,7 @@ jobs:
   # run playwright
   e2e_smoke:
     name: e2e smoke (${{ matrix.shard }}/${{ strategy.job-total }})
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [install, build, firebase_preview]
 
     strategy:
@@ -146,13 +151,13 @@ jobs:
 
       - name: smoke e2e on firebase
         if: ${{ needs.firebase_preview.outputs.output_url }}
-        run:  PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+        run: PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
 
       - name: smoke e2e local
         if: ${{ !needs.firebase_preview.outputs.output_url }}
         run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --shard=${{ matrix.shard }}/${{ strategy.job-total }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report-smoke-${{ matrix.shard }}_${{ strategy.job-total }}
@@ -161,7 +166,7 @@ jobs:
 
   e2e_full:
     name: e2e full
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [e2e_smoke]
 
     strategy:
@@ -194,7 +199,7 @@ jobs:
         continue-on-error: true
         run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --shard=${{ matrix.shard }}/${{ strategy.job-total }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report-full-${{ matrix.shard }}_${{ strategy.job-total }}

.github/workflows/on-release.yml

@@ -52,7 +52,7 @@ jobs:
           key: dist-${{ github.run_id }}
       - run: |
           npx nx build ngx-bootstrap --runner=cloud --configuration=production
-          npx ng build --runner=cloud --configuration=production
+          npx nx prerender --runner=cloud --configuration=production
 
   # update release notes in github
 #  update_release_draft:

.gitignore

@@ -42,6 +42,7 @@ Thumbs.db
 
 firebase-debug.log
 .nx-cache
+.nx
 scully.log
 /.angular
 /.scully
@@ -59,4 +60,4 @@ scully.log
 
 migration.json
 
-.nx/cache
+.nx/cache

README.md

@@ -178,7 +178,8 @@ The only two dependencies are [Angular](https://angular.io) and [Bootstrap](http
 Here is the version compatibility list:
 
 | ngx-bootstrap | Angular         | Bootstrap CSS           |
-|---------------| --------------- | ----------------------- |
+|---------------|-----------------| ----------------------- |
+| 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          |
 | 11.x.x        | 16.x.x          | 5.x.x or 4.x.x          |

apps/ngx-bootstrap-docs-e2e/playwright.config.ts

@@ -5,6 +5,7 @@ export default defineConfig({
   testMatch: '**/*.spec.ts',
   fullyParallel: true,
   workers: 3,
+
   reporter: [['html', { outputFolder: 'playwright-report', open: 'never' }]],
   use: {
     baseURL: process.env['PLAYWRIGHT_TEST_BASE_URL'] || 'http://localhost:4200/ngx-bootstrap/',

apps/ngx-bootstrap-docs-e2e/project.json

@@ -4,11 +4,15 @@
   "sourceRoot": "apps/ngx-bootstrap-docs-e2e/src",
   "projectType": "application",
   "tags": [],
-  "implicitDependencies": ["ngx-bootstrap-docs"],
+  "implicitDependencies": [
+    "ngx-bootstrap-docs"
+  ],
   "targets": {
     "e2e": {
       "executor": "@nxkit/playwright:test",
-      "outputs": ["{options.outputPath}"],
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "outputPath": "dist/apps/ngx-bootstrap-docs-e2e/test-results",
         "playwrightConfig": "apps/ngx-bootstrap-docs-e2e/playwright.config.ts",
@@ -24,8 +28,10 @@
       }
     },
     "debug": {
-      "builder": "@nxkit/playwright:test",
-      "outputs": ["{options.outputPath}"],
+      "executor": "@nxkit/playwright:test",
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "outputPath": "dist/apps/ngx-bootstrap-docs-e2e/test-results",
         "playwrightConfig": "apps/ngx-bootstrap-docs-e2e/playwright.config.ts",
@@ -39,14 +45,16 @@
       }
     },
     "show-report": {
-      "builder": "@nxkit/playwright:show-report",
+      "executor": "@nxkit/playwright:show-report",
       "options": {
         "reportPath": "dist/apps/ngx-bootstrap-docs-e2e/playwright-report"
       }
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputPath}"]
+      "outputs": [
+        "{options.outputPath}"
+      ]
     }
   }
-}
+}

apps/ngx-bootstrap-docs-e2e/src/support/accordion.po.ts

@@ -2,7 +2,7 @@ import { expect, ConsoleMessage } from '@playwright/test';
 import { BasePo } from './base.po';
 
 export class AccordionPo extends BasePo {
-  override pageUrl = '#/components/accordion';
+  override pageUrl = '/ngx-bootstrap/components/accordion';
   pageTitle = 'Accordion';
   ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/accordion';
   additionalHtml = '.badge';
@@ -38,10 +38,12 @@ export class AccordionPo extends BasePo {
   }
 
   async clickOnAccordionGroup(baseSelector: string, itemIndex: number) {
-    await this.page
+    const accordionButton = this.page
       .locator(baseSelector + ' accordion-group button')
-      .nth(itemIndex)
-      .click();
+      .nth(itemIndex);
+    
+    await accordionButton.waitFor({ state: 'visible', timeout: 10000 });
+    await accordionButton.click();
   }
 
   async expectItemContentVisible(baseSelector: string, itemIndex: number, visible: boolean) {

apps/ngx-bootstrap-docs-e2e/src/support/alerts.po.ts

@@ -2,7 +2,7 @@ import { expect } from '@playwright/test';
 import { BasePo } from './base.po';
 
 export class AlertsPo extends BasePo {
-  override pageUrl = '#/components/alerts';
+  override pageUrl = '/ngx-bootstrap/components/alerts';
   pageTitle = 'Alerts';
   ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/alert';
 
@@ -31,10 +31,10 @@ export class AlertsPo extends BasePo {
     local: '.alert-md-local',
   };
 
-  async expectAlertVisible(baseSelector: string, alertType: string, visible = true, timeout = 5000) {
-    await expect(await this.page
-      .locator(baseSelector + ` ${this.alertType[alertType]}`)
-    ).toBeVisible({ timeout: timeout, visible: visible });
+  async expectAlertVisible(baseSelector: string, alertType: string, visible = true, timeout = 10000) {
+    const alertElement = this.page.locator(baseSelector + ` ${this.alertType[alertType]}`);
+    await alertElement.waitFor({ state: visible ? 'visible' : 'hidden', timeout: timeout });
+    await expect(alertElement).toBeVisible({ visible: visible });
   }
 
   async expectBtnNotExist(baseSelector: string, buttonName: string) {

apps/ngx-bootstrap-docs-e2e/src/support/base.po.ts

@@ -16,6 +16,13 @@ export class BasePo {
   async navigateTo() {
     const bsVersionRoute = process.env['bsVersion'] ? `?_bsVersion=bs${process.env['bsVersion']}` : '';
     await this.page.goto(this.pageUrl + bsVersionRoute);
+    await this.page.waitForLoadState('domcontentloaded');
+    // Ensure Overview tab is active by clicking on it
+    const overviewTab = this.page.locator('a[aria-selected="false"]').getByText('Overview');
+    if (await overviewTab.isVisible()) {
+      await overviewTab.click();
+      await this.page.waitForTimeout(1000); // Wait for tab content to load
+    }
   }
 
   async scrollToMenu(menuTxt: string) {