Merge branch 'development' into patch-3

Author: coliff

apps/ngx-bootstrap-docs/server.ts

@@ -2,7 +2,7 @@ import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
 import { CommonEngine } from '@angular/ssr/node';
-import * as express from 'express';
+import express from 'express';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import AppServerModule from './src/main.server';
@@ -23,9 +23,12 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(distFolder, {
-    maxAge: '1y'
-  }));
+  server.get(
+    '*.*',
+    express.static(distFolder, {
+      maxAge: '1y'
+    })
+  );
 
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
@@ -37,7 +40,7 @@ export function app(): express.Express {
         documentFilePath: indexHtml,
         url: `${protocol}://${headers.host}${originalUrl}`,
         publicPath: distFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
+        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }]
       })
       .then((html) => res.send(html))
       .catch((err) => next(err));
@@ -61,7 +64,7 @@ function run(): void {
 // The below code is to ensure that the server is run only when not requiring the bundle.
 declare const __non_webpack_require__: NodeRequire;
 const mainModule = __non_webpack_require__.main;
-const moduleFilename = mainModule && mainModule.filename || '';
+const moduleFilename = (mainModule && mainModule.filename) || '';
 if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }

apps/ngx-bootstrap-docs/src/app/app.component.html

@@ -1,3 +1,5 @@
 <top-menu></top-menu>
-<sidebar id="sidebar" *ngIf="showSidebar" class="sidebar"></sidebar>
+@if (showSidebar) {
+  <sidebar id="sidebar" class="sidebar"></sidebar>
+}
 <router-outlet></router-outlet>

apps/ngx-bootstrap-docs/src/app/app.component.ts

@@ -23,6 +23,7 @@ export class AppComponent implements AfterContentInit {
 
   // almost same logic exists in top-menu component
   ngAfterContentInit(): any {
+    if (typeof window === 'undefined') return;
     this.analytics.trackPageViews();
     const getUrl = (router: Router) =>
       router.routerState.snapshot.url.slice(0, router.routerState.snapshot.url.indexOf('#'));

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

@@ -1,3 +1,3 @@
 {
-  "version": "20.0.2"
+  "version": "21.0.1"
 }

apps/ngx-bootstrap-docs/src/main.ts

@@ -1,4 +1,4 @@
-import { enableProdMode } from '@angular/core';
+import { enableProdMode, provideZoneChangeDetection } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
@@ -9,5 +9,5 @@ if (environment.production) {
 }
 
 platformBrowserDynamic()
-  .bootstrapModule(AppModule)
+  .bootstrapModule(AppModule, { applicationProviders: [provideZoneChangeDetection()], })
   .catch((err) => console.error(err));

apps/ngx-bootstrap-docs/src/test-setup.ts

@@ -1 +1,3 @@
-import 'jest-preset-angular/setup-jest';
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
+
+setupZoneTestEnv();

apps/ngx-bootstrap-docs/tsconfig.json

@@ -1,9 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "files": [],
-  "include": [
-    "./src/typings.d.ts"
-  ],
+  "include": ["./src/typings.d.ts"],
   "references": [
     {
       "path": "./tsconfig.app.json"
@@ -16,6 +14,8 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2022"
+    "target": "es2022",
+    "module": "preserve",
+    "moduleResolution": "bundler"
   }
 }

apps/ngx-bootstrap-docs/tsconfig.server.json

@@ -1,14 +1,10 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/server",
-    "types": [
-      "node"
-    ]
+    "types": ["node"],
+    "module": "preserve",
+    "moduleResolution": "bundler"
   },
-  "files": [
-    "src/main.server.ts",
-    "server.ts"
-  ]
+  "files": ["src/main.server.ts", "server.ts"]
 }

apps/ngx-bootstrap-docs/tsconfig.spec.json

@@ -2,8 +2,10 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
+    "module": "preserve",
+    "types": ["jest", "node"],
+    "moduleResolution": "bundler",
+    "isolatedModules": true
   },
   "files": ["src/test-setup.ts"],
   "include": ["**/*.spec.ts", "**/*.d.ts"]

jest.config.ts

@@ -1,6 +1,8 @@
-const { getJestProjects } = require('@nx/jest');
+import { getJestProjectsAsync } from '@nx/jest';
 
-export default {
-  setupFilesAfterEnv: ['<rootDir>/scripts/jest/toHaveCssClass.ts'],
-  projects: getJestProjects()
-};
+export default async () => ({
+  projects: [
+    ...(await getJestProjectsAsync()),
+  ],
+   setupFilesAfterEnv: ['<rootDir>/scripts/jest/toHaveCssClass.ts'],
+});