@eui/cli 15.0.0-next.2 → 15.0.0-next.20

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

@@ -3,9 +3,13 @@
   "compilerOptions": {
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
-    "module": "ESNext",
-    "target": "ES2016",
-    "lib": ["es2020", "dom"],
+    "target": "ES2022",
+    "module": "ES2022",
+    "useDefineForClassFields": false,
+    "lib": [
+      "ES2022",
+      "dom"
+    ],
     "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",
@@ -15,6 +19,9 @@
     "importHelpers": true,
     "typeRoots": [
       "node_modules/@types"
-    ]
+    ],
+    "paths": {
+        "@shared/*": ["src/app/shared/*"],
+    }
   }
 }

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

@@ -1,11 +1,11 @@
 {
     "name": "eui-angular-app",
-    "version": "15.0.0-next.2",
+    "version": "15.0.0-next.20",
     "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-scripts serve-app --configuration=proxy-mock --maxSpaceSize",
         "start": "npm-run-all --parallel start-mock-server start-serve",
         "start-proxy": "eui-scripts serve-app --configuration=proxy",
         "start-local": "eui-scripts serve-app",
@@ -20,31 +20,8 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "15.0.0-next.2",
-        "@eui/mobile-core": "14.0.0-beta.7",
-        "@eui/mobile-styles": "14.0.0-beta.7"
-    },
-    "browserslist": [
-        "last 2 chrome versions",
-        "last 2 firefox versions",
-        "last 1 edge version",
-        "Firefox ESR"
-    ],
-    "resolutions": {
-        "lodash": ">=4.17.21",
-        "handlebars": ">=4.5.3",
-        "mem": ">=4.3.0",
-        "https-proxy-agent": ">=2.2.3",
-        "minimatch": ">=3.0.4",
-        "acorn-globals": ">=6.0.0",
-        "open": "7.0.3",
-        "caniuse-lite": "1.0.30001055",
-        "dot-prop": ">=5.2.0",
-        "serialize-javascript": ">=3.1.0",
-        "socket.io": "2.4.0",
-        "ssri": "8.0.1",
-        "@types/node": "14.14.10",
-        "hosted-git-info": ">=3.0.8",
-        "yui": ">=2.9.1"
+        "@eui/deps-base": "15.0.0-next.20",
+        "@eui/mobile-core": "14.1.0-snapshot-1666685460964",
+        "@eui/mobile-styles": "14.1.0-snapshot-1666685460964"
     }
 }

package/lib/skeletons/_angular/base-mobile/src/app/core/core.module.ts

