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

package/bin/eui-cli.js

@@ -1,42 +1,63 @@
 #!/usr/bin/env node
 
-const figlet = require('figlet');
-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
-  });
+const spawn = require('cross-spawn');
+const args = process.argv.slice(2);
+
+const scriptIndex = args.findIndex(
+  (x) =>
+    x === 'new' ||
+    x === 'build-app' ||
+    x === 'serve-app' ||
+    x === 'lint-app' ||
+    x === 'start-symfony' ||
+    x === 'generate-translations' ||
+    x === 'generate-sprite' ||
+    x === 'generate-translations' ||
+    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) : [];
+
+switch (script) {
+    case 'new':
+    case 'build-app':
+    case 'serve-app':
+    case 'lint-app':
+    case 'start-symfony':
+    case 'generate-translations':
+    case 'generate-sprite':
+    case 'generate-app-metadata':
+    case 'help':
+    case 'inject-config-app': {
+        const result = spawn.sync(
+            'node',
+            nodeArgs
+                .concat(require.resolve('./scripts/' + script))
+                .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/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/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,76 @@
+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

@@ -28,8 +28,6 @@ const build = (cliConfig, targetPath) => {
       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 utils.rimraf(`${target}/**/*`);
       }
     })
 
@@ -83,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')
-            execSync(`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(() => {
-            execSync(`npm run init`, { cwd:  path.join(targetPath, 'server'), stdio: "inherit" });
-          })
-          .catch((e) => {
-            throw e;
-          })
-          .finally(() => {
-            return utils.rimraf(`${targetPath}/.git`);
-          })
-      }
-
     })
     .catch((e) => {
       console.log(e);

package/lib/cli.js

@@ -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) {

package/lib/install.js

@@ -29,9 +29,6 @@ const install = (cliConfig, targetPath) => {
   console.log('*****************************************************');
 
   return Promise.resolve()
-    .then(() => {
-      return tools.remove(path.join(wd, 'yarn.lock'));
-    })
     .then(() => {
       return execSync("yarn", { cwd: wd, stdio: "inherit" });
     })

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

@@ -46,7 +46,6 @@
                         "styles": [
                             "node_modules/@eui/styles/dist/eui.css",
                             "node_modules/@eui/styles/dist/eui-utilities.css",
-                            "node_modules/@eui/styles/dist/eui-theme-eui-legacy.css",
                             "src/styles.scss"
                         ]
                     },
@@ -143,11 +142,6 @@
                                 "glob": "**/*",
                                 "input": "node_modules/@eui/core/assets/",
                                 "output": "./assets"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/styles/dist/assets/",
-                                "output": "./assets"
                             }
                         ]
                     }

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

@@ -1,38 +1,35 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.23",
+    "version": "21.0.0-alpha.25",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
         "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
-        "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
+        "start-serve": "eui-cli serve-app --configuration=proxy-mock",
         "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --configuration=proxy",
-        "start-local": "eui-scripts serve-app",
-        "build": "eui-scripts build-app",
-        "build-dev": "eui-scripts build-app --configuration=development --configEnvTarget=dev",
-        "build-prod": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --skipTest",
-        "build-prod-stats": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --statsJson",
-        "app:build": "eui-scripts build-app",
-        "app:inject-config": "eui-scripts inject-config-app",
-        "generate-changelog": "eui-scripts generate-changelog",
-        "generate-sprite": "eui-scripts generate-sprite"
+        "start-proxy": "eui-cli serve-app --configuration=proxy",
+        "start-local": "eui-cli serve-app",
+        "build": "eui-cli build-app",
+        "build-dev": "eui-cli build-app --configuration=development --configEnvTarget=dev",
+        "build-prod": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod",
+        "build-prod-skip-test": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod --skipTest",
+        "build-prod-stats": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod --statsJson",
+        "app:build": "eui-cli build-app",
+        "app:inject-config": "eui-cli inject-config-app",
+        "generate-changelog": "eui-cli generate-changelog",
+        "generate-sprite": "eui-cli generate-sprite"
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.23"
+        "@eui/deps-base": "21.0.0-alpha.25"
     },
-    "resolutions": {
-        "js-yaml": ">=3.13.1",
-        "pdfjs-dist": "4.10.38",
-        "tar": ">=6.2.1",
-        "katex": ">=0.16.10",
-        "follow-redirects": ">=1.15.4",
-        "word-wrap": ">=1.2.4",
-        "postcss": ">=8.4.31",
-        "semver": ">=7.5.2",
-        "express": "4.21.2",
-        "path-to-regexp": "1.9.0"
-    }
+    "devDependencies": {
+        "npm-run-all": "4.1.5",
+        "json-server": "1.0.0-beta.3",
+        "nodemon": "2.0.22",
+        "lowdb": "1.0.0",
+        "body-parser": "1.20.3",
+        "express": "4.21.2"
+    },
+    "resolutions": {}
 }

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.23",
+    "version": "21.0.0-alpha.25",
     "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.23",
+    "version": "21.0.0-alpha.24",
     "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.23"
+        "@eui/deps-base": "21.0.0-alpha.24"
     }
 }

package/lib/utils.js

@@ -169,18 +169,8 @@ module.exports.move = (from, 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);
-  }
+module.exports.remove = (path) => {
+  fse.removeSync(path);
 }
 
 const log = (msg, type) => {

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.23",
+    "version": "21.0.0-alpha.25",
     "tag": "next",
     "license": "EUPL-1.1",
-    "description": "eUI CLI app generator",
+    "description": "eUI CLI app generator & tools",
     "bin": {
         "eui-cli": "bin/eui-cli.js"
     },
@@ -17,8 +17,8 @@
         "inquirer": "6.5.0",
         "yargs": "17.7.2",
         "fs-extra": "9.0.0",
-        "rimraf": "3.0.2",
-        "glob": "7.2.3"
+        "glob": "7.2.3",
+        "cross-spawn": "7.0.6"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",

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

@@ -1,8 +0,0 @@
-{
-    "projects": {
-        "app": {
-            "name": "app",
-            "folder": "."
-        }
-    }
-}