Merge pull request #18170 from abpframework/masum/update-template

Update angular versions in templates & packages

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",

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",

templates/.yarnrc

@@ -0,0 +1 @@
+"@abp:registry" "https://www.myget.org/F/abp-nightly/npm/"

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"
   }
 }

templates/app-nolayers/angular/src/app/home/home.component.html

@@ -1,35 +1,48 @@
 <div class="container">
   <div class="card">
     <div class="card-header">
-        <h5 class="card-title">
-            {{ '::Welcome_Title' | abpLocalization }}
-        </h5>
+      <h5 class="card-title">
+        {{ '::Welcome_Title' | abpLocalization }}
+      </h5>
     </div>
     <div class="card-body">
-        {{ '::Welcome_Text' | abpLocalization }}
+      @if(!hasLoggedIn){
+        <button class="btn btn-primary mb-2" (click)="login()">{{ 'AbpUi::Login' | abpLocalization }}</button>
+      }
+      
+      <p>{{ '::Welcome_Text' | abpLocalization }}</p>
     </div>
   </div>
   <div class="card mt-5">
     <div class="card-body">
       <div class="row">
         <div class="col-md-auto text-center">
-          <img src="https://abp.io/assets/png/mastering-abp-framework.webp" style="max-width: 400px;"
-               class="w-100 mb-5 my-md-3">
+          <img
+            src="https://abp.io/assets/png/mastering-abp-framework.webp"
+            style="max-width: 400px"
+            class="w-100 mb-5 my-md-3"
+          />
         </div>
         <div class="col-md d-flex align-items-center">
           <div class="pe-0 pe-md-4">
             <small class="text-uppercase text-muted">THE OFFICIAL GUIDE</small>
             <h2 class="mb-4">Mastering ABP Framework</h2>
-            <p class="mb-4">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.</p>
+            <p class="mb-4">
+              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.
+            </p>
             <div class="mb-4">
-              <a href="https://www.amazon.com/gp/product/B097Z2DM8Q/ref=dbs_a_def_rwt_hsch_vapi_tkin_p1_i0"
-                 class="btn btn-success mb-1">
+              <a
+                href="https://www.amazon.com/gp/product/B097Z2DM8Q/ref=dbs_a_def_rwt_hsch_vapi_tkin_p1_i0"
+                class="btn btn-success mb-1"
+              >
                 Buy on Amazon US
               </a>
               &nbsp;
-              <a href="https://www.packtpub.com/product/mastering-abp-framework/9781801079242"
-                 class="btn btn-primary mb-1">
+              <a
+                href="https://www.packtpub.com/product/mastering-abp-framework/9781801079242"
+                class="btn btn-primary mb-1"
+              >
                 Buy on PACKT
               </a>
             </div>

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"
   }
 }

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"
   }
 }

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: '',