@eui/cli 15.4.1 → 15.4.2

package/lib/config.js

@@ -1,54 +1,54 @@
-const path = require('path');
-
-const skeletonsPath = path.join(__dirname, 'skeletons');
-const version = require(path.join(__dirname, '../package.json')).version;
-
-module.exports.targetPath = path.resolve(process.cwd());
-module.exports.skeletonsPath = skeletonsPath;
-
-module.exports.angularBasePath = path.join(skeletonsPath, '_angular/base');
-module.exports.angularBaseMobilePath = path.join(skeletonsPath, '_angular/base-mobile');
-
-module.exports.webMavenPath = path.join(skeletonsPath, 'web-maven');
-module.exports.webSpringBootPath = path.join(skeletonsPath, 'web-spring-boot');
-
-module.exports.webPhpStarterRepo = 'webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-php-starter.git'
-module.exports.webSymfonyPath = path.join(skeletonsPath, 'web-symfony');
-
-module.exports.optionsPath = {
-    "openid-jwt": path.join(skeletonsPath, '_angular/options/openid-jwt'),
-    "ecl": path.join(skeletonsPath, '_angular/options/ecl'),
-};
-
-module.exports.version = version;
-
-
-module.exports.parseInputConfig = (inputConfig) => {
-
-  if (!inputConfig) {
-    return;
-  }
-
-  const configArray = inputConfig.split(',').map(item => {
-    const x = item.split(':');
-
-    var value = x[1];
-
-    // treating text to boolean values : f.e. : npmInstall=true
-    if (value === 'true') {
-      value = true;
-    }
-    if (value === 'false') {
-      value = false;
-    }
-
-    // treating string array values : f.e. : appFeatures=feature1_feature2_feature3
-    if (typeof value === 'string' && value.indexOf('_')) {
-      value = value.split('_');
-    }
-
-    return { [x[0]]: value };
-  });
-
-  return Object.assign({}, ...configArray);
-}
+const path = require('path');
+
+const skeletonsPath = path.join(__dirname, 'skeletons');
+const version = require(path.join(__dirname, '../package.json')).version;
+
+module.exports.targetPath = path.resolve(process.cwd());
+module.exports.skeletonsPath = skeletonsPath;
+
+module.exports.angularBasePath = path.join(skeletonsPath, '_angular/base');
+module.exports.angularBaseMobilePath = path.join(skeletonsPath, '_angular/base-mobile');
+
+module.exports.webMavenPath = path.join(skeletonsPath, 'web-maven');
+module.exports.webSpringBootPath = path.join(skeletonsPath, 'web-spring-boot');
+
+module.exports.webPhpStarterRepo = 'webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-php-starter.git'
+module.exports.webSymfonyPath = path.join(skeletonsPath, 'web-symfony');
+
+module.exports.optionsPath = {
+    "openid-jwt": path.join(skeletonsPath, '_angular/options/openid-jwt'),
+    "ecl": path.join(skeletonsPath, '_angular/options/ecl'),
+};
+
+module.exports.version = version;
+
+
+module.exports.parseInputConfig = (inputConfig) => {
+
+  if (!inputConfig) {
+    return;
+  }
+
+  const configArray = inputConfig.split(',').map(item => {
+    const x = item.split(':');
+
+    var value = x[1];
+
+    // treating text to boolean values : f.e. : npmInstall=true
+    if (value === 'true') {
+      value = true;
+    }
+    if (value === 'false') {
+      value = false;
+    }
+
+    // treating string array values : f.e. : appFeatures=feature1_feature2_feature3
+    if (typeof value === 'string' && value.indexOf('_')) {
+      value = value.split('_');
+    }
+
+    return { [x[0]]: value };
+  });
+
+  return Object.assign({}, ...configArray);
+}

package/lib/generators.js

