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

package/bin/eui-cli.js

@@ -5,14 +5,13 @@ const args = process.argv.slice(2);
 
 const scriptIndex = args.findIndex(
   (x) =>
+    x === '' ||
+    x === undefined || 
     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'
@@ -21,20 +20,25 @@ const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
 const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 
 switch (script) {
+    case '':
+    case undefined:
     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': {
+        let genScript = script;
+        if (script === '' || script === undefined) {
+            genScript = 'new';
+        }
         const result = spawn.sync(
             'node',
             nodeArgs
-                .concat(require.resolve('./scripts/' + script))
+                .concat(require.resolve('./scripts/' + genScript))
                 .concat(args.slice(scriptIndex + 1)),
             { stdio: 'inherit' }
         );

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/serve-app.js

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

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

@@ -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/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,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.24",
+    "version": "21.0.0-alpha.26",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.24"
+        "@eui/deps-base": "21.0.0-alpha.26"
     },
     "devDependencies": {
         "npm-run-all": "4.1.5",

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.24",
+    "version": "21.0.0-alpha.26",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

package/lib/utils.js

@@ -169,20 +169,6 @@ 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);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.24",
+    "version": "21.0.0-alpha.26",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator & tools",
@@ -17,7 +17,6 @@
         "inquirer": "6.5.0",
         "yargs": "17.7.2",
         "fs-extra": "9.0.0",
-        "rimraf": "3.0.2",
         "glob": "7.2.3",
         "cross-spawn": "7.0.6"
     },

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

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