devextreme-cli 1.11.2 → 1.12.1

package/README.md

@@ -1,15 +1,15 @@
 # DevExtreme CLI
 
-DevExtreme CLI is a set of command-line tools to be used with the DevExtreme controls library.
+DevExtreme CLI implements command-line tools that help you integrate DevExpress DevExtreme components into your web applications.
 
 * [Documentation](https://js.devexpress.com/Documentation/Guide/Getting_Started/DevExtreme_CLI/)
 
 ## License ##
 
-**DevExtreme CLI is released as a MIT-licensed (free and open-source) add-on to DevExtreme.**
+**DevExtreme CLI is a free and open-source add-on to DevExtreme, available under the [MIT license](LICENSE).**
 
-Familiarize yourself with the [DevExtreme License](https://js.devexpress.com/Licensing/). [Free trial is available!](http://js.devexpress.com/Buy/)
+License terms for DevExpress DevExtreme are avialable on the [DevExtreme Licensing page](https://js.devexpress.com/Licensing/). To download a free evaluation version, visit the [DevExtreme website](http://js.devexpress.com/Buy/).
 
 ## Support & Feedback ##
 
-If you want to report a bug, request a feature, or ask a question, submit an [issue](https://github.com/DevExpress/devextreme-angular/issues) to this repo. Alternatively, you can contact us at the [DevExpress Support Center](https://www.devexpress.com/Support/Center) if you own an active DevExtreme license.
+If you want to report a bug, request a feature, or ask a question, submit an [issue](https://github.com/DevExpress/devextreme-angular/issues) to this repo. You can also submit a ticket to the [DevExpress Support Center](https://www.devexpress.com/Support/Center) if you own an active DevExtreme license.

package/index.js

@@ -39,6 +39,14 @@ if(args.help) {
 const run = async(commands, options) => {
     if(application.isApplicationCommand(commands[0])) {
         await application.run(commands, options, devextremeConfig.read());
+    } else if(application.isMigrationCommand(commands[0])) {
+        if(!commands[1]) {
+            console.error('Please specify a change name for migration.');
+            printHelp('migrate');
+            return;
+        }
+        await application.run(['migrate', commands[1], ...commands.slice(2)], options, { applicationEngine: 'angular' });
+        return;
     } else if(themeBuilder.isThemeBuilderCommand(commands[0])) {
         options.command = commands[0];
         themeBuilder.run(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.11.2",
+  "version": "1.12.1",
   "description": "DevExtreme CLI",
   "keywords": [
     "devexpress",
@@ -43,7 +43,7 @@
     "minimist": "^1.2.8",
     "mustache": "^3.2.1",
     "prompts": "^2.4.2",
-    "sass": "^1.92.1",
+    "sass": "^1.93.3",
     "semver": "^5.7.2",
     "strip-bom": "^4.0.0"
   },
@@ -51,7 +51,7 @@
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "babel-eslint": "^10.1.0",
-    "create-vite": "7.1.1",
+    "create-vite": "7.1.3",
     "cross-env": "^5.2.1",
     "eslint": "^7.32.0",
     "eslint-config-angular": "^0.5.0",
@@ -74,5 +74,5 @@
     "typescript-eslint-parser": "^22.0.0",
     "wait-on": "8.0.5"
   },
-  "gitHead": "04bf9bb942b69586a4ed95b47807406844296751"
+  "gitHead": "7af3cab84fb0dee433711d63dd8ed65af4c7d9dd"
 }

package/src/application.js

@@ -9,11 +9,20 @@ const isApplicationCommand = (command) => {
     return [ 'new', 'add' ].includes(command);
 };
 
+const isMigrationCommand = (command) => {
+    return [ 'migrate' ].includes(command);
+};
+
 const handleWrongAppType = (appType, command) => {
     console.error(`The '${appType}' application type is not valid`);
     printHelp(command);
 };
 
+const handleWrongChangeName = (changeName, command) => {
+    console.error(`The '${changeName}' change name is not valid`);
+    printHelp(command);
+};
+
 const createReact = async(appName, options, command) => {
     const reactAppType = await getReactAppType(options['app-type']);
 
@@ -30,12 +39,25 @@ const createReact = async(appName, options, command) => {
 };
 
 const run = async(commands, options, devextremeConfig) => {
+
     if(!commands[1]) {
         console.error('Command is incomplete. Please specify parameters.');
         printHelp(commands[0]);
         return;
     }
 
+    if(commands[0] === 'migrate') {
+        const changeName = commands[1];
+        switch(changeName) {
+            case 'angular-config-components':
+                await angularApplication.migrateConfigComponents(options);
+                return;
+            default:
+                handleWrongChangeName(changeName, commands[0]);
+                return;
+        }
+    }
+
     if(commands[0] === 'new') {
         const app = commands[1];
         const appName = commands[2] || 'my-app';
@@ -104,5 +126,6 @@ const run = async(commands, options, devextremeConfig) => {
 
 module.exports = {
     isApplicationCommand,
+    isMigrationCommand,
     run
 };

package/src/applications/application.angular.js

@@ -54,12 +54,47 @@ async function runNgCommand(commandArguments, commandOptions, commandConfig) {
 
 function localPackageExists(packageName) {
     const nodeModulesPath = path.join(process.cwd(), 'node_modules');
-    if(!fs.existsSync(nodeModulesPath)) {
-        return;
+    if(fs.existsSync(nodeModulesPath)) {
+        const packageJsonPath = path.join(nodeModulesPath, packageName, 'package.json');
+        if(fs.existsSync(packageJsonPath)) {
+            return true;
+        }
     }
+    return false;
+}
+
+function getLocalCollectionPath(packageName) {
+    const nodeModulesPath = path.join(process.cwd(), 'node_modules', packageName, 'src', 'collection.json');
+    if(fs.existsSync(nodeModulesPath)) {
+        return nodeModulesPath;
+    }
+    return null;
+}
+
+function getCollectionPath(packageName) {
+    const localPath = getLocalCollectionPath(packageName);
+    if(localPath) {
+        return localPath;
+    }
+
+    try {
+        const packageJsonPath = require.resolve(`${packageName}/package.json`);
+        const collectionPath = path.join(path.dirname(packageJsonPath), 'src', 'collection.json');
+        if(fs.existsSync(collectionPath)) {
+            return collectionPath;
+        }
+    } catch(e) {}
+
+    return null;
+}
 
-    const packageJsonPath = path.join(nodeModulesPath, packageName, 'package.json');
-    return fs.existsSync(packageJsonPath);
+function schematicsCliExists() {
+    try {
+        require.resolve('@angular-devkit/schematics-cli/package.json');
+        return true;
+    } catch(e) {
+        return false;
+    }
 }
 
 const hasSutableNgCli = async() => {
@@ -152,6 +187,67 @@ const addView = (viewName, options) => {
     runSchematicCommand('add-view', schematicOptions);
 };
 
+const migrateConfigComponents = async(options = {}) => {
+    const collectionName = 'devextreme-schematics';
+    const collectionPath = getCollectionPath(collectionName);
+
+    if(!collectionPath) {
+        const prompts = require('prompts');
+
+        console.log(`\nThe '${collectionName}' package is required to run this command.`);
+
+        const response = await prompts({
+            type: 'confirm',
+            name: 'install',
+            message: `Would you like to install '${collectionName}@${schematicsVersion}' in the npm cache?`,
+            initial: true
+        });
+
+        if(!response.install) {
+            console.log('Migration cancelled. Install devextreme-schematics manually and rerun the command.');
+            process.exit(1);
+        }
+    }
+
+    const schematicOptions = {
+        ...options
+    };
+
+    const hasSchematicsCli = schematicsCliExists();
+    const commandArguments = ['--yes'];
+
+    if(!hasSchematicsCli) {
+        commandArguments.push('-p', '@angular-devkit/schematics-cli');
+    }
+
+    if(!collectionPath) {
+        commandArguments.push('-p', `${collectionName}@${schematicsVersion}`);
+    }
+
+    const collectionSpecifier = collectionPath
+        ? `${collectionPath.replace(/\\/g, '/')}:migrate-config-components`
+        : `${collectionName}:migrate-config-components`;
+
+    commandArguments.push('schematics', collectionSpecifier);
+
+    const { [depsVersionTagOptionName]: _, ...optionsToArguments } = schematicOptions; // eslint-disable-line no-unused-vars
+    for(let option in optionsToArguments) {
+        const value = optionsToArguments[option];
+        if(value !== undefined && value !== null && value !== '') {
+            if(Array.isArray(value)) {
+                if(value.length > 0) {
+                    commandArguments.push(`--${dasherize(option)}=${value.join(',')}`);
+                }
+            } else {
+                commandArguments.push(`--${dasherize(option)}=${value}`);
+            }
+        }
+    }
+
+    // Use runCommand directly with npx to work outside Angular workspace
+    return runCommand('npx', commandArguments, { stdio: 'inherit' });
+};
+
 const changeMainTs = (appPath) => {
     const filePath = path.join(appPath, 'src', 'main.ts');
 
@@ -174,5 +270,6 @@ module.exports = {
     install,
     create,
     addTemplate,
-    addView
+    addView,
+    migrateConfigComponents
 };

package/src/commands.json

@@ -48,6 +48,24 @@
             "name": "devextreme-angular",
             "description": "Add DevExtreme to an Angular application"
         }]
+    }, {
+        "name": "migrate",
+        "description": "Migration commands for DevExtreme applications",
+        "usage": "devextreme migrate <change name> [options]",
+        "arguments": [{
+            "name": "angular-config-components",
+            "description": "Migrate to the latest DevExtreme configuration components.",
+            "options": [{
+                "name": "--include",
+                "description": "Template file glob patterns to include (default: **/*.html). You can pass multiple patterns as a comma-separated string (e.g. \"**/a.html,**/b.html\") or as an array (e.g. [\"**/a.html\",\"**/b.html\"])."
+            }, {
+                "name": "--script-include",
+                "description": "TypeScript/JavaScript file glob patterns to scan for inline templates (default: **/*.ts,**/*.js). You can pass multiple patterns as a comma-separated string or as an array. Pass an empty value ('' or []) to disable."
+            }, {
+                "name": "--dry",
+                "description": "Run in dry mode to preview changes without applying them (default: false)."
+            }]
+        }]
     }, {
         "name": "build-theme",
         "description": "Build a custom color scheme",

package/src/utility/latest-versions.js

@@ -1,8 +1,8 @@
 const packageJson = require('../../package.json');
 module.exports = {
-    'devextreme': '25.1.5',
-    'devextreme-react': '25.1.5',
-    'devextreme-vue': '25.1.5',
+    'devextreme': '25.1.6',
+    'devextreme-react': '25.1.6',
+    'devextreme-vue': '25.1.6',
     'create-vite': '7.0.0',
     'create-vue': '3.17.0',
     'create-next-app': '15.3.4',