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

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/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/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.25",
     "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.25"
     },
     "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.25",
     "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.25",
     "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": "."
-        }
-    }
-}

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

@@ -1,169 +0,0 @@
-{
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
-    "newProjectRoot": "projects",
-    "defaultProject": "app",
-    "cli": {
-        "analytics": false
-    },
-    "projects": {
-      "app": {
-        "root": "",
-        "sourceRoot": "src",
-        "projectType": "application",
-        "prefix": "app",
-        "schematics": {
-          "@schematics/angular:component": {
-            "styleext": "scss"
-          }
-        },
-        "architect": {
-          "build": {
-            "builder": "ngx-build-plus:build",
-            "options": {
-              "outputPath": "dist",
-              "index": "src/index.html",
-              "main": "src/main.ts",
-              "polyfills": "src/polyfills.ts",
-              "tsConfig": "src/tsconfig.app.json",
-              "assets": [
-                "src/favicon.ico",
-                "src/assets",
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/core/assets/",
-                  "output": "./assets"
-                },
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/styles/dist/assets/images",
-                  "output": "./assets/images"
-                }
-              ],
-              "styles": [
-                "node_modules/@eui/styles/dist/styles/eui.css",
-                "node_modules/@eui/styles/dist/styles/eui-utilities.css",
-                "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap-utilities.css",
-                "src/styles.scss"
-              ]
-            },
-            "configurations": {
-              "production": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.prod.ts"
-                  }
-                ],
-                "optimization": true,
-                "outputHashing": "all",
-                "sourceMap": false,
-                "extractCss": true,
-                "namedChunks": true,
-                "aot": true,
-                "extractLicenses": true,
-                "vendorChunk": false,
-                "buildOptimizer": true,
-                "budgets": [
-                  {
-                    "type": "initial",
-                    "maximumWarning": "3mb",
-                    "maximumError": "5mb"
-                  }
-                ]
-              },
-              "dev": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.dev.ts"
-                  }
-                ]
-              }
-            }
-          },
-          "serve": {
-            "builder": "@angular-devkit/build-angular:dev-server",
-            "options": {
-              "browserTarget": "app:build"
-            },
-            "configurations": {
-              "proxy-mock": {
-                "browserTarget": "app:build",
-                "proxyConfig": "proxy-mock.conf.json"
-              },
-              "proxy": {
-                "browserTarget": "app:build",
-                "proxyConfig": "proxy.conf.json"
-              },
-              "production": {
-                "browserTarget": "app:build:production"
-              }
-            }
-          },
-          "test": {
-            "builder": "@angular-devkit/build-angular:karma",
-            "options": {
-              "main": "src/test.ts",
-              "polyfills": "src/polyfills.ts",
-              "tsConfig": "src/tsconfig.spec.json",
-              "karmaConfig": "src/karma.conf.js",
-              "styles": [
-                "src/styles.scss"
-              ],
-              "scripts": [],
-              "assets": [
-                "src/favicon.ico",
-                "src/assets",
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/@eui/core/assets/",
-                  "output": "./assets"
-                }
-              ]
-            }
-          },
-          "lint": {
-            "builder": "@angular-devkit/build-angular:tslint",
-            "options": {
-              "tsConfig": [
-                "src/tsconfig.app.json",
-                "src/tsconfig.spec.json"
-              ],
-              "exclude": [
-                "**/node_modules/**"
-              ]
-            }
-          }
-        }
-      },
-      "app-e2e": {
-        "root": "e2e/",
-        "projectType": "application",
-        "prefix": "",
-        "architect": {
-          "e2e": {
-            "builder": "@angular-devkit/build-angular:protractor",
-            "options": {
-              "protractorConfig": "e2e/protractor.conf.js",
-              "devServerTarget": "app:serve"
-            },
-            "configurations": {
-              "production": {
-                "devServerTarget": "app:serve:production"
-              }
-            }
-          },
-          "lint": {
-            "builder": "@angular-devkit/build-angular:tslint",
-            "options": {
-              "tsConfig": "e2e/tsconfig.e2e.json",
-              "exclude": [
-                "**/node_modules/**"
-              ]
-            }
-          }
-        }
-      }
-    }
-  }

package/lib/skeletons/web-symfony/myapp-web/src/app/app-routing.module.ts

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
-    { path: 'index.jsp', redirectTo: 'screen/home' },
-    { path: 'screen/home', loadChildren: './features/home/home.module#Module' },
-    { path: 'screen/products', loadChildren: './features/products/products.module#ProductsModule' },
-    { path: 'screen/module1', loadChildren: './features/module1/module1.module#Module' },
-    { path: 'screen/module2', loadChildren: './features/module2/module2.module#Module' }
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forRoot(routes),
-    ],
-})
-export class AppRoutingModule {}

package/lib/skeletons/web-symfony/myapp-web/src/app/app.component.ts

@@ -1,77 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
-import { Store } from '@ngrx/store';
-
-import { UserState, getUserState, UxLink, UxLanguage } from '@eui/core';
-
-@Component({
-    selector: 'app-root',
-    templateUrl: './app.component.html'
-})
-export class AppComponent implements OnInit {
-    userState: Observable<UserState>;
-
-    menuLinks: UxLink[] = [];
-    notificationLinks: UxLink[] = [];
-
-    constructor(
-        private translateService: TranslateService,
-        private store: Store<any>,
-    ) {
-    }
-
-    ngOnInit() {
-        this.userState = <any>this.store.select(getUserState);
-
-        this._createMenuLinks();
-        this._createNotifications();
-    }
-
-    onLanguageChanged(language: UxLanguage) {
-        this.translateService.use(language.code);
-    }
-
-    private _createMenuLinks() {
-        this.menuLinks = [
-            new UxLink(
-                {
-                    label: 'HOME', url: '/screen/home', isHome: true
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Module1', url: '/screen/module1', children: [
-                        new UxLink({ label: 'disabled item', disabled: true }),
-                        new UxLink({ label: 'Page 1', url: '/screen/module1/page1' }),
-                        new UxLink({ label: 'Page 2', url: '/screen/module1/page2' })
-                    ]
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Module2', url: '/screen/module2'
-                }
-            ),
-            new UxLink(
-                {
-                    label: 'Products', url: '/screen/products'
-                }
-            )
-        ];
-    }
-
-    private _createNotifications() {
-        this.notificationLinks = [
-            new UxLink(
-                { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-            new UxLink(
-                { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-            new UxLink(
-                 { label: 'Notification title', subLabel: 'This is the description of the noficiation' }
-            ),
-        ];
-    }
-}