ng-alain 15.1.0 → 15.2.0

package/application/index.spec.ts

@@ -51,28 +51,24 @@ describe('NgAlainSchematic: application', () => {
           key2: 'KEY2'
         });
         const baseRunner = createNgRunner();
-        const workspaceTree = await baseRunner
-          .runSchematicAsync('workspace', {
-            name: 'workspace',
-            newProjectRoot: 'projects',
-            version: '6.0.0'
-          })
-          .toPromise();
-        const appTree = await baseRunner
-          .runSchematicAsync(
-            'application',
-            {
-              name: APPNAME,
-              inlineStyle: false,
-              inlineTemplate: false,
-              routing: false,
-              style: 'css',
-              skipTests: false,
-              skipPackageJson: false
-            },
-            workspaceTree
-          )
-          .toPromise();
+        const workspaceTree = await baseRunner.runSchematic('workspace', {
+          name: 'workspace',
+          newProjectRoot: 'projects',
+          version: '6.0.0'
+        });
+        const appTree = await baseRunner.runSchematic(
+          'application',
+          {
+            name: APPNAME,
+            inlineStyle: false,
+            inlineTemplate: false,
+            routing: false,
+            style: 'css',
+            skipTests: false,
+            skipPackageJson: false
+          },
+          workspaceTree
+        );
         appTree.create(
           '/demo.html',
           `
@@ -86,16 +82,14 @@ describe('NgAlainSchematic: application', () => {
         );
 
         const alainRunner = createAlainRunner();
-        const tree = await alainRunner
-          .runSchematicAsync(
-            'ng-add',
-            {
-              skipPackageJson: false,
-              defaultLanguage: 'zh'
-            },
-            appTree
-          )
-          .toPromise();
+        const tree = await alainRunner.runSchematic(
+          'ng-add',
+          {
+            skipPackageJson: false,
+            defaultLanguage: 'zh'
+          },
+          appTree
+        );
 
         const res = tree.readContent('/demo.html');
         expect(res).toBe(`

package/curd/index.spec.ts

@@ -8,7 +8,7 @@ describe('Schematic: curd', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainAndModuleApp());
-    tree = await runner.runSchematicAsync('curd', { name: 'list', module: 'trade' }, tree).toPromise();
+    tree = await runner.runSchematic('curd', { name: 'list', module: 'trade' }, tree);
   });
 
   it('should be generate list page', () => {

package/edit/index.spec.ts

@@ -12,7 +12,7 @@ describe('Schematic: edit', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainAndModuleApp());
-    tree = await runner.runSchematicAsync('edit', { name: 'edit', module: 'trade' }, tree).toPromise();
+    tree = await runner.runSchematic('edit', { name: 'edit', module: 'trade' }, tree);
   });
 
   it('should be generate list page', () => {

package/empty/index.spec.ts

@@ -17,38 +17,34 @@ describe('Schematic: empty', () => {
     });
 
     it('should be generate list page', async () => {
-      tree = await runner.runSchematicAsync('empty', { name: 'list', module: 'trade' }, tree).toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' }, tree);
       [modulePath, routingPath, tsPath, htmlPath].forEach(path => expect(tree.exists(path)).toBe(true));
       expect(tree.exists(servicePath)).toBe(false);
     });
 
     it('should be has import code', async () => {
-      tree = await runner.runSchematicAsync('empty', { name: 'list', module: 'trade' }, tree).toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' }, tree);
       expect(tree.readContent(modulePath)).toContain(`import { TradeListComponent } from './list/list.component';`);
     });
 
     it('should be include module name in component name', async () => {
-      tree = await runner.runSchematicAsync('empty', { name: 'list', module: 'trade' }, tree).toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' }, tree);
       expect(tree.readContent(tsPath)).toContain(`TradeListComponent`);
     });
 
     it('shuold be exclude style', async () => {
-      tree = await runner.runSchematicAsync('empty', { name: 'list', module: 'trade' }, tree).toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' }, tree);
       expect(tree.readContent(tsPath)).not.toContain(`styleUrls`);
     });
 
     it('shuold be include service', async () => {
-      tree = await runner
-        .runSchematicAsync('empty', { name: 'list', module: 'trade', service: 'none' }, tree)
-        .toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade', service: 'none' }, tree);
       expect(tree.readContent(servicePath)).toContain(`@Injectable()`);
       expect(tree.readContent(modulePath)).toContain(`TradeService`);
     });
 
     it('shuold be include root service', async () => {
-      tree = await runner
-        .runSchematicAsync('empty', { name: 'list', module: 'trade', service: 'root' }, tree)
-        .toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade', service: 'root' }, tree);
       expect(tree.readContent(servicePath)).toContain(`@Injectable({ providedIn: 'root' })`);
     });
   });
