@eui/cli 21.0.0-next.36 → 21.0.0-next.37

package/bin/eui-cli.js

@@ -11,9 +11,6 @@ const scriptIndex = args.findIndex(
     x === 'build-app' ||
     x === 'serve-app' ||
     x === 'lint-app' ||
-    x === 'generate-sprite' ||
-    x === 'generate-app-metadata' ||
-    x === 'help' ||
     x === 'inject-config-app'
 );
 const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
@@ -26,10 +23,6 @@ switch (script) {
     case 'build-app':
     case 'serve-app':
     case 'lint-app':
-    case 'generate-translations':
-    case 'generate-sprite':
-    case 'generate-app-metadata':
-    case 'help':
     case 'inject-config-app': {
         let genScript = script;
         if (script === '' || script === undefined) {

package/bin/scripts/inject-config-app.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const build = require('../../lib/app-utils/build');
+
+Promise.resolve()
+  .then(() => {
+    return build.injectAppConfig();
+  })
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/lib/app-utils/build.js

@@ -6,16 +6,6 @@ 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,
@@ -28,7 +18,6 @@ module.exports.run = () => {
     dryRun,
     maxSpaceSize,
     statsJson,
-    extraWebpackConfig,
     ci,
     deployUrl,
     sourceMap,
@@ -42,14 +31,16 @@ module.exports.run = () => {
   const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
 
   return Promise.resolve()
-    // .then(() => {
-    //   return preBuildUtils.projects.preBuild(currentProject, envTarget, true, configEnvTarget);
-    // })
+    .then(() => {
+      if (configEnvTarget) {
+        return injectAppConfig();
+      }
+    })
 
     .then(() => {
       if (!skipLint) {
           utils.logInfo(`running ng lint ${prjName}`);
-          execSync(`ng lint ${prjName}`);        
+          execSync(`ng lint ${prjName}`, { cwd: process.cwd(), stdio: 'inherit' });        
       }
     })
 
@@ -141,30 +132,8 @@ module.exports.run = () => {
       }
     })
 
-    // .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;
@@ -172,3 +141,43 @@ module.exports.run = () => {
 };
 
 
+const injectAppConfig = module.exports.injectAppConfig = () => {
+  return Promise.resolve()
+    .then(() => {
+      let { configEnvTarget } = utils.getArgs();
+
+      if (!configEnvTarget) {
+        throw new Error('configEnvTarget not provided as argument');
+      }
+
+      // set default if not envTarget provided
+      let envFilePath = path.join(process.cwd(), 'src/assets/config', `env-json-config.json`);
+
+      utils.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
+
+      let envOpenidPrefix = 'env-json-config-';
+      let openidConfigAssetsFolder = 'assets/config';
+
+      envFilePath = path.join(process.cwd(), `src/${openidConfigAssetsFolder}`, `${envOpenidPrefix}${configEnvTarget}.json`);
+
+      if (!utils.isFileExists(envFilePath)) {
+        utils.logError(`Cannot find environment config to inject : `);
+        utils.logError(`${envFilePath} missing...`);
+        return;
+      }
+
+      let rootTargetFolder = 'src';
+      let replacedFile;
+
+      replacedFile = `${rootTargetFolder}/assets/env-json-config.json`;
+
+      utils.logInfo(`Replacing default ${replacedFile} file by ${envFilePath} content`);
+      utils.copy(envFilePath, path.join(process.cwd(), `${replacedFile}`));
+
+      utils.logSuccess();
+    })
+
+    .catch((e) => {
+      throw e;
+    });
+}

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

@@ -0,0 +1,121 @@
+{
+    "root": true,
+    "ignorePatterns": [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/coverage/**",
+        "**/e2e/**",
+        "**/test/**",
+        "**/testing/**"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "project": [
+                    "tsconfig.json",
+                    "e2e/tsconfig.json"
+                ],
+                "createDefaultProgram": true
+            },
+            "extends": [
+                "eslint:recommended",
+                "plugin:@typescript-eslint/recommended",
+                "plugin:@angular-eslint/recommended",
+                "plugin:@angular-eslint/template/process-inline-templates"
+            ],
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": ["app"],
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": ["app"],
+                        "style": "camelCase"
+                    }
+                ],
+                "@typescript-eslint/ban-ts-comment": "off",
+                "@typescript-eslint/no-empty-object-type": "error",
+                "@typescript-eslint/no-unsafe-function-type": "error",
+                "@typescript-eslint/consistent-type-definitions": "off",
+                "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-member-accessibility": [
+                    "off",
+                    {
+                        "accessibility": "explicit"
+                    }
+                ],
+                "@typescript-eslint/no-require-imports": "error",
+                "@typescript-eslint/no-unused-vars": "off",
+                "@typescript-eslint/no-var-requires": "error",
+                "@typescript-eslint/require-await": "error",
+                "brace-style": [
+                    "error",
+                    "1tbs"
+                ],
+                "id-blacklist": "off",
+                "id-match": "off",
+                "no-duplicate-case": "error",
+                "no-duplicate-imports": "off",
+                "no-invalid-this": "error",
+                "no-multiple-empty-lines": [
+                    "error",
+                    {
+                        "max": 1
+                    }
+                ],
+                "no-new-func": "error",
+                "no-redeclare": "off",
+                "@typescript-eslint/no-redeclare": [
+                    "error"
+                ],
+                "no-template-curly-in-string": "error",
+                "no-underscore-dangle": "off",
+                "@typescript-eslint/naming-convention": [
+                    "error",
+                    {
+                        "selector": "enum",
+                        "format": [
+                            "PascalCase",
+                            "UPPER_CASE"
+                        ]
+                    }
+                ],
+                "@typescript-eslint/member-ordering": [
+                    "error",
+                    {
+                        "default": [
+                            "public-static-field",
+                            "public-instance-field",
+                            "private-static-field",
+                            "private-instance-field",
+                            "public-constructor",
+                            "private-constructor",
+                            "public-instance-method",
+                            "protected-instance-method",
+                            "private-instance-method"
+                        ]
+                    }
+                ]
+            }
+        },
+        {
+            "files": [
+                "*.html"
+            ],
+            "extends": [
+                "plugin:@angular-eslint/template/recommended"
+            ],
+            "rules": {}
+        }
+    ]
+}

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

@@ -132,11 +132,8 @@
                 "lint": {
                     "builder": "@angular-eslint/builder:lint",
                     "options": {
-                        "lintFilePatterns": [
-                            "src/**/*.ts",
-                            "src/**/*.html"
-                        ],
-                        "eslintConfig": "eslint.config.js"
+                        "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"],
+                        "eslintConfig": ".eslintrc.json"
                     }
                 }
             }

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.36",
+    "version": "21.0.0-next.37",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -15,13 +15,11 @@
         "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"
