npm - ng-alain - Versions diffs - 14.0.0 → 14.1.0 - Mend

ng-alain 14.0.0 → 14.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/application/files/root/.nvmrc +1 -1
package/application/files/src/app/core/index.ts +1 -0
package/application/files/src/app/core/start-page.guard.ts +20 -0
package/application/files/src/app/core/startup/startup.service.ts +1 -1
package/application/files/src/app/routes/passport/lock/lock.component.ts +4 -9
package/application/files/src/app/routes/passport/login/login.component.ts +20 -12
package/application/files/src/app/routes/passport/register/register.component.ts +11 -7
package/application/files/src/app/routes/routes-routing.module.ts +2 -1
package/ng-update/upgrade-rules/v12/index.js +2 -2
package/ng-update/upgrade-rules/v12/index.js.map +1 -1
package/ng-update/upgrade-rules/v12/index.ts +2 -2
package/ng-update/upgrade-rules/v13/index.js +2 -2
package/ng-update/upgrade-rules/v13/index.js.map +1 -1
package/ng-update/upgrade-rules/v13/index.ts +2 -2
package/ng-update/upgrade-rules/v14/index.js +15 -0
package/ng-update/upgrade-rules/v14/index.js.map +1 -1
package/ng-update/upgrade-rules/v14/index.spec.ts +150 -2
package/ng-update/upgrade-rules/v14/index.ts +20 -0
package/package.json +1 -1
package/utils/file.js +11 -1
package/utils/file.js.map +1 -1
package/utils/file.ts +10 -0
package/utils/lib-versions.js +1 -1
package/utils/lib-versions.ts +1 -1
package/utils/workspace.js +1 -1
package/utils/workspace.js.map +1 -1
package/utils/workspace.ts +1 -1

package/application/files/root/.nvmrc CHANGED Viewed

	@@ -1 +1 @@
1	- ~~12.~~14.1
1	+ 14.17.0

package/application/files/src/app/core/index.ts CHANGED Viewed

@@ -2,3 +2,4 @@
 export * from './module-import-guard';
 export * from './net/default.interceptor';
 export * from './startup/startup.service';
+export * from './start-page.guard';

package/application/files/src/app/core/start-page.guard.ts ADDED Viewed

@@ -0,0 +1,20 @@
+import { inject } from '@angular/core';
+import { CanActivateFn, Router } from '@angular/router';
+import { MenuService } from '@delon/theme';
+import { Observable } from 'rxjs';
+/**
+ * Dynamically load the start page
+ *
+ * 动态加载启动页
+ */
+export const startPageGuard: CanActivateFn = (_, state): boolean | Observable<boolean> => {
+  // Re-jump according to the first item of the menu, you can re-customize the logic
+  // 以下代码是根据菜单的第一项进行重新跳转，你可以重新定制逻辑
+  // const menuSrv = inject(MenuService);
+  // if (menuSrv.find({ url: state.url }) == null) {
+  //   inject(Router).navigateByUrl(menuSrv.menus[0].link!);
+  //   return false;
+  // }
+  return true;
+};

package/application/files/src/app/core/startup/startup.service.ts CHANGED Viewed

