@eui/tools 4.17.10 → 4.18.3

package/.version.properties

@@ -1 +1 @@
-4.17.10
+4.18.3

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+## 4.18.3 (2021-12-15)
+
+##### Chores
+
+* **other:**
+  * added support/develop flow for snapshot on support branches - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d40e9718](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d40e9718a0ba194f7a2ce746032b0ffdce6dd106))
+
+* * *
+* * *
+## 4.18.2 (2021-12-13)
+
+##### Bug Fixes
+
+* **styles:**
+  * fixes writeFileSync data argument - EUI-5266 [EUI-5266](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5266)  ([e4937147](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e4937147a412481e9d7bd33b5c717e7d5a532bcf))
+
+* * *
+* * *
+## 4.18.1 (2021-12-09)
+
+##### Bug Fixes
+
+* **other:**
+  * metadata history extraction when first master build - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([2807a982](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2807a98230045737f5a710b07e45a75a30ea9443))
+
+* * *
+* * *
+## 4.18.0 (2021-12-08)
+
+##### New Features
+
+* **other:**
+  * added cli app skeleton for v10 apps - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([5272fbbe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5272fbbe2c7e52c4177b9105b213f5d586e766cc))
+##### Bug Fixes
+
+* **other:**
+  * remove skeletons spec files  ([d4f4eeb0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d4f4eeb0ea9ca40cb5012cb14918ca3a98062f87))
+
+* * *
+* * *
 ## 4.17.10 (2021-12-07)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.17.10",
+    "version": "4.18.3",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/cli/app.js

@@ -12,7 +12,9 @@ const configUtils = require('../config/config-utils');
 
 // CONSTANTS
 const TARGET_ROOT_PATH = path.join(process.cwd(), 'apps');
-const APP_DEFAULT_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app');
+const APP_SKELETON_EUI7_PATH = path.join(__dirname, 'skeletons', 'app');
+const APP_SKELETON_EUI10_PATH = path.join(__dirname, 'skeletons', 'app-eui10');
+const APP_SKELETON_EUI13_PATH = path.join(__dirname, 'skeletons', 'app-eui13');
 const APP_SHOWCASE_SKELETON_PATH = path.join(__dirname, 'skeletons', 'app-showcase');
 const APP_SHOWCASE_SKELETON_EUI13_PATH = path.join(__dirname, 'skeletons', 'app-showcase-eui13');
 
@@ -22,8 +24,9 @@ const defaultConfig = {
     SHOWCASE: 'showcase'
   },
   appVersion: {
-    DEFAULT: 'eui10',
-    EUI13: 'eui13'
+    EUI7: 'v7',
+    EUI10: 'v10',
+    EUI13: 'v13'
   },
   appName: 'my-app',
   appScope: '@app'
