@eui/tools 6.2.48 → 6.2.50

package/.version.properties

@@ -1 +1 @@
-6.2.48
+6.2.50

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.50 (2023-01-23)
+
+##### Chores
+
+* **other:**
+  * adapted dependencies for security - EUI-7035 [EUI-7035](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7035)  ([9ce0bd90](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9ce0bd90fdf3088bd9cbcea3cbec54d911653cc7))
+
+* * *
+* * *
+## 6.2.49 (2023-01-19)
+
+##### Chores
+
+* **other:**
+  * optional full skeleton for v15 remote injection - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([930fa7b1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/930fa7b1808f340f90595194c2d6d2950ce9148b))
+
+* * *
+* * *
 ## 6.2.48 (2023-01-11)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.2.48",
+    "version": "6.2.50",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -22,12 +22,12 @@
         "rimraf": "3.0.2",
         "ncp": "2.0.0",
         "moment": "2.29.4",
-        "moment-timezone": "0.5.37",
+        "moment-timezone": "0.5.40",
         "npm-run-all": "4.1.5",
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "json-server": "0.16.3",
+        "json-server": "0.17.1",
         "faker": "5.5.3",
         "nodemon": "2.0.20",
         "lowdb": "1.0.0",
@@ -38,10 +38,10 @@
         "postcss": "7.0.36",
         "cssnano": "4.1.11",
         "extend": "3.0.2",
-        "mocha": "8.4.0",
-        "chai": "4.3.6",
+        "mocha": "10.2.0",
+        "chai": "4.3.7",
         "nyc": "15.1.0",
-        "node-fetch": "2.6.7",
+        "node-fetch": "3.3.0",
         "sendmail": "1.6.1",
         "svg-sprite": "2.0.0",
         "imagemin": "7.0.1",

package/scripts/csdr/init/remotes/15.x/full/src/app/dummy.scss

@@ -0,0 +1,3 @@
+.example {
+    padding: 10px;
+}

package/scripts/csdr/init/remotes/15.x/full/src/app/dummy.spec.ts

@@ -0,0 +1,6 @@
+// Dummy test
+describe('Test', () => {
+    it('should work', () => {
+        expect(true).toBe(true);
+    });
+});

package/scripts/csdr/init/remotes/15.x/full/src/app/eui-components.ts

@@ -0,0 +1,9 @@
+import { EuiBlockContentModule } from '@eui/components/eui-block-content';
+import { EuiButtonModule } from '@eui/components/eui-button';
+import { EuiLabelModule } from '@eui/components/eui-label';
+
+export const EUI_COMPONENTS_MODULES = [
+    EuiBlockContentModule,
+    EuiButtonModule,
+    EuiLabelModule,
+];

package/scripts/csdr/init/remotes/15.x/full/src/app/fallback.component.ts

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+    template: `
+        <eui-block-content [isBlocked]="true">
+            <div style="height: 100%"></div>
+        </eui-block-content>
+    `,
+})
+export class FallbackComponent {
+}

package/scripts/csdr/init/remotes/15.x/full/src/app/module.component.ts

@@ -0,0 +1,91 @@
+import { Component, OnInit, Inject, ElementRef, OnDestroy } from '@angular/core';
+
+import { take } from 'rxjs/operators';
+
+import { CONFIG_TOKEN } from '@eui/core';
+import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
+
+enum ElementStatus {
+    Loading = 'loading',
+    Loaded = 'loaded',
+    Error = 'error',
+}
+
+@Component({
+    template: `
+        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
+            <div style="height: 100%"></div>
+        </eui-block-content>
+        <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
+            <router-outlet></router-outlet>
+        </ng-container>
+        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+            <div class="error-container">
+                <div>
+                    <h1>Translations or user data for this module failed to load.</h1>
+                    <p>Do you want to try again?</p>
+                    <button euiButton euiPrimary (click)="loadData()">
+                        <span euiLabel>{{ 'global.RELOAD' | translate }}</span>
+                    </button>
+                </div>
+            </div>
+        </ng-container>
+    `,
+    styles: [`
+        .error-container {
+            width: 50vw;
+            height: 50vh;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+
+        .error-container div {
+            text-align: center
+        }
+    `],
+})
+export class ModuleComponent implements OnInit, OnDestroy {
+    ElementStatus = ElementStatus;
+    moduleStatus: ElementStatus;
+
+    constructor(private elRef: ElementRef,
+                @Inject(CONFIG_TOKEN) public config: any,
+                private elementLifeCycleService: ElementLifeCycleService,
+                private elementSetupService: ElementSetupService) {
+    }
+
+    ngOnInit() {
+        const elementData = this.elementLifeCycleService.getElementData(this.elRef);
+        this.elementLifeCycleService.setup(elementData);
+        this.loadData();
+    }
+
+    ngOnDestroy(): void {
+        this.elementLifeCycleService.cleanup();
+    }
+
+    private loadData() {
+        this.setStatus(ElementStatus.Loading);
+        try {
+            this.elementSetupService.init()
+                .pipe(take(1))
+                .subscribe((loadStatus: { success: boolean; error?: string }) => {
+                    if (!loadStatus.success) {
+                        this.setStatus(ElementStatus.Error);
+                        console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
+                    } else {
+                        this.setStatus(ElementStatus.Loaded);
+                    }
+                });
+        } catch (e) {
+            console.log(e);
+            this.setStatus(ElementStatus.Error);
+        }
+    }
+
+    private setStatus(status: ElementStatus) {
+        this.moduleStatus = status;
+    }
+}