+        "app:inject-config": "eui-cli inject-config-app"
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-next.36"
+        "@eui/deps-base": "21.0.0-next.37"
     },
     "devDependencies": {
         "npm-run-all": "4.1.5",
@@ -29,12 +27,7 @@
         "nodemon": "3.1.11",
         "lowdb": "1.0.0",
         "body-parser": "1.20.3",
-        "express": "4.21.2",
-        "typescript-eslint": "8.46.3",
-        "angular-eslint": "20.6.0",
-        "eslint": "^9.39.0",
-        "vitest": "^4.0.0",
-        "jsdom": "^27.2.0"
+        "express": "4.21.2"
     },
     "resolutions": {
         "semver": ">=7.5.2",

package/lib/skeletons/_angular/base/src/app/app-starter.service.spec.ts

@@ -8,6 +8,7 @@ import { EuiServiceStatus } from '@eui/base';
 import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
 import { describe, it, beforeEach, expect, vi } from 'vitest';
 
+// eslint-disable-next-line
 type SpyObj<T> = { [K in keyof T]: T[K] extends (...args: any[]) => any ? ReturnType<typeof vi.fn> : T[K] };
 
 describe('AppStarterService', () => {

package/lib/skeletons/_angular/base/src/app/app.component.spec.ts

@@ -12,6 +12,7 @@ import { Observable, of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { describe, it, beforeEach, expect, vi } from 'vitest';
 
+// eslint-disable-next-line
 type SpyObj<T> = { [K in keyof T]: T[K] extends (...args: any[]) => any ? ReturnType<typeof vi.fn> : T[K] };
 
 describe('AppComponent', () => {

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.36",
+    "version": "21.0.0-next.37",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

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

@@ -141,38 +141,13 @@
                     "builder": "@angular-eslint/builder:lint",
                     "options": {
                         "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"],
-                        "eslintConfig": "src/.eslintrc.json"
+                        "eslintConfig": ".eslintrc.json"
                     }
                 },
                 "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
+                    "builder": "@angular/build:unit-test",
                     "options": {
-                        "polyfills": ["zone.js", "zone.js/testing"],
-                        "tsConfig": "src/tsconfig.spec.json",
-                        "karmaConfig": "src/karma.conf.js",
-                        "inlineStyleLanguage": "scss",
-                        "assets": [
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/core/assets/",
-                                "output": "./assets"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/styles/dist/assets/ecl",
-                                "output": "./assets/images/ecl"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/styles/dist/assets",
-                                "output": "./assets"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/ecl/assets/",
-                                "output": "./assets"
-                            }
-                        ]
+                        "tsConfig": "src/tsconfig.spec.json"
                     }
                 }
             }

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

@@ -141,38 +141,13 @@
                     "builder": "@angular-eslint/builder:lint",
                     "options": {
                         "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"],
-                        "eslintConfig": "src/.eslintrc.json"
+                        "eslintConfig": ".eslintrc.json"
                     }
                 },
                 "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
