@eui/cli 18.0.0-rc.19 → 18.0.0-rc.20

package/.version.properties

@@ -1 +1 @@
-18.0.0-rc.19
+18.0.0-rc.20

package/bin/eui-cli.js

@@ -19,8 +19,7 @@ console.info(
 );
 
 // remapping config if passed as argument - automated mode
-var inputConfig = config.parseInputConfig(args.config);
-
+let inputConfig = config.parseInputConfig(args.config);
 
 // Detecting targetPath and create it if present as argument - local and automated mode
 let targetPath;
@@ -28,22 +27,13 @@ let targetPath;
 if (args.targetPath) {
   targetPath = path.join(config.targetPath, args.targetPath);
 
-  if (args.m) {
-    targetPath = path.join(targetPath, 'packages');
-  }
-
-  if (fs.readdirSync(targetPath).length < 1) {
-    fs.mkdirSync(targetPath);
+  if (!tools.isDirExists(targetPath)) {
+    tools.mkdir(targetPath);
   }
 
 // otherwise taking the default config targetPath defined
 } else {
-  if (args.m) {
-    targetPath = path.join(config.targetPath, 'packages');
-
-  } else {
-    targetPath = config.targetPath;
-  }
+  targetPath = config.targetPath;
 }
 
 if (args.v) {

package/lib/config.js

@@ -22,6 +22,9 @@ module.exports.optionsPath = {
 
 module.exports.version = version;
 
+// f.e. :
+//  eui-cli --config appType:angular,npmInstall:false --targetPath eui-angular
+//  eui-cli --config appType:angular,appOptions:ecl,npmInstall:false --targetPath eui-angular-ecl-ec
 
 module.exports.parseInputConfig = (inputConfig) => {
 
@@ -32,7 +35,8 @@ module.exports.parseInputConfig = (inputConfig) => {
   const configArray = inputConfig.split(',').map(item => {
     const x = item.split(':');
 
-    var value = x[1];
+    const propName = x[0];
+    let value = x[1];
 
     // treating text to boolean values : f.e. : npmInstall=true
     if (value === 'true') {
@@ -42,12 +46,12 @@ module.exports.parseInputConfig = (inputConfig) => {
       value = false;
     }
 
-    // treating string array values : f.e. : appFeatures=feature1_feature2_feature3
-    if (typeof value === 'string' && value.indexOf('_')) {
+    // treating string array values : f.e. : appOptions=ecl_something
+    if (propName === 'appOptions') {
       value = value.split('_');
     }
 
-    return { [x[0]]: value };
+    return { [propName]: value };
   });
 
   return Object.assign({}, ...configArray);

package/lib/generators.js

@@ -5,9 +5,13 @@ const postBuild = require('./post-build');
 const install = require('./install');
 
 const appGenerate = (options) => {
-  console.info(chalk.cyan('Configuring your project : please answer the following : \n'));
+  if (options.inputConfig) {
+    console.info(chalk.cyan('Creating your project - automated mode : \n'));
+  } else {
+    console.info(chalk.cyan('Configuring your project : please answer the following : \n'));
+  }
 
-  var cliConfig;
+  let cliConfig;
 
   // Query the questions
   // -------------------

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-rc.19",
+    "version": "18.0.0-rc.20",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,7 +20,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.0-rc.19"
+        "@eui/deps-base": "18.0.0-rc.20"
     },
     "resolutions": {
         "js-yaml": ">=3.13.1",

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-rc.19",
+    "version": "18.0.0-rc.20",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.0-rc.19",
+    "version": "18.0.0-rc.20",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.0-rc.19"
+        "@eui/deps-base": "18.0.0-rc.20"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "18.0.0-rc.19",
+    "version": "18.0.0-rc.20",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",