package/scripts/csdr/init/remotes/15.x/full/src/app/reducers/custom-route-serializer.ts

@@ -0,0 +1,28 @@
+import { Params, RouterStateSnapshot } from '@angular/router';
+import { RouterStateSerializer } from '@ngrx/router-store';
+
+export interface RouterStateUrl {
+    url: string;
+    params: Params;
+    queryParams: Params;
+}
+
+export class CustomSerializer implements RouterStateSerializer<RouterStateUrl> {
+    serialize(routerState: RouterStateSnapshot): RouterStateUrl {
+        let route = routerState.root;
+
+        while (route.firstChild) {
+            route = route.firstChild;
+        }
+
+        const {
+            url,
+            root: { queryParams },
+        } = routerState;
+        const { params } = route;
+
+        // Only return an object including the URL, params and query params
+        // instead of the entire snapshot
+        return { url, params, queryParams };
+    }
+}

package/scripts/csdr/init/remotes/15.x/full/src/app/reducers/index.ts

@@ -0,0 +1,66 @@
+import { InjectionToken } from '@angular/core';
+import { ActionReducer, ActionReducerMap, MetaReducer, INIT } from '@ngrx/store';
+import * as fromRouter from '@ngrx/router-store';
+import { storeFreeze } from 'ngrx-store-freeze';
+
+import { reducers as coreReducers, CoreState, localStorageSync } from '@eui/core';
+import { ElementStorageService } from '@csdr/core';
+
+import { environment } from '../../environments/environment';
+
+export interface AppState extends CoreState {
+    router: fromRouter.RouterReducerState<any>;
+}
+
+// -----------------
+// ------------ AOT
+export const TOKEN = new InjectionToken<any>('AppReducers');
+
+export function getReducers(): ActionReducerMap<AppState, any> {
+    return {
+        router: fromRouter.routerReducer,
+        ...coreReducers,
+    };
+}
+
+export const reducerProvider = [
+    { provide: TOKEN, useFactory: getReducers },
+];
+
+// console.log all actions
+export function logger(reducer: ActionReducer<AppState>): ActionReducer<AppState> {
+    return (state, action) => {
+        const result = reducer(state, action);
+        console.groupCollapsed(action.type);
+        console.log('prev state', state);
+        console.log('action', action);
+        console.log('next state', result);
+        console.groupEnd();
+
+        return result;
+    };
+}
+
+export function hydrationFactory(config: any, elementStorage: ElementStorageService): MetaReducer<AppState> {
+    return (reducer: ActionReducer<AppState>): ActionReducer<any> => {
+        return (state, action) => {
+            const key = `NgRx store: ${config.global.elementName}`;
+            if (action.type === INIT && elementStorage.hasData(key)) {
+                const cachedState = elementStorage.getData(key);
+                const nextStateFromCache = reducer(cachedState as AppState, action);
+                elementStorage.setData(key, nextStateFromCache);
+                return nextStateFromCache;
+            }
+            const nextState = reducer(state, action);
+            elementStorage.setData(key, nextState);
+            return nextState;
+        };
+    };
+}
+
+export function getMetaReducers(config: any, elementStorage: ElementStorageService): MetaReducer<AppState>[] {
+    if (!environment.production) {
+        return [logger, localStorageSync, storeFreeze, hydrationFactory(config, elementStorage)];
+    }
+    return [localStorageSync, hydrationFactory(config, elementStorage)];
+}

package/scripts/csdr/init/remotes/15.x/full/src/config/index.ts