@@ -135,7 +135,7 @@ export class StartupService {
     // Can be set page suffix title, https://ng-alain.com/theme/title
     this.titleService.suffix = app.name;
-    return of();
+    return of(void 0);
   }
   load(): Observable<void> {

package/application/files/src/app/routes/passport/lock/lock.component.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { FormBuilder, Validators } from '@angular/forms';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
 import { SettingsService, User } from '@delon/theme';
@@ -10,20 +10,15 @@ import { SettingsService, User } from '@delon/theme';
   styleUrls: ['./lock.component.less']
 })
 export class UserLockComponent {
-  f = this.fb.group({
-    password: [null, Validators.required]
+  f = new FormGroup({
+    password: new FormControl('', { nonNullable: true, validators: [Validators.required] })
   });
   get user(): User {
     return this.settings.user;
   }
-  constructor(
-    private fb: FormBuilder,
-    @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
-    private settings: SettingsService,
-    private router: Router
-  ) {}
+  constructor(@Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private settings: SettingsService, private router: Router) {}
   submit(): void {
     this.f.controls.password.markAsDirty();

package/application/files/src/app/routes/passport/login/login.component.ts CHANGED Viewed

@@ -1,9 +1,10 @@
+import { HttpContext } from '@angular/common/http';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnDestroy, Optional } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { StartupService } from '@core';
 import { ReuseTabService } from '@delon/abc/reuse-tab';
-import { DA_SERVICE_TOKEN, ITokenService, SocialOpenType, SocialService } from '@delon/auth';
+import { ALLOW_ANONYMOUS, DA_SERVICE_TOKEN, ITokenService, SocialOpenType, SocialService } from '@delon/auth';
 import { SettingsService, _HttpClient } from '@delon/theme';
 import { environment } from '@env/environment';
 import { NzTabChangeEvent } from 'ng-zorro-antd/tabs';
@@ -33,11 +34,11 @@ export class UserLoginComponent implements OnDestroy {
   // #region fields
-  form = this.fb.group({
-    userName: [null, [Validators.required, Validators.pattern(/^(admin|user)$/)]],
-    password: [null, [Validators.required, Validators.pattern(/^(ng\-alain\.com)$/)]],
-    mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
-    captcha: [null, [Validators.required]],
+  form = this.fb.nonNullable.group({
+    userName: ['', [Validators.required, Validators.pattern(/^(admin|user)$/)]],
+    password: ['', [Validators.required, Validators.pattern(/^(ng\-alain\.com)$/)]],
+    mobile: ['', [Validators.required, Validators.pattern(/^1\d{10}$/)]],
+    captcha: ['', [Validators.required]],
     remember: [true]
   });
   error = '';
@@ -96,15 +97,22 @@ export class UserLoginComponent implements OnDestroy {
     }
     // 默认配置中对所有HTTP请求都会强制 [校验](https://ng-alain.com/auth/getting-started) 用户 Token
-    // 然一般来说登录请求不需要校验，因此可以在请求URL加上：`/login?_allow_anonymous=true` 表示不触发用户 Token 校验
+    // 然一般来说登录请求不需要校验，因此加上 `ALLOW_ANONYMOUS` 表示不触发用户 Token 校验
     this.loading = true;
     this.cdr.detectChanges();
     this.http
-      .post('/login/account?_allow_anonymous=true', {
-        type: this.type,
-        userName: this.form.value.userName,
-        password: this.form.value.password
-      })
+      .post(
+        '/login/account',
+        {
+          type: this.type,
+          userName: this.form.value.userName,
+          password: this.form.value.password
+        },
+        null,
+        {
+          context: new HttpContext().set(ALLOW_ANONYMOUS, true)
+        }
+      )
       .pipe(
         finalize(() => {
           this.loading = false;

package/application/files/src/app/routes/passport/register/register.component.ts CHANGED Viewed

@@ -1,6 +1,8 @@
+import { HttpContext } from '@angular/common/http';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
 import { AbstractControl, FormBuilder, FormControl, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
+import { ALLOW_ANONYMOUS } from '@delon/auth';
 import { _HttpClient } from '@delon/theme';
 import { MatchControl } from '@delon/util/form';
 import { NzSafeAny } from 'ng-zorro-antd/core/types';
@@ -17,14 +19,14 @@ export class UserRegisterComponent implements OnDestroy {
   // #region fields
-  form = this.fb.group(
+  form = this.fb.nonNullable.group(
     {
-      mail: [null, [Validators.required, Validators.email]],
-      password: [null, [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]],
-      confirm: [null, [Validators.required, Validators.minLength(6)]],
+      mail: ['', [Validators.required, Validators.email]],
+      password: ['', [Validators.required, Validators.minLength(6), UserRegisterComponent.checkPassword.bind(this)]],
+      confirm: ['', [Validators.required, Validators.minLength(6)]],
       mobilePrefix: ['+86'],
-      mobile: [null, [Validators.required, Validators.pattern(/^1\d{10}$/)]],
-      captcha: [null, [Validators.required]]
+      mobile: ['', [Validators.required, Validators.pattern(/^1\d{10}$/)]],
+      captcha: ['', [Validators.required]]
     },
     {
       validators: MatchControl('password', 'confirm')
@@ -104,7 +106,9 @@ export class UserRegisterComponent implements OnDestroy {
     this.loading = true;
     this.cdr.detectChanges();
     this.http
-      .post('/register?_allow_anonymous=true', data)
+      .post('/register', data, null, {
+        context: new HttpContext().set(ALLOW_ANONYMOUS, true)
+      })
       .pipe(
         finalize(() => {
           this.loading = false;

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

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { startPageGuard } from '@core';
 import { SimpleGuard } from '@delon/auth';
 import { environment } from '@env/environment';
 // layout
@@ -19,7 +20,7 @@ const routes: Routes = [
   {
     path: '',
     component: LayoutBasicComponent,
-    canActivate: [SimpleGuard],
+    canActivate: [startPageGuard, SimpleGuard],
     children: [
       { path: '', redirectTo: 'dashboard', pathMatch: 'full' },
       { path: 'dashboard', component: DashboardComponent, data: { title: '仪表盘'<% if (!i18n) { %>, titleI18n: 'dashboard'<% } %> } },

package/ng-update/upgrade-rules/v12/index.js CHANGED Viewed

@@ -59,8 +59,8 @@ function fixAngularJson(context) {
 }
 function upgradeThirdVersion() {
     return (tree, context) => {
-        (0, utils_1.addPackage)(tree, [`ngx-ueditor@^14.0.0`, `ngx-tinymce@^14.0.0`], 'dependencies');
-        (0, utils_1.logStart)(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
+        (0, utils_1.addPackage)(tree, [`ngx-tinymce@^14.0.0`], 'dependencies');
+        (0, utils_1.logStart)(context, `Upgrade third libs (ngx-tinymce) version number`);
     };
 }
 function removeThird() {

package/ng-update/upgrade-rules/v12/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v12/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,qEAAwE;AACxE,sCAAsC;AAEtC,0CAiBwB;AACxB,0DAA4E;AAC5E,sDAA6E;AAG7E,sBAAsB;AACtB,SAAS,cAAc,CAAC,OAAyB;IAC/C,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;YAC3C,MAAM,UAAU,GAAG;gBACjB,KAAK;gBACL,aAAa;gBACb,iBAAiB;gBACjB,gBAAgB;gBAChB,WAAW;gBACX,cAAc;gBACd,aAAa;aACd,CAAC;YACF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;YACtD,IAAI,KAAK,IAAI,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;YACnC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,MAAM,kBAAkB,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,CAAC,UAAU,CAAC;YAC5D,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,KAAK,CAAC,cAAc,CAAC,WAAW,GAAG;gBACjC,cAAc,EAAE,KAAK;gBACrB,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,IAAI;gBACjB,eAAe,EAAE,KAAK;gBACtB,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;aAClB,CAAC;YACF,KAAK,CAAC,oBAAoB,GAAG,YAAY,CAAC;YAE1C,QAAQ;YACR,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;YACtD,IAAI,KAAK,IAAI,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC5E,KAAK,CAAC,cAAc,CAAC,WAAW,GAAG;gBACjC,aAAa,EAAE,GAAG,IAAI,oBAAoB;aAC3C,CAAC;YACF,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAA,gBAAQ,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACxC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAA,kBAAU,EAAC,IAAI,EAAE,CAAC,mCAAmC,~~EAAE,mCAAmC,~~CAAC,EAAE,cAAc,CAAC,CAAC;~~QAC7G~~,IAAA,gBAAQ,EAAC,OAAO,EAAE,~~8DAA8D~~,CAAC,CAAC;~~IACpF~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v12/index.ts"],"names":[],"mappings":"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"}

package/ng-update/upgrade-rules/v12/index.ts CHANGED Viewed

@@ -67,8 +67,8 @@ function fixAngularJson(context: SchematicContext): Rule {
 function upgradeThirdVersion(): Rule {
   return (tree: Tree, context: SchematicContext) => {
-    addPackage(tree, [`ngx-ueditor@^14.0.0`, `ngx-tinymce@^14.0.0`], 'dependencies');
-    logStart(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
+    addPackage(tree, [`ngx-tinymce@^14.0.0`], 'dependencies');
+    logStart(context, `Upgrade third libs (ngx-tinymce) version number`);
   };
 }

package/ng-update/upgrade-rules/v13/index.js CHANGED Viewed

@@ -71,8 +71,8 @@ function upgradeKarmaCoverage() {
 }
 function upgradeThirdVersion() {
     return (tree, context) => {
-        (0, utils_1.addPackage)(tree, [`ngx-ueditor@^14.0.0`, `ngx-tinymce@^14.0.0`], 'dependencies');
-        (0, utils_1.logStart)(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
+        (0, utils_1.addPackage)(tree, [`ngx-tinymce@^14.0.0`], 'dependencies');
+        (0, utils_1.logStart)(context, `Upgrade third libs ( ngx-tinymce) version number`);
     };
 }
 function finished() {

package/ng-update/upgrade-rules/v13/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":"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~~EAAE,mCAAmC,~~CAAC,EAAE,cAAc,CAAC,CAAC;~~QAC7G~~,IAAA,gBAAQ,EAAC,OAAO,EAAE,~~8DAA8D~~,CAAC,CAAC;~~IACpF~~,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,KAAK,CACV,uHAAuH,CACxH,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,OAAO;IACrB,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAA,gBAAQ,EAAC,OAAO,EAAE,iCAAiC,CAAC,CAAC;QACrD,IAAA,8BAAmB,EAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,IAAA,kBAAK,EAAC;YACX,QAAQ,EAAE;YACV,2BAA2B,EAAE;YAC7B,eAAe,EAAE;YACjB,oBAAoB,EAAE;YACtB,mBAAmB,EAAE;YACrB,OAAO,CAAC,OAAO,CAAC;YAChB,QAAQ,EAAE;SACX,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;AAdD,0BAcC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":"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"}

package/ng-update/upgrade-rules/v13/index.ts CHANGED Viewed

@@ -76,8 +76,8 @@ function upgradeKarmaCoverage(): Rule {
 function upgradeThirdVersion(): Rule {
   return (tree: Tree, context: SchematicContext) => {
-    addPackage(tree, [`ngx-ueditor@^14.0.0`, `ngx-tinymce@^14.0.0`], 'dependencies');
-    logStart(context, `Upgrade third libs (ngx-ueditor, ngx-tinymce) version number`);
+    addPackage(tree, [`ngx-tinymce@^14.0.0`], 'dependencies');
+    logStart(context, `Upgrade third libs ( ngx-tinymce) version number`);
   };
 }

package/ng-update/upgrade-rules/v14/index.js CHANGED Viewed

@@ -40,6 +40,20 @@ function addEslintPluginDeprecation() {
         (0, utils_1.logStart)(context, `Add deprecation warn of eslint`);
     };
 }
+function fixReuseTabActiviteInHtml() {
+    return (tree, context) => {
+        const layoutPath = (0, utils_1.findFile)(tree, 'basic/basic.component.ts');
+        if (!tree.exists(layoutPath))
+            return;
+        let layoutContent = tree.get(layoutPath).content.toString('utf8');
+        const checkHtml = `<router-outlet (activate)="reuseTab.activate($event)"></router-outlet>`;
+        if (!layoutContent.includes(checkHtml))
+            return;
+        layoutContent = layoutContent.replace(checkHtml, `<router-outlet (activate)="reuseTab.activate($event)" (attach)="reuseTab.activate($event)"></router-outlet>`);
+        tree.overwrite(layoutPath, layoutContent);
+        (0, utils_1.logStart)(context, `Fix can't refresh current item in resut-tab (https://github.com/ng-alain/ng-alain/issues/2302)`);
+    };
+}
 function finished() {
     return (_tree, context) => {
         context.addTask(new tasks_1.NodePackageInstallTask());
@@ -56,6 +70,7 @@ function v14Rule() {
             // https://angular.io/guide/build#configuring-commonjs-dependencies
             (0, utils_1.addAllowedCommonJsDependencies)([]),
             fixSchematicCollections(context),
+            fixReuseTabActiviteInHtml(),
             addEslintPluginDeprecation(),
             finished()
         ]);

package/ng-update/upgrade-rules/v14/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v14/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,qEAAwE;AACxE,sCAAsC;AAEtC,~~0CAMwB~~;AACxB,sDAA8D;AAE9D,SAAS,uBAAuB,CAAC,OAAyB;IACxD,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,IAAA,+BAAuB,EAAC,SAAS,CAAC,CAAC;QACnC,IAAA,gBAAQ,EAAC,OAAO,EAAE,+FAA+F,CAAC,CAAC;IACrH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B;IACjC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,cAAc,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,OAAO;QAE/B,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,CAAC,QAAQ,CAAC,2CAA2C,CAAC,EAAE;YACjE,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,2CAA2C,EAC3C,0DAA0D,CAC3D,CAAC;SACH;QACD,IAAI,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE;YAC9C,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,EAAE,4DAA4D,CAAC,CAAC;SACnH;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,kBAAkB;QAClB,IAAA,kBAAU,EAAC,IAAI,EAAE,8CAA8C,EAAE,iBAAiB,CAAC,CAAC;QACpF,IAAA,gBAAQ,EAAC,OAAO,EAAE,gCAAgC,CAAC,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,KAAK,CACV,uHAAuH,CACxH,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,OAAO;IACrB,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAA,gBAAQ,EAAC,OAAO,EAAE,iCAAiC,CAAC,CAAC;QACrD,IAAA,8BAAmB,EAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,uCAA+B,GAAE;YACjC,oCAAoC;YACpC,mEAAmE;YACnE,IAAA,sCAA8B,EAAC,EAAE,CAAC;YAClC,uBAAuB,CAAC,OAAO,CAAC;YAChC,0BAA0B,EAAE;YAC5B,QAAQ,EAAE;SACX,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;AACJ,CAAC;~~AAdD~~,~~0BAcC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v14/index.ts"],"names":[],"mappings":"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"}

package/ng-update/upgrade-rules/v14/index.spec.ts CHANGED Viewed

@@ -1,5 +1,7 @@
+import { JsonObject } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { findFile } from '../../../utils/file';
 import { createAlainApp, migrationCollection } from '../../../utils/testing';
 describe('Schematic: ng-update: v14Rule', () => {
@@ -19,6 +21,139 @@ describe('Schematic: ng-update: v14Rule', () => {
   }
   it(`should be working`, async () => {
+    tree.overwrite(
+      '/angular.json',
+      `{
+      "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+      "version": 1,
+      "newProjectRoot": "projects",
+      "projects": {
+        "ng-alain": {
+          "projectType": "application",
+          "root": "",
+          "sourceRoot": "src",
+          "prefix": "app",
+          "schematics": {
+            "@schematics/angular:component": {
+              "style": "less"
+            },
+            "@schematics/angular:application": {
+              "strict": true
+            }
+          },
+          "architect": {
+            "build": {
+              "builder": "@angular-devkit/build-angular:browser",
+              "options": {
+                "outputPath": "dist",
+                "index": "src/index.html",
+                "main": "src/main.ts",
+                "tsConfig": "tsconfig.app.json",
+                "polyfills": "src/polyfills.ts",
+                "assets": ["src/assets", "src/favicon.ico"],
+                "styles": ["src/styles.less"],
+                "scripts": [],
+                "allowedCommonJsDependencies": ["@antv/g2", "ajv", "ajv-formats", "date-fns", "file-saver"],
+                "stylePreprocessorOptions": {
+                  "includePaths": [
+                    "node_modules/"
+                  ]
+                }
+              },
+              "configurations": {
+                "production": {
+                  "fileReplacements": [
+                    {
+                      "replace": "src/environments/environment.ts",
+                      "with": "src/environments/environment.prod.ts"
+                    }
+                  ],
+                  "outputHashing": "all",
+                  "budgets": [
+                    {
+                      "type": "initial",
+                      "maximumWarning": "2mb",
+                      "maximumError": "6mb"
+                    },
+                    {
+                      "type": "anyComponentStyle",
+                      "maximumWarning": "6kb",
+                      "maximumError": "10kb"
+                    }
+                  ]
+                },
+                "development": {
+                  "buildOptimizer": false,
+                  "optimization": false,
+                  "vendorChunk": true,
+                  "extractLicenses": false,
+                  "sourceMap": true,
+                  "namedChunks": true
+                }
+              },
+              "defaultConfiguration": "production"
+            },
+            "serve": {
+              "builder": "@angular-devkit/build-angular:dev-server",
+              "options": {
+                "browserTarget": "ng-alain:build",
+                "proxyConfig": "proxy.conf.js"
+              },
+              "configurations": {
+                "production": {
+                  "browserTarget": "ng-alain:build:production"
+                },
+                "development": {
+                  "browserTarget": "ng-alain:build:development"
+                }
+              },
+              "defaultConfiguration": "development"
+            },
+            "extract-i18n": {
+              "builder": "@angular-devkit/build-angular:extract-i18n",
+              "options": {
+                "browserTarget": "ng-alain:build"
+              }
+            },
+            "test": {
+              "builder": "@angular-devkit/build-angular:karma",
+              "options": {
+                "main": "src/test.ts",
+                "polyfills": "src/polyfills.ts",
+                "karmaConfig": "karma.conf.js",
+                "tsConfig": "tsconfig.spec.json",
+                "scripts": [],
+                "styles": [],
+                "assets": ["src/assets"]
+              }
+            },
+            "lint": {
+              "builder": "@angular-eslint/builder:lint",
+              "options": {
+                "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
+              }
+            },
+            "e2e": {
+              "builder": "@angular-devkit/build-angular:protractor",
+              "options": {
+                "protractorConfig": "e2e/protractor.conf.js",
+                "devServerTarget": "ng-alain:serve"
+              },
+              "configurations": {
+                "production": {
+                  "devServerTarget": "ng-alain:serve:production"
+                }
+              }
+            }
+          }
+        }
+      },
+      "defaultProject": "ng-alain",
+      "cli": {
+        "packageManager": "yarn"
+      }
+    }`
+    );
     tree.create(
       `.eslintrc.js`,
       `
@@ -151,7 +286,20 @@ describe('Schematic: ng-update: v14Rule', () => {
       `
     );
     await runMigration();
-    const content = tree.readContent('angular.json');
-    expect(content).toContain(`schematicCollections`);
+    const content = tree.readJson('angular.json') as JsonObject;
+    expect((content.cli as { schematicCollections: string[] }).schematicCollections).toContain(`ng-alain`);
+  });
+  it('#fixReuseTabActiviteInHtml', async () => {
+    const layoutPath = findFile(tree, 'basic/basic.component.ts')!;
+    tree.overwrite(
+      layoutPath,
+      `
+    <router-outlet (activate)="reuseTab.activate($event)"></router-outlet>
+    `
+    );
+    await runMigration();
+    const content = tree.get(layoutPath)!.content.toString('utf8');
+    expect(content).toContain(`(attach)`);
   });
 });

package/ng-update/upgrade-rules/v14/index.ts CHANGED Viewed

@@ -8,6 +8,7 @@ import {
   addAllowSyntheticDefaultImports,
   addPackage,
   addSchematicCollections,
+  findFile,
   logStart
 } from '../../../utils';
 import { UpgradeMainVersions } from '../../../utils/versions';
@@ -42,6 +43,24 @@ function addEslintPluginDeprecation(): Rule {
   };
 }
+function fixReuseTabActiviteInHtml(): Rule {
+  return (tree: Tree, context: SchematicContext) => {
+    const layoutPath = findFile(tree, 'basic/basic.component.ts');
+    if (!tree.exists(layoutPath)) return;
+    let layoutContent = tree.get(layoutPath)!.content.toString('utf8');
+    const checkHtml = `<router-outlet (activate)="reuseTab.activate($event)"></router-outlet>`;
+    if (!layoutContent.includes(checkHtml)) return;
+    layoutContent = layoutContent.replace(
+      checkHtml,
+      `<router-outlet (activate)="reuseTab.activate($event)" (attach)="reuseTab.activate($event)"></router-outlet>`
+    );
+    tree.overwrite(layoutPath, layoutContent);
+    logStart(context, `Fix can't refresh current item in resut-tab (https://github.com/ng-alain/ng-alain/issues/2302)`);
+  };
+}
 function finished(): Rule {
   return (_tree: Tree, context: SchematicContext) => {
     context.addTask(new NodePackageInstallTask());
@@ -64,6 +83,7 @@ export function v14Rule(): Rule {
       // https://angular.io/guide/build#configuring-commonjs-dependencies
       addAllowedCommonJsDependencies([]),
       fixSchematicCollections(context),
+      fixReuseTabActiviteInHtml(),
       addEslintPluginDeprecation(),
       finished()
     ]);

package/package.json CHANGED Viewed

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

package/utils/file.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFile = exports.overwriteIfExists = exports.overwriteFile = exports.getFileContentInApplicationFiles = exports.readContent = exports.tryAddFile = exports.tryDelFile = void 0;
+exports.writeFile = exports.overwriteIfExists = exports.overwriteFile = exports.getFileContentInApplicationFiles = exports.findFile = exports.readContent = exports.tryAddFile = exports.tryDelFile = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const fs = require("fs");
 const path_1 = require("path");
@@ -21,6 +21,16 @@ function readContent(tree, filePath) {
     return tree.read(filePath).toString('utf-8');
 }
 exports.readContent = readContent;
+function findFile(tree, fileName) {
+    let res = undefined;
+    tree.visit(path => {
+        if (res == null && path.endsWith(fileName)) {
+            res = path;
+        }
+    });
+    return res;
+}
+exports.findFile = findFile;
 function getFileContentInApplicationFiles(fileName) {
     const filePath = (0, path_1.join)(__dirname, `../application/files/${fileName}`);
     if (fs.existsSync(filePath)) {

package/utils/file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../schematics/utils/file.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../../schematics/utils/file.ts"],"names":[],"mappings":"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"}

package/utils/file.ts CHANGED Viewed

@@ -18,6 +18,16 @@ export function readContent(tree: Tree, filePath: string): string {
   return tree.read(filePath).toString('utf-8');
 }
+export function findFile(tree: Tree, fileName: string): string | undefined {
+  let res: string = undefined;
+  tree.visit(path => {
+    if (res == null && path.endsWith(fileName)) {
+      res = path;
+    }
+  });
+  return res;
+}
 export interface OverWriteFileOptions {
   tree: Tree;
   filePath: string;

package/utils/lib-versions.js CHANGED Viewed

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

package/utils/lib-versions.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-export const VERSION = '^14.0.0';
+export const VERSION = '^14.1.0';
 export const ZORROVERSION = '^14.0.0';

package/utils/workspace.js CHANGED Viewed

@@ -82,7 +82,7 @@ function addAllowedCommonJsDependencies(items, projectName) {
         if (Array.isArray(items)) {
             list = [...list, ...items];
         }
-        const result = new Set(...list);
+        const result = new Set(list);
         ['ajv', 'ajv-formats', 'mockjs', 'file-saver', 'extend'].forEach(key => result.add(key));
         targetOptions.allowedCommonJsDependencies = Array.from(result).sort();
     }));

package/utils/workspace.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":"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~~GAAG,~~IAAI,CAAC,CAAC;~~QACxC~~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"}
1	+ {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../schematics/utils/workspace.ts"],"names":[],"mappings":"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"}

package/utils/workspace.ts CHANGED Viewed

@@ -90,7 +90,7 @@ export function addAllowedCommonJsDependencies(items: string[], projectName?: st
       list = [...list, ...items];
     }
-    const result = new Set<string>(...list);
+    const result = new Set<string>(list);
     ['ajv', 'ajv-formats', 'mockjs', 'file-saver', 'extend'].forEach(key => result.add(key));
     targetOptions.allowedCommonJsDependencies = Array.from(result).sort();