Skip to content

Commit 172ef1b

Browse files
lexasqchergui
lexasq
and
chergui
authored
Alex chore 21 (#6792)
* 20.0.2 * Upgrade angular 21 (#6788) * chore: upgrade package * chore(ngx-bootstrap-docs): updates Angular to v21 * refactor: migrate common-docs HTML templates to Angular control flow * chore: update common-docs TypeScript configuration * fix: add type guard for event target in ExamplesComponent * chore(tsconfig): update compiler options for new build setup * refactor(accordion): migrate HTML templates to new control flow syntax * refactor(alerts): migrate HTML templates to new control flow syntax * refactor(buttons): migrate HTML templates to new control flow syntax * refactor(carousel): migrate HTML templates to new control flow syntax * refactor(datepicker): migrate HTML templates to new control flow syntax * refactor: update Angular template control flow syntax to `@for` and `@if` * chore(tsconfig): update TypeScript configuration for modern Angular * build: update root tsconfig for doc pages to support new module resolution * build: standardize and update tsconfig.lib.json for doc pages libraries * build: standardize and update tsconfig.spec.json for doc pages tests * refactor: migrate doc page templates to Angular control flow syntax * refactor(build): update TypeScript and Jest configurations * refactor(buttons): widen HostListener event types to generic Event * chore: migrate templates to built-in control flow * refactor: remove redundant @angular/common imports * chore: migrate component templates to new Angular control flow syntax * chore: modernize TypeScript and Jest configurations across libraries * test: update jest-preset-angular serializer paths * test: standardize Jest Zone.js test environment setup * refactor(jest): update configuration for Nx and jest-preset-angular * test(typeahead): update Jest 'toThrowError' to 'toThrow' matcher * fix(typeahead): correct test file formatting and syntax * chore: update package-lock.json dependencies and properties * refactor: standardize TypeScript and Jest configurations across libraries * refactor: improve event handling type safety and robustness * chore: migrate Angular templates to new control flow syntax * test(carousel): add CommonModule to carousel test component * chore: bump version to 21.0.0 * chore(release): bump project version to 21.0.0 * fix(typeahead): prevents potential null reference * fix(dependencies): fixed package.lock * fix(dependencies): fixed app.component * Update package.json * Update package-lock.json --------- Co-authored-by: Amine CHERGUI <chergui.amine@gmail.com>
1 parent 0357a3a commit 172ef1b

332 files changed

Lines changed: 25736 additions & 20072 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/ngx-bootstrap-docs/server.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'zone.js/node';
22

33
import { APP_BASE_HREF } from '@angular/common';
44
import { CommonEngine } from '@angular/ssr/node';
5-
import * as express from 'express';
5+
import express from 'express';
66
import { existsSync } from 'node:fs';
77
import { join } from 'node:path';
88
import AppServerModule from './src/main.server';
@@ -23,9 +23,12 @@ export function app(): express.Express {
2323
// Example Express Rest API endpoints
2424
// server.get('/api/**', (req, res) => { });
2525
// Serve static files from /browser
26-
server.get('*.*', express.static(distFolder, {
27-
maxAge: '1y'
28-
}));
26+
server.get(
27+
'*.*',
28+
express.static(distFolder, {
29+
maxAge: '1y'
30+
})
31+
);
2932

3033
// All regular routes use the Angular engine
3134
server.get('*', (req, res, next) => {
@@ -37,7 +40,7 @@ export function app(): express.Express {
3740
documentFilePath: indexHtml,
3841
url: `${protocol}://${headers.host}${originalUrl}`,
3942
publicPath: distFolder,
40-
providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
43+
providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }]
4144
})
4245
.then((html) => res.send(html))
4346
.catch((err) => next(err));
@@ -61,7 +64,7 @@ function run(): void {
6164
// The below code is to ensure that the server is run only when not requiring the bundle.
6265
declare const __non_webpack_require__: NodeRequire;
6366
const mainModule = __non_webpack_require__.main;
64-
const moduleFilename = mainModule && mainModule.filename || '';
67+
const moduleFilename = (mainModule && mainModule.filename) || '';
6568
if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
6669
run();
6770
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<top-menu></top-menu>
2-
<sidebar id="sidebar" *ngIf="showSidebar" class="sidebar"></sidebar>
2+
@if (showSidebar) {
3+
<sidebar id="sidebar" class="sidebar"></sidebar>
4+
}
35
<router-outlet></router-outlet>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export class AppComponent implements AfterContentInit {
2323

2424
// almost same logic exists in top-menu component
2525
ngAfterContentInit(): any {
26+
if (typeof window === 'undefined') return;
2627
this.analytics.trackPageViews();
2728
const getUrl = (router: Router) =>
2829
router.routerState.snapshot.url.slice(0, router.routerState.snapshot.url.indexOf('#'));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "20.0.2"
2+
"version": "21.0.0"
33
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { enableProdMode } from '@angular/core';
1+
import { enableProdMode, provideZoneChangeDetection } from '@angular/core';
22
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
33

44
import { AppModule } from './app/app.module';
@@ -9,5 +9,5 @@ if (environment.production) {
99
}
1010

1111
platformBrowserDynamic()
12-
.bootstrapModule(AppModule)
12+
.bootstrapModule(AppModule, { applicationProviders: [provideZoneChangeDetection()], })
1313
.catch((err) => console.error(err));

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
import 'jest-preset-angular/setup-jest';
1+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
2+
3+
setupZoneTestEnv();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"files": [],
4-
"include": [
5-
"./src/typings.d.ts"
6-
],
4+
"include": ["./src/typings.d.ts"],
75
"references": [
86
{
97
"path": "./tsconfig.app.json"
@@ -16,6 +14,8 @@
1614
}
1715
],
1816
"compilerOptions": {
19-
"target": "es2022"
17+
"target": "es2022",
18+
"module": "preserve",
19+
"moduleResolution": "bundler"
2020
}
2121
}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
/* To learn more about this file see: https://angular.io/config/tsconfig. */
21
{
32
"extends": "./tsconfig.app.json",
43
"compilerOptions": {
54
"outDir": "../../out-tsc/server",
6-
"types": [
7-
"node"
8-
]
5+
"types": ["node"],
6+
"module": "preserve",
7+
"moduleResolution": "bundler"
98
},
10-
"files": [
11-
"src/main.server.ts",
12-
"server.ts"
13-
]
9+
"files": ["src/main.server.ts", "server.ts"]
1410
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"module": "commonjs",
6-
"types": ["jest", "node"]
5+
"module": "preserve",
6+
"types": ["jest", "node"],
7+
"moduleResolution": "bundler",
8+
"isolatedModules": true
79
},
810
"files": ["src/test-setup.ts"],
911
"include": ["**/*.spec.ts", "**/*.d.ts"]

‎jest.config.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
const { getJestProjects } = require('@nx/jest');
1+
import { getJestProjectsAsync } from '@nx/jest';
22

3-
export default {
4-
setupFilesAfterEnv: ['<rootDir>/scripts/jest/toHaveCssClass.ts'],
5-
projects: getJestProjects()
6-
};
3+
export default async () => ({
4+
projects: [
5+
...(await getJestProjectsAsync()),
6+
],
7+
setupFilesAfterEnv: ['<rootDir>/scripts/jest/toHaveCssClass.ts'],
8+
});

0 commit comments

Comments
 (0)