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

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

@@ -1,3 +1,5 @@
+// TODO v21 - app prebuild for config injection from eUI tools
+
 const path = require('path');
 const childProcess = require('child_process');
 const execSync = childProcess.execSync;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.25",
+    "version": "21.0.0-alpha.27",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator & tools",

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,23 +0,0 @@
-{
-    "name": "eui-angular-app",
-    "version": "21.0.0-alpha.24",
-    "license": "EUPL-1.1",
-    "description": "eUI JEE Symfony app scripts",
-    "scripts": {
-        "ng": "ng",
-        "e2e": "ng e2e",
-        "stylelint": "stylelint \"src/**/*.scss\"",
-        "tslint": "tslint \"src/**/*.ts\"",
-        "clean": "rimraf out-tsc dist packages/**/dist/** packages/**/out-tsc/** packages/**/src/lib/**/*.js packages/**/src/lib/**/*.js.map",
-        "start-symfony": "eui-scripts start-symfony --configuration=dev",
-        "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
-        "start": "npm run clean && npm-run-all --parallel start-symfony start-serve",
-        "start-mean": "npm run clean && npm-run-all --parallel start-mock-server-mean start-serve",
-        "start-proxy": "npm run clean && eui-scripts serve-app --configuration=proxy",
-        "generate-changelog": "eui-scripts generate-changelog"
-    },
-    "private": true,
-    "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.24"
-    }
-}