@@ -54,13 +57,13 @@ const prompt = () => {
           name: 'appVersion',
           message: 'Select eUI version target :',
           choices: [
-            { name: 'v10', value: defaultConfig.pkgFrontendVersion.DEFAULT },
-            { name: 'v13', value: defaultConfig.pkgFrontendVersion.EUI13 },
+            { name: 'v10', value: defaultConfig.appVersion.EUI10 },
+            { name: 'v13', value: defaultConfig.appVersion.EUI13 },
           ],
-          default: defaultConfig.appType.DEFAULT,
-          when: function (answers) {
-            return (answers.appType === defaultConfig.appType.SHOWCASE);
-          },
+          default: defaultConfig.appVersion.EUI10,
+          // when: function (answers) {
+          //   return (answers.appType === defaultConfig.appType.SHOWCASE);
+          // },
           validate: function (value) {
             if (value.length) {
               return true;
@@ -101,7 +104,15 @@ const build = (name, scope, appType, targetPath, appVersion) => {
     .then(() => {
       tools.logInfo('Copying skeleton to target');
       if (appType === defaultConfig.appType.DEFAULT) {
-        return tools.copydir(APP_DEFAULT_SKELETON_PATH, targetPath, true);
+        if (appVersion === defaultConfig.appVersion.EUI13) {
+          return tools.copydir(APP_SKELETON_EUI13_PATH, targetPath, true);
+        }
+        if (appVersion === defaultConfig.appVersion.EUI10) {
+          return tools.copydir(APP_SKELETON_EUI10_PATH, targetPath, true);
+        }
+        if (appVersion === defaultConfig.appVersion.EUI7) {
+          return tools.copydir(APP_SKELETON_EUI7_PATH, targetPath, true);
+        }
 
       } else if (appType === defaultConfig.appType.SHOWCASE) {
         if (appVersion === defaultConfig.appVersion.EUI13) {

package/scripts/csdr/cli/skeletons/app-eui10/angular-config.json

@@ -0,0 +1,20 @@
+{
+    "build": {
+        "assets": [
+            "apps/@app.name@/src/favicon.ico",
+            "apps/@app.name@/src/assets",
+            {
+                "glob": "**/*",
+                "input": "node_modules/@eui/core/assets/",
+                "output": "./assets"
+            }
+        ],
+        "styles": [
+            "node_modules/@eui/styles/dist/styles/eui.css",
+            "node_modules/@eui/styles/dist/styles/eui-components.css",
+            "node_modules/@eui/styles/dist/styles/eui-next.css",
+            "apps/@app.name@/src/styles.scss"
+        ],
+        "scripts": []
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/dependencies-base.json

@@ -0,0 +1,2 @@
+{
+}

package/scripts/csdr/cli/skeletons/app-eui10/dependencies-composite.json

@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "@eui/deps-base": "^10.0.0"
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/gitignore_TO_REPLACE

@@ -0,0 +1,63 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+**/node_modules
+**/target
+**/build
+**/dist
+**/out-tsc
+**/tmp
+**/tests/reports
+# /src/assets/i18n-compiled/*
+# /src/assets/openid-login-config*
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+yarn-error.log
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db
+
+/*.iml
+
+/proxy-mock.conf.json
+/proxy.conf.json
+/src/assets/dynamic-config.prod.json
+/src/assets/jsrsasign-all-min.js
+/src/assets/oidc-client.min.js
+/src/assets/openid-login-config.json
+/src/assets/openid-login.js
+/src/karma.conf.js
+/src/main.ts
+/src/polyfills.ts
+/src/test.ts
+/tsconfig.app.json
+/tsconfig.spec.json
+/webpack.extra.js

package/scripts/csdr/cli/skeletons/app-eui10/mock/app/models/user.js

@@ -0,0 +1,8 @@
+module.exports = {
+  id: 0,
+  firstName: '',
+  lastName: '',
+  email: '',
+  isAdmin: false,
+  birthdate: null
+}

package/scripts/csdr/cli/skeletons/app-eui10/mock/app/routes/index.js

@@ -0,0 +1,5 @@
+const userRoutes = require('./user_routes');
+
+module.exports = function (app, db) {
+    userRoutes(app, db);
+};

package/scripts/csdr/cli/skeletons/app-eui10/mock/app/routes/user_routes.js

@@ -0,0 +1,24 @@
+const User = require('../models/user');
+const uuid = require('uuid');
+
+module.exports = function (app, db) {
+  db.then(db => {
+
+    app.get('/api/user-details', (req, res) => {
+      res.send(db.get('user-details'))
+    });
+
+    app.get('/api/users', (req, res) => {
+      res.send(db.get('users'))
+    });
+
+    app.post('/api/users', (req, res) => {
+      db.get('users')
+        .push({ ...User, ...req.body, ...{ id: uuid.v1() } })
+        .last()
+        .write()
+        .then(user => res.send(user))
+    });
+
+  });
+};

package/scripts/csdr/cli/skeletons/app-eui10/mock/db/db.json

@@ -0,0 +1,12 @@
+{
+    "user-details": {
+        "firstName": "John",
+        "lastName": "Doe",
+        "fullName": "John Doe",
+        "organisationRef": {
+          "id": "123456", "abbreviation": "DIGIT.B.3"
+        },
+        "userId": "doejohn",
+        "email": "John.DOE@ec.europa.eu"
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/mock/server.js

@@ -0,0 +1,16 @@
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+const low = require('lowdb')
+const FileAsync = require('lowdb/adapters/FileAsync')
+const adapter = new FileAsync('apps/@app.name@/mock/db/db.json')
+const db = low(adapter)
+const port = 3000;
+
+app.use(bodyParser.urlencoded({ extended: true }));
+
+require('./app/routes')(app, db);
+
+app.listen(port, () => {
+  console.log('We are live on ' + port);
+});

package/scripts/csdr/cli/skeletons/app-eui10/package.json

@@ -0,0 +1,6 @@
+{
+    "name": "@app.name@",
+    "version": "1.0.0",
+    "license": "EUPL-1.1",
+    "private": true
+}

package/scripts/csdr/cli/skeletons/app-eui10/scripts.json

@@ -0,0 +1,5 @@
+{
+    "@app.name@:start-mock-server": "nodemon --ext js --watch ./apps/@app.name@/mock ./apps/@app.name@/mock/server.js",
+    "@app.name@:start-serve": "eui-scripts serve-app @app.name@ --configuration=proxy-mock",
+    "@app.name@:start": "npm-run-all --parallel @app.name@:start-mock-server @app.name@:start-serve"
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/app-routing.module.ts

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

package/scripts/csdr/cli/skeletons/app-eui10/src/app/app-starter.service.ts

@@ -0,0 +1,68 @@
+import { Inject, Injectable } from '@angular/core';
+import {
+    CONFIG_TOKEN,
+    UserService,
+    EuiAppConfig,
+    UserDetails,
+    UserPreferences,
+    I18nService,
+} from '@eui/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable, of, zip } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class AppStarterService {
+    defaultUserPreferences: UserPreferences;
+
+    constructor(
+        protected userService: UserService,
+        protected i18nService: I18nService,
+        @Inject(CONFIG_TOKEN) private config: EuiAppConfig,
+        protected http: HttpClient,
+    ) {
+    }
+
+    start(): Observable<any> {
+
+        return zip(
+            this.initUserService().pipe(
+                switchMap((userStatus) => {
+                    console.log(userStatus);
+                    return this.i18nService.init();
+                }),
+            ),
+        );
+    }
+
+    /**
+     * Fetches user details,
+     * create user: UserState object
+     * then initialise to the UserService on run time
+     */
+    initUserService(): Observable<any> {
+        return zip(
+            this.fetchUserDetails(),
+        ).pipe(
+            switchMap(([userDetails]) => {
+                return this.userService.init(userDetails);
+            }));
+    }
+
+    /**
+     * Fetches user details
+     */
+    private fetchUserDetails(): Observable<UserDetails> {
+        // const url = this.config.modules.your_custom_module.your_custom_endpoint
+        const moduleCoreApi = this.config.modules.core;
+        const url = `${moduleCoreApi.base}${moduleCoreApi.userDetails}`;
+        const user = { userId: 'anonymous' };
+
+        if (!url) {
+            return of(user);
+        }
+        return this.http.get<UserDetails>(url);
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/app.component.html

@@ -0,0 +1,29 @@
+<eui-app [userInfos]="userInfos?.fullName" isSidebarOpen=true>
+    <eui-app-toolbar>
+        <eui-toolbar>
+            <eui-toolbar-logo></eui-toolbar-logo>
+            <eui-toolbar-app appName="@app.name@"></eui-toolbar-app>
+            <eui-toolbar-environment>MOCK</eui-toolbar-environment>
+            <eui-toolbar-items euiPositionRight>
+                <eui-toolbar-item-user-profile>
+                    <eui-user-profile-menu>
+                        <eui-user-profile-menu-item>
+                            <eui-icon iconClass="eui-icon-person-thin"></eui-icon> {{ 'eui.my-profile-informations' | translate }}
+                        </eui-user-profile-menu-item>
+                        <eui-user-profile-menu-item>
+                            <eui-icon iconClass="eui-icon-logout-thin"></eui-icon> {{ 'eui.sign-out' | translate }}
+                        </eui-user-profile-menu-item>
+                    </eui-user-profile-menu>
+                </eui-toolbar-item-user-profile>
+                <eui-toolbar-item-notifications>
+                    <eui-notifications [count]="notificationItems?.length" [items]="notificationItems"></eui-notifications>
+                </eui-toolbar-item-notifications>
+            </eui-toolbar-items>
+        </eui-toolbar>
+    </eui-app-toolbar>
+    <eui-app-sidebar>
+        <eui-app-sidebar-body>
+            <eui-app-sidebar-menu [items]="sidebarItems"></eui-app-sidebar-menu>
+        </eui-app-sidebar-body>
+    </eui-app-sidebar>
+</eui-app>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/app.component.ts

@@ -0,0 +1,55 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import {
+    getUserState,
+    UserState,
+} from '@eui/core';
+import { Observable, Subscription } from 'rxjs';
+import { AppStarterService } from './app-starter.service';
+
+@Component({
+    selector: 'app-root',
+    templateUrl: './app.component.html',
+})
+export class AppComponent implements OnInit, OnDestroy {
+    userInfos: UserState;
+    // Observe state changes
+    userState: Observable<UserState>;
+    // an array to keep all subscriptions and easily unsubscribe
+    subs: Subscription[] = [];
+
+    sidebarItems = [
+        { label: 'Home', url: 'home', iconClass: 'eui-icon-home' },
+        { label: 'Module 1', url: 'module1', iconClass: 'eui-icon-work', children: [
+            { label: 'page 1', url: 'module1/page1' },
+            { label: 'page 2', url: 'module1/page2' },
+        ] },
+        { label: 'Module 2', url: 'module2', iconClass: 'eui-icon-work' },
+    ];
+    notificationItems = [
+        { label: 'Title label 1', subLabel: 'Subtitle label' },
+        { label: 'Title label 2', subLabel: 'Subtitle label' },
+        { label: 'Title label 3', subLabel: 'Subtitle label' },
+        { label: 'Title label 4', subLabel: 'Subtitle label' },
+    ];
+
+    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() {
+    }
+
+    ngOnDestroy() {
+        this.subs.forEach((s: Subscription) => s.unsubscribe());
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/app.module.ts

@@ -0,0 +1,27 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NgModule } 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: [
+        AppStarterService,
+    ],
+    bootstrap: [
+        AppComponent,
+    ],
+})
+export class AppModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/core/core.module.ts

@@ -0,0 +1,84 @@
+import { NgModule } from '@angular/core';
+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 {
+    CachePreventionInterceptor,
+    CorsSecurityInterceptor,
+    CsrfPreventionInterceptor,
+    EuLoginSessionTimeoutHandlingInterceptor,
+    CoreModule as EuiCoreModule,
+    translateConfig,
+    CoreModuleEffects,
+    EUI_CONFIG_TOKEN,
+} from '@eui/core';
+
+import { appConfig } from '../../config/index';
+import { environment } from '../../environments/environment';
+
+import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers/index';
+
+import { SharedModule } from '../shared/shared.module';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        EuiCoreModule.forRoot(),
+        EffectsModule.forRoot([...CoreModuleEffects]),
+        TranslateModule.forRoot(translateConfig),
+        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
+        !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 50 }) : [],
+    ],
+    declarations: [
+    ],
+    exports: [
+        SharedModule,
+    ],
+    providers: [
+        {
+            provide: REDUCER_TOKEN,
+            deps: [],
+            useFactory: getReducers,
+        },
+        {
+            provide: EUI_CONFIG_TOKEN,
+            useValue: { appConfig: appConfig, environment: environment }
+        },
+        {
+            // Sets the withCredentials on Ajax Request to send the JSESSIONID cookie to another domain.
+            // This is necessary when a request is being made to another domain that is protected by EU Login.
+            provide: HTTP_INTERCEPTORS,
+            useClass: CorsSecurityInterceptor,
+            multi: true,
+        },
+        {
+            // WARNING: in case of OpenID this is not needed since OpenID is stateless therefore no revalidation needed.
+            // When the authentication session is invalid, we need to re-authenticate. The browser refreshes the current URL,
+            // and lets the EU Login client redirect to the official EU Login page.
+            provide: HTTP_INTERCEPTORS,
+            useClass: EuLoginSessionTimeoutHandlingInterceptor,
+            multi: true,
+        },
+        {
+            // Adds HTTP header to each Ajax request that ensures the request is set by a piece of JavaScript code in the application.
+            // This prevents dynamically-loaded content from forging a request in the name of the currently logged-in user.
+            // Be aware that this assumes that cross-site scripting (XSS) is already put in place, (default setting in Angular).
+            provide: HTTP_INTERCEPTORS,
+            useClass: CsrfPreventionInterceptor,
+            multi: true,
+        },
+        {
+            // Asks the intermediate proxies not to return a cache copy of the resource.
+            // In matter of fact forces each server in the chain to validate the freshness of the resource.
+            provide: HTTP_INTERCEPTORS,
+            useClass: CachePreventionInterceptor,
+            multi: true,
+        },
+    ]
+})
+export class CoreModule {
+
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/core/reducers/index.ts

@@ -0,0 +1,33 @@
+import { InjectionToken } from '@angular/core';
+import { MetaReducer } from '@ngrx/store';
+import { storeFreeze } from 'ngrx-store-freeze';
+import { reducers as coreReducers, CoreState, getAppState, localStorageSync } from '@eui/core';
+
+import { environment } from '../../../environments/environment';
+
+export const REDUCER_TOKEN = new InjectionToken<any>('Registered Reducers');
+
+/**
+ * Define here your app state
+ *
+ * [IMPORTANT]
+ * There are some **reserved** slice of the state
+ * that you **can not** use in your application ==> app |user | notification
+ */
+/* tslint:disable-next-line */
+export interface AppState extends CoreState {
+    // [key: string]: fromTaskManager.State | any;
+}
+
+/**
+ * Define here the reducers of your app
+ */
+const rootReducer = Object.assign({}, coreReducers, {
+    // [fromTaskManager.namespace]: fromTaskManager.reducers,
+});
+
+export function getReducers() {
+    return rootReducer;
+}
+
+export const metaReducers: MetaReducer<AppState>[] = !environment.production ? [localStorageSync, storeFreeze] : [localStorageSync];

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { HomeComponent } from './home.component';
+
+const routes: Routes = [
+    { path: '', component: HomeComponent },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+})
+export class HomeRoutingModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home.component.html

@@ -0,0 +1,7 @@
+<eui-page>
+    <eui-page-header label="{{ 'page.home.title' | translate }}"></eui-page-header>
+
+    <eui-page-content>
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home.component.ts

@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import { UxAppShellService } from '@eui/core';
+
+@Component({
+    templateUrl: './home.component.html',
+})
+export class HomeComponent {
+    constructor(
+        private asService: UxAppShellService,
+    ) {
+    }
+
+    onUpdateAppName() {
+        this.asService.setState({
+            ...this.asService.state,
+            appName: 'Updated app name'
+        })
+    }
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/home/home.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+
+import { HomeRoutingModule } from './home-routing.module';
+
+import { HomeComponent } from './home.component';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        HomeRoutingModule,
+    ],
+    declarations: [
+        HomeComponent,
+    ],
+})
+export class Module {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page1/page1.component.html

@@ -0,0 +1,7 @@
+<div id="page-title">
+    <h2>Module1 - Page 1</h2>
+</div>
+
+<ux-panel label="Panel">
+    Panel content
+</ux-panel>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page1/page1.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './page1.component.html'
+})
+export class Page1Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page2/page2.component.html

@@ -0,0 +1,7 @@
+<div id="page-title">
+    <h2>Module 1 - page 2</h2>
+</div>
+
+<ux-panel label="Panel">
+    Panel content
+</ux-panel>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/components/page2/page2.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './page2.component.html'
+})
+export class Page2Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { Page1Component } from './components/page1/page1.component';
+import { Page2Component } from './components/page2/page2.component';
+import { Module1Component } from './module1.component';
+
+const routes: Routes = [
+    { path: '', component: Module1Component },
+    { path: 'page1', component: Page1Component },
+    { path: 'page2', component: Page2Component },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+})
+export class Module1RoutingModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.component.html

