diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 4db45a4896..8b7d5e1349 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -66,7 +66,7 @@ "@angular/platform-browser-dynamic": "~17.0.0", "@angular/router": "~17.0.0", "@fortawesome/fontawesome-free": "^6.0.0", - "@ng-bootstrap/ng-bootstrap": "^15.0.0", + "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.0", "@ngneat/spectator": "^15.0.0", "@ngx-validate/core": "^0.2.0", "@nx/angular": "~17.1.0", @@ -115,7 +115,7 @@ "postcss-url": "10.1.3", "prettier": "2.7.1", "protractor": "~7.0.0", - "rxjs": "7.8.1", + "rxjs": "~7.8.0", "should-quote": "^1.0.0", "ts-jest": "29.1.0", "ts-node": "10.9.1", diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index ba54517fbb..d28159d838 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -9,7 +9,7 @@ "dependencies": { "@abp/ng.core": "~7.4.2", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "^15.0.0", + "@ng-bootstrap/ng-bootstrap": "^16.0.0-rc.0", "@ngx-validate/core": "^0.2.0", "@popperjs/core": "~2.11.2", "@swimlane/ngx-datatable": "^20.0.0", diff --git a/templates/.yarnrc b/templates/.yarnrc new file mode 100644 index 0000000000..0bcfa81fd9 --- /dev/null +++ b/templates/.yarnrc @@ -0,0 +1 @@ +"@abp:registry" "https://www.myget.org/F/abp-nightly/npm/" diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index 4cf64e3a86..dced62779e 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,44 +12,44 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@abp/ng.theme.lepton-x": "~2.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "rxjs": "~7.4.0", + "@abp/ng.account": "~7.4.0", + "@abp/ng.components": "~7.4.0", + "@abp/ng.core": "~7.4.0", + "@abp/ng.oauth": "~7.4.0", + "@abp/ng.identity": "~7.4.0", + "@abp/ng.setting-management": "~7.4.0", + "@abp/ng.tenant-management": "~7.4.0", + "@abp/ng.theme.shared": "~7.4.0", + "@abp/ng.theme.lepton-x": "~2.4.1", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "rxjs": "~7.8.0", "tslib": "^2.1.0", "bootstrap-icons": "~1.8.3", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@abp/ng.schematics": "~7.4.0", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -57,7 +57,7 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "ng-packagr": "~16.2.0", - "typescript": "~5.0.4" + "ng-packagr": "~17.0.0", + "typescript": "~5.2.0" } } diff --git a/templates/app-nolayers/angular/src/app/home/home.component.html b/templates/app-nolayers/angular/src/app/home/home.component.html index 14accbdf36..5336e56c18 100644 --- a/templates/app-nolayers/angular/src/app/home/home.component.html +++ b/templates/app-nolayers/angular/src/app/home/home.component.html @@ -1,35 +1,48 @@
-
- {{ '::Welcome_Title' | abpLocalization }} -
+
+ {{ '::Welcome_Title' | abpLocalization }} +
- {{ '::Welcome_Text' | abpLocalization }} + @if(!hasLoggedIn){ + + } + +

{{ '::Welcome_Text' | abpLocalization }}

- +
THE OFFICIAL GUIDE

Mastering ABP Framework

-

Written by the creator of the ABP Framework, this book will help you gain a complete - understanding of the framework and modern web application development techniques.

+

+ Written by the creator of the ABP Framework, this book will help you gain a complete + understanding of the framework and modern web application development techniques. +

diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index 530abe4097..64cfc81ecf 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,44 +12,44 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@abp/ng.theme.lepton-x": "~2.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "bootstrap-icons": "~1.8.3", - "rxjs": "~7.4.0", - "tslib": "^2.1.0", + "@abp/ng.account": "~7.4.0", + "@abp/ng.components": "~7.4.0", + "@abp/ng.core": "~7.4.0", + "@abp/ng.identity": "~7.4.0", + "@abp/ng.oauth": "~7.4.0", + "@abp/ng.setting-management": "~7.4.0", + "@abp/ng.tenant-management": "~7.4.0", + "@abp/ng.theme.lepton-x": "~2.4.0", + "@abp/ng.theme.shared": "~7.4.0", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "bootstrap-icons": "~1.8.0", + "rxjs": "~7.8.0", + "tslib": "^2.0.0", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@abp/ng.schematics": "~7.4.0", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -57,6 +57,6 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.0.4" + "typescript": "~5.2.0" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 5f1897d16e..a1765b24d2 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -12,43 +12,43 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.4.2", - "@abp/ng.components": "~7.4.2", - "@abp/ng.core": "~7.4.2", - "@abp/ng.oauth": "~7.4.2", - "@abp/ng.identity": "~7.4.2", - "@abp/ng.setting-management": "~7.4.2", - "@abp/ng.tenant-management": "~7.4.2", - "@abp/ng.theme.basic": "~7.4.2", - "@abp/ng.theme.shared": "~7.4.2", - "@angular/animations": "~16.2.0", - "@angular/common": "~16.2.0", - "@angular/compiler": "~16.2.0", - "@angular/core": "~16.2.0", - "@angular/forms": "~16.2.0", - "@angular/localize": "~16.2.0", - "@angular/platform-browser": "~16.2.0", - "@angular/platform-browser-dynamic": "~16.2.0", - "@angular/router": "~16.2.0", - "rxjs": "~7.4.0", + "@abp/ng.account": "~7.4.0", + "@abp/ng.components": "~7.4.0", + "@abp/ng.core": "~7.4.0", + "@abp/ng.identity": "~7.4.0", + "@abp/ng.oauth": "~7.4.0", + "@abp/ng.setting-management": "~7.4.0", + "@abp/ng.tenant-management": "~7.4.0", + "@abp/ng.theme.basic": "~7.4.0", + "@abp/ng.theme.shared": "~7.4.0", + "@angular/animations": "~17.0.0", + "@angular/common": "~17.0.0", + "@angular/compiler": "~17.0.0", + "@angular/core": "~17.0.0", + "@angular/forms": "~17.0.0", + "@angular/localize": "~17.0.0", + "@angular/platform-browser": "~17.0.0", + "@angular/platform-browser-dynamic": "~17.0.0", + "@angular/router": "~17.0.0", + "rxjs": "~7.8.0", "tslib": "^2.1.0", "zone.js": "~0.13.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~16.2.0", - "@angular-eslint/builder": "~16.2.0", - "@angular-eslint/eslint-plugin": "~16.2.0", - "@angular-eslint/eslint-plugin-template": "~16.2.0", - "@angular-eslint/schematics": "~16.2.0", - "@angular-eslint/template-parser": "~16.2.0", - "@abp/ng.schematics": "~7.4.2", - "@angular/cli": "~16.2.0", - "@angular/compiler-cli": "~16.2.0", - "@angular/language-service": "~16.2.0", + "@abp/ng.schematics": "~7.4.0", + "@angular-devkit/build-angular": "~17.0.0", + "@angular-eslint/builder": "~17.0.0", + "@angular-eslint/eslint-plugin": "~17.0.0", + "@angular-eslint/eslint-plugin-template": "~17.0.0", + "@angular-eslint/schematics": "~17.0.0", + "@angular-eslint/template-parser": "~17.0.0", + "@angular/cli": "~17.0.0", + "@angular/compiler-cli": "~17.0.0", + "@angular/language-service": "~17.0.0", "@types/jasmine": "~3.6.0", "@types/node": "^12.11.1", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", + "@typescript-eslint/eslint-plugin": "6.9.1", + "@typescript-eslint/parser": "6.9.1", "eslint": "^8.23.0", "jasmine-core": "~4.0.0", "karma": "~6.3.0", @@ -56,6 +56,7 @@ "karma-coverage": "~2.1.0", "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", - "typescript": "~5.0.4" + "ng-packagr": "^17.0.0", + "typescript": "~5.2.0" } } diff --git a/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts b/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts index 75934a9b70..f676a219d9 100644 --- a/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts +++ b/templates/module/angular/projects/my-project-name/src/lib/my-project-name-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { DynamicLayoutComponent } from '@abp/ng.core'; +import { RouterOutletComponent } from '@abp/ng.core'; import { Routes, RouterModule } from '@angular/router'; import { MyProjectNameComponent } from './components/my-project-name.component'; @@ -7,7 +7,7 @@ const routes: Routes = [ { path: '', pathMatch: 'full', - component: DynamicLayoutComponent, + component: RouterOutletComponent, children: [ { path: '',