@@ -24,7 +24,7 @@ import { environment } from '../../environments/environment';
 
 import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers/index';
 
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 
 @NgModule({
     imports: [

package/lib/skeletons/_angular/base-mobile/src/app/features/module1/module1.module.ts

@@ -4,7 +4,7 @@ import { Module1Component } from './module1.component';
 import { Page1Component } from './components/page1/page1.component';
 import { Page2Component } from './components/page2/page2.component';
 
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 
 @NgModule({
     imports: [

package/lib/skeletons/_angular/base-mobile/src/app/features/module2/module2.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Module2RoutingModule } from './module2-routing.module';
 import { Module2Component } from './module2.component';
 
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 
 @NgModule({
     imports: [

package/lib/skeletons/_angular/options/ecl/angular.json

@@ -21,6 +21,16 @@
           }
         },
         "architect": {
+          "lint": {
+              "builder": "@angular-eslint/builder:lint",
+              "options": {
+                  "lintFilePatterns": [
+                      "src/**/*.ts",
+                      "src/**/*.html"
+                  ],
+                  "eslintConfig": "src/.eslintrc.json"
+              }
+          },
           "build": {
             "builder": "@angular-devkit/build-angular:browser",
             "options": {
@@ -40,17 +50,22 @@
                 },
                 {
                   "glob": "**/*",
-                  "input": "node_modules/@eui/styles-base/src/assets/",
+                  "input": "node_modules/@eui/styles-base/dist/assets/ecl",
+                  "output": "./assets/images/ecl"
+                },
+                {
+                  "glob": "**/*",
+                  "input": "node_modules/@eui/styles-base/dist/assets",
                   "output": "./assets"
                 },
                 {
                     "glob": "**/*",
-                    "input": "node_modules/@eui/ecl-core/assets/",
+                    "input": "node_modules/@eui/ecl/assets/",
                     "output": "./assets"
                 }
               ],
               "styles": [
-                "node_modules/@eui/ecl-styles/dist/styles/eui-ecl-ec.css",
+                "node_modules/@eui/styles/dist/styles/eui-ecl-ec.css",
                 "src/styles.scss"
               ]
             },

package/lib/skeletons/_angular/options/ecl/src/app/app.component.ts

@@ -9,8 +9,8 @@ import { Observable, Subscription } from 'rxjs';
 import {
     EclMenuItemSelectEvent,
     EclSiteHeaderLoginEvent,
-    EclSiteHeaderSearchEvent
-} from '@eui/ecl-core';
+    EclSiteHeaderSearchEvent,
+} from '@eui/ecl';
 
 @Component({
     selector: 'app-root',
@@ -28,7 +28,7 @@ export class AppComponent implements OnDestroy {
     constructor(
         private store: Store<any>,
     ) {
-        this.userState = <any>this.store.select(getUserState);
+        this.userState = this.store.select(getUserState);
         this.subs.push(this.userState.subscribe((user: UserState) => {
             this.userInfos = { ...user };
         }));

package/lib/skeletons/_angular/options/ecl/src/app/shared/shared.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { EclAllModule } from '@eui/ecl-core';
+import { EclAllModule } from '@eui/ecl';
 
 @NgModule({
     imports: [

package/lib/skeletons/_angular/options/ecl/src/config/global.ts

@@ -1,8 +1,4 @@
-import { GlobalConfig, LogEvent, LogLevel, ConsoleAppender, UrlAppender } from '@eui/core';
-
-export function LogConsoleLowercasePrefixConverter(event: LogEvent): string {
-    return `Custom Prefix: ${event.loggerName.toUpperCase()}`;
-}
+import { GlobalConfig } from '@eui/core';
 
 export const GLOBAL: GlobalConfig = {
     appTitle: 'CSDR-app',

package/lib/skeletons/_angular/options/openid-jwt/package.json

@@ -1,13 +1,13 @@
 {
     "name": "eui-angular-app",
-    "version": "15.0.0-next.2",
+    "version": "15.0.0-next.20",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
         "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
-        "start-serve": "eui-scripts serve-app --openid",
+        "start-serve": "eui-scripts serve-app --openid --maxSpaceSize",
         "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --openid",
+        "start-proxy": "eui-scripts serve-app --openid --maxSpaceSize",
         "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
         "build": "eui-scripts build-app",
         "build-prod-openid-dev": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=dev",
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "15.0.0-next.2"
+        "@eui/deps-base": "15.0.0-next.20"
     }
 }

package/lib/skeletons/_angular/options/openid-jwt/src/app/core/core.module.ts

@@ -22,7 +22,7 @@ import { environment } from '../../environments/environment';
 
 import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers/index';
 
-import { SharedModule } from '../shared/shared.module';
+import { SharedModule } from '@shared/shared.module';
 
 @NgModule({
     imports: [

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "15.0.0-next.2",
+    "version": "15.0.0-next.20",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -19,6 +19,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "15.0.0-next.2"
+        "@eui/deps-base": "15.0.0-next.20"
     }
 }

package/lib/utils.js

@@ -9,8 +9,6 @@ module.exports.getAngularPath = (targetPath, appName, appType, artifactId) => {
       return targetPath;
     case 'web-maven':
       return `${targetPath}/src/main/angular`;
-    case 'full-stack':
-      return `${targetPath}/${artifactId}-web/src/main/angular`;
     case 'web-spring-boot':
       return `${targetPath}/${artifactId}-web/src/main/angular`;
     case 'web-symfony':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "15.0.0-next.2",
+    "version": "15.0.0-next.20",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
@@ -13,7 +13,7 @@
         "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
     },
     "dependencies": {
-        "@eui/tools": "5.3.67"
+        "@eui/tools": "5.3.80"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",

package/lib/__old-to-review/build-feature.js

@@ -1,74 +0,0 @@
-const tools = require('@eui/tools/scripts/utils/tools');
-const configUtils = require('@eui/tools/scripts/csdr/config/config-utils');
-const config = require('./config');
-const path = require('path');
-const replace = require('replace-in-file');
-const fs = require('fs');
-
-
-module.exports.start = (options) => {
-  console.log(options);
-
-  return Promise.resolve()
-    .then(() => {
-      return build(options.config, options.targetPath);
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-function build(cliConfig, targetPath) {
-  return Promise.resolve()
-  .then(() => {
-    // module paths
-    let paths = '';
-    let links = '';
-
-    // create feature module based on features options
-    cliConfig.appFeatures.forEach(feature => {
-      const { filePath, moduleName, routePath } = config.featuresPath[feature];
-      // copy files of feature
-      console.log(`Generating feature : ${feature}`);
-      tools.copydir(filePath, targetPath, true);
-
-      // construct paths
-      paths+=`\n    { \npath: 'screen/${routePath}',\nloadChildren: './features/${routePath}/${routePath}.module#${moduleName}Module'\n },`
-
-      // construct links
-      links+= `\nnew UxLink({ label: '${moduleName}', url: 'screen/${routePath}' }),`;
-    });
-
-    // replace module paths in routing
-    replaceInFile(
-      `${targetPath}/src/app/app-routing.module.ts`,
-      'OTHER_MODULES',
-      paths
-    );
-
-    // replace module menu links
-    replaceInFile(
-      `${targetPath}/src/app/app.component.ts`,
-'MODULE_MENU_LINKS',
-      links
-    );
-
-  })
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-const replaceInFile = (filePath, placeholderId, content) => {
-
-  let fileContent = fs.readFileSync(filePath).toString();
-  // replace placeholder
-  fileContent = fileContent.replace(`<%${placeholderId}%>`, content);
-  // write in file
-  fs.writeFileSync(filePath, fileContent);
-
-  return fileContent;
-};

package/lib/__old-to-review/build-module.js

@@ -1,113 +0,0 @@
-const tools = require('@eui/tools/scripts/utils/tools');
-const configUtils = require('@eui/tools/scripts/csdr/config/config-utils');
-const config = require('./config');
-const path = require('path');
-const replace = require('replace-in-file');
-const fs = require('fs');
-
-const getPackageInfo = (config) => {
-  return {
-    name: config.fullName,
-    npmPkgScope: config.scope,
-    npmPkgName: config.name
-  }
-}
-
-module.exports.start = (options) => {
-
-  const pkg = getPackageInfo(options.config);
-
-  return Promise.resolve()
-    .then(() => {
-      return build(options.config, options.targetPath);
-    })
-    .then(() => {
-      if (options.config.element) {
-        return configUtils.angular.registerAngularElementModule(pkg);
-      } else {
-        return configUtils.angular.registerAngularPackage(pkg);
-      }
-    })
-    .then(() => {
-      return configUtils.angular.registerModulePaths(pkg);
-    })
-    .then(() => {
-      return configUtils.global.registerEuiModule(pkg, options.config.element);
-    })
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-function build(cliConfig, targetPath) {
-  const name = cliConfig.name;
-  const fullName = cliConfig.fullName;
-  const scope = cliConfig.scope;
-  const ngrx = cliConfig.ngrx;
-
-  console.log(`Building module : ${scope}/${name} - fullName: ${fullName}`);
-
-  const moduleTargetPath = targetPath ? path.join(targetPath, fullName) : path.join(config.targetPath, fullName);
-
-  return Promise.resolve()
-    .then(() => {
-      console.log(`--cleaning target : ${moduleTargetPath}`);
-      return tools.rimraf(moduleTargetPath);
-    })
-    .then(() => {
-      if (cliConfig.element) {
-        return tools.copydir(config.moduleElementBaseSrcPath, moduleTargetPath);
-      } else {
-        return tools.copydir(config.moduleBaseSrcPath, moduleTargetPath);
-      }
-    })
-    .then(() => {
-      if (cliConfig.routeModule) {
-        return tools.copydir(config.moduleOptionsPath['route-module'], moduleTargetPath);
-      }
-    })
-    .then(() => {
-      return replace.sync({
-        files: [moduleTargetPath + '/**/*.*'],
-        from: /@module.name@/g,
-        to: name,
-      })
-    })
-    .then(() => {
-      return replace.sync({
-        files: [moduleTargetPath + '/**/*.*'],
-        from: /@module.full.name@/g,
-        to: fullName,
-      })
-    })
-    .then(() => {
-      return replace.sync({
-        files: [moduleTargetPath + '/**/*.*'],
-        from: /@module.scope@/g,
-        to: scope,
-      })
-    })
-    .then(() => {
-      return replace.sync({
-        files: [moduleTargetPath + '/**/*.*'],
-        from: /@module.scope.string@/g,
-        to: scope.substr(1),
-      })
-    })
-    .then(() => {
-      return replace.sync({
-        files: [moduleTargetPath + '/**/*.*'],
-        from: /@module.class.name@/g,
-        to: tools.camelCaseString(name, '-', true),
-      })
-    })
-
-    .then(() => {
-      tools.remove(path.join(moduleTargetPath, 'angular-config.json'));
-    })
-
-    .catch((e) => {
-      throw e;
-    })
-}

package/lib/__old-to-review/cli-feature.js

@@ -1,42 +0,0 @@
-const inquirer = require('inquirer');
-
-module.exports.start = (options) => {
-
-  if (options.inputConfig) {
-    return options.inputConfig;
-  }
-
-  return Promise.resolve()
-    .then(() => {
-      return inquirer.prompt(questions);
-    })
-    .then((answers) => {
-      console.log('--provided config : ');
-      console.log(answers);
-      return answers;
-    })
-    .catch((e) => {
-      throw e;
-    })
-
-}
-
-const questions = [
-    {
-      type: 'checkbox',
-      name: 'appFeatures',
-      default: [],
-      message: 'Select one or more service showcases :',
-      choices: [
-        { name: 'Api Queue', value: 'api-queue-service' },
-        { name: 'Dynamic Component', value: 'dynamic-component-service' },
-        { name: 'Dynamic Configuration', value: 'dynamic-configuration-service' },
-        { name: 'Error Handling', value: 'error-handling-service' },
-        { name: 'Http Interceptor', value: 'http-interceptor' },
-        { name: 'Migration', value: 'migration-service' },
-        { name: 'Permission', value: 'permission-service' },
-        { name: 'Translation', value: 'translation-service' },
-        { name: 'Web Storage', value: 'web-storage-service' }
-      ]
-    },
-];

package/lib/__old-to-review/cli-module.js

@@ -1,65 +0,0 @@
-const inquirer = require('inquirer');
-
-module.exports.start = (options) => {
-
-  if (options.inputConfig) {
-    return options.inputConfig;
-  }
-
-  return Promise.resolve()
-    .then(() => {
-      console.log('\n The generated module/package will be located in the folder : /packages/SCOPE-NAME \n\n');
-    })
-    .then(() => {
-      return inquirer.prompt(questions);
-    })
-    .then((answers) => {
-      console.log('--provided config : ');
-      console.log(answers);
-      return answers;
-    })
-    .catch((e) => {
-      throw e;
-    })
-
-}
-
-const questions = [
-  {
-    name: 'scope',
-    type: 'input',
-    message: 'Enter the module SCOPE - your project name in CITnet !!',
-    default: '@app',
-    validate: function (value) {
-      if (value.length) {
-        return true;
-      }
-    }
-  },
-  {
-    name: 'name',
-    type: 'input',
-    message: 'Enter the module NAME : kebab case !!!',
-    default: 'my-module',
-    validate: function (value) {
-      if (value.length) {
-        return true;
-      }
-    },
-  },
-  {
-    name: 'element',
-    type: 'confirm',
-    message: 'Generate AS element?',
-    default: false
-  },
-  {
-    name: 'routeModule',
-    type: 'confirm',
-    message: 'Route module ?',
-    default: false,
-    when: function (answers) {
-      return (!answers.element);
-    }
-  },
-];

package/lib/__old-to-review/skeletons/_angular/_base-advanced/.editorconfig

@@ -1,16 +0,0 @@
-# Editor configuration, see http://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.scss]
-indent_size = 4
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false

package/lib/__old-to-review/skeletons/_angular/_base-advanced/.euirc.json

@@ -1,29 +0,0 @@
-{
-    "paths": {
-        "packages": "packages"
-    },
-    "npm": {
-        "registry": {
-            "default": {
-                "uri": "https://webgate.ec.europa.eu/CITnet/nexus/repository/npm-YOUR_DG/"
-            },
-            "aliases": {
-                "citnet": {
-                    "uri": "https://webgate.ec.europa.eu/CITnet/nexus/repository/npm-YOUR_DG/"
-                },
-                "verdaccio": {
-                    "uri": "http://localhost:4873/",
-                    "inPublishAll": false
-                }
-            }
-        }
-    },
-    "projects": {
-        "app": {
-            "name": "app",
-            "folder": "."
-        }
-    },
-    "packages": {
-    }
-}

package/lib/__old-to-review/skeletons/_angular/_base-advanced/.stylelintrc

@@ -1,24 +0,0 @@
-{
-  "extends":"stylelint-config-standard",
-  "plugins": [
-    "stylelint-order",
-    "stylelint-scss"
-  ],
-  "rules": {
-	"order/order": [
-	    "custom-properties",
-		"declarations"
-	],
-	"order/properties-alphabetical-order": true,
-
-    "at-rule-empty-line-before": "never",
-    "no-descending-specificity": null,
-    "no-duplicate-selectors": null,
-    "font-family-no-missing-generic-family-keyword": null,
-    "indentation": 4,
-    "selector-type-no-unknown": null,
-    "at-rule-no-unknown": [true, {
-        ignoreAtRules: ['at-root', 'content', 'each', 'else', 'extend', 'for', 'function', 'if', 'include', 'mixin', 'return', 'warn', 'while']
-    }]
-  }
-}

package/lib/__old-to-review/skeletons/_angular/_base-advanced/README.md

@@ -1,26 +0,0 @@
-# eui starter app
-
-## Development server
-
-````npm start```` to start the angular project with json-server proxy mock server
-
-````npm run start-proxy```` to start the angular project with real backend proxy server deployed
-
-````npm run build```` to build, lint and test your project for DEV
-
-````npm run build-prod```` to build, lint and test your project for PROD
-
-````npm run build-prod-skip-test```` to build and lint your project for PROD - Unit test skipped
-
-````npm run build-prod-stats```` to build, lint and test your project for PROD - with stats.json file generated for webpack-bundle-analyzer input
-
-* check package.json for more info on executable scripts provided
-
-## Further help
-
-- https://eui.ecdevops.eu
-
-- register on [slack](https://ec-eui.slack.com) with your EC mail account,
-
-- For bugs / request new features : Drop us an email at : DIGIT-EUI-SUPPORT@ec.europa.eu
-