ng-alain 15.2.1 → 16.0.0

package/application/index.js

@@ -147,14 +147,14 @@ function addCodeStylesToPackageJson() {
         // dependencies
         (0, utils_1.addPackage)(tree, [
             `husky@^7.0.4`,
-            `lint-staged@^13.1.0`,
-            `prettier@^2.8.3`,
-            `stylelint@^14.16.1`,
-            `stylelint-config-prettier@^9.0.4`,
+            `lint-staged@^13.2.2`,
+            `prettier@^2.8.8`,
+            `stylelint@^15.6.2`,
+            `stylelint-config-prettier@^9.0.5`,
             `stylelint-config-rational-order@^0.1.2`,
-            `stylelint-config-standard@^29.0.0`,
-            `stylelint-declaration-block-no-ignored-properties@^2.6.0`,
-            `stylelint-order@^6.0.1`
+            `stylelint-config-standard@^33.0.0`,
+            `stylelint-declaration-block-no-ignored-properties@^2.7.0`,
+            `stylelint-order@^6.0.3`
         ], 'devDependencies');
         return tree;
     };

package/application/index.ts

@@ -184,14 +184,14 @@ function addCodeStylesToPackageJson(): Rule {
       tree,
       [
         `husky@^7.0.4`,
-        `lint-staged@^13.1.0`,
-        `prettier@^2.8.3`,
-        `stylelint@^14.16.1`,
-        `stylelint-config-prettier@^9.0.4`,
+        `lint-staged@^13.2.2`,
+        `prettier@^2.8.8`,
+        `stylelint@^15.6.2`,
+        `stylelint-config-prettier@^9.0.5`,
         `stylelint-config-rational-order@^0.1.2`,
-        `stylelint-config-standard@^29.0.0`,
-        `stylelint-declaration-block-no-ignored-properties@^2.6.0`,
-        `stylelint-order@^6.0.1`
+        `stylelint-config-standard@^33.0.0`,
+        `stylelint-declaration-block-no-ignored-properties@^2.7.0`,
+        `stylelint-order@^6.0.3`
       ],
       'devDependencies'
     );

package/migration.json

