devextreme-cli 1.12.0 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.12.0",
+  "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.93.2",
+    "sass": "^1.93.3",
     "semver": "^5.7.2",
     "strip-bom": "^4.0.0"
   },
@@ -74,5 +74,5 @@
     "typescript-eslint-parser": "^22.0.0",
     "wait-on": "8.0.5"
   },
-  "gitHead": "0a56ed4e9c13e1deb23007f0d23f974806878a7f"
+  "gitHead": "7af3cab84fb0dee433711d63dd8ed65af4c7d9dd"
 }

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,9 +189,9 @@ 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.`);
@@ -175,23 +199,12 @@ const migrateConfigComponents = async(options = {}) => {
         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 cancelled. Install devextreme-schematics manually and rerun the command.');
             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) {