@@ -1,64 +1,64 @@
-const chalk = require('chalk');
-const cli = require('./cli');
-const build = require('./build');
-const postBuild = require('./post-build');
-const install = require('./install');
-
-const appGenerate = (options) => {
-  console.info(chalk.cyan('Configuring your project : please answer the following : \n'));
-
-  var cliConfig;
-
-  // Query the questions
-  // -------------------
-  return Promise.resolve()
-    .then(() => {
-      return cli.start(options);
-    })
-
-    // Storing config
-    // --------------
-    .then((config) => {
-      cliConfig = config;
-      console.log(config);
-    })
-
-    // Building the file structure
-    // ---------------------------
-    .then(() => {
-      return build.start({
-        config: cliConfig,
-        targetPath: options.targetPath
-      });
-    })
-
-    // Post build operations
-    // ---------------------
-    .then(() => {
-      return postBuild.start({
-        config: cliConfig,
-        targetPath: options.targetPath
-      });
-    })
-
-    // Install dependencies
-    // --------------------
-    .then(() => {
-      return install.start({
-        config: cliConfig,
-        targetPath: options.targetPath,
-      });
-    })
-
-    .catch((e) => {
-      console.error(e);
-      process.exitCode = 1;
-    })
-
-    .finally(() => process.exit())
-}
-
-
-module.exports = {
-  appGenerate,
-};
+const chalk = require('chalk');
+const cli = require('./cli');
+const build = require('./build');
+const postBuild = require('./post-build');
+const install = require('./install');
+
+const appGenerate = (options) => {
+  console.info(chalk.cyan('Configuring your project : please answer the following : \n'));
+
+  var cliConfig;
+
+  // Query the questions
+  // -------------------
+  return Promise.resolve()
+    .then(() => {
+      return cli.start(options);
+    })
+
+    // Storing config
+    // --------------
+    .then((config) => {
+      cliConfig = config;
+      console.log(config);
+    })
+
+    // Building the file structure
+    // ---------------------------
+    .then(() => {
+      return build.start({
+        config: cliConfig,
+        targetPath: options.targetPath
+      });
+    })
+
+    // Post build operations
+    // ---------------------
+    .then(() => {
+      return postBuild.start({
+        config: cliConfig,
+        targetPath: options.targetPath
+      });
+    })
+
+    // Install dependencies
+    // --------------------
+    .then(() => {
+      return install.start({
+        config: cliConfig,
+        targetPath: options.targetPath,
+      });
+    })
+
+    .catch((e) => {
+      console.error(e);
+      process.exitCode = 1;
+    })
+
+    .finally(() => process.exit())
+}
+
+
+module.exports = {
+  appGenerate,
+};

package/lib/install.js