@@ -0,0 +1,7 @@
+<eui-page>
+    <eui-page-header label="Module 1"></eui-page-header>
+
+    <eui-page-content>
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.component.ts

@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './module1.component.html',
+})
+export class Module1Component {
+
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module1/module1.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Module1RoutingModule } from './module1-routing.module';
+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';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        Module1RoutingModule,
+    ],
+    declarations: [
+        Module1Component,
+        Page1Component,
+        Page2Component,
+    ],
+})
+export class Module {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2-routing.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { Module2Component } from './module2.component';
+
+const routes: Routes = [
+    { path: '', component: Module2Component },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild([
+            { path: '', component: Module2Component }
+        ])
+    ],
+})
+export class Module2RoutingModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.component.html

@@ -0,0 +1,8 @@
+<eui-page>
+    <eui-page-header label="Module 2"></eui-page-header>
+
+    <eui-page-content>
+        
+
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+    templateUrl: './module2.component.html'
+})
+export class Module2Component {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/features/module2/module2.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Module2RoutingModule } from './module2-routing.module';
+import { Module2Component } from './module2.component';
+
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+    imports: [
+        SharedModule,
+        Module2RoutingModule,
+    ],
+    declarations: [
+        Module2Component,
+    ],
+})
+export class Module {
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/shared/shared.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { UxAllModule } from '@eui/components';
+import { EuiAllModule } from '@eui/components-next';
+
+@NgModule({
+    imports: [
+        UxAllModule,
+        EuiAllModule,
+        TranslateModule,
+    ],
+    declarations: [
+    ],
+    exports: [
+        UxAllModule,
+        EuiAllModule,
+        TranslateModule,
+    ]
+})
+export class SharedModule {}

package/scripts/csdr/cli/skeletons/app-eui10/src/app/shared/testing/router.mock.ts

@@ -0,0 +1,18 @@
+import { NavigationEnd } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+
+export class RouterMock {
+    routerState = { root: '' };
+    public navigationEnd = new NavigationEnd(0, 'http://url1', 'http://url2');
+    public events = new Observable(observer => {
+        observer.next(this.navigationEnd);
+        observer.complete();
+    });
+
+    constructor() {}
+
+    createUrlTree() {}
+
+    serializeUrl() {}
+
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/config/env-json-config.json

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

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/i18n/en.json

@@ -0,0 +1,7 @@
+{
+    "page.home.title": "Welcome to eUI!",
+    "app.search.button": "Search",
+    "eui.my-profile-informations": "My profile information",
+    "eui.you-are-logged-in-as": "You are logged in as",
+    "eui.sign-out": "Sign out"
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/assets/i18n/fr.json

@@ -0,0 +1,7 @@
+{
+    "page.home.title": "Bienvenue dans eUI!",
+    "app.search.button": "Chercher",
+    "eui.my-profile-informations": "My profile information FR",
+    "eui.you-are-logged-in-as": "You are logged in as FR",
+    "eui.sign-out": "Sign out FR"
+}

package/scripts/csdr/cli/skeletons/app-eui10/src/config/global.ts

@@ -0,0 +1,20 @@
+import { GlobalConfig } from '@eui/core';
+
+export const GLOBAL: GlobalConfig = {
+    appTitle: 'CSDR-app',
+    i18n: {
+        i18nService: {
+            defaultLanguage: 'en',
+            languages: ['en', 'fr'],
+        },
+        i18nLoader: {
+            i18nFolders: ['i18n-eui', 'i18n'],
+        },
+    },
+    user: {
+        defaultUserPreferences: {
+            dashboard: { },
+            lang: 'en',
+        },
+    },
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/config/index.ts

@@ -0,0 +1,8 @@
+import { EuiAppConfig } from '@eui/core';
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+
+export const appConfig: EuiAppConfig = {
+    global: GLOBAL,
+    modules: MODULES,
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/config/modules.ts

@@ -0,0 +1,4 @@
+import { ModulesConfig } from '@eui/core';
+
+export const MODULES: ModulesConfig = {
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/environments/environment.prod.ts

@@ -0,0 +1,9 @@
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: true,
+    enableDevToolRedux: false,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/environments/environment.ts

@@ -0,0 +1,9 @@
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: false,
+    enableDevToolRedux: true,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};

package/scripts/csdr/cli/skeletons/app-eui10/src/index.html

@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>@app.name@</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+
+<body>
+  <app-root>
+    <div id="loader-wrapper">
+      <div id="loader"></div>
+    </div>
+  </app-root>
+</body>
+
+</html>

package/scripts/csdr/cli/skeletons/app-eui10/src/styles.scss

@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */

package/scripts/csdr/cli/skeletons/app-eui10/tslint.json

@@ -0,0 +1,17 @@
+{
+    "extends": "../../tslint.json",
+    "rules": {
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ]
+    }
+}

package/scripts/csdr/metadata/package-history.js

@@ -128,7 +128,7 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
   if (!fromBuildMetadata) {
     tools.logWarning('No previous metadata found for package...skipping');
-    return {};
+    return null;
   }
 
   return Promise.resolve()

package/scripts/csdr/release/package/common.js

@@ -19,9 +19,9 @@ module.exports.getBranches = () => {
 
   const isSnapshot =  (branch === 'develop');
   const isMaster =  (branch === 'master');
-  const isSupport = (!isMaster && !isSnapshot && branch.indexOf('support/') > -1);
+  const isSupportSnapshot = (!isMaster && !isSnapshot && branch.indexOf('support/develop') > -1);
+  const isSupport = (!isMaster && !isSnapshot && !isSupportSnapshot && branch.indexOf('support/') > -1);
   const isNext = (!isMaster && !isSnapshot && !isSupport && branch.indexOf('next/') > -1);
-  const isSupportSnapshot = (!isMaster && !isSnapshot && !isSupport && !isNext);
 
   return {
     isSupport: isSupport,
@@ -178,7 +178,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
   // GET NEW VERSION from VALID commits found in metadata
   .then(() => {
-    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, branches.isSnapshot, branches.isNext, branches.isSupport);
+    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
   })
 
 
@@ -187,7 +187,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
     newVersion = version;
 
     if (!dryRun) {
-      return versionUtils.package.updateVersion(pkg, version, branches.isSnapshot, branches.isNext, branches.isSupport);
+      return versionUtils.package.updateVersion(pkg, version, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
     }
   })
 
@@ -288,7 +288,7 @@ module.exports.runGitOperations = (pkg, version) => {
 
   // TAG THE NEW RELEASE (MASTER) for MASTER and SUPPORT
   .then(() => {
-    if (!branches.isSnapshot) {
+    if (!branches.isSnapshot && !branches.isSupportSnapshot) {
       return utils.git.tagVersion(
         version, branches.branch,
         `chore(release): tagging ${version} - from CI server`,

package/scripts/utils/build/package/styles.js

@@ -141,7 +141,7 @@ const compileSassFileDartSass = (folder, filename) => {
         fs.writeFileSync(finalDest, postcssResult.css);
 
         if (postcssResult.map) {
-          fs.writeFileSync(`${finalDest}.map`, postcssResult.map);
+          fs.writeFileSync(`${finalDest}.map`, postcssResult.map.toString());
         }
       });
     })