@eui/cli 14.0.0-beta.2 → 14.0.0-rc.3

package/.version.properties

@@ -1 +1 @@
-14.0.0-beta.2
+14.0.0-rc.3

package/lib/__old-to-review/skeletons/_angular/_base-advanced/src/app/app-starter.service.ts

@@ -25,6 +25,7 @@ import { LangChangeEvent } from '@ngx-translate/core/lib/translate.service';
 })
 export class AppStarterService {
     defaultUserPreferences: UserPreferences;
+    preferencesLoaded = false;
 
     constructor(
         protected userService: UserService,
@@ -106,6 +107,7 @@ export class AppStarterService {
             this.fetchUserPreferences(),
         ).pipe(
             switchMap(([userDetails, userPreferences]) => {
+                this.preferencesLoaded = true;
 
                 const user: UserState = {
                     ...userDetails,
@@ -166,6 +168,13 @@ export class AppStarterService {
         if (!url) {
             return of({});
         }
+        if (!this.preferencesLoaded) {
+            console.error(
+                'The user\'s preferences initially failed to load. Storing default preferences could overwrite legitimate preferences. ' +
+                'The REST call to store preferences is therefore cancelled.'
+            );
+            return of(prefs);
+        }
 
         return this.store.select(getUserId).pipe(switchMap(userId => this.http.put<UserPreferences>(`${url}?userId=${userId}`, prefs)));
     }

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

@@ -51,6 +51,7 @@
             ],
             "styles": [
               "node_modules/@eui/styles/dist/styles/eui.css",
+              "node_modules/@eui/styles/dist/styles/eui-legacy.css",
               "src/styles.scss"
             ]
           },

package/lib/skeletons/_angular/base/gitignore_TO_REPLACE

@@ -44,4 +44,7 @@ yarn-error.log
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db
+
+/assets/env-json-config.json
+/assets/openid-login-config.json

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

@@ -1,25 +1,25 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.0-beta.2",
+    "version": "14.0.0-rc.3",
     "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 --configEnvTarget=mock",
+        "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
         "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --configuration=proxy --configEnvTarget=proxy",
-        "start-local": "eui-scripts serve-app --configEnvTarget=local",
+        "start-proxy": "eui-scripts serve-app --configuration=proxy",
+        "start-local": "eui-scripts serve-app",
         "build": "eui-scripts build-app",
-        "build-dev": "eui-scripts build-app --configuration=development",
-        "build-prod": "eui-scripts build-app --configuration=production-optimized",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=ENV --skipTest",
-        "build-prod-stats": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=ENV --statsJson",
+        "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",
         "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.0-beta.2"
+        "@eui/deps-base": "14.0.0-rc.3"
     }
 }

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

@@ -5,7 +5,6 @@ import {
     UserState,
 } from '@eui/core';
 import { Observable, Subscription } from 'rxjs';
-import { AppStarterService } from './app-starter.service';
 
 @Component({
     selector: 'app-root',
@@ -35,15 +34,12 @@ export class AppComponent implements OnInit, OnDestroy {
 
     constructor(
         private store: Store<any>,
-        private appStarterService: AppStarterService,
     ) {
-        this.appStarterService.start().subscribe(() => {
             this.userState = <any>this.store.select(getUserState);
             this.subs.push(this.userState.subscribe((user: UserState) => {
                 this.userInfos = { ...user };
                 console.log(user);
             }));
-        });
     }
 
     ngOnInit() {

package/lib/skeletons/_angular/base/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
+import { APP_INITIALIZER, NgModule } from '@angular/core';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -19,6 +19,16 @@ import { AppStarterService } from './app-starter.service';
     ],
     providers: [
         AppStarterService,
+        {
+            provide: APP_INITIALIZER,
+            useFactory: (appStarterService) => {
+                return () => new Promise<void>((resolve) => {
+                    appStarterService.start().subscribe(() => resolve());
+                });
+            },
+            deps: [AppStarterService],
+            multi: true
+        },
     ],
     bootstrap: [
         AppComponent,

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

@@ -3,8 +3,7 @@ import { TranslateModule } from '@ngx-translate/core';
 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 +25,7 @@ import { SharedModule } from '../shared/shared.module';
 @NgModule({
     imports: [
         SharedModule,
+        HttpClientModule,
         EuiCoreModule.forRoot(),
         EffectsModule.forRoot([...CoreModuleEffects]),
         TranslateModule.forRoot(translateConfig),

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

@@ -1,41 +1,28 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.0-beta.2",
+    "version": "14.0.0-rc.3",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
-        "e2e": "ng e2e",
-        "postinstall": "tslint --project ./src/tsconfig.app.json --fix",
         "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
         "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
         "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-mean": "npm-run-all --parallel start-mock-server-mean start-serve",
         "start-proxy": "eui-scripts serve-app --configuration=proxy",
-        "start-openid": "eui-scripts serve-app --configuration=local-openid",
+        "start-local": "eui-scripts serve-app",
         "build": "eui-scripts build-app",
-        "build-dev": "eui-scripts build-app --configuration=dev",
-        "build-prod": "eui-scripts build-app --configuration=production",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production --extraWebpackConfig --skipTest",
-        "build-prod-ci": "ncp tsconfig-ci.json tsconfig.json && npm run build-prod",
-        "build-prod-stats": "eui-scripts build-app --configuration=production --extraWebpackConfig --statsJson",
-        "pkg:init": "eui-cli -m",
-        "pkg:clean": "eui-scripts clean-package",
-        "pkg:clean-all": "eui-scripts clean-all",
-        "pkg:test": "eui-scripts test-package",
-        "pkg:build": "eui-scripts build-package",
-        "pkg:build-deps": "eui-scripts build-deps",
-        "pkg:build-all": "eui-scripts build-all",
-        "pkg:build-element": "eui-scripts build-element",
-        "build-prod:all": "npm run pkg:build-all && npm run build",
-        "pkg:publish": "eui-scripts publish",
-        "pkg:publish-all": "eui-scripts publish-all",
+        "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",
+        "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.0-beta.2",
-        "@eui/mobile-core": "10.0.0-pre.19",
-        "@eui/mobile-styles": "10.0.0-pre.19"
+        "@eui/deps-base": "14.0.0-rc.3",
+        "@eui/mobile-core": "13.0.0-rc.1",
+        "@eui/mobile-styles": "13.0.0-rc.1"
     },
     "browserslist": [
         "last 2 chrome versions",

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-ecl-angular-app",
-    "version": "14.0.0-beta.2",
+    "version": "14.0.0-rc.3",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -8,18 +8,19 @@
         "start-serve": "eui-scripts serve-app --configuration=proxy-mock",
         "start": "npm-run-all --parallel start-mock-server start-serve",
         "start-proxy": "eui-scripts serve-app --configuration=proxy",
+        "start-local": "eui-scripts serve-app",
         "build": "eui-scripts build-app",
-        "build-dev": "eui-scripts build-app --configuration=development",
-        "build-prod": "eui-scripts build-app --configuration=production-optimized",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --skipTest",
-        "build-prod-stats": "eui-scripts build-app --configuration=production --statsJson",
+        "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",
         "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.0-beta.2",
+        "@eui/deps-base": "14.0.0-rc.3",
         "@eui/ecl-core": "13.0.0-rc.15",
         "@eui/ecl-styles": "13.0.0-rc.15"
     }

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

@@ -1,29 +1,23 @@
 {
     "name": "eui-angular-app",
-    "version": "14.0.0-beta.2",
+    "version": "14.0.0-rc.3",
     "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",
+        "start-serve": "eui-scripts serve-app --openid",
         "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --openid --configuration=proxy",
+        "start-proxy": "eui-scripts serve-app --openid",
         "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
         "build": "eui-scripts build-app",
-        "build-dev": "eui-scripts build-app --configuration=development",
-        "build-prod": "eui-scripts build-app --configuration=production-optimized",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --skipTest",
-        "build-prod-stats": "eui-scripts build-app --configuration=production-optimized --statsJson",
-        "build-prod-openid-dev": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=dev",
-        "build-prod-openid-tst": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=tst",
-        "build-prod-openid-acc": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=acc",
-        "build-prod-openid-prd": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=prd",
+        "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.0-beta.2"
+        "@eui/deps-base": "14.0.0-rc.3"
     }
 }

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "14.0.0-beta.2",
+    "version": "14.0.0-rc.3",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
@@ -13,13 +13,13 @@
         "url": "https://citnet.tech.ec.europa.eu/CITnet/stash/projects/CSDR/repos/eui"
     },
     "dependencies": {
-        "@eui/tools": "4.21.8"
+        "@eui/tools": "5.3.11"
     },
     "preferGlobal": true,
     "homepage": "https://eui.ecdevops.eu",
     "author": "ec.europa.eui@gmail.com",
     "engines": {
-        "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+        "node": "^14.15.0 || >=16.10.0",
         "yarn": ">=1.22.4 <2",
         "npm": "Please use yarn instead of NPM to install dependencies"
     }

package/lib/skeletons/_angular/base/src/assets/config/env-json-config-mock.json

@@ -1,7 +0,0 @@
-{
-    "modules": {
-        "core": {
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/base/src/assets/config/env-json-config-proxy.json

@@ -1,7 +0,0 @@
-{
-    "modules": {
-        "core": {
-            "userDetails": "/user-details"
-        }
-    }
-}

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

@@ -1,37 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule, APP_INITIALIZER } from '@angular/core';
-
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { CoreModule } from './core/core.module';
-import { AppStarterService } from './app-starter.service';
-
-@NgModule({
-    declarations: [
-        AppComponent,
-    ],
-    imports: [
-        BrowserModule,
-        BrowserAnimationsModule,
-        CoreModule,
-        AppRoutingModule,
-    ],
-    providers: [
-        {
-            provide: APP_INITIALIZER,
-            useFactory: (appStarterService) => {
-                return () => new Promise<void>((resolve) => {
-                    appStarterService.start().subscribe(() => resolve());
-                });
-            },
-            deps: [AppStarterService],
-            multi: true
-        },
-        AppStarterService, AppStarterService,
-    ],
-    bootstrap: [
-        AppComponent,
-    ],
-})
-export class AppModule { }

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

@@ -1,24 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": true,
-        "allowDevelopmentLogin": true,
-        "stripIdTokenFromLocation": true,
-        "maximumRequestRetries": 1,
-        "metadataUrl": "https://webgate.ec.europa.eu/cas/oauth2/.well-known/openid-configuration",
-        "spaClientId": "your-webapp-EU-Login-PROD-client-ID-here",
-        "spaRedirectUrl": "https://your-acc-server-url/",
-        "apiGatewayAccessTokenUrl": "https://api.tech.ec.europa.eu/federation/oauth/token",
-        "apiGatewayAccessTokenAudienceId": "DFlp4emQ6jCLjNw8U7ko18zNjb9bwJ3ACrnP89iPsVv4zcChOEVRPHCT88Q7jPpNGCFa0hJEtV77rBj6L1XvOt-Jj71zxYb8yr7ujzQt669zSG",
-        "apiGatewayConsumerKey": "API-Gateway-production-URL-consumer-key-here",
-        "apiGatewayServices": {
-        },
-        "services": {
-        }
-    },
-    "modules": {
-        "core": {
-            "base": "/api",
-            "userDetails": "/user-details"
-        }
-    }
-}

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

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

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

@@ -1,24 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": true,
-        "allowDevelopmentLogin": true,
-        "stripIdTokenFromLocation": true,
-        "maximumRequestRetries": 1,
-        "metadataUrl": "https://webgate.ec.europa.eu/cas/oauth2/.well-known/openid-configuration",
-        "spaClientId": "your-webapp-EU-Login-ACC-client-ID-here",
-        "spaRedirectUrl": "https://your-tst-server-url/",
-        "apiGatewayAccessTokenUrl": "https://api.tech.ec.europa.eu/federation/oauth/token",
-        "apiGatewayAccessTokenAudienceId": "DFlp4emQ6jCLjNw8U7ko18zNjb9bwJ3ACrnP89iPsVv4zcChOEVRPHCT88Q7jPpNGCFa0hJEtV77rBj6L1XvOt-Jj71zxYb8yr7ujzQt669zSG",
-        "apiGatewayConsumerKey": "API-Gateway-tst-URL-consumer-key-here",
-        "apiGatewayServices": {
-        },
-        "services": {
-        }
-    },
-    "modules": {
-        "core": {
-            "base": "/api",
-            "userDetails": "/user-details"
-        }
-    }
-}