diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 67c3532061..e1a015dcf9 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -21,16 +21,16 @@ "@abp/ng.tenant-management": "~10.5.0-rc.1", "@abp/ng.theme.lepton-x": "~5.5.0-rc.1", "@abp/ng.theme.shared": "~10.5.0-rc.1", - "@angular/animations": "~21.2.0", - "@angular/aria": "~21.2.0", - "@angular/common": "~21.2.0", - "@angular/compiler": "~21.2.0", - "@angular/core": "~21.2.0", - "@angular/forms": "~21.2.0", - "@angular/localize": "~21.2.0", - "@angular/platform-browser": "~21.2.0", - "@angular/platform-browser-dynamic": "~21.2.0", - "@angular/router": "~21.2.0", + "@angular/animations": "~22.0.1", + "@angular/aria": "~22.0.0", + "@angular/common": "~22.0.1", + "@angular/compiler": "~22.0.1", + "@angular/core": "~22.0.1", + "@angular/forms": "~22.0.1", + "@angular/localize": "~22.0.1", + "@angular/platform-browser": "~22.0.1", + "@angular/platform-browser-dynamic": "~22.0.1", + "@angular/router": "~22.0.1", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -43,16 +43,16 @@ "@angular-eslint/eslint-plugin-template": "~21.2.0", "@angular-eslint/schematics": "~21.2.0", "@angular-eslint/template-parser": "~21.2.0", - "@angular/build": "~21.2.0", - "@angular/cli": "~21.2.0", - "@angular/compiler-cli": "~21.2.0", - "@angular/language-service": "~21.2.0", + "@angular/build": "~22.0.1", + "@angular/cli": "~22.0.1", + "@angular/compiler-cli": "~22.0.1", + "@angular/language-service": "~22.0.1", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jsdom": "^27.1.0", - "typescript": "~5.9.0", + "typescript": "~6.0.3", "vitest": "^4.0.0" } -} +} \ No newline at end of file diff --git a/templates/app-nolayers/angular/tsconfig.app.json b/templates/app-nolayers/angular/tsconfig.app.json index 264f459bf8..e2ab1e22ed 100644 --- a/templates/app-nolayers/angular/tsconfig.app.json +++ b/templates/app-nolayers/angular/tsconfig.app.json @@ -11,5 +11,14 @@ ], "exclude": [ "src/**/*.spec.ts" - ] + ], + "angularCompilerOptions": { + "extendedDiagnostics": { + "checks": { + "nullishCoalescingNotNullable": "suppress", + "optionalChainNotNullable": "suppress" + } + }, + "strictTemplates": true + } } diff --git a/templates/app-nolayers/angular/tsconfig.json b/templates/app-nolayers/angular/tsconfig.json index 9a18adaf46..bc6c6bb55d 100644 --- a/templates/app-nolayers/angular/tsconfig.json +++ b/templates/app-nolayers/angular/tsconfig.json @@ -2,7 +2,6 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -15,10 +14,10 @@ "esModuleInterop": true, "paths": { "@proxy": [ - "src/app/proxy/index.ts" + "./src/app/proxy/index.ts" ], "@proxy/*": [ - "src/app/proxy/*" + "./src/app/proxy/*" ] }, "useDefineForClassFields": false diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index a40a8c062e..48b4c4b16e 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -21,16 +21,16 @@ "@abp/ng.tenant-management": "~10.5.0-rc.1", "@abp/ng.theme.lepton-x": "~5.5.0-rc.1", "@abp/ng.theme.shared": "~10.5.0-rc.1", - "@angular/animations": "~21.2.0", - "@angular/aria": "~21.2.0", - "@angular/common": "~21.2.0", - "@angular/compiler": "~21.2.0", - "@angular/core": "~21.2.0", - "@angular/forms": "~21.2.0", - "@angular/localize": "~21.2.0", - "@angular/platform-browser": "~21.2.0", - "@angular/platform-browser-dynamic": "~21.2.0", - "@angular/router": "~21.2.0", + "@angular/animations": "~22.0.1", + "@angular/aria": "~22.0.0", + "@angular/common": "~22.0.1", + "@angular/compiler": "~22.0.1", + "@angular/core": "~22.0.1", + "@angular/forms": "~22.0.1", + "@angular/localize": "~22.0.1", + "@angular/platform-browser": "~22.0.1", + "@angular/platform-browser-dynamic": "~22.0.1", + "@angular/router": "~22.0.1", "bootstrap-icons": "~1.8.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", @@ -43,16 +43,16 @@ "@angular-eslint/eslint-plugin-template": "~21.2.0", "@angular-eslint/schematics": "~21.2.0", "@angular-eslint/template-parser": "~21.2.0", - "@angular/build": "~21.2.0", - "@angular/cli": "~21.2.0", - "@angular/compiler-cli": "~21.2.0", - "@angular/language-service": "~21.2.0", + "@angular/build": "~22.0.1", + "@angular/cli": "~22.0.1", + "@angular/compiler-cli": "~22.0.1", + "@angular/language-service": "~22.0.1", "@types/node": "~20.11.0", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jsdom": "^27.1.0", - "typescript": "~5.9.3", + "typescript": "~6.0.3", "vitest": "^4.0.0" } } diff --git a/templates/app/angular/src/app/app.config.ts b/templates/app/angular/src/app/app.config.ts index 1baf8e50ae..c73beb2b51 100644 --- a/templates/app/angular/src/app/app.config.ts +++ b/templates/app/angular/src/app/app.config.ts @@ -6,7 +6,6 @@ import { } from '@abp/ng.theme.shared'; import { ApplicationConfig } from '@angular/core'; import { provideRouter } from '@angular/router'; -import { provideAnimations } from '@angular/platform-browser/animations'; import { appRoutes } from './app.routes'; import { APP_ROUTE_PROVIDER } from './route.provider'; @@ -30,7 +29,7 @@ export const appConfig: ApplicationConfig = { withOptions({ environment, registerLocaleFn: registerLocaleForEsBuild(), - }) + }), ), provideThemeLeptonX(), provideSideMenuLayout(), @@ -40,12 +39,11 @@ export const appConfig: ApplicationConfig = { provideIdentityConfig(), provideTenantManagementConfig(), provideFeatureManagementConfig(), - provideAnimations(), provideLogo(withEnvironmentOptions(environment)), provideAbpThemeShared( withValidationBluePrint({ wrongPassword: 'Please choose 1q2w3E*', - }) + }), ), ], }; diff --git a/templates/app/angular/src/app/home/home.component.ts b/templates/app/angular/src/app/home/home.component.ts index 68e7b4db97..d1589e3705 100644 --- a/templates/app/angular/src/app/home/home.component.ts +++ b/templates/app/angular/src/app/home/home.component.ts @@ -1,13 +1,13 @@ import { AuthService, LocalizationPipe } from '@abp/ng.core'; import { Component, inject } from '@angular/core'; import { NgTemplateOutlet } from '@angular/common'; -import { DynamicFormComponent, FormFieldConfig } from '@abp/ng.components/dynamic-form'; +import { FormFieldConfig } from '@abp/ng.components/dynamic-form'; @Component({ selector: 'app-home', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], - imports: [NgTemplateOutlet, LocalizationPipe, DynamicFormComponent], + imports: [NgTemplateOutlet, LocalizationPipe], }) export class HomeComponent { private authService = inject(AuthService); diff --git a/templates/app/angular/tsconfig.app.json b/templates/app/angular/tsconfig.app.json index 264f459bf8..6c801721a6 100644 --- a/templates/app/angular/tsconfig.app.json +++ b/templates/app/angular/tsconfig.app.json @@ -6,10 +6,15 @@ "outDir": "./out-tsc/app", "types": [] }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "src/**/*.spec.ts" - ] + "include": ["src/**/*.ts"], + "exclude": ["src/**/*.spec.ts"], + "angularCompilerOptions": { + "extendedDiagnostics": { + "checks": { + "nullishCoalescingNotNullable": "suppress", + "optionalChainNotNullable": "suppress" + } + }, + "strictTemplates": true + } } diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index 9a18adaf46..902054a3ec 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -2,7 +2,6 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -14,12 +13,8 @@ "skipLibCheck": true, "esModuleInterop": true, "paths": { - "@proxy": [ - "src/app/proxy/index.ts" - ], - "@proxy/*": [ - "src/app/proxy/*" - ] + "@proxy": ["./src/app/proxy/index.ts"], + "@proxy/*": ["./src/app/proxy/*"] }, "useDefineForClassFields": false }, diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 9184f6b1cf..7f1fa75a68 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -22,39 +22,39 @@ "@abp/ng.tenant-management": "~10.5.0-rc.1", "@abp/ng.theme.basic": "~10.5.0-rc.1", "@abp/ng.theme.shared": "~10.5.0-rc.1", - "@angular/animations": "~21.2.0", - "@angular/aria": "~21.2.0", - "@angular/common": "~21.2.0", - "@angular/compiler": "~21.2.0", - "@angular/core": "~21.2.0", - "@angular/forms": "~21.2.0", - "@angular/localize": "~21.2.0", - "@angular/platform-browser": "~21.2.0", - "@angular/platform-browser-dynamic": "~21.2.0", - "@angular/router": "~21.2.0", + "@angular/animations": "~22.0.0", + "@angular/aria": "~22.0.0", + "@angular/common": "~22.0.0", + "@angular/compiler": "~22.0.0", + "@angular/core": "~22.0.0", + "@angular/forms": "~22.0.0", + "@angular/localize": "~22.0.0", + "@angular/platform-browser": "~22.0.0", + "@angular/platform-browser-dynamic": "~22.0.0", + "@angular/router": "~22.0.0", "rxjs": "~7.8.0", "tslib": "^2.0.0", "zone.js": "~0.15.0" }, "devDependencies": { "@abp/ng.schematics": "~10.5.0-rc.1", - "@angular-eslint/builder": "~21.2.0", - "@angular-eslint/eslint-plugin": "~21.2.0", - "@angular-eslint/eslint-plugin-template": "~21.2.0", - "@angular-eslint/schematics": "~21.2.0", - "@angular-eslint/template-parser": "~21.2.0", - "@angular/build": "~21.2.0", - "@angular/cli": "~21.2.0", - "@angular/compiler-cli": "~21.2.0", - "@angular/language-service": "~21.2.0", + "@angular-eslint/builder": "~22.0.0", + "@angular-eslint/eslint-plugin": "~22.0.0", + "@angular-eslint/eslint-plugin-template": "~22.0.0", + "@angular-eslint/schematics": "~22.0.0", + "@angular-eslint/template-parser": "~22.0.0", + "@angular/build": "~22.0.0", + "@angular/cli": "~22.0.0", + "@angular/compiler-cli": "~22.0.0", + "@angular/language-service": "~22.0.0", "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "7.16.0", "@typescript-eslint/parser": "7.16.0", "eslint": "^8.0.0", "jsdom": "^27.1.0", - "ng-packagr": "~21.2.0", + "ng-packagr": "~22.0.0", "symlink": "^2.0.0", - "typescript": "~5.9.0", + "typescript": "~6.0.3", "vitest": "^4.0.0" } } \ No newline at end of file diff --git a/templates/module/angular/tsconfig.json b/templates/module/angular/tsconfig.json index 2e5e466bf0..79a5e33978 100644 --- a/templates/module/angular/tsconfig.json +++ b/templates/module/angular/tsconfig.json @@ -6,13 +6,13 @@ "skipLibCheck": true, "paths": { "@my-company-name/my-project-name": [ - "projects/my-project-name/src/public-api.ts" + "./projects/my-project-name/src/public-api.ts" ], "@my-company-name/my-project-name/config": [ - "projects/my-project-name/config/src/public-api.ts" + "./projects/my-project-name/config/src/public-api.ts" ], - "@proxy": ["projects/my-project-name/src/lib/proxy/index.ts"], - "@proxy/*": ["projects/my-project-name/src/lib/proxy/*"] + "@proxy": ["./projects/my-project-name/src/lib/proxy/index.ts"], + "@proxy/*": ["./projects/my-project-name/src/lib/proxy/*"] } } } diff --git a/templates/module/angular/tsconfig.prod.json b/templates/module/angular/tsconfig.prod.json index 2f4afb8ff7..b8243f2066 100644 --- a/templates/module/angular/tsconfig.prod.json +++ b/templates/module/angular/tsconfig.prod.json @@ -1,7 +1,6 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -18,6 +17,12 @@ ], }, "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false + "extendedDiagnostics": { + "checks": { + "nullishCoalescingNotNullable": "suppress", + "optionalChainNotNullable": "suppress" + } + }, + "strictTemplates": true } }