devextreme-schematics 1.10.1 → 1.11.0-beta.0

package/src/add-layout/index_spec.ts

@@ -101,25 +101,17 @@ describe('layout', () => {
     expect(styles[3]).toBe('src/themes/generated/theme.additional.dark.css');
     expect(styles[4]).toBe('src/themes/generated/theme.additional.css');
 
-    const moduleContent = tree.readContent('/src/app/app.module.ts');
-    expect(moduleContent).toContain('import { DxHttpModule }');
-    expect(moduleContent)
-      .toContain('import { SideNavOuterToolbarModule, SideNavInnerToolbarModule, SingleCardModule }');
-    expect(moduleContent)
-      .toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
-    expect(moduleContent).toContain('import { AppRoutingModule }');
-    expect(moduleContent)
-      .toContain('import { FooterModule, ' +
-      'ResetPasswordFormModule, ' +
-      'CreateAccountFormModule, ' +
-      'ChangePasswordFormModule, ' +
-      'LoginFormModule }');
-
     const appContent = tree.readContent('/src/app/app.component.ts');
+    expect(appContent).toContain('import { DxHttpModule }');
+    expect(appContent)
+      .toContain('import { SideNavOuterToolbarComponent as SideNavToolbarComponent }');
+    expect(appContent)
+      .toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
+    expect(appContent)
+      .toContain('import { FooterComponent }');
     expect(appContent).toContain('templateUrl: \'./app.component.html\',');
     expect(appContent).toContain('styleUrls: [\'./app.component.scss\']');
     expect(appContent).toContain('selector: \'app-root\',');
-    expect(appContent).toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
 
     const navigationMenu = tree.readContent(
       '/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts');
@@ -244,28 +236,32 @@ describe('layout', () => {
   });
 
   it('should add routing to layout', async () => {
-    let newAppTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
-
-    appOptions.routing = false;
-    newAppTree = await schematicRunner.runSchematic(
-      'application', appOptions, newAppTree);
-
     const runner = new SchematicTestRunner('schematics', collectionPath);
     const tree = await runner.runSchematic('add-layout', options, appTree);
 
-    expect(tree.files).toContain('/src/app/app-routing.module.ts');
-    const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
-    expect(moduleContent)
-      .toMatch(/imports:\s\[RouterModule\.forRoot\(routes, { useHash: true }\)\],/);
-
-    expect(moduleContent)
-      .toContain(`{
-    path: 'login-form',
-    component: LoginFormComponent,
-    canActivate: [ AuthGuardService ]
-  }`);
+    expect(tree.files).toContain('/src/app/app.routes.ts');
+    const routesContent = tree.readContent('/src/app/app.routes.ts');
+
+    expect(routesContent)
+      .toContain(`import { AuthGuardService } from './shared/services';`);
+    const loginFormComponentMatch = routesContent.match(/\bLoginFormComponent\b/g);
+    const resetPasswordFormComponentMatch = routesContent.match(/\bResetPasswordFormComponent\b/g);
+    const createAccountFormComponentMatch = routesContent.match(/\bCreateAccountFormComponent\b/g);
+    const changePasswordFormComponentMatch = routesContent.match(/\bChangePasswordFormComponent\b/g);
+    expect(loginFormComponentMatch?.length).toBe(2);
+    expect(resetPasswordFormComponentMatch?.length).toBe(2);
+    expect(createAccountFormComponentMatch?.length).toBe(2);
+    expect(changePasswordFormComponentMatch?.length).toBe(2);
+
+    expect(routesContent)
+      .toContain(`path: 'login-form'`);
+    expect(routesContent)
+      .toContain(`path: 'reset-password'`);
+    expect(routesContent)
+      .toContain(`path: 'create-account'`);
+    expect(routesContent)
+      .toContain(`path: 'change-password/:recoveryCode'`);
   });
-
   it('should use selected layout', async () => {
     const runner = new SchematicTestRunner('schematics', collectionPath);
     options.layout = 'side-nav-inner-toolbar';

package/src/add-sample-views/files/pages/profile/profile.component.ts

@@ -1,9 +1,11 @@
 import { Component } from '@angular/core';
+import { DxFormModule } from 'devextreme-angular/ui/form';
 
 @Component({
   templateUrl: 'profile.component.html',
   styleUrls: [ './profile.component.scss' ],
-  standalone: false
+  standalone: true,
+  imports: [DxFormModule],
 })
 
 export class ProfileComponent {

package/src/add-sample-views/files/pages/tasks/tasks.component.ts

@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
-import 'devextreme/data/odata/store';
+import { DxDataGridModule } from 'devextreme-angular/ui/data-grid';
 
 @Component({
   templateUrl: 'tasks.component.html',
   styleUrls: ['tasks.component.scss'],
-  standalone: false
+  standalone: true,
+  imports: [DxDataGridModule]
 })
 
 export class TasksComponent {

package/src/add-sample-views/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const add_view_1 = require("../add-view");
 const project_1 = require("../utility/project");
 const string_1 = require("../utility/string");
@@ -31,15 +30,6 @@ const sampleViewOptions = [
         relativePath: './pages/tasks/tasks.component'
     }
 ];
-const devextremeOptions = [
-    {
-        componentName: 'DxDataGridModule',
-        relativePath: 'devextreme-angular'
-    }, {
-        componentName: 'DxFormModule',
-        relativePath: 'devextreme-angular'
-    }
-];
 const navigations = [
     `  {
     text: 'Home',
@@ -61,22 +51,6 @@ const navigations = [
     ]
   }`
 ];
-function addImportsToRoutingModule(isView, routingPath, options) {
-    return (host) => {
-        const source = (0, source_1.getSourceFile)(host, routingPath);
-        if (!source) {
-            return host;
-        }
-        let changes;
-        if (isView) {
-            changes = (0, ast_utils_1.addDeclarationToModule)(source, routingPath, options.componentName, options.relativePath);
-        }
-        else {
-            changes = (0, ast_utils_1.addImportToModule)(source, routingPath, options.componentName, options.relativePath);
-        }
-        return (0, change_1.applyChanges)(host, changes, routingPath);
-    };
-}
 function addDefaultNavigation(rootPath) {
     return (host) => {
         const navigationPath = rootPath + 'app-navigation.ts';
@@ -91,7 +65,6 @@ function default_1(options) {
     return (host) => __awaiter(this, void 0, void 0, function* () {
         const project = yield (0, project_1.getProjectName)(host, options.project);
         const rootPath = yield (0, project_1.getApplicationPath)(host, project);
-        const routingPath = rootPath + 'app-routing.module.ts';
         const rules = [];
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             (0, schematics_1.template)({
@@ -101,11 +74,7 @@ function default_1(options) {
         ]);
         rules.push((0, schematics_1.mergeWith)(templateSource));
         sampleViewOptions.forEach((viewOptions) => {
-            rules.push((0, add_view_1.addViewToRouting)({ name: viewOptions.name, project, module: 'app-routing' }));
-            rules.push(addImportsToRoutingModule(true, routingPath, viewOptions));
-        });
-        devextremeOptions.forEach((moduleOptions) => {
-            rules.push(addImportsToRoutingModule(false, routingPath, moduleOptions));
+            rules.push((0, add_view_1.addViewToRouting)({ name: viewOptions.name, project, module: 'app.routes' }));
         });
         rules.push(addDefaultNavigation(rootPath));
         return (0, schematics_1.chain)(rules);

package/src/add-sample-views/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DASoC;AAEpC,0CAA+C;AAE/C,gDAG6B;AAE7B,8CAA6C;AAE7C,8CAE4B;AAE5B,8CAAkD;AAElD,MAAM,iBAAiB,GAAG;IACxB;QACE,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,eAAe;QAC9B,YAAY,EAAE,6BAA6B;KAC5C,EAAE;QACD,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,kBAAkB;QACjC,YAAY,EAAE,mCAAmC;KAClD,EAAE;QACD,IAAI,EAAE,OAAO;QACb,aAAa,EAAE,gBAAgB;QAC/B,YAAY,EAAE,+BAA+B;KAChD;CAAC,CAAC;AAEH,MAAM,WAAW,GAAG;IAClB;;;;IAIE;IACF;;;;;;;;;;;;;IAaE;CACH,CAAC;AAEF,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,QAAQ,GAAG,mBAAmB,CAAC;QAEtD,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,MAAM,gBAAgB,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAc,CAAE,CAAC;YAC9D,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,mBAAwB,OAAY;IAClC,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,KAAK,GAAU,EAAE,CAAC;QAExB,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;YAC3C,IAAA,qBAAQ,EAAC;gBACP,OAAO,EAAE,IAAA,iBAAQ,EAAC,OAAO,CAAC;aAC3B,CAAC;YACF,IAAA,iBAAI,EAAC,QAAQ,CAAC;SACf,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,cAAc,CAAC,CAAC,CAAC;QAEtC,iBAAiB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACxC,KAAK,CAAC,IAAI,CAAC,IAAA,2BAAgB,EAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3C,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC;AAvBD,4BAuBC"}

package/src/add-sample-views/index.ts

@@ -9,11 +9,6 @@ import {
   mergeWith
 } from '@angular-devkit/schematics';
 
-import {
-  addDeclarationToModule,
-  addImportToModule
-} from '@schematics/angular/utility/ast-utils';
-
 import { addViewToRouting } from '../add-view';
 
 import {
@@ -24,7 +19,6 @@ import {
 import { humanize } from '../utility/string';
 
 import {
-   applyChanges,
    insertItemToArray
  } from '../utility/change';
 
@@ -45,15 +39,6 @@ const sampleViewOptions = [
     relativePath: './pages/tasks/tasks.component'
 }];
 
-const devextremeOptions = [
-  {
-    componentName: 'DxDataGridModule',
-    relativePath: 'devextreme-angular'
-  }, {
-    componentName: 'DxFormModule',
-    relativePath: 'devextreme-angular'
-}];
-
 const navigations = [
   `  {
     text: 'Home',
@@ -76,26 +61,6 @@ const navigations = [
   }`
 ];
 
-function addImportsToRoutingModule(isView: boolean, routingPath: string, options: any) {
-  return (host: Tree) => {
-    const source = getSourceFile(host, routingPath);
-
-    if (!source) {
-      return host;
-    }
-
-    let changes;
-
-    if (isView) {
-      changes = addDeclarationToModule(source, routingPath, options.componentName, options.relativePath);
-    } else {
-      changes = addImportToModule(source, routingPath, options.componentName, options.relativePath);
-    }
-
-    return applyChanges(host, changes, routingPath);
-  };
-}
-
 function addDefaultNavigation(rootPath: string) {
   return (host: Tree) => {
     const navigationPath = rootPath + 'app-navigation.ts';
@@ -113,7 +78,6 @@ export default function(options: any): Rule {
   return async (host: Tree) => {
     const project = await getProjectName(host, options.project);
     const rootPath = await getApplicationPath(host, project);
-    const routingPath = rootPath + 'app-routing.module.ts';
     const rules: any[] = [];
 
     const templateSource = apply(url('./files'), [
@@ -126,12 +90,7 @@ export default function(options: any): Rule {
     rules.push(mergeWith(templateSource));
 
     sampleViewOptions.forEach((viewOptions) => {
-      rules.push(addViewToRouting({ name: viewOptions.name, project, module: 'app-routing' }));
-      rules.push(addImportsToRoutingModule(true, routingPath, viewOptions));
-    });
-
-    devextremeOptions.forEach((moduleOptions) => {
-      rules.push(addImportsToRoutingModule(false, routingPath, moduleOptions));
+      rules.push(addViewToRouting({ name: viewOptions.name, project, module: 'app.routes' }));
     });
 
     rules.push(addDefaultNavigation(rootPath));

package/src/add-sample-views/index_spec.js

@@ -42,11 +42,10 @@ describe('sample views', () => {
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
         tree = yield runner.runSchematic('add-sample-views', sampleViewsOptions, tree);
-        const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+        const moduleContent = tree.readContent('/src/app/app.routes.ts');
         expect(moduleContent).toMatch(/component: HomeComponent/);
         expect(moduleContent).toMatch(/path: 'home'/);
         expect(moduleContent).toMatch(/import { HomeComponent } from /);
-        expect(moduleContent).toMatch(/declarations:\s\[\n*\s*HomeComponent/);
         const navigationContent = tree.readContent('/src/app/app-navigation.ts');
         expect(navigationContent).toMatch(/text: 'Home'/);
         expect(navigationContent).toContain(`export const navigation = [

package/src/add-sample-views/index_spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC;QAClG,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;QAEtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;GAoBrC,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAC7E,OAAO,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACnF,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC;QAClG,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE/E,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QAEjE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAEhE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;GAoBrC,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/add-sample-views/index_spec.ts

@@ -40,13 +40,12 @@ describe('sample views', () => {
     let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
     tree = await runner.runSchematic('add-sample-views', sampleViewsOptions, tree);
 
-    const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+    const moduleContent = tree.readContent('/src/app/app.routes.ts');
 
     expect(moduleContent).toMatch(/component: HomeComponent/);
     expect(moduleContent).toMatch(/path: 'home'/);
 
     expect(moduleContent).toMatch(/import { HomeComponent } from /);
-    expect(moduleContent).toMatch(/declarations:\s\[\n*\s*HomeComponent/);
 
     const navigationContent = tree.readContent('/src/app/app-navigation.ts');
     expect(navigationContent).toMatch(/text: 'Home'/);

package/src/add-view/index.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addViewToRouting = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const find_module_1 = require("@schematics/angular/utility/find-module");
 const change_1 = require("../utility/change");
 const routing_1 = require("../utility/routing");
@@ -77,6 +78,10 @@ function addViewToRouting(options) {
         if (!(0, routing_1.hasComponentInRoutes)(routes, options.name)) {
             const route = (0, routing_1.getRoute)(options.name);
             (0, change_1.insertItemToArray)(host, routingModulePath, routes, route);
+            const name = options.name.replace(/^pages\//, '');
+            const componentName = (0, routing_1.getRouteComponentName)(name);
+            const importChanges = (0, ast_utils_1.insertImport)(source, routingModulePath, componentName, `./pages/${name}/${name}.component`);
+            (0, change_1.applyChanges)(host, [importChanges], routingModulePath);
         }
         return host;
     });
@@ -90,7 +95,7 @@ function getPathForView(name) {
 }
 function getModuleName(addRoute, moduleName) {
     if (!moduleName && addRoute) {
-        return 'app-routing';
+        return 'app.routes';
     }
     return moduleName;
 }
@@ -126,7 +131,7 @@ function addContentToTS(options) {
   selector: 'app-${name}',
   templateUrl: './${name}.component.html',
   styleUrl: './${name}.component.css',
-  standalone: false
+  standalone: true
 })
 export class ${core_1.strings.classify((0, core_1.basename)((0, core_1.normalize)(name)))}Component {
 
@@ -148,7 +153,7 @@ function default_1(options) {
                 skipTests: options.skipTests,
                 inlineStyle: options.inlineStyle,
                 prefix: options.prefix,
-                standalone: false
+                standalone: true
             }),
             addContentToView({ name, project }),
             addContentToTS({ name, project })

package/src/add-view/index.js.map

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

package/src/add-view/index.ts

@@ -5,19 +5,21 @@ import {
   SchematicsException,
   externalSchematic
 } from '@angular-devkit/schematics';
-
+import { insertImport } from '@schematics/angular/utility/ast-utils';
 import {
   findModuleFromOptions
 } from '@schematics/angular/utility/find-module';
 
 import {
+  applyChanges,
   insertItemToArray
 } from '../utility/change';
 
 import {
   hasComponentInRoutes,
   getRoute,
-  findRoutesInSource
+  findRoutesInSource,
+  getRouteComponentName,
 } from '../utility/routing';
 
 import { getSourceFile } from '../utility/source';
@@ -101,6 +103,11 @@ export function addViewToRouting(options: any) {
     if (!hasComponentInRoutes(routes, options.name)) {
       const route = getRoute(options.name);
       insertItemToArray(host, routingModulePath, routes, route);
+
+      const name = options.name.replace(/^pages\//, '');
+      const componentName = getRouteComponentName(name);
+      const importChanges = insertImport(source, routingModulePath, componentName, `./pages/${name}/${name}.component`);
+      applyChanges(host, [importChanges], routingModulePath);
     }
     return host;
   };
@@ -115,7 +122,7 @@ function getPathForView(name: string) {
 
 function getModuleName(addRoute: boolean, moduleName: string) {
   if (!moduleName && addRoute) {
-    return 'app-routing';
+    return 'app.routes';
   }
   return moduleName;
 }
@@ -154,7 +161,7 @@ async function addContentToTS(options: any) {
   selector: 'app-${name}',
   templateUrl: './${name}.component.html',
   styleUrl: './${name}.component.css',
-  standalone: false
+  standalone: true
 })
 export class ${strings.classify(basename(normalize(name)))}Component {
 
@@ -178,7 +185,7 @@ export default function(options: any): Rule {
         skipTests: options.skipTests,
         inlineStyle: options.inlineStyle,
         prefix: options.prefix,
-        standalone: false
+        standalone: true
       }),
       addContentToView({ name, project }) as any,
       addContentToTS({ name, project }) as any

package/src/add-view/index_spec.js

@@ -60,7 +60,7 @@ describe('view', () => {
         expect(contentTS).toContain(`selector: 'app-${componentName}'`);
         expect(contentTS).toContain(`templateUrl: './${componentName}.component.html'`);
         expect(contentTS).toContain(`styleUrl: './${componentName}.component.css'`);
-        expect(contentTS).toContain('standalone: false');
+        expect(contentTS).toContain('standalone: true');
         expect(contentTS).toContain(`export class ${core_1.strings.classify((0, core_1.basename)((0, core_1.normalize)(componentName)))}Component`);
     }));
     it('should add view to default routing module', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -69,28 +69,9 @@ describe('view', () => {
         let tree = yield runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
         tree = yield runner.runSchematic('add-view', options, tree);
         tree = yield runner.runSchematic('add-view', Object.assign(Object.assign({}, options), { name: 'test2' }), tree);
-        const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
-        expect(moduleContent).toContain(`const routes: Routes = [
-  {
-    path: 'pages/test2',
-    component: Test2Component,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: 'pages/test',
-    component: TestComponent,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: 'login-form',
-    component: LoginFormComponent,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: '**',
-    redirectTo: 'pages/test'
-  }
-];`);
+        const moduleContent = tree.readContent('/src/app/app.routes.ts');
+        expect(moduleContent).toContain(`path: 'pages/test2',\n    component: Test2Component,\n    canActivate: [ AuthGuardService ]`);
+        expect(moduleContent).toContain(`path: 'pages/test',\n    component: TestComponent,\n    canActivate: [ AuthGuardService ]`);
     }));
     it('should add view to other routing module', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign(Object.assign({}, componentOptions), { addRoute: true, module: 'test/test-routing' });

package/src/add-view/index_spec.js.map

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

package/src/add-view/index_spec.ts

@@ -60,7 +60,7 @@ describe('view', () => {
     expect(contentTS).toContain(`selector: 'app-${componentName}'`);
     expect(contentTS).toContain(`templateUrl: './${componentName}.component.html'`);
     expect(contentTS).toContain(`styleUrl: './${componentName}.component.css'`);
-    expect(contentTS).toContain('standalone: false');
+    expect(contentTS).toContain('standalone: true');
     expect(contentTS).toContain(`export class ${strings.classify(basename(normalize(componentName)))}Component`);
   });
 
@@ -71,29 +71,10 @@ describe('view', () => {
     let tree = await runner.runSchematic('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree);
     tree = await runner.runSchematic('add-view', options, tree);
     tree = await runner.runSchematic('add-view', { ...options, name: 'test2' }, tree);
-    const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+    const moduleContent = tree.readContent('/src/app/app.routes.ts');
 
-    expect(moduleContent).toContain(`const routes: Routes = [
-  {
-    path: 'pages/test2',
-    component: Test2Component,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: 'pages/test',
-    component: TestComponent,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: 'login-form',
-    component: LoginFormComponent,
-    canActivate: [ AuthGuardService ]
-  },
-  {
-    path: '**',
-    redirectTo: 'pages/test'
-  }
-];`);
+    expect(moduleContent).toContain(`path: 'pages/test2',\n    component: Test2Component,\n    canActivate: [ AuthGuardService ]`);
+    expect(moduleContent).toContain(`path: 'pages/test',\n    component: TestComponent,\n    canActivate: [ AuthGuardService ]`);
   });
 
   it('should add view to other routing module', async () => {

package/src/install/schema.json

@@ -7,7 +7,7 @@
     "dxversion": {
       "type": "string",
       "description": "The DevExtreme version",
-      "default": "24.2.6"
+      "default": "25.1.2-beta"
     },
     "project": {
       "type": "string",

package/src/utility/angular-version.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@angular-devkit/schematics';
+export declare function getAngularVersion(host: Tree): number;
+export declare function isAngularVersionHigherThan(host: Tree, version: number): boolean;

package/src/utility/angular-version.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAngularVersionHigherThan = exports.getAngularVersion = void 0;
+const semver_1 = require("semver");
+function getAngularVersion(host) {
+    var _a, _b;
+    const packageJson = JSON.parse(((_a = host.read('package.json')) === null || _a === void 0 ? void 0 : _a.toString()) || '{}');
+    const angularCore = (_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/core'];
+    if (angularCore) {
+        const version = new semver_1.SemVer(angularCore.replace(/\^|\~/g, ''));
+        return version.major;
+    }
+    throw new Error('Angular version not found');
+}
+exports.getAngularVersion = getAngularVersion;
+function isAngularVersionHigherThan(host, version) {
+    return getAngularVersion(host) >= version;
+}
+exports.isAngularVersionHigherThan = isAngularVersionHigherThan;
+//# sourceMappingURL=angular-version.js.map

package/src/utility/angular-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-version.js","sourceRoot":"","sources":["angular-version.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAEhC,SAAgB,iBAAiB,CAAC,IAAU;;IAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,0CAAE,QAAQ,EAAE,KAAI,IAAI,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,MAAA,WAAW,CAAC,YAAY,0CAAG,eAAe,CAAC,CAAC;IAEhE,IAAI,WAAW,EAAE;QACf,MAAM,OAAO,GAAG,IAAI,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,KAAK,CAAC;KACtB;IAED,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC;AAVD,8CAUC;AAED,SAAgB,0BAA0B,CAAC,IAAU,EAAE,OAAe;IACpE,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;AAC5C,CAAC;AAFD,gEAEC"}

package/src/utility/angular-version.ts

@@ -0,0 +1,18 @@
+import { Tree } from '@angular-devkit/schematics';
+import { SemVer } from 'semver';
+
+export function getAngularVersion(host: Tree): number {
+  const packageJson = JSON.parse(host.read('package.json')?.toString() || '{}');
+  const angularCore = packageJson.dependencies?.['@angular/core'];
+
+  if (angularCore) {
+    const version = new SemVer(angularCore.replace(/\^|\~/g, ''));
+    return version.major;
+  }
+
+  throw new Error('Angular version not found');
+}
+
+export function isAngularVersionHigherThan(host: Tree, version: number): boolean {
+  return getAngularVersion(host) >= version;
+}

package/src/utility/latest-versions.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = void 0;
 // TODO: implement
 exports.latestVersions = {
-    'devextreme': '24.2.6',
-    'devextreme-angular': '24.2.6',
+    'devextreme': '25.1.2-beta',
+    'devextreme-angular': '25.1.2-beta',
     'devextreme-cli': 'latest'
 };
 //# sourceMappingURL=latest-versions.js.map

package/src/utility/latest-versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"latest-versions.js","sourceRoot":"","sources":["latest-versions.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AACL,QAAA,cAAc,GAAG;IAC5B,YAAY,EAAE,QAAQ;IACtB,oBAAoB,EAAE,QAAQ;IAC9B,gBAAgB,EAAE,QAAQ;CAC3B,CAAC"}
+{"version":3,"file":"latest-versions.js","sourceRoot":"","sources":["latest-versions.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AACL,QAAA,cAAc,GAAG;IAC5B,YAAY,EAAE,aAAa;IAC3B,oBAAoB,EAAE,aAAa;IACnC,gBAAgB,EAAE,QAAQ;CAC3B,CAAC"}