@@ -0,0 +1,20 @@
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+import { EuiAppConfig, LogLevel, ConsoleAppender, LogConfig } from '@eui/core';
+
+/**
+ * Log Configuration
+ */
+const logConfig: LogConfig = {
+    logLevel: LogLevel.ALL,
+    logAppenders: [{
+        type: ConsoleAppender,
+        prefixFormat: '[{level}]',
+    }],
+};
+
+export const appConfig: EuiAppConfig = {
+    global: GLOBAL,
+    modules: MODULES,
+    log: logConfig,
+};

package/scripts/csdr/init/remotes/15.x/full/src/config/modules.ts

@@ -0,0 +1,3 @@
+import { ModulesConfig } from '@eui/core';
+
+export const MODULES: ModulesConfig = JSON.parse(JSON.stringify(window['PROVIDERS']['CONFIG_TOKEN'].modules));

package/scripts/csdr/init/remotes/15.x/full/src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+    production: true,
+};

package/scripts/csdr/init/remotes/15.x/full/src/environments/environment.ts

@@ -0,0 +1,3 @@
+export const environment = {
+    production: false,
+};

package/scripts/csdr/init/remotes/15.x/full/src/index.html

@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <base href="/">
+</head>
+<body>
+  dummy index.html
+</body>
+</html>

package/scripts/csdr/init/remotes/15.x/full/src/main.ts

@@ -0,0 +1,11 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/module';
+import { environment } from './environments/environment';
+if (environment.production) {
+    enableProdMode();
+}
+
+platformBrowserDynamic()
+    .bootstrapModule(AppModule)
+    .catch(err => console.log(err));

package/scripts/csdr/init/remotes/15.x/full/src/polyfills.ts

@@ -0,0 +1,87 @@
+/* eslint-disable */
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+// import 'core-js/es6/reflect';
+
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+// import 'core-js/es7/reflect';
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ */
+
+// (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+
+/*
+* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+* with the following flag, it will bypass `zone.js` patch for IE/Edge
+*/
+// (window as any).__Zone_enable_cross_context_check = true;
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+ /**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';

package/scripts/csdr/init/remotes/15.x/full/src/test.ts

@@ -0,0 +1,20 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

package/scripts/csdr/init/remotes.js

@@ -61,9 +61,10 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
       // constructing the remote folder
       const remotePath = path.join(process.cwd(), 'remotes', remote.name);
-      const remoteSkeletonPath = path.join(__dirname, 'remotes', remote.euiVersion);
+      const remoteSkeletonPath = path.join(__dirname, 'remotes', remote.euiVersion, 'base');
+      const remoteSkeletonFullPath = path.join(__dirname, 'remotes', remote.euiVersion, 'full');
 
-      tools.logInfo(`Copying angular.json => ${remoteSkeletonPath} ==> ${remotePath}`);
+      tools.logInfo(`Copying base sources => ${remoteSkeletonPath} ==> ${remotePath}`);
 
       tools.copy(remoteSkeletonPath, remotePath);
 
@@ -118,6 +119,14 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
       tools.writeJsonFileSync(packageJsonPath, packageJson);
 
       tools.logSuccess('OK => package.json generated');
+
+      // initializing "full" remote sources
+      if (remote.fullSkeletonSources) {
+        tools.logInfo(`copying full sources skeleton : ${remoteSkeletonFullPath} ==> ${remotePath}`);
+        tools.copy(remoteSkeletonFullPath, remotePath);
+
+        tools.logSuccess('OK => copy done');
+      }
     })
 
 

package/scripts/utils/pre-build/injection/externals.js

@@ -301,9 +301,11 @@ module.exports.injectElementExternalSources = (pkg) => {
           throw new Error('External sources not found');
 
         } else {
-          if (tools.isDirExists(pkgSrcPath)) {
-            tools.logInfo(`Removing ${pkgSrcPath} content`);
-            tools.rmdirFull(pkgSrcPath, false);
+          if (!pkg.fullSkeletonSources) {
+            if (tools.isDirExists(pkgSrcPath)) {
+              tools.logInfo(`Removing ${pkgSrcPath} content`);
+              tools.rmdirFull(pkgSrcPath, false);
+            }
           }
 
           tools.logInfo(`${externalSourcesSrcPath} injecting in ${pkgSrcPath}`);

package/scripts/utils/test/test-utils.js

@@ -48,7 +48,7 @@ module.exports.runMocha = (pkg) => {
       tools.logTitle(`Executing Mocha test for pkg: ${pkg.name}`);
 
       // set jest binary
-      const mocha = path.resolve(process.cwd(), 'node_modules', 'mocha', 'bin', 'mocha');
+      const mocha = path.resolve(process.cwd(), 'node_modules', 'mocha', 'bin', '_mocha');
       const nyc = path.resolve(process.cwd(), 'node_modules', 'nyc', 'bin', 'nyc');
 
       // default arguments