@eui/cli 21.0.0-alpha.22 → 21.0.0-alpha.23

package/README.md

@@ -2,7 +2,7 @@
 
 ## Pre-requisites
 
-**NodeJS 10.x**
+**NodeJS 20.19.x**
 
 **Yarn**
 

package/bin/eui-cli.js

@@ -1,22 +1,17 @@
 #!/usr/bin/env node
 
-const chalk = require('chalk');
-const tools = require('@eui/tools/scripts/utils/tools');
 const figlet = require('figlet');
 const path = require('path');
-const fs = require('fs');
 const generators = require('../lib/generators');
 const config = require('../lib/config');
+const utils = require('../lib/utils');
 
 // fetching cli arguments
-const args = tools.getArgs();
+const args = utils.getArgs();
 
 // Print header and version
-console.info(
-  '\n\n',
-  chalk.yellow(figlet.textSync('eUI CLI', { horizontalLayout: 'full' })),
-  chalk.green(`\n  v${config.version}\n`)
-);
+utils.logBigTitle('eUI CLI');
+utils.logAccent(` --- v${config.version} ---\n`);
 
 // remapping config if passed as argument - automated mode
 let inputConfig = config.parseInputConfig(args.config);
@@ -28,7 +23,7 @@ if (args.targetPath) {
   targetPath = path.join(config.targetPath, args.targetPath);
 
   if (!tools.isDirExists(targetPath)) {
-    tools.mkdir(targetPath);
+    utils.mkdir(targetPath);
   }
 
 // otherwise taking the default config targetPath defined

package/lib/build.js

@@ -1,10 +1,8 @@
-const tools = require('@eui/tools/scripts/utils/tools');
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
 const path = require('path');
 const utils = require('./utils');
 const config = require('./config');
-const childProcess = require('child_process');
-const execa = require('execa');
-const execSync = childProcess.execSync;
 
 module.exports.start = (options) => {
   return Promise.resolve()
@@ -27,11 +25,11 @@ const build = (cliConfig, targetPath) => {
       let target = targetPath;
       console.log(`--cleaning target : ${target}`);
 
-      if (!tools.isDirEmpty(target)) {
-        tools.logError(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
+      if (!utils.isDirEmpty(target)) {
+        utils.logError(`Target directory : ${target} is not empty, execute eUI CLI in a blank directory... quitting`);
         throw new Error('DIR_NOT_EMPTY');
       } else {
-        return tools.rimraf(`${target}/**/*`);
+        return utils.rimraf(`${target}/**/*`);
       }
     })
 
@@ -56,7 +54,7 @@ const build = (cliConfig, targetPath) => {
         return Promise.resolve()
           .then(() => {
             console.log('--building web-maven');
-            return tools.copydir(config.webMavenPath, targetPath);
+            return utils.copydir(config.webMavenPath, targetPath);
           })
           .then(() => {
             const angularPath = utils.getAngularPath(targetPath, appName, appType);
@@ -93,7 +91,7 @@ const build = (cliConfig, targetPath) => {
         return Promise.resolve()
           .then(() => {
             console.log('--cloning eui php starter repository')
-            execa.shellSync(`git clone https://${config.webPhpStarterRepo} ${targetPath}`);
+            execSync(`git clone https://${config.webPhpStarterRepo} ${targetPath}`);
           })
           .then(() => {
             console.log('--building web-symfony');
@@ -101,13 +99,13 @@ const build = (cliConfig, targetPath) => {
             return copyAngular(angularPath, cliConfig, false);
           })
           .then(() => {
-            execa.shellSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
+            execSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
           })
           .catch((e) => {
             throw e;
           })
           .finally(() => {
-            return tools.rimraf(`${targetPath}/.git`);
+            return utils.rimraf(`${targetPath}/.git`);
           })
       }
 
@@ -127,11 +125,11 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       const {angularBasePath} = config;
       const sourcePath = angularBasePath;
 
-      return tools.copydir(sourcePath, targetPath, overwrite);
+      return utils.copydir(sourcePath, targetPath, overwrite);
     })
     .then(() => {
       if (cliConfig.appType === 'mobile') {
-        return tools.copydir(config.angularBaseMobilePath, targetPath, overwrite);
+        return utils.copydir(config.angularBaseMobilePath, targetPath, overwrite);
       }
     })
     .then(() => {
@@ -139,12 +137,12 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
         cliConfig.appOptions.forEach((item) => {
           if (item !== 'ecl') {
             console.log('Applying option : ' + item);
-            tools.copydir(config.optionsPath[item], targetPath, true);
+            utils.copydir(config.optionsPath[item], targetPath, true);
           }
         })
         if (cliConfig.appOptions.includes('ecl') && cliConfig.appOptionsEclTheme) {
           console.log(`eUI ECL theme selected : ` + cliConfig.appOptionsEclTheme);
-          tools.copydir(config.optionsPath[cliConfig.appOptionsEclTheme], targetPath, true);
+          utils.copydir(config.optionsPath[cliConfig.appOptionsEclTheme], targetPath, true);
         }
       }
       return Promise.resolve();

package/lib/generators.js

@@ -1,4 +1,3 @@
-const chalk = require('chalk');
 const childProcess = require('child_process');
 const execSync = childProcess.execSync;
 const cli = require('./cli');
@@ -10,9 +9,9 @@ const utils = require('./utils');
 
 const appGenerate = (options) => {
   if (options.inputConfig) {
-    console.info(chalk.cyan('Creating your project - automated mode : \n'));
+    utils.logInfo('Creating your project - automated mode : \n');
   } else {
-    console.info(chalk.cyan('Configuring your project : please answer the following : \n'));
+    utils.logInfo('Configuring your project : please answer the following : \n');
   }
 
   // Query the questions
@@ -52,11 +51,9 @@ const appGenerate = (options) => {
         if (!cliConfig.appStart || typeof cliConfig.npmInstall !== 'boolean' || !cliConfig.npmInstall) {
           return;
         }
-        console.log('');
-        console.log('');
-        console.log('*****************************************************************');
-        console.log(chalk.cyan(' Starting eUI app... browser will open soon on localhost:4200'));
-        console.log('*****************************************************************');
+        utils.logInfo('*****************************************************************');
+        utils.logInfo(' Starting eUI app... browser will open soon on localhost:4200');
+        utils.logInfo('*****************************************************************');
 
         const wd = path.resolve(utils.getAngularPath(options.targetPath, cliConfig.appName, cliConfig.appType, cliConfig.artifactId));
         return execSync("npm start", { cwd: wd, stdio: "inherit" });

package/lib/install.js

@@ -1,9 +1,7 @@
 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) => {
 
@@ -27,7 +25,7 @@ const install = (cliConfig, targetPath) => {
   console.log('');
   console.log('');
   console.log('*****************************************************');
-  console.log(chalk.cyan(' Installing app dependencies... PLEASE WAIT....'));
+  console.log(' Installing app dependencies... PLEASE WAIT....');
   console.log('*****************************************************');
 
   return Promise.resolve()

package/lib/post-build.js

@@ -1,6 +1,4 @@
 const path = require('path');
-const tools = require('@eui/tools/scripts/utils/tools');
-
 const utils = require('./utils');
 
 module.exports.start = (options) => {
@@ -24,7 +22,7 @@ const postBuild = (cliConfig, targetPath) => {
     .then(() => {
       console.log('--renaming .gitignore');
       const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-      return tools.move(path.join(angularPath, 'gitignore_TO_REPLACE'), path.join(angularPath, '.gitignore'));
+      return utils.move(path.join(angularPath, 'gitignore_TO_REPLACE'), path.join(angularPath, '.gitignore'));
     })
 
     .catch((e) => {

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.22",
+    "version": "21.0.0-alpha.23",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.22"
+        "@eui/deps-base": "21.0.0-alpha.23"
     },
     "resolutions": {
         "js-yaml": ">=3.13.1",

package/lib/skeletons/_angular/base/src/karma.conf.js

@@ -1,7 +1,47 @@
-const karmaConfig = require('@eui/tools/karma/karma.conf');
+function get(config) {
+
+    return {
+        basePath: '',
+        frameworks: ['jasmine', '@angular-devkit/build-angular'],
+        plugins: [
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('karma-coverage'),
+            require('karma-sourcemap-loader'),
+            require('@angular-devkit/build-angular/plugins/karma')
+        ],
+        client:{
+          clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+          reports: [ 'html', 'lcovonly' ],
+          fixWebpackSourcePaths: true
+        },
+        angularCli: {
+          environment: 'dev'
+        },
+        reporters: ['progress', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['ChromeHeadlessCustom'],
+        customLaunchers: {
+            ChromeHeadlessCustom: {
+                base: 'ChromeHeadless',
+                flags: [
+                    '--no-sandbox',
+                ],
+            },
+        },
+        singleRun: false
+    }
+}
 
 module.exports = function (config) {
     config.set(
-        karmaConfig.get(config)
+        get(config)
     );
 }

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.22",
+    "version": "21.0.0-alpha.23",
     "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": "21.0.0-alpha.22",
+    "version": "21.0.0-alpha.23",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.22"
+        "@eui/deps-base": "21.0.0-alpha.23"
     }
 }

package/lib/utils.js

@@ -1,3 +1,11 @@
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
+const fs = require('fs');
+const fse = require('fs-extra');
+const glob = require('glob');
+const path = require('path');
+const figlet = require('figlet');
+
 module.exports.getAngularPath = (targetPath, appName, appType, artifactId) => {
   switch(appType) {
     case 'angular':
@@ -11,3 +19,205 @@ module.exports.getAngularPath = (targetPath, appName, appType, artifactId) => {
       return `${targetPath}/client`;
   }
 }
+
+module.exports.getArgs = () => {
+  const argv = require('yargs').argv;
+
+  const processArgs = process.env._CSDR_ARGS;
+
+  let args = {};
+
+  if (processArgs) {
+    processArgs.split(',').forEach((item) => {
+      // check if it's defined as array - example format : someArray:test1=test1|test2=test2
+      if (item.indexOf('Array') > 0) {
+        const arrayItems = item.split(':')[1];
+        const subItems = arrayItems.split('|');
+        const array = [];
+        subItems.forEach((sub) => {
+          const subItemSplit = sub.split('=');
+          const newItem = {};
+          newItem[subItemSplit[0].trim()] = subItemSplit[1].trim();
+          array.push(newItem);
+        })
+        args[item.split(':')[0]] = array;
+
+      // otherwise normal key/value pairs - example format : test1:test1,test2:test2
+      } else {
+        const itemSplit = item.split(':');
+        args[itemSplit[0].trim()] = itemSplit[1].trim();
+      }
+    })
+  }
+
+  return {
+    root: argv._[0],
+    ...argv,
+    ...args
+  }
+}
+
+
+module.exports.logBigTitle = (text) => {
+  console.log('\n\n');
+  console.log('\x1b[33m', figlet.textSync(text, { horizontalLayout: 'full' }) ,'\x1b[0m');
+  console.log('\n');
+}
+
+module.exports.logTitle = (msg) => {
+  log(msg, 0);
+}
+
+const logInfo = module.exports.logInfo = (msg) => {
+  log(msg, 1);
+}
+
+module.exports.logSuccess = (msg) => {
+  if (!msg) msg = 'OK';
+  log(msg, 2);
+}
+
+module.exports.logError = (msg) => {
+  log(msg, 3);
+}
+module.exports.logErrorTrace = (filename, method, e) => {
+  log(`ERROR in ${filename}`, 3);
+  log(`...method : ${method}`, 3);
+  log(`...message : ${e.message}`, 3);
+}
+
+module.exports.logWarning = (msg) => {
+  log(msg, 4);
+}
+
+module.exports.logAccent = (msg) => {
+  log(msg, 5);
+}
+
+module.exports.logBanner = (msg) => {
+  log(msg, 6);
+}
+
+module.exports.logDebug = (msg) => {
+  if (getArgs().debug) {
+    log(msg, 7);
+  }
+}
+module.exports.logDebugTrace = (filename, method, e) => {
+  if (getArgs().debug) {
+    log(`ERROR in ${filename}`, 7);
+    log(`...method : ${method}`, 7);
+    log(`...message : ${e.message}`, 7);
+  }
+}
+module.exports.logDebugResponse = (response) => {
+  if (getArgs().debug) {
+    console.log(response);
+  }
+}
+
+module.exports.isDirEmpty = (path) => {
+  try {
+    var files = fse.readdirSync(path);
+
+    if (files.length === 0) {
+      return true;
+    } else {
+      return false;
+    }
+
+  } catch (err) {
+    return false;
+  }
+}
+
+const isFileExists = module.exports.isFileExists = (path) => {
+  try {
+      return fs.statSync(path);
+  } catch (err) {
+      return false;
+  }
+}
+
+
+module.exports.mkdir = (path) => {
+  if (!fs.existsSync(path)) {
+      fs.mkdirSync(path);
+  }
+}
+
+module.exports.copydir = (from, to, overwrite = true, globPattern = '**/*') => {
+  function _recursiveMkDir(dir) {
+    if (!fs.existsSync(dir)) {
+        _recursiveMkDir(path.dirname(dir));
+        fs.mkdirSync(dir);
+    }
+  }
+  
+  logInfo('----->copydir from : ' + from + ' ====> to : ' + to );
+  var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
+  files.forEach(file => {
+      const origin = path.join(from, file);
+      const dest = path.join(to, file);
+      _recursiveMkDir(path.dirname(dest));
+      fse.copySync(origin, dest, { overwrite: overwrite });
+  });
+}
+
+module.exports.move = (from, to) => {
+    fse.removeSync(to);
+    fse.moveSync(from, to, );
+}
+
+module.exports.rimraf = (inputPath) => {
+  this.logInfo(`Removing ${inputPath}...`);
+  let exec = path.resolve(process.cwd(), 'node_modules', 'rimraf', 'bin.js');
+  if (!isFileExists(exec)) {
+      // special location when used within eUI CLI
+      exec = path.resolve(__dirname, '../../../..', 'rimraf', 'bin.js');
+  }
+  try {
+    execSync(`node ${exec} ${inputPath}`, { cwd: process.cwd(), stdio: 'inherit' });
+  } catch(e) {
+    console.log(e);
+  }
+}
+
+const log = (msg, type) => {
+  var msgContent;
+
+  if (type === 0 || !type) {
+      msgContent = `\n${msg.toUpperCase()}`;
+      console.info('\x1b[33m', msgContent ,'\x1b[0m');
+  }
+  if (type === 1) {
+      msgContent = `${msg}`;
+      console.info('\x1b[34m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 2) {
+      msgContent = `${msg}\n`;
+      console.info('\x1b[32m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 3) {
+      msgContent = `\n${msg}`;
+      console.info('\x1b[31m\x1b[1m', msgContent ,'\x1b[0m');
+  }
+  if (type === 4) {
+      msgContent = `\n${msg}\n`;
+      console.info('\x1b[33m', msgContent ,'\x1b[0m');
+  }
+  if (type === 5) {
+      msgContent = `${msg}\n`;
+      console.info(msgContent);
+  }
+  if (type === 6) {
+      msgContent = msg
+      console.info('\n\n');
+      console.info(msgContent);
+      console.info('\n');
+  }
+  if (type === 7) {
+    msgContent = `${msg}`;
+    console.info(msgContent);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.22",
+    "version": "21.0.0-alpha.23",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
@@ -13,21 +13,18 @@
         "url": "https://sdlc.webcloud.ec.europa.eu/csdr/eui/eui.git"
     },
     "dependencies": {
-        "@eui/tools": "6.21.124"
-    },
-    "peerDependencies": {
-        "@eui/tools": "^6.0.0",
-        "chalk": "^4.1.0",
-        "figlet": "^1.7.0",
-        "replace-in-file": "^7.1.0",
-        "execa": "^5.1.1",
-        "inquirer": "^8.1.0"
+        "figlet": "1.9.3",
+        "inquirer": "6.5.0",
+        "yargs": "17.7.2",
+        "fs-extra": "9.0.0",
+        "rimraf": "3.0.2",
+        "glob": "7.2.3"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",
     "author": "ec.europa.eui@gmail.com",
     "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
         "yarn": ">=1.22.4 <2"
     }
 }