@@ -1,10 +1,10 @@
 {
   "$schema": "./node_modules/@angular-devkit/schematics/collection-schema.json",
   "schematics": {
-    "migration-v15": {
-      "version": "15",
-      "description": "Updates NG-ALAIN to v15 [https://github.com/ng-alain/ng-alain/issues/2347]",
-      "factory": "./ng-update/index#updateToV15"
+    "migration-v16": {
+      "version": "16",
+      "description": "Updates NG-ALAIN to v16 [https://github.com/ng-alain/ng-alain/issues/2390]",
+      "factory": "./ng-update/index#updateToV16"
     },
     "ng-post-update": {
       "description": "Performs cleanup after ng-update.",

package/ng-add/index.js

@@ -5,7 +5,7 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 const colors = require("ansi-colors");
 const utils_1 = require("../utils");
 const node_1 = require("../utils/node");
-const V = 15;
+const V = 16;
 function genRules(options) {
     return () => {
         const rules = [];

package/ng-add/index.ts

@@ -7,7 +7,7 @@ import { DEFAULT_WORKSPACE_PATH, readJSON, readPackage } from '../utils';
 import { getNodeMajorVersion } from '../utils/node';
 import { Schema as NgAddOptions } from './schema';
 
-const V = 15;
+const V = 16;
 
 function genRules(options: NgAddOptions): Rule {
   return () => {

package/ng-update/data/attribute-selectors.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.attributeSelectors = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.attributeSelectors = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=attribute-selectors.js.map

package/ng-update/data/attribute-selectors.ts

@@ -1,5 +1,5 @@
 import { AttributeSelectorUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const attributeSelectors: VersionChanges<AttributeSelectorUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/class-names.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.classNames = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.classNames = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=class-names.js.map

package/ng-update/data/class-names.ts

@@ -1,5 +1,5 @@
 import { ClassNameUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const classNames: VersionChanges<ClassNameUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/constructor-checks.js

@@ -8,6 +8,6 @@ const schematics_1 = require("@angular/cdk/schematics");
  * automatically through type checking.
  */
 exports.constructorChecks = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=constructor-checks.js.map

package/ng-update/data/constructor-checks.ts

@@ -6,5 +6,5 @@ import { ConstructorChecksUpgradeData, TargetVersion, VersionChanges } from '@an
  * automatically through type checking.
  */
 export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/css-selectors.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cssSelectors = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.cssSelectors = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=css-selectors.js.map

package/ng-update/data/css-selectors.ts

@@ -1,5 +1,5 @@
 import { CssSelectorUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const cssSelectors: VersionChanges<CssSelectorUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/element-selectors.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.elementSelectors = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.elementSelectors = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=element-selectors.js.map

package/ng-update/data/element-selectors.ts

@@ -1,5 +1,5 @@
 import { ElementSelectorUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const elementSelectors: VersionChanges<ElementSelectorUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/input-names.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inputNames = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.inputNames = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=input-names.js.map

package/ng-update/data/input-names.ts

@@ -1,5 +1,5 @@
 import { InputNameUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const inputNames: VersionChanges<InputNameUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/method-call-checks.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.methodCallChecks = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.methodCallChecks = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=method-call-checks.js.map

package/ng-update/data/method-call-checks.ts

@@ -1,5 +1,5 @@
 import { MethodCallUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const methodCallChecks: VersionChanges<MethodCallUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/output-names.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.outputNames = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.outputNames = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=output-names.js.map

package/ng-update/data/output-names.ts

@@ -1,5 +1,5 @@
 import { OutputNameUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const outputNames: VersionChanges<OutputNameUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/data/property-names.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.propertyNames = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 exports.propertyNames = {
-    [schematics_1.TargetVersion.V15]: []
+    [schematics_1.TargetVersion.V16]: []
 };
 //# sourceMappingURL=property-names.js.map

package/ng-update/data/property-names.ts

@@ -1,5 +1,5 @@
 import { PropertyNameUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';
 
 export const propertyNames: VersionChanges<PropertyNameUpgradeData> = {
-  [TargetVersion.V15]: []
+  [TargetVersion.V16]: []
 };

package/ng-update/index.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postUpdate = exports.updateToV15 = void 0;
+exports.postUpdate = exports.updateToV16 = void 0;
 const schematics_1 = require("@angular/cdk/schematics");
 const schematics_2 = require("@angular-devkit/schematics");
 const upgrade_data_1 = require("./upgrade-data");
-const v15_1 = require("./upgrade-rules/v15");
+const v16_1 = require("./upgrade-rules/v16");
 const migrations = [];
-function updateToV15() {
-    return (0, schematics_2.chain)([(0, v15_1.v15Rule)(), (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V15, migrations, upgrade_data_1.ruleUpgradeData, postUpdate)]);
+function updateToV16() {
+    return (0, schematics_2.chain)([(0, v16_1.v16Rule)(), (0, schematics_1.createMigrationSchematicRule)(schematics_1.TargetVersion.V16, migrations, upgrade_data_1.ruleUpgradeData, postUpdate)]);
 }
-exports.updateToV15 = updateToV15;
+exports.updateToV16 = updateToV16;
 /** Post-update schematic to be called when update is finished. */
 function postUpdate(context, targetVersion, hasFailures) {
     context.logger.info('');

package/ng-update/index.ts

@@ -3,12 +3,12 @@ import { createMigrationSchematicRule, NullableDevkitMigration, TargetVersion }
 import { chain, Rule, SchematicContext } from '@angular-devkit/schematics';
 
 import { ruleUpgradeData } from './upgrade-data';
-import { v15Rule } from './upgrade-rules/v15';
+import { v16Rule } from './upgrade-rules/v16';
 
 const migrations: NullableDevkitMigration[] = [];
 
-export function updateToV15(): Rule {
-  return chain([v15Rule(), createMigrationSchematicRule(TargetVersion.V15, migrations, ruleUpgradeData, postUpdate)]);
+export function updateToV16(): Rule {
+  return chain([v16Rule(), createMigrationSchematicRule(TargetVersion.V16, migrations, ruleUpgradeData, postUpdate)]);
 }
 
 /** Post-update schematic to be called when update is finished. */

package/ng-update/upgrade-rules/{v15 → v16}/index.js

@@ -9,36 +9,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v15Rule = void 0;
+exports.v16Rule = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const colors = require("ansi-colors");
 const utils_1 = require("../../../utils");
-const less_1 = require("../../../utils/less");
 const versions_1 = require("../../../utils/versions");
-function removeDuplicateDependencies() {
-    return (tree, context) => {
-        const pkg = (0, utils_1.readPackage)(tree);
-        if (!pkg.devDependencies)
-            return;
-        delete pkg.devDependencies['ng-alain-sts'];
-        delete pkg.devDependencies['ng-alain-plugin-theme'];
-        (0, utils_1.writePackage)(tree, pkg);
-        (0, utils_1.logStart)(context, `Remove duplicate dev-dependencies: 'ng-alain-sts', 'ng-alain-plugin-theme'`);
-    };
-}
 function finished() {
     return (_tree, context) => {
         context.addTask(new tasks_1.NodePackageInstallTask());
-        context.logger.info(colors.green(`  ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2347`));
+        context.logger.info(colors.green(`  ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2390`));
     };
 }
-function v15Rule() {
+function v16Rule() {
     return (tree, context) => __awaiter(this, void 0, void 0, function* () {
         (0, utils_1.logStart)(context, `Upgrade @delon/* version number`);
         (0, versions_1.UpgradeMainVersions)(tree);
-        return (0, schematics_1.chain)([(0, less_1.addImportNotation)(), removeDuplicateDependencies(), finished()]);
+        return (0, schematics_1.chain)([finished()]);
     });
 }
-exports.v15Rule = v15Rule;
+exports.v16Rule = v16Rule;
 //# sourceMappingURL=index.js.map

package/ng-update/upgrade-rules/v16/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v16/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,sCAAsC;AAEtC,0CAA0C;AAC1C,sDAA8D;AAE9D,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,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAA,CAAC;AACJ,CAAC;AAND,0BAMC"}

package/ng-update/upgrade-rules/{v15 → v16}/index.spec.ts

@@ -2,7 +2,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 
 import { createAlainApp, migrationCollection } from '../../../utils/testing';
 
-describe('Schematic: ng-update: v15Rule', () => {
+describe('Schematic: ng-update: v16Rule', () => {
   let runner: SchematicTestRunner;
   let tree: UnitTestTree;
   const logs: string[] = [];
@@ -15,6 +15,6 @@ describe('Schematic: ng-update: v15Rule', () => {
     logs.length = 0;
     runner = new SchematicTestRunner('schematics', migrationCollection);
     runner.logger.subscribe(e => logs.push(e.message));
-    await runner.runSchematic('migration-v15', {}, tree);
+    await runner.runSchematic('migration-v16', {}, tree);
   }
 });

package/ng-update/upgrade-rules/v16/index.ts

@@ -0,0 +1,26 @@
+import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import * as colors from 'ansi-colors';
+
+import { logStart } from '../../../utils';
+import { UpgradeMainVersions } from '../../../utils/versions';
+
+function finished(): Rule {
+  return (_tree: Tree, context: SchematicContext) => {
+    context.addTask(new NodePackageInstallTask());
+
+    context.logger.info(
+      colors.green(
+        `  ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2390`
+      )
+    );
+  };
+}
+
+export function v16Rule(): Rule {
+  return async (tree: Tree, context: SchematicContext) => {
+    logStart(context, `Upgrade @delon/* version number`);
+    UpgradeMainVersions(tree);
+    return chain([finished()]);
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "15.2.1",
+  "version": "16.0.0",
   "description": "Schematics specific to ng-alain",
   "author": "cipchk<cipchk@qq.com>",
   "license": "MIT",
@@ -22,7 +22,7 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "swagger-typescript-api": "^12.0.2",
+    "swagger-typescript-api": "^12.0.4",
     "ng-alain-sts": "^0.0.2",
     "ng-alain-plugin-theme": "^15.0.1"
   },

package/tpl/index.js

@@ -33,11 +33,10 @@ function parseExtraArgs(options) {
     });
 }
 function runFixJS(options) {
-    var _a;
     parseExtraArgs(options);
     const fixScriptPath = path.join(options._tplDir, '_fix.js');
     if (fs.existsSync(fixScriptPath)) {
-        return (_a = path.relative(__dirname, fixScriptPath), Promise.resolve().then(() => require(_a))).then(a => {
+        return Promise.resolve(`${path.relative(__dirname, fixScriptPath)}`).then(s => require(s)).then(a => {
             if (a.fix) {
                 return a.fix(options);
             }

package/tpl/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/tpl/index.ts"],"names":[],"mappings":";;AAAA,2DAAuE;AACvE,yBAAyB;AACzB,6BAA6B;AAE7B,oCAAsC;AAGtC,MAAM,KAAK,GAAG,yEAAyE,CAAC;AAExF,SAAS,QAAQ,CAAC,OAAe;IAC/B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI;QACF,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,MAAM,IAAI,gCAAmB,CAAC,iBAAiB,OAAO,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;KAC5E;IACD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,MAAM,IAAI,gCAAmB,CAAC,wBAAwB,OAAO,CAAC,OAAO,kBAAkB,OAAO,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;KACnH;IAED,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAQ,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAa,CAAC;IACtC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,OAAO;KACR;IACD,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;IACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe;;IAC/B,cAAc,CAAC,OAAO,CAAC,CAAC;IACxB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO,MAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,6CAAE,IAAI,CAAC,CAAC,CAAC,EAAE;YAC9D,IAAI,CAAC,CAAC,GAAG,EAAE;gBACT,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,mBAAyB,OAAe;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,OAAO,GAAkB,EAAE;QACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,kBAAU,kBAAG,aAAa,EAAE,KAAK,IAAK,OAAO,EAAG,CAAC,CAAC;IACxF,CAAC,CAAC;AACJ,CAAC;AALD,4BAKC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/tpl/index.ts"],"names":[],"mappings":";;AAAA,2DAAuE;AACvE,yBAAyB;AACzB,6BAA6B;AAE7B,oCAAsC;AAGtC,MAAM,KAAK,GAAG,yEAAyE,CAAC;AAExF,SAAS,QAAQ,CAAC,OAAe;IAC/B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI;QACF,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,MAAM,IAAI,gCAAmB,CAAC,iBAAiB,OAAO,CAAC,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;KAC5E;IACD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,MAAM,IAAI,gCAAmB,CAAC,wBAAwB,OAAO,CAAC,OAAO,kBAAkB,OAAO,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;KACnH;IAED,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAQ,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAa,CAAC;IACtC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,OAAO;KACR;IACD,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;IACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe;IAC/B,cAAc,CAAC,OAAO,CAAC,CAAC;IACxB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO,mBAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,0BAAE,IAAI,CAAC,CAAC,CAAC,EAAE;YAC9D,IAAI,CAAC,CAAC,GAAG,EAAE;gBACT,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,mBAAyB,OAAe;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,OAAO,GAAkB,EAAE;QACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,kBAAU,kBAAG,aAAa,EAAE,KAAK,IAAK,OAAO,EAAG,CAAC,CAAC;IACxF,CAAC,CAAC;AACJ,CAAC;AALD,4BAKC"}

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 = '^15.2.1';
-exports.ZORROVERSION = '^15.1.0';
+exports.VERSION = '^16.0.0';
+exports.ZORROVERSION = '^16.0.0-beta.0';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^15.2.1';
-export const ZORROVERSION = '^15.1.0';
+export const VERSION = '^16.0.0';
+export const ZORROVERSION = '^16.0.0-beta.0';

package/utils/versions.js

@@ -21,29 +21,29 @@ 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@~15.2.0`,
-        `@angular-eslint/eslint-plugin@~15.2.0`,
-        `@angular-eslint/eslint-plugin-template@~15.2.0`,
-        `@angular-eslint/schematics@~15.2.0`,
-        `@angular-eslint/template-parser@~15.2.0`,
-        `@typescript-eslint/eslint-plugin@~5.49.0`,
-        `@typescript-eslint/parser@~5.49.0`,
-        `eslint@^8.33.0`,
-        `eslint-config-prettier@~8.6.0`,
-        `eslint-plugin-import@~2.26.0`,
-        `eslint-plugin-jsdoc@~39.7.4`,
+        `@angular-eslint/builder@~16.0.3`,
+        `@angular-eslint/eslint-plugin@~16.0.3`,
+        `@angular-eslint/eslint-plugin-template@~16.0.3`,
+        `@angular-eslint/schematics@~16.0.3`,
+        `@angular-eslint/template-parser@~16.0.3`,
+        `@typescript-eslint/eslint-plugin@~5.59.8`,
+        `@typescript-eslint/parser@~5.59.8`,
+        `eslint@^8.41.0`,
+        `eslint-config-prettier@~8.8.0`,
+        `eslint-plugin-import@~2.25.3`,
+        `eslint-plugin-jsdoc@~45.0.0`,
         `eslint-plugin-prefer-arrow@~1.2.3`,
         `eslint-plugin-prettier@~4.2.1`,
-        `eslint-plugin-deprecation@~1.3.3`,
-        `prettier@^2.8.3`,
+        `eslint-plugin-deprecation@~1.4.1`,
+        `prettier@^2.8.8`,
         `husky@^7.0.4`,
         `ng-alain@${version}`,
         `ng-alain-plugin-theme@^15.0.1`,
         `source-map-explorer@^2.5.3`,
-        `@angular/language-service@^15.1.0`,
+        `@angular/language-service@^16.0.3`,
         `@delon/testing@${version}`
     ], 'devDependencies');
-    (0, package_1.addPackage)(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.1.0`]);
+    (0, package_1.addPackage)(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^16.0.0-beta.0`]);
 }
 exports.UpgradeMainVersions = UpgradeMainVersions;
 function addESLintRule(context, showLog = true) {

package/utils/versions.ts

@@ -17,31 +17,31 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
   addPackage(
     tree,
     [
-      `@angular-eslint/builder@~15.2.0`,
-      `@angular-eslint/eslint-plugin@~15.2.0`,
-      `@angular-eslint/eslint-plugin-template@~15.2.0`,
-      `@angular-eslint/schematics@~15.2.0`,
-      `@angular-eslint/template-parser@~15.2.0`,
-      `@typescript-eslint/eslint-plugin@~5.49.0`,
-      `@typescript-eslint/parser@~5.49.0`,
-      `eslint@^8.33.0`,
-      `eslint-config-prettier@~8.6.0`,
-      `eslint-plugin-import@~2.26.0`,
-      `eslint-plugin-jsdoc@~39.7.4`,
+      `@angular-eslint/builder@~16.0.3`,
+      `@angular-eslint/eslint-plugin@~16.0.3`,
+      `@angular-eslint/eslint-plugin-template@~16.0.3`,
+      `@angular-eslint/schematics@~16.0.3`,
+      `@angular-eslint/template-parser@~16.0.3`,
+      `@typescript-eslint/eslint-plugin@~5.59.8`,
+      `@typescript-eslint/parser@~5.59.8`,
+      `eslint@^8.41.0`,
+      `eslint-config-prettier@~8.8.0`,
+      `eslint-plugin-import@~2.25.3`,
+      `eslint-plugin-jsdoc@~45.0.0`,
       `eslint-plugin-prefer-arrow@~1.2.3`,
       `eslint-plugin-prettier@~4.2.1`,
-      `eslint-plugin-deprecation@~1.3.3`,
-      `prettier@^2.8.3`,
+      `eslint-plugin-deprecation@~1.4.1`,
+      `prettier@^2.8.8`,
       `husky@^7.0.4`,
       `ng-alain@${version}`,
       `ng-alain-plugin-theme@^15.0.1`,
       `source-map-explorer@^2.5.3`,
-      `@angular/language-service@^15.1.0`,
+      `@angular/language-service@^16.0.3`,
       `@delon/testing@${version}`
     ],
     'devDependencies'
   );
-  addPackage(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.1.0`]);
+  addPackage(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^16.0.0-beta.0`]);
 }
 
 export function addESLintRule(context: SchematicContext, showLog: Boolean = true): Rule {

package/ng-update/upgrade-rules/v15/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v15/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,sCAAsC;AAEtC,0CAAqE;AACrE,8CAAwD;AACxD,sDAA8D;AAE9D,SAAS,2BAA2B;IAClC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,eAAe;YAAE,OAAO;QACjC,OAAO,GAAG,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;QACpD,IAAA,oBAAY,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxB,IAAA,gBAAQ,EAAC,OAAO,EAAE,4EAA4E,CAAC,CAAC;IAClG,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,CAAC,IAAA,wBAAiB,GAAE,EAAE,2BAA2B,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC,CAAA,CAAC;AACJ,CAAC;AAND,0BAMC"}

package/ng-update/upgrade-rules/v15/index.ts

@@ -1,38 +0,0 @@
-import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import * as colors from 'ansi-colors';
-
-import { logStart, readPackage, writePackage } from '../../../utils';
-import { addImportNotation } from '../../../utils/less';
-import { UpgradeMainVersions } from '../../../utils/versions';
-
-function removeDuplicateDependencies(): Rule {
-  return (tree: Tree, context: SchematicContext) => {
-    const pkg = readPackage(tree);
-    if (!pkg.devDependencies) return;
-    delete pkg.devDependencies['ng-alain-sts'];
-    delete pkg.devDependencies['ng-alain-plugin-theme'];
-    writePackage(tree, pkg);
-    logStart(context, `Remove duplicate dev-dependencies: 'ng-alain-sts', 'ng-alain-plugin-theme'`);
-  };
-}
-
-function finished(): Rule {
-  return (_tree: Tree, context: SchematicContext) => {
-    context.addTask(new NodePackageInstallTask());
-
-    context.logger.info(
-      colors.green(
-        `  ✓ Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2347`
-      )
-    );
-  };
-}
-
-export function v15Rule(): Rule {
-  return async (tree: Tree, context: SchematicContext) => {
-    logStart(context, `Upgrade @delon/* version number`);
-    UpgradeMainVersions(tree);
-    return chain([addImportNotation(), removeDuplicateDependencies(), finished()]);
-  };
-}