+                    "builder": "@angular/build:unit-test",
                     "options": {
-                        "polyfills": ["zone.js", "zone.js/testing"],
-                        "tsConfig": "src/tsconfig.spec.json",
-                        "karmaConfig": "src/karma.conf.js",
-                        "inlineStyleLanguage": "scss",
-                        "assets": [
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/core/assets/",
-                                "output": "./assets"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/styles/dist/assets/ecl",
-                                "output": "./assets/images/ecl"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/styles/dist/assets",
-                                "output": "./assets"
-                            },
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/ecl/assets/",
-                                "output": "./assets"
-                            }
-                        ]
+                        "tsConfig": "src/tsconfig.spec.json"
                     }
                 }
             }

package/lib/skeletons/_angular/options/pnpm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-next.36",
+    "version": "21.0.0-next.37",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -12,27 +12,25 @@
         "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 --skipLint --skipTest",
-        "app:inject-config": "eui-cli inject-config-app",
-        "generate-changelog": "eui-cli generate-changelog",
-        "generate-sprite": "eui-cli generate-sprite"
+        "app:inject-config": "eui-cli inject-config-app"
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "21.0.0",
-        "@angular/common": "21.0.0",
-        "@angular/compiler": "21.0.0",
-        "@angular/core": "21.0.0",
-        "@angular/forms": "21.0.0",
-        "@angular/platform-browser": "21.0.0",
-        "@angular/platform-browser-dynamic": "21.0.0",
-        "@angular/router": "21.0.0",
-        "@angular/elements": "21.0.0",
-        "@angular/language-service": "21.0.0",
-        "@angular/service-worker": "21.0.0",
-        "@angular/cdk": "21.0.0",
-        "@angular/material": "21.0.0",
-        "@angular/material-moment-adapter": "21.0.0",
-        "@angular-devkit/build-angular": "21.0.0",
+        "@angular/animations": "21.0.1",
+        "@angular/common": "21.0.1",
+        "@angular/compiler": "21.0.1",
+        "@angular/core": "21.0.1",
+        "@angular/forms": "21.0.1",
+        "@angular/platform-browser": "21.0.1",
+        "@angular/platform-browser-dynamic": "21.0.1",
+        "@angular/router": "21.0.1",
+        "@angular/elements": "21.0.1",
+        "@angular/language-service": "21.0.1",
+        "@angular/service-worker": "21.0.1",
+        "@angular/cdk": "21.0.1",
+        "@angular/material": "21.0.1",
+        "@angular/material-moment-adapter": "21.0.1",
+        "@angular-devkit/build-angular": "21.0.1",
         "rxjs": "7.8.2",
         "tslib": "2.8.1",
         "zone.js": "0.15.1",
