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

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 utils = require('../../lib/utils');
+
+Promise.resolve()
+  .then(() => {
+    return utils.serve();
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

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/package.json

@@ -1,38 +1,35 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.23",
+    "version": "21.0.0-alpha.24",
     "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.24"
     },
-    "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.24",
     "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

@@ -183,6 +183,10 @@ module.exports.rimraf = (inputPath) => {
   }
 }
 
+module.exports.remove = (path) => {
+  fse.removeSync(path);
+}
+
 const log = (msg, type) => {
   var msgContent;
 

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.23",
+    "version": "21.0.0-alpha.24",
     "tag": "next",
     "license": "EUPL-1.1",
-    "description": "eUI CLI app generator",
+    "description": "eUI CLI app generator & tools",
     "bin": {
         "eui-cli": "bin/eui-cli.js"
     },
@@ -18,7 +18,8 @@
         "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",