@@ -1,54 +1,54 @@
-const childProcess = require("child_process");
-const execSync = childProcess.execSync;
-const path = require("path");
-const tools = require('@eui/tools/scripts/utils/tools');
-const utils = require('./utils');
-const chalk = require('chalk');
-
-
-module.exports.start = (options) => {
-
-  if (!options.config.npmInstall) {
-    return;
-  }
-
-  return Promise.resolve()
-    .then(() => {
-      return install(options.config, options.targetPath)
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-const install = (cliConfig, targetPath) => {
-
-  const wd = path.resolve(utils.getAngularPath(targetPath, cliConfig.appName, cliConfig.appType, cliConfig.artifactId));
-
-  console.log('');
-  console.log('');
-  console.log('*****************************************************');
-  console.log(chalk.cyan(' Installing app dependencies... PLEASE WAIT....'));
-  console.log('*****************************************************');
-
-  return Promise.resolve()
-    .then(() => {
-      return tools.remove(path.join(wd, 'yarn.lock'));
-    })
-    .then(() => {
-      return execSync("yarn", { cwd: wd, stdio: "inherit" });
-    })
-    .then(() => {
-      console.log('');
-      console.log('');
-      console.log('*****************************************************************');
-      console.log(chalk.cyan(' Starting eUI app... browser will open soon on localhost:4200'));
-      console.log('*****************************************************************');
-
-      return execSync("npm start", { cwd: wd, stdio: "inherit" });
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
+const childProcess = require("child_process");
+const execSync = childProcess.execSync;
+const path = require("path");
+const tools = require('@eui/tools/scripts/utils/tools');
+const utils = require('./utils');
+const chalk = require('chalk');
+
+
+module.exports.start = (options) => {
+
+  if (!options.config.npmInstall) {
+    return;
+  }
+
+  return Promise.resolve()
+    .then(() => {
+      return install(options.config, options.targetPath)
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+const install = (cliConfig, targetPath) => {
+
+  const wd = path.resolve(utils.getAngularPath(targetPath, cliConfig.appName, cliConfig.appType, cliConfig.artifactId));
+
+  console.log('');
+  console.log('');
+  console.log('*****************************************************');
+  console.log(chalk.cyan(' Installing app dependencies... PLEASE WAIT....'));
+  console.log('*****************************************************');
+
+  return Promise.resolve()
+    .then(() => {
+      return tools.remove(path.join(wd, 'yarn.lock'));
+    })
+    .then(() => {
+      return execSync("yarn", { cwd: wd, stdio: "inherit" });
+    })
+    .then(() => {
+      console.log('');
+      console.log('');
+      console.log('*****************************************************************');
+      console.log(chalk.cyan(' Starting eUI app... browser will open soon on localhost:4200'));
+      console.log('*****************************************************************');
+
+      return execSync("npm start", { cwd: wd, stdio: "inherit" });
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+

package/lib/maven-build/build.xml

@@ -1,115 +1,115 @@
-<?xml version="1.0"?>
-<project name="eUI-build" basedir=".">
-
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-        <classpath>
-            <fileset dir="lib" includes="ant-contrib-*.jar"/>
-        </classpath>
-    </taskdef>
-
-    <scriptdef language="javascript" name="lower">
-        <attribute name="string" />
-        <attribute name="to" />
-
-        project.setProperty( attributes.get( "to" ),
-                             attributes.get( "string" ).toLowerCase() );
-    </scriptdef>
-
-    <scriptdef language="javascript" name="ucfirst">
-        <attribute name="string" />
-        <attribute name="to" />
-
-        var the_string = attributes.get( "string" );
-        project.setProperty( attributes.get( "to" ),
-                    the_string.substr(0,1).toUpperCase() + the_string.substr(1) );
-    </scriptdef>
-
-    <scriptdef name="camelCaseString" language="javascript">
-        <attribute name="text" />
-        <attribute name="separator" />
-        <attribute name="property" />
-        <attribute name="first" />
-        <![CDATA[
-            var string = attributes.get("text");
-            var stringArray = string.split(attributes.get("separator"));
-            var result = "";
-            var s;
-
-            for (var i=0; i<stringArray.length;i++) {
-                s = stringArray[i];
-                if (i == 0) {
-                    if (attributes.get("first") == 'true') {
-                        result += s.substring(0,1).toUpperCase() + s.substr(1);
-                    } else {
-                        result += s;
-                    }
-                } else {
-                    result += s.substring(0,1).toUpperCase() + s.substr(1);
-                }
-            }
-
-            project.setProperty(attributes.get("property"), result);
-        ]]>
-    </scriptdef>
-
-
-    <macrodef name="replaceAll" taskname="@{taskname}">
-        <attribute name="src" />
-        <attribute name="dest" default="" />
-        <attribute name="replace" default="" />
-        <attribute name="with" default="" />
-        <sequential>
-            <loadresource property="@{dest}">
-                <propertyresource name="@{src}" />
-                <filterchain>
-                    <tokenfilter>
-                        <filetokenizer/>
-                        <replacestring from="@{replace}" to="@{with}"/>
-                    </tokenfilter>
-                </filterchain>
-            </loadresource>
-        </sequential>
-    </macrodef>
-
-
-
-    <!--======================================================================-->
-    <!--                     TOKEN FILTERS                                    -->
-    <!--======================================================================-->
-
-    <!--application files replacement-->
-    <filter token="app.name" value="${app.artifact.id}"/>
-    <filter token="app.name.display" value="${app.artifact.id}"/>
-    <filter token="app.group.id" value="${app.group.id}"/>
-
-    <target name="generate.web-spring-boot">
-        <echo></echo>
-        <echo>TARGET : ${target.path}</echo>
-        <echo></echo>
-        <echo>app.name: ${app.name}</echo>
-        <echo>app.artifact.id: ${app.artifact.id}</echo>
-        <echo>app.group.id: ${app.group.id}</echo>
-        <echo></echo>
-
-         <copy todir="${target.path}" filtering="true" overwrite="true">
-            <fileset dir="${src.path}"/>
-         </copy>
-
-         <!--REPLACE MODULE NAMES DIRECTORIES-->
-         <move toFile="${target.path}/${app.artifact.id}-web-rest"
-               file="${target.path}/myapp-web-rest"/>
-         <move toFile="${target.path}/${app.artifact.id}-web"
-               file="${target.path}/myapp-web"/>
-
-        <!--RENAMING JAVA SOURCES TARGET by custom app group id provided-->
-
-        <replaceAll src="app.group.id" dest="app.group.id.dir" replace="." with="/"/>
-
-        <move tofile="${target.path}/${app.name}-web-rest/src/main/java/${app.group.id.dir}/${app.name}"
-              file="${target.path}/${app.name}-web-rest/src/main/java/myapp"/>
-        <mkdir dir="${target.path}/${app.name}-web-rest/src/test/java/${app.group.id.dir}/${app.name}"/>
-
-    </target>
-
-</project>
-
+<?xml version="1.0"?>
+<project name="eUI-build" basedir=".">
+
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+        <classpath>
+            <fileset dir="lib" includes="ant-contrib-*.jar"/>
+        </classpath>
+    </taskdef>
+
+    <scriptdef language="javascript" name="lower">
+        <attribute name="string" />
+        <attribute name="to" />
+
+        project.setProperty( attributes.get( "to" ),
+                             attributes.get( "string" ).toLowerCase() );
+    </scriptdef>
+
+    <scriptdef language="javascript" name="ucfirst">
+        <attribute name="string" />
+        <attribute name="to" />
+
+        var the_string = attributes.get( "string" );
+        project.setProperty( attributes.get( "to" ),
+                    the_string.substr(0,1).toUpperCase() + the_string.substr(1) );
+    </scriptdef>
+
+    <scriptdef name="camelCaseString" language="javascript">
+        <attribute name="text" />
+        <attribute name="separator" />
+        <attribute name="property" />
+        <attribute name="first" />
+        <![CDATA[
+            var string = attributes.get("text");
+            var stringArray = string.split(attributes.get("separator"));
+            var result = "";
+            var s;
+
+            for (var i=0; i<stringArray.length;i++) {
+                s = stringArray[i];
+                if (i == 0) {
+                    if (attributes.get("first") == 'true') {
+                        result += s.substring(0,1).toUpperCase() + s.substr(1);
+                    } else {
+                        result += s;
+                    }
+                } else {
+                    result += s.substring(0,1).toUpperCase() + s.substr(1);
+                }
+            }
+
+            project.setProperty(attributes.get("property"), result);
+        ]]>
+    </scriptdef>
+
+
+    <macrodef name="replaceAll" taskname="@{taskname}">
+        <attribute name="src" />
+        <attribute name="dest" default="" />
+        <attribute name="replace" default="" />
+        <attribute name="with" default="" />
+        <sequential>
+            <loadresource property="@{dest}">
+                <propertyresource name="@{src}" />
+                <filterchain>
+                    <tokenfilter>
+                        <filetokenizer/>
+                        <replacestring from="@{replace}" to="@{with}"/>
+                    </tokenfilter>
+                </filterchain>
+            </loadresource>
+        </sequential>
+    </macrodef>
+
+
+
+    <!--======================================================================-->
+    <!--                     TOKEN FILTERS                                    -->
+    <!--======================================================================-->
+
+    <!--application files replacement-->
+    <filter token="app.name" value="${app.artifact.id}"/>
+    <filter token="app.name.display" value="${app.artifact.id}"/>
+    <filter token="app.group.id" value="${app.group.id}"/>
+
+    <target name="generate.web-spring-boot">
+        <echo></echo>
+        <echo>TARGET : ${target.path}</echo>
+        <echo></echo>
+        <echo>app.name: ${app.name}</echo>
+        <echo>app.artifact.id: ${app.artifact.id}</echo>
+        <echo>app.group.id: ${app.group.id}</echo>
+        <echo></echo>
+
+         <copy todir="${target.path}" filtering="true" overwrite="true">
+            <fileset dir="${src.path}"/>
+         </copy>
+
+         <!--REPLACE MODULE NAMES DIRECTORIES-->
+         <move toFile="${target.path}/${app.artifact.id}-web-rest"
+               file="${target.path}/myapp-web-rest"/>
+         <move toFile="${target.path}/${app.artifact.id}-web"
+               file="${target.path}/myapp-web"/>
+
+        <!--RENAMING JAVA SOURCES TARGET by custom app group id provided-->
+
+        <replaceAll src="app.group.id" dest="app.group.id.dir" replace="." with="/"/>
+
+        <move tofile="${target.path}/${app.name}-web-rest/src/main/java/${app.group.id.dir}/${app.name}"
+              file="${target.path}/${app.name}-web-rest/src/main/java/myapp"/>
+        <mkdir dir="${target.path}/${app.name}-web-rest/src/test/java/${app.group.id.dir}/${app.name}"/>
+
+    </target>
+
+</project>
+