@eui/cli 14.0.30 → 14.0.31-snapshot-1698063744709

package/.version.properties

@@ -1 +1 @@
-14.0.30
+14.0.31-snapshot-1698063744709

package/lib/build.js

@@ -168,6 +168,14 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       }
       return Promise.resolve();
     })
+    .then(() => {
+        const allAvaiableOptionsCount = Object.keys(config.optionsPath).length - 1;
+        if (cliConfig.appOptions && cliConfig.appOptions.length === allAvaiableOptionsCount) {
+            tools.copydir(config.optionsPath["ecl-openid-jwt"], targetPath, true);
+            console.log('Applying options merge : ecl-openid-jwt');
+        }
+        return Promise.resolve();
+    })
 //     .then(() => {
 //       // module paths
 //       let paths = '';

package/lib/config.js

@@ -22,6 +22,7 @@ module.exports.webSymfonyPath = path.join(skeletonsPath, 'web-symfony');
 module.exports.optionsPath = {
     "openid-jwt": path.join(skeletonsPath, '_angular/options/openid-jwt'),
     "ecl": path.join(skeletonsPath, '_angular/options/ecl'),
+    "ecl-openid-jwt": path.join(skeletonsPath, '_angular/options/merged-ecl-openid-jwt'),
 };
 // module.exports.featuresPath = {
 //    'api-queue-service': {

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.30",
+    "version": "14.0.31-snapshot-1698063744709",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,7 +20,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "14.0.30"
+        "@eui/deps-base": "14.0.31-snapshot-1698063744709"
     },
     "resolutions": {
         "json5": ">=2.2.2",

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.30",
+    "version": "14.0.31-snapshot-1698063744709",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,7 +20,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "14.0.30",
+        "@eui/deps-base": "14.0.31-snapshot-1698063744709",
         "@eui/mobile-core": "14.2.0",
         "@eui/mobile-styles": "14.2.0",
         "@eui/ecl-core": "14.1.3"

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-ecl-angular-app",
-    "version": "14.0.30",
+    "version": "14.0.31-snapshot-1698063744709",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,7 +20,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "14.0.30",
+        "@eui/deps-base": "14.0.31-snapshot-1698063744709",
         "@eui/ecl-core": "14.1.9",
         "@eui/ecl-styles": "14.1.9"
     }

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

@@ -0,0 +1,28 @@
+{
+  "name": "eui-angular-app",
+  "version": "14.0.30",
+  "license": "EUPL-1.1",
+  "scripts": {
+    "ng": "ng",
+    "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
+    "start-serve": "eui-scripts serve-app --openid --configuration=proxy-mock --configEnvTarget=local-mock",
+    "start": "npm-run-all --parallel start-mock-server start-serve",
+    "start-proxy": "eui-scripts serve-app --openid",
+    "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
+    "build-dev": "eui-scripts build-app --configuration=development --configEnvTarget=dev",
+    "build-prod": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod",
+    "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --skipTest",
+    "build-prod-stats": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --statsJson",
+    "build-prod-openid-dev": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=dev",
+    "build-prod-openid-prd": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=prod",
+    "app:build": "eui-scripts build-app",
+    "app:inject-config": "eui-scripts inject-config-app",
+    "generate-changelog": "eui-scripts generate-changelog"
+  },
+  "private": true,
+  "dependencies": {
+    "@eui/deps-base": "14.0.30",
+    "@eui/ecl-core": "14.1.9",
+    "@eui/ecl-styles": "14.1.9"
+  }
+}

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

@@ -1,11 +1,11 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.30",
+    "version": "14.0.31-snapshot-1698063744709",
     "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 --configuration=proxy-mock --configEnvTarget=local-mock",
         "start": "npm-run-all --parallel start-mock-server start-serve",
         "start-proxy": "eui-scripts serve-app --openid",
         "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "14.0.30"
+        "@eui/deps-base": "14.0.31-snapshot-1698063744709"
     }
 }

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

@@ -4,7 +4,7 @@ import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import {
     CachePreventionInterceptor,
     CorsSecurityInterceptor,
@@ -26,6 +26,7 @@ import { SharedModule } from '../shared/shared.module';
 
 @NgModule({
     imports: [
+        HttpClientModule,
         SharedModule,
         EuiCoreModule.forRoot(),
         EffectsModule.forRoot([...CoreModuleEffects]),
@@ -46,7 +47,7 @@ import { SharedModule } from '../shared/shared.module';
         },
         {
             provide: EUI_CONFIG_TOKEN,
-            useValue: { appConfig: appConfig, environment: environment }
+            useValue: { appConfig, environment }
         },
         {
             // Sets the withCredentials on Ajax Request to send the JSESSIONID cookie to another domain.

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config-local-mock.json

@@ -0,0 +1,10 @@
+{
+    "openIdConnect": {
+        "enabled": false
+    },
+    "modules": {
+        "core": {
+            "userDetails": "/user-details"
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.30",
+    "version": "14.0.31-snapshot-1698063744709",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -19,6 +19,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "14.0.30"
+        "@eui/deps-base": "14.0.31-snapshot-1698063744709"
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/cli",
-    "version": "14.0.30",
-    "tag": "prev",
+    "version": "14.0.31-snapshot-1698063744709",
+    "tag": "snapshot",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
     "bin": {
@@ -13,7 +13,7 @@
         "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
     },
     "dependencies": {
-        "@eui/tools": "6.12.33"
+        "@eui/tools": "6.13.5"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",