ng-alain 16.2.0 → 16.3.0

package/application/files/root/.eslintrc.js

@@ -113,7 +113,9 @@ module.exports = {
     {
       files: ['*.html'],
       extends: ['plugin:@angular-eslint/template/recommended'],
-      rules: {}
+      rules: {
+        "@angular-eslint/template/prefer-self-closing-tags": "error"
+      }
     },
     {
       files: ['*.html'],

package/application/files/src/app/app.component.ts

@@ -7,7 +7,7 @@ import { VERSION as VERSION_ZORRO } from 'ng-zorro-antd/version';
 
 @Component({
   selector: 'app-root',
-  template: ` <router-outlet></router-outlet> `
+  template: ` <router-outlet />`
 })
 export class AppComponent implements OnInit {
   constructor(

package/application/files/src/app/layout/basic/widgets/user.component.ts

@@ -7,7 +7,7 @@ import { SettingsService, User } from '@delon/theme';
   selector: 'header-user',
   template: `
     <div class="alain-default__nav-item d-flex align-items-center px-sm" nz-dropdown nzPlacement="bottomRight" [nzDropdownMenu]="userMenu">
-      <nz-avatar [nzSrc]="user.avatar" nzSize="small" class="mr-sm"></nz-avatar>
+      <nz-avatar [nzSrc]="user.avatar" nzSize="small" class="mr-sm" />
       {{ user.name }}
     </div>
     <nz-dropdown-menu #userMenu="nzDropdownMenu">

package/application/files/src/app/layout/blank/blank.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'layout-blank',
-  template: `<router-outlet></router-outlet> `,
+  template: `<router-outlet />`,
   host: {
     '[class.alain-blank]': 'true'
   }

package/application/files/src/app/routes/exception/exception.component.ts

@@ -4,7 +4,7 @@ import { ExceptionType } from '@delon/abc/exception';
 
 @Component({
   selector: 'app-exception',
-  template: ` <exception [type]="type" style="min-height: 500px; height: 80%;"> </exception> `,
+  template: ` <exception [type]="type" style="min-height: 500px; height: 80%;" />`,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ExceptionComponent {

package/application/files/src/app/routes/passport/callback.component.ts

@@ -1,5 +1,4 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, Input, OnInit } from '@angular/core';
 import { SocialService } from '@delon/auth';
 import { SettingsService } from '@delon/theme';
 
@@ -9,16 +8,14 @@ import { SettingsService } from '@delon/theme';
   providers: [SocialService]
 })
 export class CallbackComponent implements OnInit {
-  type = '';
+  @Input() type = '';
 
   constructor(
     private socialService: SocialService,
-    private settingsSrv: SettingsService,
-    private route: ActivatedRoute
+    private settingsSrv: SettingsService
   ) {}
 
   ngOnInit(): void {
-    this.type = this.route.snapshot.params['type'];
     this.mockModel();
   }
 

package/application/files/src/app/routes/passport/lock/lock.component.html

@@ -1,7 +1,7 @@
 <div class="ant-card width-lg" style="margin: 0 auto">
   <div class="ant-card-body">
     <div class="avatar">
-      <nz-avatar [nzSrc]="user.avatar" nzIcon="user" nzSize="large"></nz-avatar>
+      <nz-avatar [nzSrc]="user.avatar" nzIcon="user" nzSize="large" />
     </div>
     <form nz-form [formGroup]="f" (ngSubmit)="submit()" role="form" class="mt-md">
       <nz-form-item>

package/application/files/src/app/routes/passport/login/login.component.html

@@ -1,7 +1,7 @@
 <form nz-form [formGroup]="form" (ngSubmit)="submit()" role="form">
   <nz-tabset [nzAnimated]="false" class="tabs" (nzSelectChange)="switch($event)">
     <nz-tab [nzTitle]="'app.login.tab-login-credentials' | i18n">
-      <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg"></nz-alert>
+      <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg" />
       <nz-form-item>
         <nz-form-control nzErrorTip="Please enter mobile number, muse be: admin or user">
           <nz-input-group nzSize="large" nzPrefixIcon="user">

package/application/files/src/app/routes/passport/register/register.component.html

@@ -1,6 +1,6 @@
 <h3>{{ 'app.register.register' | i18n }}</h3>
 <form nz-form [formGroup]="form" (ngSubmit)="submit()" role="form">
-  <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg"></nz-alert>
+  <nz-alert *ngIf="error" [nzType]="'error'" [nzMessage]="error" [nzShowIcon]="true" class="mb-lg" />
   <nz-form-item>
     <nz-form-control [nzErrorTip]="mailErrorTip">
       <nz-input-group nzSize="large" nzAddonBeforeIcon="user">
@@ -35,12 +35,7 @@
             <div *ngSwitchDefault class="error">{{ 'validation.password.strength.short' | i18n }}</div>
           </ng-container>
           <div class="progress-{{ status }}">
-            <nz-progress
-              [nzPercent]="progress"
-              [nzStatus]="passwordProgressMap[status]"
-              [nzStrokeWidth]="6"
-              [nzShowInfo]="false"
-            ></nz-progress>
+            <nz-progress [nzPercent]="progress" [nzStatus]="passwordProgressMap[status]" [nzStrokeWidth]="6" [nzShowInfo]="false" />
           </div>
           <p class="mt-sm">{{ 'validation.password.strength.msg' | i18n }}</p>
         </div>
@@ -63,8 +58,8 @@
       <nz-input-group nzSize="large" [nzAddOnBefore]="addOnBeforeTemplate">
         <ng-template #addOnBeforeTemplate>
           <nz-select formControlName="mobilePrefix" style="width: 100px">
-            <nz-option [nzLabel]="'+86'" [nzValue]="'+86'"></nz-option>
-            <nz-option [nzLabel]="'+87'" [nzValue]="'+87'"></nz-option>
+            <nz-option [nzLabel]="'+86'" [nzValue]="'+86'" />
+            <nz-option [nzLabel]="'+87'" [nzValue]="'+87'" />
           </nz-select>
         </ng-template>
         <input formControlName="mobile" nz-input placeholder="Phone number" />

package/application/files/src/app/routes/routes-routing.module.ts

@@ -60,6 +60,7 @@ const routes: Routes = [
         // NOTICE: If you use `reuse-tab` component and turn on keepingScroll you can set to `disabled`
         // Pls refer to https://ng-alain.com/components/reuse-tab
         scrollPositionRestoration: 'top',
+        bindToComponentInputs: true
       }
     )],
   exports: [RouterModule],

package/application/index.js

@@ -146,10 +146,10 @@ function addCodeStylesToPackageJson() {
         }
         // dependencies
         (0, utils_1.addPackage)(tree, [
-            `husky@^7.0.4`,
-            `lint-staged@^13.2.3`,
-            `prettier@^3.0.0`,
-            `stylelint@^15.10.2`,
+            `husky@^8.0.3`,
+            `lint-staged@^14.0.1`,
+            `prettier@^3.0.2`,
+            `stylelint@^15.10.3`,
             `stylelint-config-rational-order@^0.1.2`,
             `stylelint-config-standard@^34.0.0`,
             `stylelint-declaration-block-no-ignored-properties@^2.7.0`,

package/application/index.ts

@@ -183,10 +183,10 @@ function addCodeStylesToPackageJson(): Rule {
     addPackage(
       tree,
       [
-        `husky@^7.0.4`,
-        `lint-staged@^13.2.3`,
-        `prettier@^3.0.0`,
-        `stylelint@^15.10.2`,
+        `husky@^8.0.3`,
+        `lint-staged@^14.0.1`,
+        `prettier@^3.0.2`,
+        `stylelint@^15.10.3`,
         `stylelint-config-rational-order@^0.1.2`,
         `stylelint-config-standard@^34.0.0`,
         `stylelint-declaration-block-no-ignored-properties@^2.7.0`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "16.2.0",
+  "version": "16.3.0",
   "description": "Schematics specific to ng-alain",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",

package/utils/lib-versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZORROVERSION = exports.VERSION = void 0;
-exports.VERSION = '^16.2.0';
+exports.VERSION = '^16.3.0';
 exports.ZORROVERSION = '^16.1.0';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^16.2.0';
+export const VERSION = '^16.3.0';
 export const ZORROVERSION = '^16.1.0';

package/utils/versions.js

@@ -21,26 +21,26 @@ const workspace_2 = require("./workspace");
 function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
     (0, package_1.addPackage)(tree, ['abc', 'acl', 'auth', 'cache', 'form', 'mock', 'theme', 'util', 'chart'].map(name => `@delon/${name}@${version}`));
     (0, package_1.addPackage)(tree, [
-        `@angular-eslint/builder@~16.1.0`,
-        `@angular-eslint/eslint-plugin@~16.1.0`,
-        `@angular-eslint/eslint-plugin-template@~16.1.0`,
-        `@angular-eslint/schematics@~16.1.0`,
-        `@angular-eslint/template-parser@~16.1.0`,
-        `@typescript-eslint/eslint-plugin@~6.1.0`,
-        `@typescript-eslint/parser@~6.1.0`,
-        `eslint@^8.45.0`,
-        `eslint-config-prettier@~8.8.0`,
-        `eslint-plugin-import@~2.27.5`,
-        `eslint-plugin-jsdoc@~46.4.4`,
+        `@angular-eslint/builder@~16.1.1`,
+        `@angular-eslint/eslint-plugin@~16.1.1`,
+        `@angular-eslint/eslint-plugin-template@~16.1.1`,
+        `@angular-eslint/schematics@~16.1.1`,
+        `@angular-eslint/template-parser@~16.1.1`,
+        `@typescript-eslint/eslint-plugin@~6.4.1`,
+        `@typescript-eslint/parser@~6.4.1`,
+        `eslint@^8.48.0`,
+        `eslint-config-prettier@~9.0.0`,
+        `eslint-plugin-import@~2.28.1`,
+        `eslint-plugin-jsdoc@~46.5.0`,
         `eslint-plugin-prefer-arrow@~1.2.3`,
         `eslint-plugin-prettier@~5.0.0`,
-        `eslint-plugin-deprecation@~1.4.1`,
-        `prettier@^3.0.0`,
-        `husky@^7.0.4`,
+        `eslint-plugin-deprecation@~1.5.0`,
+        `prettier@^3.0.2`,
+        `husky@^8.0.3`,
         `ng-alain@${version}`,
         `ng-alain-plugin-theme@^15.0.1`,
         `source-map-explorer@^2.5.3`,
-        `@angular/language-service@^16.1.0`,
+        `@angular/language-service@^16.2.0`,
         `@delon/testing@${version}`
     ], 'devDependencies');
     (0, package_1.addPackage)(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^16.1.0`]);

package/utils/versions.ts

@@ -17,26 +17,26 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
   addPackage(
     tree,
     [
-      `@angular-eslint/builder@~16.1.0`,
-      `@angular-eslint/eslint-plugin@~16.1.0`,
-      `@angular-eslint/eslint-plugin-template@~16.1.0`,
-      `@angular-eslint/schematics@~16.1.0`,
-      `@angular-eslint/template-parser@~16.1.0`,
-      `@typescript-eslint/eslint-plugin@~6.1.0`,
-      `@typescript-eslint/parser@~6.1.0`,
-      `eslint@^8.45.0`,
-      `eslint-config-prettier@~8.8.0`,
-      `eslint-plugin-import@~2.27.5`,
-      `eslint-plugin-jsdoc@~46.4.4`,
+      `@angular-eslint/builder@~16.1.1`,
+      `@angular-eslint/eslint-plugin@~16.1.1`,
+      `@angular-eslint/eslint-plugin-template@~16.1.1`,
+      `@angular-eslint/schematics@~16.1.1`,
+      `@angular-eslint/template-parser@~16.1.1`,
+      `@typescript-eslint/eslint-plugin@~6.4.1`,
+      `@typescript-eslint/parser@~6.4.1`,
+      `eslint@^8.48.0`,
+      `eslint-config-prettier@~9.0.0`,
+      `eslint-plugin-import@~2.28.1`,
+      `eslint-plugin-jsdoc@~46.5.0`,
       `eslint-plugin-prefer-arrow@~1.2.3`,
       `eslint-plugin-prettier@~5.0.0`,
-      `eslint-plugin-deprecation@~1.4.1`,
-      `prettier@^3.0.0`,
-      `husky@^7.0.4`,
+      `eslint-plugin-deprecation@~1.5.0`,
+      `prettier@^3.0.2`,
+      `husky@^8.0.3`,
       `ng-alain@${version}`,
       `ng-alain-plugin-theme@^15.0.1`,
       `source-map-explorer@^2.5.3`,
-      `@angular/language-service@^16.1.0`,
+      `@angular/language-service@^16.2.0`,
       `@delon/testing@${version}`
     ],
     'devDependencies'