devextreme-cli 1.12.0 → 1.12.2

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

@@ -41,7 +41,7 @@ const run = async(commands, options) => {
         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.');
+            console.error('Please specify a migration command.');
             printHelp('migrate');
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "description": "DevExtreme CLI",
   "keywords": [
     "devexpress",
@@ -43,14 +43,13 @@
     "minimist": "^1.2.8",
     "mustache": "^3.2.1",
     "prompts": "^2.4.2",
-    "sass": "^1.93.2",
+    "sass": "^1.94.2",
     "semver": "^5.7.2",
     "strip-bom": "^4.0.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "babel-eslint": "^10.1.0",
     "create-vite": "7.1.3",
     "cross-env": "^5.2.1",
     "eslint": "^7.32.0",
@@ -74,5 +73,9 @@
     "typescript-eslint-parser": "^22.0.0",
     "wait-on": "8.0.5"
   },
-  "gitHead": "0a56ed4e9c13e1deb23007f0d23f974806878a7f"
+  "overrides": {
+    "@babel/traverse@<7.23.2": ">=7.23.2",
+    "braces@<3.0.3": ">=3.0.3"
+  },
+  "gitHead": "d8919cf6f14386254ace295b651ce3f532833ba8"
 }

package/src/application.js

@@ -19,7 +19,7 @@ const handleWrongAppType = (appType, command) => {
 };
 
 const handleWrongChangeName = (changeName, command) => {
-    console.error(`The '${changeName}' change name is not valid`);
+    console.error(`Invalid migration command: ${changeName}`);
     printHelp(command);
 };
 

package/src/applications/application.angular.js

@@ -53,7 +53,6 @@ async function runNgCommand(commandArguments, commandOptions, commandConfig) {
 }
 
 function localPackageExists(packageName) {
-    // Check local node_modules first
     const nodeModulesPath = path.join(process.cwd(), 'node_modules');
     if(fs.existsSync(nodeModulesPath)) {
         const packageJsonPath = path.join(nodeModulesPath, packageName, 'package.json');
@@ -61,16 +60,41 @@ function localPackageExists(packageName) {
             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;
+    }
 
-    // Check if globally installed by trying to resolve the package
     try {
-        require.resolve(`${packageName}/package.json`);
+        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;
+}
+
+function schematicsCliExists() {
+    try {
+        require.resolve('@angular-devkit/schematics-cli/package.json');
         return true;
     } catch(e) {
-        // Package not found globally
+        return false;
     }
-
-    return false;
 }
 
 const hasSutableNgCli = async() => {
@@ -165,33 +189,22 @@ const addView = (viewName, options) => {
 
 const migrateConfigComponents = async(options = {}) => {
     const collectionName = 'devextreme-schematics';
+    const collectionPath = getCollectionPath(collectionName);
 
-    // Check if devextreme-schematics is installed
-    if(!localPackageExists(collectionName)) {
+    if(!collectionPath) {
         const prompts = require('prompts');
 
-        console.log(`\nThe '${collectionName}' package is required to run this command.`);
+        console.log(`\nRequired package is missing: '${collectionName}'`);
 
         const response = await prompts({
             type: 'confirm',
             name: 'install',
-            message: `Would you like to install '${collectionName}' now?`,
+            message: `Would you like to install '${collectionName}@${schematicsVersion}' in the npm cache?`,
             initial: true
         });
 
         if(!response.install) {
-            console.log('Migration cancelled. Please install devextreme-schematics manually:');
-            console.log(`npm install -g ${collectionName}@${schematicsVersion}`);
-            process.exit(1);
-        }
-
-        console.log(`Installing ${collectionName}@${schematicsVersion}...`);
-        try {
-            await runCommand('npm', ['install', '-g', `${collectionName}@${schematicsVersion}`], { stdio: 'inherit' });
-            console.log('Installation completed successfully.');
-        } catch(error) {
-            console.error('Failed to install devextreme-schematics. Please install manually:');
-            console.error(`npm install -g ${collectionName}@${schematicsVersion}`);
+            console.log('Migration was canceled.');
             process.exit(1);
         }
     }
@@ -200,14 +213,22 @@ const migrateConfigComponents = async(options = {}) => {
         ...options
     };
 
-    if(schematicOptions.include && typeof schematicOptions.include === 'string') {
-        schematicOptions.include = schematicOptions.include.split(',').map(s => s.trim());
+    const hasSchematicsCli = schematicsCliExists();
+    const commandArguments = ['--yes'];
+
+    if(!hasSchematicsCli) {
+        commandArguments.push('-p', '@angular-devkit/schematics-cli');
     }
-    if(schematicOptions.scriptInclude && typeof schematicOptions.scriptInclude === 'string') {
-        schematicOptions.scriptInclude = schematicOptions.scriptInclude.split(',').map(s => s.trim());
+
+    if(!collectionPath) {
+        commandArguments.push('-p', `${collectionName}@${schematicsVersion}`);
     }
 
-    const commandArguments = ['schematics', `${collectionName}:migrate-config-components`];
+    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) {

package/src/commands.json

@@ -51,19 +51,19 @@
     }, {
         "name": "migrate",
         "description": "Migration commands for DevExtreme applications",
-        "usage": "devextreme migrate <change name> [options]",
+        "usage": "devextreme migrate <migration command> [options]",
         "arguments": [{
             "name": "angular-config-components",
-            "description": "Migrate to the latest DevExtreme configuration components.",
+            "description": "Migrates DevExtreme Angular applications to named 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\"])."
+                "description": "Template file glob patterns to include (default: **/*.html). You can pass multiple patterns as a comma-separated string (\"**/a.html,**/b.html\") or as an array ([\"**/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."
+                "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 to disable ('' or [])."
             }, {
                 "name": "--dry",
-                "description": "Run in dry mode to preview changes without applying them (default: false)."
+                "description": "Run in dry mode to preview changes."
             }]
         }]
     }, {

package/src/utility/latest-versions.js

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

package/src/utility/ng-version.js

@@ -2,12 +2,12 @@ const semver = require('semver').SemVer;
 const execSync = require('child_process').execSync;
 
 function parseNgCliVersion(stdout) {
-    return /angular.cli:\s*(\S+)/ig.exec(stdout)[1];
+    return stdout.trim();
 }
 
 const getLocalNgVersion = () => {
     try {
-        const version = parseNgCliVersion(execSync('ng v').toString());
+        const version = parseNgCliVersion(execSync('ng --version').toString());
         return new semver(version);
     } catch(e) {
         return '';