@@ -48,17 +46,17 @@
         "pikaday": "1.8.2",
         "lodash-es": "4.17.21",
         "localforage": "1.10.0",
-        "@eui/base": "21.0.0-next.36",
-        "@eui/core": "21.0.0-next.36",
-        "@eui/styles": "21.0.0-next.36",
-        "@eui/components": "21.0.0-next.36",
-        "@eui/ecl": "21.0.0-next.36"
+        "@eui/base": "21.0.0-next.37",
+        "@eui/core": "21.0.0-next.37",
+        "@eui/styles": "21.0.0-next.37",
+        "@eui/components": "21.0.0-next.37",
+        "@eui/ecl": "21.0.0-next.37"
     },
     "devDependencies": {
-        "@angular/build": "21.0.0",
-        "@angular/compiler-cli": "21.0.0",
-        "@angular/cli": "21.0.0",
-        "@eui/cli": "21.0.0-next.36",
+        "@angular/build": "21.0.1",
+        "@angular/compiler-cli": "21.0.1",
+        "@angular/cli": "21.0.1",
+        "@eui/cli": "21.0.0-next.37",
         "ng-packagr": "21.0.0",
         "typescript": "5.9.2",
         "npm-run-all": "4.1.5",

package/package.json

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

package/lib/app-utils/projects.js

@@ -1,41 +0,0 @@
-// 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/skeletons/_angular/base/eslint.config.js

@@ -1,43 +0,0 @@
-// @ts-check
-const eslint = require("@eslint/js");
-const tseslint = require("typescript-eslint");
-const angular = require("angular-eslint");
-
-module.exports = tseslint.config(
-    {
-        files: ["**/*.ts"],
-        extends: [
-            eslint.configs.recommended,
-            ...tseslint.configs.recommended,
-            ...tseslint.configs.stylistic,
-            ...angular.configs.tsRecommended,
-        ],
-        processor: angular.processInlineTemplates,
-        rules: {
-            "@angular-eslint/directive-selector": [
-                "error",
-                {
-                    type: "attribute",
-                    prefix: "app",
-                    style: "camelCase",
-                },
-            ],
-            "@angular-eslint/component-selector": [
-                "error",
-                {
-                    type: "element",
-                    prefix: "app",
-                    style: "kebab-case",
-                },
-            ],
-        },
-    },
-    {
-        files: ["**/*.html"],
-        extends: [
-            ...angular.configs.templateRecommended,
-            ...angular.configs.templateAccessibility,
-        ],
-        rules: {},
-    },
-);

package/lib/skeletons/_angular/base/src/karma.conf.js

@@ -1,47 +0,0 @@
-function get(config) {
-
-    return {
-        basePath: '',
-        frameworks: ['jasmine', '@angular-devkit/build-angular'],
-        plugins: [
-            require('karma-jasmine'),
-            require('karma-chrome-launcher'),
-            require('karma-jasmine-html-reporter'),
-            require('karma-coverage-istanbul-reporter'),
-            require('karma-coverage'),
-            require('karma-sourcemap-loader'),
-            require('@angular-devkit/build-angular/plugins/karma')
-        ],
-        client:{
-          clearContext: false // leave Jasmine Spec Runner output visible in browser
-        },
-        coverageIstanbulReporter: {
-          reports: [ 'html', 'lcovonly' ],
-          fixWebpackSourcePaths: true
-        },
-        angularCli: {
-          environment: 'dev'
-        },
-        reporters: ['progress', 'kjhtml'],
-        port: 9876,
-        colors: true,
-        logLevel: config.LOG_INFO,
-        autoWatch: true,
-        browsers: ['ChromeHeadlessCustom'],
-        customLaunchers: {
-            ChromeHeadlessCustom: {
-                base: 'ChromeHeadless',
-                flags: [
-                    '--no-sandbox',
-                ],
-            },
-        },
-        singleRun: false
-    }
-}
-
-module.exports = function (config) {
-    config.set(
-        get(config)
-    );
-}