ng-alain 13.0.0-beta.1 → 13.0.0-beta.2

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

@@ -12,16 +12,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.v13Rule = void 0;
 const color_1 = require("@angular/cli/utilities/color");
 const schematics_1 = require("@angular-devkit/schematics");
+const workspace_1 = require("@schematics/angular/utility/workspace");
 const utils_1 = require("../../../utils");
 const versions_1 = require("../../../utils/versions");
 function removeIE() {
     return (tree, context) => {
         const pkg = (0, utils_1.readPackage)(tree);
-        if (!pkg.scripts['ie:start'])
+        if (pkg.scripts && !pkg.scripts['ie:start'])
             return;
         context.logger.warn(color_1.colors.yellow(`TIPS: Starting from NG-ALAIN 13 will no longer support IE`));
     };
 }
+function addYarn(context) {
+    return (0, workspace_1.updateWorkspace)((workspace) => __awaiter(this, void 0, void 0, function* () {
+        const cli = workspace.extensions.cli;
+        if (cli && cli.packageManager)
+            return;
+        if (cli == null)
+            workspace.extensions.cli = {};
+        workspace.extensions.cli['packageManager'] = 'yarn';
+        (0, utils_1.logStart)(context, `Configuration optimization using Yarn to install dependencies`);
+    }));
+}
 function upgradeThirdVersion() {
     return (tree, context) => {
         (0, utils_1.addPackage)(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
@@ -37,7 +49,7 @@ function v13Rule() {
     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)([removeIE(), upgradeThirdVersion(), finished()]);
+        return (0, schematics_1.chain)([removeIE(), upgradeThirdVersion(), addYarn(context), finished()]);
     });
 }
 exports.v13Rule = v13Rule;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsD;AAEtD,2DAAiF;AAEjF,0CAAmE;AACnE,sDAA8D;AAE9D,SAAS,QAAQ;IACf,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QAErC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC,MAAM,CAAC,2DAA2D,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC;AACJ,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,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,cAAM,CAAC,KAAK,CACV,wHAAwH,CACzH,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,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC,CAAA,CAAC;AACJ,CAAC;AAND,0BAMC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/upgrade-rules/v13/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAsD;AAEtD,2DAAiF;AACjF,qEAAwE;AAExE,0CAAmE;AACnE,sDAA8D;AAE9D,SAAS,QAAQ;IACf,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,OAAO;QAEpD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,cAAM,CAAC,MAAM,CAAC,2DAA2D,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,OAAyB;IACxC,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,GAA8B,CAAC;QAChE,IAAI,GAAG,IAAI,GAAG,CAAC,cAAc;YAAE,OAAO;QACtC,IAAI,GAAG,IAAI,IAAI;YAAE,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,EAAE,CAAC;QAC/C,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC;QACpD,IAAA,gBAAQ,EAAC,OAAO,EAAE,+DAA+D,CAAC,CAAC;IACrF,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,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAChD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,cAAM,CAAC,KAAK,CACV,wHAAwH,CACzH,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,EAAE,mBAAmB,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC,CAAA,CAAC;AACJ,CAAC;AAND,0BAMC"}

package/ng-update/upgrade-rules/v13/index.spec.ts

