devextreme-schematics 1.15.0 → 1.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-schematics",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "DevExtreme schematics",
   "author": "Developer Express Inc.",
   "license": "MIT",
@@ -17,16 +17,16 @@
   ],
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^19.2.25",
-    "@angular-devkit/schematics": "^19.2.25",
-    "@schematics/angular": "^19.2.25",
+    "@angular-devkit/core": "^19.2.27",
+    "@angular-devkit/schematics": "^19.2.27",
+    "@schematics/angular": "^19.2.27",
     "parse5": "^7.3.0",
     "picomatch": "^4.0.4",
-    "semver": "^7.8.0"
+    "semver": "^7.8.5"
   },
   "devDependencies": {
     "@types/jasmine": "~3.10.19",
-    "@types/node": "20.19.40",
+    "@types/node": "20.19.43",
     "@types/picomatch": "^4.0.3",
     "@types/semver": "^7.7.1",
     "jasmine": "^2.99.0",

package/src/add-app-template/schema.json

@@ -39,7 +39,7 @@
     "dxversion": {
       "type": "string",
       "description": "The DevExtreme version",
-      "default": "25.2.7"
+      "default": "26.1.3"
     },
     "globalNgCliVersion": {
       "type":"string",

package/src/install/schema.json

@@ -7,7 +7,7 @@
     "dxversion": {
       "type": "string",
       "description": "The DevExtreme version",
-      "default": "25.2.7"
+      "default": "26.1.3"
     },
     "project": {
       "type": "string",

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': '25.2.7',
-    'devextreme-angular': '25.2.7',
+    'devextreme': '26.1.3',
+    'devextreme-angular': '26.1.3',
     'devextreme-cli': 'latest',
     'sass-embedded': '1.66.0'
 };

package/src/add-app-template/index.ts

@@ -1,56 +0,0 @@
-import {
-  Rule,
-  chain,
-  schematic,
-  Tree,
-} from '@angular-devkit/schematics';
-
-import { existsSync } from 'fs';
-import { resolve, join } from 'path';
-
-import { spawnSync } from 'child_process';
-
-export default function(options: any): Rule {
-  const rules = [
-    schematic('install', {
-      dxversion: options.dxversion,
-      project: options.project
-    }),
-    schematic('add-layout', {
-      layout: options.layout,
-      resolveConflicts: options.resolveConflicts,
-      project: options.project,
-      skipInstall: true,
-      updateBudgets: options.updateBudgets,
-      globalNgCliVersion: options.globalNgCliVersion
-    }),
-    // schematics installed packages with flag --ignore-scripts
-    // @angular/cli@14 add option allowScript to NodePackageInstallTask
-    (host: Tree) => {
-      postinstallScripts();
-      return host;
-    }
-  ];
-
-  if (!options.empty) {
-    rules.push(schematic('add-sample-views', {
-      project: options.project
-    }));
-  }
-
-  return chain(rules);
-}
-
-const postinstallScripts = () => {
-  const isWin = /^win/.test(process.platform);
-
-  const sassEmbeddedPath = resolve('node_modules', 'sass-embedded');
-  const sassVendorPath = join(sassEmbeddedPath, 'dist', 'lib', 'src', 'vendor', 'dart-sass-embedded');
-  if (!existsSync(sassVendorPath)) {
-    spawnSync('npm', ['run', 'postinstall'], {
-      cwd: resolve(join('node_modules', 'sass-embedded')),
-      windowsVerbatimArguments: true,
-      shell: isWin ? false : true
-    });
-  }
-};

package/src/add-app-template/index_spec.ts

@@ -1,73 +0,0 @@
-import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
-import * as path from 'path';
-
-const collectionPath = path.join(__dirname, '../collection.json');
-
-const appOptions: any = {
-  name: 'testApp',
-  projectRoot: '',
-  inlineStyle: false,
-  inlineTemplate: false,
-  routing: true,
-  style: 'css',
-  skipTests: false,
-  skipPackageJson: false
-};
-
-const workspaceOptions: WorkspaceOptions = {
-  name: 'workspace',
-  version: '6.0.0'
-};
-
-const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
-const schematicRunner = new SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
-let appTree: UnitTestTree;
-
-beforeEach(async () => {
-  appTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
-  appTree = await schematicRunner.runSchematic('application', appOptions, appTree);
-});
-
-describe('add-app-template', () => {
-  it('should add DevExtreme', async () => {
-    const runner = new SchematicTestRunner('schematics', collectionPath);
-    const tree = await runner.runSchematic('add-app-template', { }, appTree);
-    const packageConfig = JSON.parse(tree.readContent('package.json'));
-
-    expect('devextreme' in packageConfig.dependencies).toBe(true);
-  });
-
-  it('should consider the `project` option', async () => {
-    appTree = await schematicRunner.runSchematic('application', {
-      name: 'testApp2',
-      inlineStyle: false,
-      inlineTemplate: false,
-      routing: true,
-      style: 'scss',
-      projectRoot: 'projects/testApp2'
-    }, appTree);
-
-    const runner = new SchematicTestRunner('schematics', collectionPath);
-    const tree = await runner.runSchematic('add-app-template', {
-      project: 'testApp2'
-    }, appTree);
-
-    expect(tree.files)
-      .toContain('/devextreme.json');
-    expect(tree.files)
-      .toContain('/projects/testApp2/src/themes/metadata.base.json');
-    expect(tree.files)
-      .toContain('/projects/testApp2/src/app/pages/home/home.component.ts');
-  });
-
-  it('should consider the `updateBudgets` option', async () => {
-    const runner = new SchematicTestRunner('schematics', collectionPath);
-    const tree = await runner.runSchematic('add-app-template', { updateBudgets: true }, appTree);
-
-    const angularContent = JSON.parse(tree.readContent('/angular.json'));
-    const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
-
-    expect(budgets[0].maximumWarning).toEqual('4mb');
-  });
-});

package/src/add-layout/index.ts

@@ -1,447 +0,0 @@
-import {
-  Rule,
-  SchematicContext,
-  Tree,
-  apply,
-  url,
-  move,
-  chain,
-  filter,
-  forEach,
-  mergeWith,
-  callRule,
-  FileEntry,
-  template
-} from '@angular-devkit/schematics';
-
-import {
-  SourceFile
-} from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-
-import { strings } from '@angular-devkit/core';
-
-import { join, basename } from 'path';
-
-import { SemVer } from 'semver';
-
-import {
-  getApplicationPath,
-  getSourceRootPath,
-  getProjectName
- } from '../utility/project';
-
-import {
-  humanize
-} from '../utility/string';
-
-import {
-  addStylesToApp
- } from '../utility/styles';
-
-import {
-  modifyJSONFile,
- } from '../utility/modify-json-file';
-
-import {
-  NodeDependencyType,
-  addPackageJsonDependency,
-  getPackageJsonDependency,
-} from '@schematics/angular/utility/dependencies';
-
-import { getSourceFile } from '../utility/source';
-
-import {
-  applyChanges,
-  insertItemToArray
-} from '../utility/change';
-
-import {
-  hasComponentInRoutes,
-  getRoute,
-  findRoutesInSource
-} from '../utility/routing';
-
-import { insertImport } from '@schematics/angular/utility/ast-utils';
-
-import { getWorkspace } from '@schematics/angular/utility/workspace';
-import { Change } from '@schematics/angular/utility/change';
-
-import { PatchNodePackageInstallTask } from '../utility/patch';
-import { isAngularVersionHigherThan } from '../utility/angular-version';
-
-const routes = [
-  {
-    name: 'AuthGuardService',
-    type: 'service',
-    location: './shared/services'
-  },
-  {
-    name: 'LoginFormComponent',
-    path: 'login-form',
-    type: 'component',
-    location: './shared/components'
-  },
-  {
-    name: 'ResetPasswordFormComponent',
-    path: 'reset-password',
-    type: 'component',
-    location: './shared/components'
-  },
-  {
-    name: 'CreateAccountFormComponent',
-    path: 'create-account',
-    type: 'component',
-    location: './shared/components'
-  },
-  {
-    name: 'ChangePasswordFormComponent',
-    path: 'change-password/:recoveryCode',
-    type: 'component',
-    location: './shared/components'
-  }
-];
-
-const projectFilesSource = './files/src';
-const workspaceFilesSource = './files';
-
-function addScriptSafe(scripts: any, name: string, value: string) {
-  const currentValue = scripts[name];
-
-  if (!currentValue) {
-    scripts[name] = value;
-    return;
-  }
-
-  const alterName = `origin-${name}`;
-  const safeValue = `npm run ${alterName} && ${value}`;
-
-  if (currentValue === value || currentValue === safeValue) {
-    return;
-  }
-
-  scripts[alterName] = currentValue;
-  scripts[name] = safeValue;
-}
-
-function addBuildThemeScript() {
-  return (host: Tree) => {
-    modifyJSONFile(host, './package.json', config => {
-      const scripts = config['scripts'];
-
-      addScriptSafe(scripts, 'build-themes', 'devextreme build');
-      addScriptSafe(scripts, 'postinstall', 'npm run build-themes');
-
-      return config;
-    });
-
-    return host;
-  };
-}
-
-async function addCustomThemeStyles(host: Tree, options: any, sourcePath: string = '') {
-    const projectName = await getProjectName(host, options.project);
-    modifyJSONFile(host, './angular.json', config => {
-      const stylesList = [
-        `${sourcePath}/variables.scss`,
-        `${sourcePath}/dx-styles.scss`,
-        `${sourcePath}/themes/generated/theme.additional.css`,
-        `${sourcePath}/themes/generated/theme.additional.dark.css`,
-        `${sourcePath}/themes/generated/theme.base.css`,
-        `${sourcePath}/themes/generated/theme.base.dark.css`,
-        'node_modules/devextreme/dist/css/dx.common.css'
-      ];
-
-      return addStylesToApp(projectName, config, stylesList);
-    });
-
-    return host;
-}
-
-async function updateBudgets(host: Tree, options: any) {
-  const projectName = await getProjectName(host, options.project);
-  modifyJSONFile(host, './angular.json', config => {
-      const budgets: any[] = config.projects[projectName].architect.build.configurations.production.budgets;
-
-      const budget = budgets.find((item) => item.type === 'initial');
-      if (budget) {
-        budget.maximumWarning = '4mb';
-        budget.maximumError = '7mb';
-      }
-
-      return config;
-  });
-
-  return host;
-}
-
-async function addPolyfills(host: Tree, project: string, polyfills: string[]) {
-  const projectName = await getProjectName(host, project);
-
-  modifyJSONFile(host, './angular.json', config => {
-    const buildOptions: Record<string, any> = config.projects[projectName]['architect']['build']['options'];
-
-    if (!buildOptions.polyfills) {
-      buildOptions.polyfills = [];
-    }
-
-    polyfills.forEach((polyfill) => {
-      if (!buildOptions.polyfills.includes(polyfill)) {
-        buildOptions.polyfills.push(polyfill);
-      }
-    });
-
-    return config;
-  });
-
-  return host;
-}
-
-function addViewportToBody(sourcePath: string = '') {
-  return (host: Tree) => {
-    const indexPath =  join(sourcePath, 'index.html');
-    let indexContent = host.read(indexPath)!.toString();
-
-    indexContent = indexContent.replace(/<body>/, '<body class="dx-viewport">');
-    host.overwrite(indexPath, indexContent);
-
-    return host;
-  };
-}
-
-function modifyFileRule(path: string, callback: (source: SourceFile) => Change[]) {
-  return (host: Tree) => {
-    const source = getSourceFile(host, path);
-
-    if (!source) {
-      return host;
-    }
-
-    const changes = callback(source);
-
-    return applyChanges(host, changes, path);
-  };
-}
-
-function updateAppComponent(sourcePath: string, templateOptions: any = {}) {
-  const appMComponentPath = sourcePath + templateOptions.name + '.ts';
-
-  const importSetter = (importName: string, path: string, alias: string) => {
-    return (source: SourceFile) => {
-      return [insertImport(source, appMComponentPath, importName, path, false, alias)];
-    };
-  };
-
-  const rules = [
-    modifyFileRule(appMComponentPath, importSetter(
-      templateOptions.layout === 'side-nav-outer-toolbar'
-        ? 'SideNavOuterToolbarComponent'
-        : 'SideNavInnerToolbarComponent',
-      './layouts',
-      'SideNavToolbarComponent',
-      )),
-  ];
-
-  return chain(rules);
-}
-
-function getComponentName(host: Tree, sourcePath: string) {
-  let name = '';
-  let index = 0;
-
-  if (!host.exists(sourcePath + 'app.component.ts') && !host.exists(sourcePath + 'app.ts')) {
-    name = 'app';
-  }
-
-  while (!name) {
-    index++;
-    const componentName = `app${index}`;
-
-    if (
-      !host.exists(`${sourcePath}${componentName}.component.ts`)
-      && !host.exists(`${sourcePath}${componentName}.ts`)
-    ) {
-      name = componentName;
-    }
-  }
-
-  return name;
-}
-
-function hasRouting(host: Tree, sourcePath: string) {
-  return host.exists(sourcePath + 'app.routes.ts');
-}
-
-function addPackagesToDependency(globalNgCliVersion: string) {
-  const version = new SemVer(globalNgCliVersion.replace(/\^|\~/g, ''));
-
-  return (host: Tree) => {
-    const zonejs = getPackageJsonDependency(host, 'zone.js');
-
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Default,
-      name: '@angular/cdk',
-      version: version.raw.includes('next') || version.raw.includes('-rc')
-        ? 'next' : `^${version.major}.0.0`
-    });
-
-    if (!zonejs) {
-      addPackageJsonDependency(host, {
-        type: NodeDependencyType.Default,
-        name: 'zone.js',
-        version: version.major > 18 ? '~0.15.0' : '~0.14.0'
-      });
-    }
-
-    return host;
-  };
-}
-
-function modifyContentByTemplate(
-  sourcePath: string = '',
-  templateSourcePath: string,
-  filePath: string | null,
-  templateOptions: any = {},
-  modifyContent?: (templateContent: string, currentContent: string, filePath: string ) => string)
-: Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const modifyIfExists = (fileEntry: FileEntry) => {
-      const fileEntryPath = join(sourcePath, fileEntry.path.toString());
-      if (!host.exists(fileEntryPath)) {
-        return fileEntry;
-      }
-
-      const templateContent = fileEntry.content!.toString();
-      let modifiedContent = templateContent;
-
-      const currentContent = host.read(fileEntryPath)!.toString();
-      if (modifyContent) {
-        modifiedContent = modifyContent(templateContent, currentContent, fileEntryPath);
-      }
-
-      // NOTE: Workaround for https://github.com/angular/angular-cli/issues/11337
-      if (modifiedContent !== currentContent) {
-        host.overwrite(fileEntryPath,  modifiedContent);
-      }
-      return null;
-    };
-
-    const rules = [
-      filter(path => {
-        return !filePath || join('./', path) === join('./', filePath);
-      }),
-      template(templateOptions),
-      forEach(modifyIfExists),
-      move(sourcePath)
-    ];
-
-    const modifiedSource = apply(url(templateSourcePath), rules);
-    const resultRule = mergeWith(modifiedSource);
-
-    return callRule(resultRule, host, context);
-  };
-}
-
-function updateDevextremeConfig(sourcePath: string = '') {
-  const devextremeConfigPath = '/devextreme.json';
-  const templateOptions = {
-    sourcePath
-  };
-
-  const modifyConfig = (templateContent: string, currentContent: string) => {
-    const oldConfig = JSON.parse(currentContent);
-    const newConfig = JSON.parse(templateContent);
-
-    [].push.apply(oldConfig.build.commands, newConfig.build.commands);
-
-    return JSON.stringify(oldConfig, null, '  ');
-  };
-
-  return modifyContentByTemplate('./', workspaceFilesSource, devextremeConfigPath, templateOptions, modifyConfig);
-}
-
-const modifyRouting = (host: Tree, routingFilePath: string) => {
-  // TODO: Try to use the isolated host to generate the result string
-  let source = getSourceFile(host, routingFilePath)!;
-  const importChanges = [];
-  for (const route of routes) {
-    importChanges.push(insertImport(source, routingFilePath, route.name, route.location));
-  }
-
-  applyChanges(host, importChanges, routingFilePath);
-  for (const route of routes) {
-    if (route.type === 'component' && route.path) {
-      source = getSourceFile(host, routingFilePath)!;
-      const routeInSource = findRoutesInSource(source)!;
-      if (!hasComponentInRoutes(routeInSource, route.path)) {
-        const routeToAdd = getRoute(route.name, route.name, route.path);
-        insertItemToArray(host, routingFilePath, routeInSource, routeToAdd);
-      }
-    }
-  }
-
-};
-
-function setPostfix(host: Tree, name: string) {
-  return name + (isAngularVersionHigherThan(host, 20) ? '' : '.component');
-}
-
-export default function(options: any): Rule {
-  return async (host: Tree) => {
-    const project = await getProjectName(host, options.project);
-    const workspace = await getWorkspace(host);
-    const ngProject = workspace.projects.get(project);
-    const prefix = ngProject?.prefix;
-    const title = humanize(project);
-    const appPath = await getApplicationPath(host, project);
-    const sourcePath = await getSourceRootPath(host, project);
-    const layout = options.layout;
-    const override = options.resolveConflicts === 'override';
-    const componentName = override ? 'app' : getComponentName(host, appPath);
-    const pathToCss = sourcePath?.replace(/\/?(\w)+\/?/g, '../');
-
-    const templateOptions = {
-      name: setPostfix(host, componentName),
-      layout,
-      title,
-      strings,
-      path: pathToCss,
-      prefix
-    };
-
-    const modifyContent = (templateContent: string, currentContent: string, filePath: string) => {
-      if (basename(filePath) === 'styles.scss') {
-        return `${currentContent}\n${templateContent}`;
-      }
-
-      if (basename(filePath) === 'app.routes.ts' && hasRouting(host, appPath)) {
-        modifyRouting(host, filePath);
-        return currentContent;
-      }
-
-      return templateContent;
-    };
-
-    const rules = [
-      modifyContentByTemplate(sourcePath, projectFilesSource, null, templateOptions, modifyContent),
-      updateDevextremeConfig(sourcePath),
-      updateAppComponent(appPath, templateOptions),
-      addBuildThemeScript(),
-      () => addCustomThemeStyles(host, options, sourcePath) as any,
-      addViewportToBody(sourcePath),
-      addPackagesToDependency(options.globalNgCliVersion),
-      () => addPolyfills(host, options.project, ['zone.js'])
-    ];
-
-    if (options.updateBudgets) {
-      rules.push(() => updateBudgets(host, options) as any);
-    }
-
-    if (!options.skipInstall) {
-      rules.push((_: Tree, context: SchematicContext) => {
-        context.addTask(new PatchNodePackageInstallTask());
-      });
-    }
-
-    return chain(rules);
-  };
-}