Add new features and bump versions (#190)

Author: tar-g

.gitattributes

@@ -10,5 +10,7 @@
 *.yml text eol=lf
 *.scss text eol=lf
 *.vue text eol=lf
+*.ts text eol=lf
+*.html text eol=lf
 
 *.png binary

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.1.13"
+  "version": "1.2.0"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli-monorepo",
-  "version": "1.1.10",
+  "version": "1.2.0",
   "scripts": {
     "test": "lerna run --stream test",
     "test-dev": "lerna run --stream test-dev",

package.json

@@ -1,2 +1,2 @@
-/templates
+/src/templates
 /testing/sandbox

packages/devextreme-cli/.eslintignore

@@ -4,12 +4,12 @@ const args = require('minimist')(process.argv.slice(2), {
 });
 const commands = args['_'];
 delete args['_'];
-const themeBuilder = require('./commands/themebuider');
-const application = require('./commands/application');
-const devextremeConfig = require('./utility/devextreme-config');
-const printHelp = require('./commands/help').printHelp;
+const themeBuilder = require('./src/themebuider');
+const application = require('./src/application');
+const devextremeConfig = require('./src/utility/devextreme-config');
+const printHelp = require('./src/help').printHelp;
 const packageJson = require('./package.json');
-const lock = require('./utility/file-lock');
+const lock = require('./src/utility/file-lock');
 
 lock.release();
 

packages/devextreme-cli/index.js

@@ -1,6 +1,6 @@
 {
   "name": "devextreme-cli",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "description": "DevExtreme CLI",
   "keywords": [
     "devexpress",
@@ -14,9 +14,7 @@
     "devextreme": "index.js"
   },
   "files": [
-    "commands/**/*",
-    "templates/**/*",
-    "utility/**/*",
+    "src/**/*",
     "index.js"
   ],
   "scripts": {
@@ -31,6 +29,7 @@
   "license": "MIT",
   "dependencies": {
     "@vue/cli": "^3.5.5",
+    "@yarnpkg/lockfile": "^1.1.0",
     "dart-sass": "^1.25.0",
     "ip": "^1.1.5",
     "less": "3.9.0",

packages/devextreme-cli/package-lock.json

@@ -1,6 +1,6 @@
-const angularApplication = require('./application.angular');
-const reactApplication = require('./application.react');
-const vueApplication = require('./application.vue');
+const angularApplication = require('./applications/application.angular');
+const reactApplication = require('./applications/application.react');
+const vueApplication = require('./applications/application.vue');
 const printHelp = require('./help').printHelp;
 
 const isApplicationCommand = (command) => {

packages/devextreme-cli/package.json

@@ -1,39 +1,39 @@
+const getLayoutInfo = require('../layout').getLayoutInfo;
 const path = require('path');
 const runCommand = require('../utility/run-command');
 const semver = require('semver').SemVer;
 const fs = require('fs');
 const exec = require('child_process').exec;
 const minNgCliVersion = new semver('8.0.0');
+const latestVersions = require('../utility/latest-versions');
+const schematicsVersion = latestVersions['devextreme-schematics'] || 'latest';
 
-function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
+async function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
     const collectionName = 'devextreme-schematics';
-    let collectionPath = collectionName;
+    let collectionPath = `${collectionName}@${schematicsVersion}`;
 
     if(options['c']) {
         collectionPath = `${path.join(process.cwd(), options['c'])}`;
         delete options['c'];
     }
 
-    const additionalOptions = [];
+    if(!localPackageExists(collectionName)) {
+        await runNgCommand(['add', collectionPath], evaluatingOptions);
+    }
+
+    const commandArguments = ['g', `${collectionName}:${schematicCommand}`];
     for(let option in options) {
-        const schematicOption = `--${option}=${options[option]}`;
-        additionalOptions.push(schematicOption);
+        commandArguments.push(`--${option}=${options[option]}`);
     };
 
+    runNgCommand(commandArguments, evaluatingOptions);
+}
 
-    let commandArguments = [
-        'ng', 'g', `${collectionName}:${schematicCommand}`
-    ].concat(additionalOptions);
+async function runNgCommand(commandArguments, evaluatingOptions) {
+    const ngCommandArguments = await hasSutableNgCli() ? [] : ['-p', '@angular/cli'];
 
-    optimizeNgCommandArguments(commandArguments).then((optimizedArguments) => {
-        if(!localPackageExists(collectionPath)) {
-            runCommand('npm', ['install', collectionPath], evaluatingOptions).then(() => {
-                runCommand('npx', optimizedArguments, evaluatingOptions);
-            });
-        } else {
-            runCommand('npx', optimizedArguments, evaluatingOptions);
-        }
-    });
+    ngCommandArguments.push('ng', ...commandArguments);
+    return runCommand('npx', ngCommandArguments, evaluatingOptions);
 }
 
 function localPackageExists(packageName) {
@@ -46,18 +46,12 @@ function localPackageExists(packageName) {
     return fs.existsSync(packageJsonPath);
 }
 
-function optimizeNgCommandArguments(args) {
-    return new Promise((resolve, reject) => {
-        hasSutableNgCli().then(() => resolve(args), () => resolve(['-p', '@angular/cli', ...args]));
-    });
-}
-
 function hasSutableNgCli() {
     return new Promise((resolve, reject) => {
         exec('ng v', (err, stdout, stderr) => {
             stderr || parseNgCliVersion(stdout).compare(minNgCliVersion) < 0
-                ? reject()
-                : resolve();
+                ? resolve(false)
+                : resolve(true);
         });
     });
 }
@@ -71,11 +65,13 @@ const install = (options) => {
 };
 
 const create = (appName, options) => {
-    let commandArguments = ['ng', 'new', appName, '--style=scss', '--routing=false', '--skip-install=true', '--skip-tests=true'];
-    optimizeNgCommandArguments(commandArguments).then((optimizedArguments) => {
-        runCommand('npx', optimizedArguments).then(() => {
+    const commandArguments = ['new', appName, '--style=scss', '--routing=false', '--skip-tests=true', '--skip-install=true'];
+
+    getLayoutInfo(options.layout).then(layoutInfo => {
+        runNgCommand(commandArguments).then(() => {
             options.resolveConflicts = 'override';
             options.updateBudgets = true;
+            options.layout = layoutInfo.layout;
             addTemplate(appName, options, {
                 cwd: path.join(process.cwd(), appName)
             });