@@ -18,6 +18,12 @@ describe('Schematic: ng-update: v13Rule', () => {
     await runner.runSchematicAsync('migration-v13', {}, tree).toPromise();
   }
 
+  it(`should be add yarn`, async () => {
+    await runMigration();
+    const content = tree.readContent('angular.json');
+    expect(content).toContain(`"packageManager": "yarn"`);
+  });
+
   it(`should be tips not support ie`, async () => {
     tree.overwrite(`package.json`, JSON.stringify({ scripts: { 'ie:start': 'npm' } }));
     await runMigration();

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

@@ -1,6 +1,7 @@
 import { colors } from '@angular/cli/utilities/color';
 
 import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { updateWorkspace } from '@schematics/angular/utility/workspace';
 
 import { addPackage, logStart, readPackage } from '../../../utils';
 import { UpgradeMainVersions } from '../../../utils/versions';
@@ -8,12 +9,22 @@ import { UpgradeMainVersions } from '../../../utils/versions';
 function removeIE(): Rule {
   return (tree: Tree, context: SchematicContext) => {
     const pkg = readPackage(tree);
-    if (!pkg.scripts['ie:start']) return;
+    if (pkg.scripts && !pkg.scripts['ie:start']) return;
 
     context.logger.warn(colors.yellow(`TIPS: Starting from NG-ALAIN 13 will no longer support IE`));
   };
 }
 
+function addYarn(context: SchematicContext): Rule {
+  return updateWorkspace(async workspace => {
+    const cli = workspace.extensions.cli as Record<string, unknown>;
+    if (cli && cli.packageManager) return;
+    if (cli == null) workspace.extensions.cli = {};
+    workspace.extensions.cli['packageManager'] = 'yarn';
+    logStart(context, `Configuration optimization using Yarn to install dependencies`);
+  });
+}
+
 function upgradeThirdVersion(): Rule {
   return (tree: Tree, context: SchematicContext) => {
     addPackage(tree, [`ngx-ueditor@^13.0.0`, `ngx-tinymce@^13.0.0`], 'dependencies');
@@ -35,6 +46,6 @@ export function v13Rule(): Rule {
   return async (tree: Tree, context: SchematicContext) => {
     logStart(context, `Upgrade @delon/* version number`);
     UpgradeMainVersions(tree);
-    return chain([removeIE(), upgradeThirdVersion(), finished()]);
+    return chain([removeIE(), upgradeThirdVersion(), addYarn(context), finished()]);
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-alain",
-  "version": "13.0.0-beta.1",
+  "version": "13.0.0-beta.2",
   "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 = '^13.0.0-beta.1';
+exports.VERSION = '^13.0.0-beta.2';
 exports.ZORROVERSION = '^13.0.0';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^13.0.0-beta.1';
+export const VERSION = '^13.0.0-beta.2';
 export const ZORROVERSION = '^13.0.0';

package/utils/log.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logWarn = exports.logInfo = exports.logStart = void 0;
 const color_1 = require("@angular/cli/utilities/color");
 function logStart(context, message) {
-    context.logger.info(`    ${color_1.colors.green('✓')} ${message}`);
+    context.logger.info(`  ${color_1.colors.green('✓')} ${message}`);
 }
 exports.logStart = logStart;
 function logInfo(context, message) {
-    context.logger.info(`        ${color_1.colors.green('✓')} ${message}`);
+    context.logger.info(`    ${color_1.colors.green('✓')} ${message}`);
 }
 exports.logInfo = logInfo;
 function logWarn(context, message) {
-    context.logger.info(`        ${color_1.colors.yellow('✓')} ${message}`);
+    context.logger.info(`    ${color_1.colors.yellow('✓')} ${message}`);
 }
 exports.logWarn = logWarn;
 //# sourceMappingURL=log.js.map

package/utils/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../schematics/utils/log.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AAItD,SAAgB,QAAQ,CAAC,OAAyB,EAAE,OAAe;IACjE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAC7D,CAAC;AAFD,4BAEC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,cAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AACjE,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,cAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAClE,CAAC;AAFD,0BAEC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../schematics/utils/log.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AAItD,SAAgB,QAAQ,CAAC,OAAyB,EAAE,OAAe;IACjE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,cAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAC3D,CAAC;AAFD,4BAEC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAC7D,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,OAAyB,EAAE,OAAe;IAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;AAC9D,CAAC;AAFD,0BAEC"}

package/utils/log.ts

@@ -3,13 +3,13 @@ import { colors } from '@angular/cli/utilities/color';
 import { SchematicContext } from '@angular-devkit/schematics';
 
 export function logStart(context: SchematicContext, message: string): void {
-  context.logger.info(`    ${colors.green('✓')} ${message}`);
+  context.logger.info(`  ${colors.green('✓')} ${message}`);
 }
 
 export function logInfo(context: SchematicContext, message: string): void {
-  context.logger.info(`        ${colors.green('✓')} ${message}`);
+  context.logger.info(`    ${colors.green('✓')} ${message}`);
 }
 
 export function logWarn(context: SchematicContext, message: string): void {
-  context.logger.info(`        ${colors.yellow('✓')} ${message}`);
+  context.logger.info(`    ${colors.yellow('✓')} ${message}`);
 }

package/utils/versions.js

@@ -21,6 +21,7 @@ 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, [
+        `ng-zorro-antd@^13.0.0`,
         `@angular-eslint/builder@~13.0.1`,
         `@angular-eslint/eslint-plugin@~13.0.1`,
         `@angular-eslint/eslint-plugin-template@~13.0.1`,

package/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE,+CAA+C;QAC/C,qDAAqD;QACrD,8DAA8D;QAC9D,kDAAkD;QAClD,uDAAuD;QACvD,wDAAwD;QACxD,iDAAiD;QACjD,8BAA8B;QAC9B,8CAA8C;QAC9C,4CAA4C;QAC5C,2CAA2C;QAC3C,kDAAkD;QAClD,8CAA8C;QAC9C,gCAAgC;QAChC,6BAA6B;QAC7B,YAAY,OAAO,EAAE;QACrB,6CAA6C;QAC7C,2CAA2C;QAC3C,iDAAiD;QACjD,kBAAkB,OAAO,EAAE;KAC5B,EACD,iBAAiB,CAClB,CAAC;IACF,IAAA,oBAAU,EAAC,IAAI,EAAE,CAAC,2BAA2B,EAAE,mCAAmC,CAAC,CAAC,CAAC;AACvF,CAAC;AAhCD,kDAgCC;AAED,SAAgB,aAAa,CAAC,OAAyB,EAAE,UAAmB,IAAI;IAC9E,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,EAAE;gBAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;aAC3C;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,EAAE;gBACrC,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE;oBACP,gBAAgB,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;iBACnD;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,IAAA,aAAO,EAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;SACxD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,sCAiBC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../schematics/utils/versions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qEAAwE;AAExE,iDAAyC;AACzC,+BAAgC;AAChC,uCAAuC;AACvC,2CAAgD;AAEhD;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,UAAkB,sBAAO;IACvE,IAAA,oBAAU,EACR,IAAI,EACJ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,IAAI,IAAI,OAAO,EAAE,CAAC,CACnH,CAAC;IACF,IAAA,oBAAU,EACR,IAAI,EACJ;QACE,qCAAqC;QACrC,+CAA+C;QAC/C,qDAAqD;QACrD,8DAA8D;QAC9D,kDAAkD;QAClD,uDAAuD;QACvD,wDAAwD;QACxD,iDAAiD;QACjD,8BAA8B;QAC9B,8CAA8C;QAC9C,4CAA4C;QAC5C,2CAA2C;QAC3C,kDAAkD;QAClD,8CAA8C;QAC9C,gCAAgC;QAChC,6BAA6B;QAC7B,YAAY,OAAO,EAAE;QACrB,6CAA6C;QAC7C,2CAA2C;QAC3C,iDAAiD;QACjD,kBAAkB,OAAO,EAAE;KAC5B,EACD,iBAAiB,CAClB,CAAC;IACF,IAAA,oBAAU,EAAC,IAAI,EAAE,CAAC,2BAA2B,EAAE,mCAAmC,CAAC,CAAC,CAAC;AACvF,CAAC;AAjCD,kDAiCC;AAED,SAAgB,aAAa,CAAC,OAAyB,EAAE,UAAmB,IAAI;IAC9E,OAAO,IAAA,2BAAe,EAAC,CAAM,SAAS,EAAC,EAAE;QACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,EAAE;gBAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;aAC3C;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAiB,EAAE;gBACrC,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE;oBACP,gBAAgB,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC;iBACnD;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,IAAA,aAAO,EAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;SACxD;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,sCAiBC"}

package/utils/versions.ts

@@ -17,6 +17,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
   addPackage(
     tree,
     [
+      `ng-zorro-antd@^13.0.0`,
       `@angular-eslint/builder@~13.0.1`,
       `@angular-eslint/eslint-plugin@~13.0.1`,
       `@angular-eslint/eslint-plugin-template@~13.0.1`,