@@ -56,8 +52,8 @@ describe('Schematic: empty', () => {
   describe('ng-alain.json', () => {
     it('should be specify routesRoot', async () => {
       const alainJson = { projects: { foo: { routesRoot: 'app/pages' } } };
-      ({ runner, tree } = await createAlainAndModuleApp('trade', null, alainJson));
-      tree = await runner.runSchematicAsync('empty', { name: 'list', module: 'trade' }, tree).toPromise();
+      ({ runner, tree } = await createAlainAndModuleApp('trade', undefined, alainJson));
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' }, tree);
       expect(tree.exists('/projects/foo/src/app/pages/trade/trade.module.ts')).toBe(true);
     });
   });

package/list/index.spec.ts

@@ -14,7 +14,7 @@ describe('Schematic: list', () => {
   beforeEach(async () => {
     ({ runner, tree } = await createAlainAndModuleApp());
 
-    tree = await runner.runSchematicAsync('list', { name: 'list', module: 'trade' }, tree).toPromise();
+    tree = await runner.runSchematic('list', { name: 'list', module: 'trade' }, tree);
   });
 
   it('should be generate list page', () => {
@@ -34,9 +34,7 @@ describe('Schematic: list', () => {
   });
 
   it('should be support targets (like: list/edit)', async () => {
-    tree = await runner
-      .runSchematicAsync('list', { name: 'list2', module: 'trade', target: 'list/edit' }, tree)
-      .toPromise();
+    tree = await runner.runSchematic('list', { name: 'list2', module: 'trade', target: 'list/edit' }, tree);
     expect(tree.exists(`/projects/foo/src/app/routes/trade/list/edit/list2/list2.component.html`)).toBe(true);
   });
 
@@ -45,7 +43,7 @@ describe('Schematic: list', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     spyOn(fs, 'readdirSync').and.returnValue({ length: 1 } as any);
     try {
-      tree = await runner.runSchematicAsync('list', { name: 'list', module: 'trade' }, tree).toPromise();
+      tree = await runner.runSchematic('list', { name: 'list', module: 'trade' }, tree);
       expect(true).toBe(false);
     } catch (e) {
       expect(e.message).toContain(`already exists`);
@@ -53,7 +51,7 @@ describe('Schematic: list', () => {
   });
 
   it('shuold be include service', async () => {
-    tree = await runner.runSchematicAsync('list', { name: 'list', module: 'trade', service: 'none' }, tree).toPromise();
+    tree = await runner.runSchematic('list', { name: 'list', module: 'trade', service: 'none' }, tree);
     const servicePath = '/projects/foo/src/app/routes/trade/list/list.service.ts';
     expect(tree.readContent(servicePath)).toContain(`@Injectable()`);
     expect(tree.readContent(modulePath)).toContain(`TradeService`);

package/module/index.spec.ts

@@ -17,7 +17,7 @@ describe('NgAlainSchematic: module', () => {
   });
 
   it('should create a module', async () => {
-    tree = await runner.runSchematicAsync('module', { ...defaultOptions }, tree).toPromise();
+    tree = await runner.runSchematic('module', { ...defaultOptions }, tree);
     expect(tree.files.includes('/projects/foo/src/app/routes/trade/trade.module.ts')).toBe(true);
     expect(tree.files.includes('/projects/foo/src/app/routes/trade/trade-routing.module.ts')).toBe(true);
     const routesRoutingModuleContent = tree.readContent(`/projects/foo/src/app/routes/routes-routing.module.ts`);
@@ -27,15 +27,17 @@ describe('NgAlainSchematic: module', () => {
   });
 
   it('should import into another module', async () => {
-    tree = await runner
-      .runSchematicAsync('module', { ...defaultOptions, module: 'app.module.ts', path: '/projects/foo/src/app' }, tree)
-      .toPromise();
+    tree = await runner.runSchematic(
+      'module',
+      { ...defaultOptions, module: 'app.module.ts', path: '/projects/foo/src/app' },
+      tree
+    );
     const content = tree.readContent('/projects/foo/src/app/app.module.ts');
     expect(content).toContain(`import { TradeModule } from './trade/trade.module';`);
   });
 
   it('shuold be include service', async () => {
-    tree = await runner.runSchematicAsync('module', { ...defaultOptions, service: 'none' }, tree).toPromise();
+    tree = await runner.runSchematic('module', { ...defaultOptions, service: 'none' }, tree);
     const content = tree.readContent('/projects/foo/src/app/routes/trade/trade.service.ts');
     const contentModule = tree.readContent('/projects/foo/src/app/routes/trade/trade.module.ts');
     expect(content).toContain(`@Injectable()`);
@@ -44,7 +46,7 @@ describe('NgAlainSchematic: module', () => {
   });
 
   it('shuold be include root service', async () => {
-    tree = await runner.runSchematicAsync('module', { ...defaultOptions, service: 'root' }, tree).toPromise();
+    tree = await runner.runSchematic('module', { ...defaultOptions, service: 'root' }, tree);
     const content = tree.readContent('/projects/foo/src/app/routes/trade/trade.service.ts');
     expect(content).toContain(`@Injectable({ providedIn: 'root' })`);
     expect(content).toContain(`TradeService`);

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

@@ -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.runSchematicAsync('migration-v15', {}, tree).toPromise();
+    await runner.runSchematic('migration-v15', {}, tree);
   }
 });

package/package.json

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

package/plugin/index.spec.ts

@@ -10,9 +10,7 @@ describe('NgAlainSchematic: plugin', () => {
 
   it('should be throw error when not find plugin name', async () => {
     try {
-      await runner
-        .runSchematicAsync('plugin', { name: 'invalid-name', type: 'remove', packageManager: 'npm' }, tree)
-        .toPromise();
+      await runner.runSchematic('plugin', { name: 'invalid-name', type: 'remove', packageManager: 'npm' }, tree);
       expect(true).toBe(false);
     } catch {
       expect(true).toBe(true);

package/plugin/plugin.code-style.spec.ts

@@ -17,7 +17,7 @@ describe('NgAlainSchematic: plugin: codeStyle', () => {
   });
 
   describe('when remove', () => {
-    beforeEach(async () => runner.runSchematicAsync('plugin', { name: 'codeStyle', type: 'remove' }, tree).toPromise());
+    beforeEach(async () => runner.runSchematic('plugin', { name: 'codeStyle', type: 'remove' }, tree));
 
     it(`should remove precommit`, () => {
       const json = JSON.parse(tree.readContent('package.json'));

package/plugin/plugin.default-language.spec.ts

@@ -18,9 +18,7 @@ describe('NgAlainSchematic: plugin: default-language', () => {
   });
 
   it('should be from en to zh', async () => {
-    await runner
-      .runSchematicAsync('plugin', { name: 'defaultLanguage', type: 'add', defaultLanguage: 'zh' }, tree)
-      .toPromise();
+    await runner.runSchematic('plugin', { name: 'defaultLanguage', type: 'add', defaultLanguage: 'zh' }, tree);
     const content = tree.readContent(PATH);
     expect(content).toContain(`@angular/common/locales/zh`);
     expect(content).toContain(`NZ_I18N, zh_CN`);

package/plugin/plugin.docker.spec.ts

@@ -8,7 +8,7 @@ describe('NgAlainSchematic: plugin: docker', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainApp());
-    tree = await runner.runSchematicAsync('plugin', { name: 'docker', type: 'add' }, tree).toPromise();
+    tree = await runner.runSchematic('plugin', { name: 'docker', type: 'add' }, tree);
   });
 
   describe('when add', () => {
@@ -21,10 +21,7 @@ describe('NgAlainSchematic: plugin: docker', () => {
   });
 
   describe('when remove', () => {
-    beforeEach(
-      async () =>
-        (tree = await runner.runSchematicAsync('plugin', { name: 'docker', type: 'remove' }, tree).toPromise())
-    );
+    beforeEach(async () => (tree = await runner.runSchematic('plugin', { name: 'docker', type: 'remove' }, tree)));
     it(`should add fiels`, () => {
       expect(tree.exists(`/projects/${APPNAME}/.dockerignore`)).toBe(false);
       expect(tree.exists(`/projects/${APPNAME}/docker-compose.yml`)).toBe(false);

package/plugin/plugin.icon.spec.ts

@@ -49,7 +49,7 @@ describe('NgAlainSchematic: plugin: icon', () => {
   beforeEach(async () => {
     ({ runner, tree } = await createAlainApp());
     Object.keys(testCases).forEach(name => tree.create(`/projects/foo/src/${name}`, testCases[name]));
-    tree = await runner.runSchematicAsync('plugin', { name: 'icon', type: 'add' }, tree).toPromise();
+    tree = await runner.runSchematic('plugin', { name: 'icon', type: 'add' }, tree);
   });
 
   it(`should working`, () => {

package/plugin/plugin.network-env.spec.ts

@@ -20,9 +20,7 @@ describe('NgAlainSchematic: plugin: networkEnv', () => {
 
     describe('when remove', () => {
       beforeEach(async () =>
-        runner
-          .runSchematicAsync('plugin', { name: 'networkEnv', type: 'remove', packageManager: 'npm' }, tree)
-          .toPromise()
+        runner.runSchematic('plugin', { name: 'networkEnv', type: 'remove', packageManager: 'npm' }, tree)
       );
 
       it(`should remove .npmrc`, () => {
@@ -45,9 +43,7 @@ describe('NgAlainSchematic: plugin: networkEnv', () => {
 
     describe('when remove', () => {
       beforeEach(async () =>
-        runner
-          .runSchematicAsync('plugin', { name: 'networkEnv', type: 'remove', packageManager: 'yarn' }, tree)
-          .toPromise()
+        runner.runSchematic('plugin', { name: 'networkEnv', type: 'remove', packageManager: 'yarn' }, tree)
       );
 
       it(`should remove .yarnrc`, () => {

package/plugin/plugin.rtl.spec.ts

@@ -8,7 +8,7 @@ describe('NgAlainSchematic: plugin: rtl', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainApp());
-    tree = await runner.runSchematicAsync('plugin', { name: 'rtl', type: 'add' }, tree).toPromise();
+    tree = await runner.runSchematic('plugin', { name: 'rtl', type: 'add' }, tree);
   });
 
   it(`should be working`, () => {

package/plugin/plugin.sts.spec.ts

@@ -8,7 +8,7 @@ describe('NgAlainSchematic: plugin: sts', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainApp());
-    tree = await runner.runSchematicAsync('plugin', { name: 'sts', type: 'add' }, tree).toPromise();
+    tree = await runner.runSchematic('plugin', { name: 'sts', type: 'add' }, tree);
   });
 
   describe('when add', () => {
@@ -30,9 +30,7 @@ describe('NgAlainSchematic: plugin: sts', () => {
   });
 
   describe('when remove', () => {
-    beforeEach(
-      async () => (tree = await runner.runSchematicAsync('plugin', { name: 'sts', type: 'remove' }, tree).toPromise())
-    );
+    beforeEach(async () => (tree = await runner.runSchematic('plugin', { name: 'sts', type: 'remove' }, tree)));
     it(`should add fiels`, () => {
       const json = JSON.parse(tree.readContent('package.json'));
       expect(json.devDependencies['ng-alain-sts']).not.toBeDefined();

package/sta/index.spec.ts

@@ -41,7 +41,7 @@ describe('Schematic: sta', () => {
   let tree: UnitTestTree;
 
   async function run(): Promise<void> {
-    tree = await runner.runSchematicAsync('sta', { spec: SPEC }, tree).toPromise();
+    tree = await runner.runSchematic('sta', { spec: SPEC }, tree);
   }
 
   beforeEach(async () => ({ runner, tree } = await createAlainAndModuleApp()));
@@ -56,7 +56,7 @@ describe('Schematic: sta', () => {
   });
 
   it('#tagsMapping', async () => {
-    tree = await runner.runSchematicAsync('sta', { spec: SPEC, tagsMapping: { user: 'AA' } }, tree).toPromise();
+    tree = await runner.runSchematic('sta', { spec: SPEC, tagsMapping: { user: 'AA' } }, tree);
     const newModulePath = '/projects/foo/src/app/_sta/AA/service.ts';
     expect(tree.exists(newModulePath)).toBe(true);
     expect(tree.readContent(newModulePath)).toContain(`export class AaService`);

package/tpl/index.spec.ts

@@ -10,7 +10,7 @@ describe('Schematic: tpl', () => {
   let tree: UnitTestTree;
 
   async function run(): Promise<void> {
-    tree = await runner.runSchematicAsync('tpl', { name: 'edit', module: 'trade', modal: true }, tree).toPromise();
+    tree = await runner.runSchematic('tpl', { name: 'edit', module: 'trade', modal: true }, tree);
   }
 
   beforeEach(async () => ({ runner, tree } = await createAlainAndModuleApp()));

package/utils/alain.spec.ts

@@ -27,20 +27,16 @@ const COMPONENTS = [Components...];
 
   describe('#withoutModulePrefixInComponentName', () => {
     it('with true', async () => {
-      tree = await runner
-        .runSchematicAsync(
-          'empty',
-          { name: 'list', module: 'trade', withoutModulePrefixInComponentName: true } as CommonSchema,
-          tree
-        )
-        .toPromise();
+      tree = await runner.runSchematic(
+        'empty',
+        { name: 'list', module: 'trade', withoutModulePrefixInComponentName: true } as CommonSchema,
+        tree
+      );
       const listTsCon = tree.readContent(`/projects/foo/src/app/routes/trade/list/list.component.ts`);
       expect(listTsCon).toContain(`ListComponent`);
     });
     it('with false', async () => {
-      tree = await runner
-        .runSchematicAsync('empty', { name: 'list', module: 'trade' } as CommonSchema, tree)
-        .toPromise();
+      tree = await runner.runSchematic('empty', { name: 'list', module: 'trade' } as CommonSchema, tree);
       const listTsCon = tree.readContent(`/projects/foo/src/app/routes/trade/list/list.component.ts`);
       expect(listTsCon).toContain(`TradeListComponent`);
     });

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.1.0';
-exports.ZORROVERSION = '^15.0.3';
+exports.VERSION = '^15.2.0';
+exports.ZORROVERSION = '^15.1.0';
 //# sourceMappingURL=lib-versions.js.map

package/utils/lib-versions.ts

@@ -1,2 +1,2 @@
-export const VERSION = '^15.1.0';
-export const ZORROVERSION = '^15.0.3';
+export const VERSION = '^15.2.0';
+export const ZORROVERSION = '^15.1.0';

package/utils/testing.js

@@ -29,15 +29,12 @@ exports.createAlainRunner = createAlainRunner;
 function createAlainApp(ngAddOptions) {
     return __awaiter(this, void 0, void 0, function* () {
         const baseRunner = createNgRunner();
-        const workspaceTree = yield baseRunner
-            .runSchematicAsync('workspace', {
+        const workspaceTree = yield baseRunner.runSchematic('workspace', {
             name: 'workspace',
             newProjectRoot: 'projects',
             version: '8.0.0'
-        })
-            .toPromise();
-        const appTree = yield baseRunner
-            .runSchematicAsync('application', {
+        });
+        const appTree = yield baseRunner.runSchematic('application', {
             name: exports.APPNAME,
             inlineStyle: false,
             inlineTemplate: false,
@@ -45,12 +42,9 @@ function createAlainApp(ngAddOptions) {
             style: 'css',
             skipTests: false,
             skipPackageJson: false
-        }, workspaceTree)
-            .toPromise();
+        }, workspaceTree);
         const alainRunner = createAlainRunner();
-        const tree = yield alainRunner
-            .runSchematicAsync('ng-add', Object.assign({ skipPackageJson: false }, ngAddOptions), appTree)
-            .toPromise();
+        const tree = yield alainRunner.runSchematic('ng-add', Object.assign({ skipPackageJson: false }, ngAddOptions), appTree);
         return { runner: alainRunner, tree };
     });
 }
@@ -61,9 +55,7 @@ function createAlainAndModuleApp(name = 'trade', ngAddOptions, alainData) {
         if (alainData != null) {
             res.tree.create('ng-alain.json', JSON.stringify(alainData));
         }
-        res.tree = yield res.runner
-            .runSchematicAsync('module', { name, project: exports.APPNAME, routing: true }, res.tree)
-            .toPromise();
+        res.tree = yield res.runner.runSchematic('module', { name, project: exports.APPNAME, routing: true }, res.tree);
         return res;
     });
 }
@@ -71,15 +63,12 @@ exports.createAlainAndModuleApp = createAlainAndModuleApp;
 function createTestApp() {
     return __awaiter(this, void 0, void 0, function* () {
         const runner = yield createNgRunner();
-        const workspaceTree = yield runner
-            .runSchematicAsync('workspace', {
+        const workspaceTree = yield runner.runSchematic('workspace', {
             name: 'workspace',
             newProjectRoot: 'projects',
             version: '8.0.0'
-        })
-            .toPromise();
-        const appTree = yield runner
-            .runSchematicAsync('application', {
+        });
+        const appTree = yield runner.runSchematic('application', {
             name: exports.APPNAME,
             inlineStyle: false,
             inlineTemplate: false,
@@ -87,8 +76,7 @@ function createTestApp() {
             style: 'css',
             skipTests: false,
             skipPackageJson: false
-        }, workspaceTree)
-            .toPromise();
+        }, workspaceTree);
         return { runner, tree: appTree };
     });
 }

package/utils/testing.js.map

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

package/utils/testing.ts

@@ -27,39 +27,33 @@ export function createAlainRunner(): SchematicTestRunner {
 
 export async function createAlainApp(ngAddOptions?: NgAddSchema): Promise<AppResult> {
   const baseRunner = createNgRunner();
-  const workspaceTree = await baseRunner
-    .runSchematicAsync('workspace', {
-      name: 'workspace',
-      newProjectRoot: 'projects',
-      version: '8.0.0'
-    })
-    .toPromise();
-  const appTree = await baseRunner
-    .runSchematicAsync(
-      'application',
-      {
-        name: APPNAME,
-        inlineStyle: false,
-        inlineTemplate: false,
-        routing: false,
-        style: 'css',
-        skipTests: false,
-        skipPackageJson: false
-      },
-      workspaceTree
-    )
-    .toPromise();
+  const workspaceTree = await baseRunner.runSchematic('workspace', {
+    name: 'workspace',
+    newProjectRoot: 'projects',
+    version: '8.0.0'
+  });
+  const appTree = await baseRunner.runSchematic(
+    'application',
+    {
+      name: APPNAME,
+      inlineStyle: false,
+      inlineTemplate: false,
+      routing: false,
+      style: 'css',
+      skipTests: false,
+      skipPackageJson: false
+    },
+    workspaceTree
+  );
   const alainRunner = createAlainRunner();
-  const tree = await alainRunner
-    .runSchematicAsync(
-      'ng-add',
-      {
-        skipPackageJson: false,
-        ...ngAddOptions
-      },
-      appTree
-    )
-    .toPromise();
+  const tree = await alainRunner.runSchematic(
+    'ng-add',
+    {
+      skipPackageJson: false,
+      ...ngAddOptions
+    },
+    appTree
+  );
   return { runner: alainRunner, tree };
 }
 
@@ -72,35 +66,29 @@ export async function createAlainAndModuleApp(
   if (alainData != null) {
     res.tree.create('ng-alain.json', JSON.stringify(alainData));
   }
-  res.tree = await res.runner
-    .runSchematicAsync('module', { name, project: APPNAME, routing: true }, res.tree)
-    .toPromise();
+  res.tree = await res.runner.runSchematic('module', { name, project: APPNAME, routing: true }, res.tree);
   return res;
 }
 
 export async function createTestApp(): Promise<{ runner: SchematicTestRunner; tree: UnitTestTree }> {
   const runner = await createNgRunner();
-  const workspaceTree = await runner
-    .runSchematicAsync('workspace', {
-      name: 'workspace',
-      newProjectRoot: 'projects',
-      version: '8.0.0'
-    })
-    .toPromise();
-  const appTree = await runner
-    .runSchematicAsync(
-      'application',
-      {
-        name: APPNAME,
-        inlineStyle: false,
-        inlineTemplate: false,
-        routing: false,
-        style: 'css',
-        skipTests: false,
-        skipPackageJson: false
-      },
-      workspaceTree
-    )
-    .toPromise();
+  const workspaceTree = await runner.runSchematic('workspace', {
+    name: 'workspace',
+    newProjectRoot: 'projects',
+    version: '8.0.0'
+  });
+  const appTree = await runner.runSchematic(
+    'application',
+    {
+      name: APPNAME,
+      inlineStyle: false,
+      inlineTemplate: false,
+      routing: false,
+      style: 'css',
+      skipTests: false,
+      skipPackageJson: false
+    },
+    workspaceTree
+  );
   return { runner, tree: appTree };
 }

package/utils/versions.js

@@ -43,7 +43,7 @@ function UpgradeMainVersions(tree, version = lib_versions_1.VERSION) {
         `@angular/language-service@^15.1.0`,
         `@delon/testing@${version}`
     ], 'devDependencies');
-    (0, package_1.addPackage)(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.0.3`]);
+    (0, package_1.addPackage)(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.1.0`]);
 }
 exports.UpgradeMainVersions = UpgradeMainVersions;
 function addESLintRule(context, showLog = true) {

package/utils/versions.ts

@@ -41,7 +41,7 @@ export function UpgradeMainVersions(tree: Tree, version: string = VERSION): void
     ],
     'devDependencies'
   );
-  addPackage(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.0.3`]);
+  addPackage(tree, [`rxjs@~7.8.0`, `ng-zorro-antd@^15.1.0`]);
 }
 
 export function addESLintRule(context: SchematicContext, showLog: Boolean = true): Rule {

package/view/index.spec.ts

@@ -12,7 +12,7 @@ describe('Schematic: view', () => {
 
   beforeEach(async () => {
     ({ runner, tree } = await createAlainAndModuleApp());
-    tree = await runner.runSchematicAsync('view', { name: 'view', module: 'trade' }, tree).toPromise();
+    tree = await runner.runSchematic('view', { name: 'view', module: 'trade' }, tree);
   });
 
   it('should be generate list page', () => {
@@ -24,7 +24,7 @@ describe('Schematic: view', () => {
   });
 
   it('should support a.b.c module name', async () => {
-    tree = await runner.runSchematicAsync('view', { name: 'view', module: 'trade', target: 'list' }, tree).toPromise();
+    tree = await runner.runSchematic('view', { name: 'view', module: 'trade', target: 'list' }, tree);
     expect(tree.exists('/projects/foo/src/app/routes/trade/list/view/view.component.ts')).toBe(true);
   });
 });