@eui/cli 21.0.0-alpha.9 → 21.0.0-next.2

package/README.md

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

package/bin/eui-cli.js

@@ -1,47 +1,67 @@
 #!/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 spawn = require('cross-spawn');
+const args = process.argv.slice(2);
 
-// fetching cli arguments
-const args = tools.getArgs();
-
-// Print header and version
-console.info(
-  '\n\n',
-  chalk.yellow(figlet.textSync('eUI CLI', { horizontalLayout: 'full' })),
-  chalk.green(`\n  v${config.version}\n`)
+const scriptIndex = args.findIndex(
+  (x) =>
+    x === '' ||
+    x === undefined || 
+    x === 'new' ||
+    x === 'build-app' ||
+    x === 'serve-app' ||
+    x === 'lint-app' ||
+    x === 'generate-sprite' ||
+    x === 'generate-app-metadata' ||
+    x === 'help' ||
+    x === 'inject-config-app'
 );
+const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
+const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 
-// remapping config if passed as argument - automated mode
-let inputConfig = config.parseInputConfig(args.config);
-
-// Detecting targetPath and create it if present as argument - local and automated mode
-let targetPath;
-
-if (args.targetPath) {
-  targetPath = path.join(config.targetPath, args.targetPath);
-
-  if (!tools.isDirExists(targetPath)) {
-    tools.mkdir(targetPath);
-  }
-
-// otherwise taking the default config targetPath defined
-} else {
-  targetPath = config.targetPath;
-}
-
-if (args.v) {
-  console.info('Current eUI CLI version installed : ' + config.version);
-
-} else {
-  return generators.appGenerate({
-    inputConfig: inputConfig,
-    targetPath: targetPath
-  });
+switch (script) {
+    case '':
+    case undefined:
+    case 'new':
+    case 'build-app':
+    case 'serve-app':
+    case 'lint-app':
+    case 'generate-translations':
+    case 'generate-sprite':
+    case 'generate-app-metadata':
+    case 'help':
+    case 'inject-config-app': {
+        let genScript = script;
+        if (script === '' || script === undefined) {
+            genScript = 'new';
+        }
+        const result = spawn.sync(
+            'node',
+            nodeArgs
+                .concat(require.resolve('./scripts/' + genScript))
+                .concat(args.slice(scriptIndex + 1)),
+            { stdio: 'inherit' }
+        );
+        if (result.signal) {
+            if (result.signal === 'SIGKILL') {
+                console.log(
+                    'The build failed because the process exited too early. '+
+                    'This probably means the system ran out of memory or someone called ' +
+                    '`kill -9` on the process.'
+                );
+            } else if(result.signal === 'SIGTERM') {
+                console.log(
+                    'The build failed because the process exited too early. ' +
+                    'Someone might have called `kill` or `killall`, or the system could ' +
+                    'be shutting down.'
+                )
+            }
+            process.exit(1);
+        }
+        process.exit(result.status);
+        break;
+    }
+    default:
+        console.log('Unknown script "' + script + '".');
+        break;
 }

package/bin/scripts/build-app.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const build = require('../../lib/app-utils/build');
+
+Promise.resolve()
+  .then(() => {
+    return build.run();
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/bin/scripts/lint-app.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const path = require('path');
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
+
+const utils = require('../../lib/utils');
+
+Promise.resolve()
+  .then(() => {
+    const prjName = 'app';
+
+    utils.logTitle(`Linting application : ${prjName}...`);
+
+    const ng = path.resolve(process.cwd(), '@angular', 'cli', 'bin', 'ng');    
+
+    execSync(`ng lint ${prjName}`);  
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/bin/scripts/new.js

@@ -0,0 +1,39 @@
+const path = require('path');
+const generators = require('../../lib/generators');
+const config = require('../../lib/config');
+const utils = require('../../lib/utils');
+
+// fetching cli arguments
+const args = utils.getArgs();
+
+// Print header and version
+utils.logBigTitle('eUI CLI');
+utils.logAccent(` --- v${config.version} ---\n`);
+
+// remapping config if passed as argument - automated mode
+let inputConfig = config.parseInputConfig(args.config);
+
+// Detecting targetPath and create it if present as argument - local and automated mode
+let targetPath;
+
+if (args.targetPath) {
+  targetPath = path.join(config.targetPath, args.targetPath);
+
+  if (!tools.isDirExists(targetPath)) {
+    utils.mkdir(targetPath);
+  }
+
+// otherwise taking the default config targetPath defined
+} else {
+  targetPath = config.targetPath;
+}
+
+if (args.v) {
+  console.info('Current eUI CLI version installed : ' + config.version);
+
+} else {
+  return generators.appGenerate({
+    inputConfig: inputConfig,
+    targetPath: targetPath
+  });
+}

package/bin/scripts/serve-app.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const serve = require('../../lib/app-utils/serve');
+
+Promise.resolve()
+  .then(() => {
+    return serve.run();
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/lib/app-utils/build.js

@@ -0,0 +1,176 @@
+// TODO v21 - app prebuild for config injection from eUI tools
+
+const path = require('path');
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
+
+const utils = require('../utils');
+
+// const execa = require('execa');
+
+// const tools = require('../../tools');
+// const mavenUtils = require('../../maven-utils');
+// const configUtils = require('../../../csdr/config/config-utils');
+// const versionUtils = require('../../../csdr/version/version-utils');
+
+// const preBuildUtils = require('../../pre-build/pre-build-utils');
+
+
+module.exports.run = () => {
+  let {
+    skipLint,
+    skipTest,
+    skipCompile,
+    configuration,
+    baseHref,
+    servePath,
+    watch,
+    dryRun,
+    maxSpaceSize,
+    statsJson,
+    extraWebpackConfig,
+    ci,
+    deployUrl,
+    sourceMap,
+    configEnvTarget,
+  } = utils.getArgs();
+
+  const prjName = 'app';
+
+  utils.logTitle(`Building application : ${prjName}...`);
+
+  const ng = path.resolve(process.cwd(), '@angular', 'cli', 'bin', 'ng');
+
+  return Promise.resolve()
+    // .then(() => {
+    //   return preBuildUtils.projects.preBuild(currentProject, envTarget, true, configEnvTarget);
+    // })
+
+    .then(() => {
+      if (!skipLint) {
+          utils.logInfo(`running ng lint ${prjName}`);
+          execSync(`ng lint ${prjName}`);        
+      }
+    })
+
+    .then(() => {
+      if (!skipLint) {
+        utils.logSuccess();
+      }
+    })
+
+    .then(() => {
+      if (!skipLint) {
+        utils.logSuccess();
+      }
+      if (!skipTest) {
+        utils.logInfo(`Launching application unit testing...`);
+
+        let args;
+
+        if (maxSpaceSize) {
+          args = ['--max_old_space_size=8096', ng, 'test', prjName];
+        } else {
+          args = [ng, 'test', prjName];
+        }
+
+        if (watch) {
+          args.push(`--watch=true`);
+        } else {
+          args.push(`--watch=false`);
+        }
+
+        args.push('--code-coverage');
+
+        utils.logInfo(`ng test : watching = ${watch || false}`);
+
+        utils.logInfo(`running Angular TEST with args: ${args} on :`);
+
+        if (!dryRun) {
+          execSync(`node ${args.join(' ')}`, { cwd: currentProject.paths.angularPath, stdio: 'inherit' });
+        }
+      }
+    })
+
+    .then(() => {
+      if (!skipTest) {
+        utils.logSuccess();
+      }
+      utils.logInfo(`Launching application build...`);
+
+      let args;
+
+      if (maxSpaceSize) {
+        args = ['--max_old_space_size=8096', ng, 'build', prjName, '--aot'];
+      } else {
+        args = [ng, 'build', prjName, '--aot'];
+      }
+
+      if (statsJson) {
+        args.push('--stats-json');
+      }
+
+      if (configuration) {
+        args.push(`--configuration=${configuration}`);
+      } 
+
+      if (baseHref) {
+        args.push(`--base-href=${baseHref}`);
+      }
+
+      if (servePath) {
+        args.push(`--serve-path=${servePath}`);
+      }
+
+      if (deployUrl) {
+        args.push(`--deploy-url=${deployUrl}`);
+      }
+
+      if (ci) {
+        args.push('--progress=false');
+      }
+
+      if (sourceMap) {
+        args.push('--source-map');
+      }
+
+      utils.logInfo(`ng build for configuration : ${configuration || 'production'}`);
+
+      utils.logInfo(`running Angular BUILD with args: ${args}`);
+
+      if (!dryRun && !skipCompile) {
+        execSync(`node ${args.join(' ')}`, { cwd: currentProject.paths.angularPath, stdio: 'inherit' });
+      }
+    })
+
+    // .then(() => {
+    //   const projectVersion = parseInt(configUtils.projects.getProjectEuiVersion(currentProject));
+
+    //   if (currentProject.build && currentProject.build.skipBrowserOutputPath) {
+    //     if (currentProject.build.esbuild || projectVersion >= 18) {
+    //       utils.copydir(path.join(currentProject.paths.rootPath, 'dist', 'browser'), path.join(currentProject.paths.rootPath, 'dist'));
+    //       utils.remove(path.join(currentProject.paths.rootPath, 'dist', 'browser'));
+    //     }
+    //   }
+    // })
+
+    // .then(() => {
+    //   const desti18ncompiledPath = path.join(currentProject.paths.rootPath, 'dist', 'assets', 'i18n-compiled');
+    //   if (utils.isDirExists(desti18ncompiledPath)) {
+    //     utils.logTitle('Post-build assets i18n-compiled folder content:');
+    //     const i18nfiles = utils.getFiles(desti18ncompiledPath);
+    //     console.log(i18nfiles);
+    //   }
+
+    //   const mediaAssetsPath = path.join(currentProject.paths.rootPath, 'dist', 'assets', 'media');
+    //   if (utils.isDirExists(mediaAssetsPath)) {
+    //     utils.copydirFiles(mediaAssetsPath, path.join(currentProject.paths.rootPath, 'dist', 'media'));
+    //   }
+    // })
+
+    .catch((e) => {
+      throw e;
+    });
+};
+
+

package/lib/app-utils/projects.js

@@ -0,0 +1,41 @@
+// TODO v21 - for openid config injection extracted from eUI tools
+
+// 'use strict';
+
+// const path = require('path');
+
+// const tools = require('../tools');
+
+// const injectionUtils = require('./injection/injection-utils');
+// const translationUtils = require('./translations/translation-utils');
+
+// module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
+//   return Promise.resolve()
+//     .then(() => {
+//       tools.logTitle('PRE-BUILD : preparing the project...');
+//     })
+
+//     // openId files replacement and app config injection
+//     .then(() => {
+//       return injectionUtils.openid.injectConfig(project, configEnvTarget);
+//     })
+
+//     .catch((e) => {
+//       throw e;
+//     })
+// };
+
+// module.exports.processSvgAssets = (project) => {
+//   return Promise.resolve()
+//     .then(() => {
+//       const svgsInPath = path.join(project.paths.rootPath, 'src', 'assets', 'svg');
+//       const svgsSpritePath = path.join(svgsInPath, sprites);
+//       const svgsSpriteFile = 'sprite.svg';
+
+//       return svgUtils.generateSvgsSprite(svgsInPath, svgsSpritePath, svgsSpriteFile);
+//     })
+
+//     .catch((e) => {
+//       throw e;
+//     });
+// };

package/lib/app-utils/serve.js

@@ -0,0 +1,78 @@
+// TODO v21 - app prebuild for config injection from eUI tools
+
+const path = require('path');
+const childProcess = require('child_process');
+const execSync = childProcess.execSync;
+
+const utils = require('../utils');
+
+module.exports.run = () => {
+
+  let { configuration, baseHref, servePath, host, proxyConfig, maxSpaceSize, port, disableHostCheck, open, debug, configEnvTarget, noLiveReload } = utils.getArgs();
+
+  const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
+
+  const prjName = 'app';
+
+  return Promise.resolve()
+    // .then(() => {
+    //   return preBuildUtils.projects.preBuild(prj, configuration, false, configEnvTarget);
+    // })
+
+
+    // trigger ng serve with parameters provided
+    .then(() => {
+      utils.logTitle(`Serving application : ${prjName}...`);
+
+      let args;
+
+      if (maxSpaceSize) {
+      args = ['--max_old_space_size=8192', ng, 'serve', prjName];
+      } else {
+        args = [ng, 'serve', prjName];
+      }
+
+      if (configuration) {
+        args.push(`--configuration=${configuration}`);
+      }
+
+      if (proxyConfig) {
+        args.push(`--proxy-config=${proxyConfig}`);
+      }
+
+      if (baseHref) {
+        args.push(`--base-href=${baseHref}`);
+      }
+
+      if (servePath) {
+        args.push(`--serve-path=${servePath}`);
+      }
+
+      if (host) {
+        args.push(`--host=${host}`);
+      }
+
+      if (port) {
+        args.push(`--port=${port}`);
+      }
+
+      if (disableHostCheck) {
+        args.push(`--disable-host-check`);
+      }
+
+      if (!(open === 'false')) {
+        args.push('--open=true');
+      }
+
+      if (noLiveReload) {
+        args.push('--live-reload=false');
+      }
+
+      utils.logInfo(`ng serve with args ${args}`);
+
+      return execSync(`node ${args.join(' ')}`, { cwd: process.cwd(), stdio: 'inherit' });
+    })
+    .catch((e) => {
+      throw e;
+    });
+}

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,9 @@ 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}/**/*`);
       }
     })
 
@@ -56,7 +52,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);
@@ -85,32 +81,6 @@ const build = (cliConfig, targetPath) => {
             throw e;
           })
       }
-
-
-      // BUILD symfony
-      if (appType === 'web-symfony') {
-
-        return Promise.resolve()
-          .then(() => {
-            console.log('--cloning eui php starter repository')
-            execa.shellSync(`git clone https://${config.webPhpStarterRepo} ${targetPath}`);
-          })
-          .then(() => {
-            console.log('--building web-symfony');
-            const angularPath = utils.getAngularPath(targetPath, appName, appType, artifactId);
-            return copyAngular(angularPath, cliConfig, false);
-          })
-          .then(() => {
-            execa.shellSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
-          })
-          .catch((e) => {
-            throw e;
-          })
-          .finally(() => {
-            return tools.rimraf(`${targetPath}/.git`);
-          })
-      }
-
     })
     .catch((e) => {
       console.log(e);
@@ -127,11 +97,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,16 +109,21 @@ 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();
     })
+    .then(() => {
+      if (cliConfig.packageManager === 'pnpm') {
+        utils.copy(path.join(config.pnpmOptionPath, 'package.json'), path.join(targetPath, 'package.json'));
+      }    
+    })
     .catch((e) => {
       throw e;
     })

package/lib/cli.js

@@ -9,7 +9,7 @@ const defaultConfig = {
   appFeatures: [],
   groupId: 'ec.europa.digit',
   artifactId: 'myapp',
-  useYarn: true,
+  packageManager: 'yarn',
   npmInstall: true,
   appStart: true,
 };
@@ -35,7 +35,6 @@ module.exports.start = (options) => {
         { name: 'eUI Angular - Mobile Ionic', value: 'mobile' },
         { name: 'eUI Angular + Spring Boot web module - JDK + Maven required !!!', value: 'web-spring-boot' },
         { name: 'eUI Angular + Maven web module (JEE Spring maven web module) - JDK + Maven required !!!', value: 'web-maven' },
-        { name: 'eUI Angular + PHP/Symfony starter - PHP7 and composer required !!!', value: 'web-symfony' },
       ],
       default: 0,
       validate: function (value) {
@@ -102,9 +101,28 @@ module.exports.start = (options) => {
     {
       name: 'npmInstall',
       type: 'confirm',
-      message: 'Yarn install dependencies when the app is generated :',
+      message: 'Install dependencies when the app is generated :',
       default: defaultConfig.npmInstall
-    }
+    },
+
+    {
+      type: 'list',
+      name: 'packageManager',
+      message: 'Package manager for installation :',
+      choices: [
+        { name: 'Yarn 1.x (default)', value: 'yarn' },
+        { name: 'Pnpm - experimental', value: 'pnpm' },
+      ],
+      default: 0,
+      when: function (answers) {
+        return (answers.npmInstall);
+      },      
+      validate: function (value) {
+        if (value.length) {
+          return true;
+        }
+      }
+    },    
   ])
     .then((answers) => {
       let outputConfig;
@@ -118,6 +136,5 @@ module.exports.start = (options) => {
     .catch((e) => {
       throw e;
     })
-
 }
 

package/lib/config.js

@@ -19,6 +19,7 @@ module.exports.optionsPath = {
     "ecl-ec": path.join(skeletonsPath, '_angular/options/ecl-ec'),
     "ecl-eu": path.join(skeletonsPath, '_angular/options/ecl-eu'),
 };
+module.exports.pnpmOptionPath = path.join(skeletonsPath, '_angular/options/pnpm');
 
 module.exports.version = version;