@eui/tools 6.3.2 → 6.3.4

package/.version.properties

@@ -1 +1 @@
-6.3.2
+6.3.4

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.4 (2023-01-31)
+
+##### Chores
+
+* **other:**
+  * adapted v15 remote CLI - fix wrong file replacement - EUI-7035 [EUI-7035](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7035)  ([1856bc0e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1856bc0e32cd077f21cf1a2652c35f033c451cde))
+
+* * *
+* * *
+## 6.3.3 (2023-01-30)
+
+##### Chores
+
+* **other:**
+  * use es2022 features for >= v14 - EUI-7067 [EUI-7067](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7067)  ([f3667b86](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f3667b8691706569e7ab40eaa0561a2d942f9304))
+
+* * *
+* * *
 ## 6.3.2 (2023-01-25)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/package-build-frontend.js

@@ -42,7 +42,9 @@ const replaceExtensions = (targetPath) => {
 
     .then(() => {
       tools.logInfo('Executing post generation operations');
-      tools.move(path.join(targetPath, 'gitignore_TO_REPLACE'), path.join(targetPath, '.gitignore'));
+      if (tools.isFileExists(path.join(targetPath, 'gitignore_TO_REPLACE'))) {
+        tools.move(path.join(targetPath, 'gitignore_TO_REPLACE'), path.join(targetPath, '.gitignore'));
+      }
       if (tools.isFileExists(path.join(targetPath, 'package.json_TO_REPLACE'))) {
         tools.move(path.join(targetPath, 'package.json_TO_REPLACE'), path.join(targetPath, 'package.json'));
       }
@@ -87,7 +89,6 @@ const generateVirtualRemote = ({fullName, targetPath, rootPackagePath, pkg, args
 
       // for the moment the virtual remotes are only activated for v15+
       if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
-        tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
         tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
       }
 

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/app/dummy.scss

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/app/dummy.spec.ts

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/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/cli/skeletons/package/frontend-remote-eui15/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/cli/skeletons/package/frontend-remote-eui15/src/app/module.ts

@@ -0,0 +1,87 @@
+import { NgModule, Injector, DoBootstrap, ApplicationRef } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HttpClientModule } from '@angular/common/http';
+import { createCustomElement } from '@angular/elements';
+
+import { StoreModule } from '@ngrx/store';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreRouterConnectingModule } from '@ngrx/router-store';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+    CoreModule,
+    EUI_CONFIG_TOKEN,
+    translateConfig,
+} from '@eui/core';
+
+import { EUI_COMPONENTS_MODULES } from './eui-components';
+
+import { CsdrCoreModule } from '@csdr/core';
+
+import { TOKEN, reducerProvider, metaReducers } from './reducers/index';
+import { CustomSerializer } from './reducers/custom-route-serializer';
+
+import { environment } from '../environments/environment';
+import { appConfig } from '../config';
+
+import { Module as RootPackageCommonModule } from '@module.scope@/@module.name@';
+import { DEFAULT_MAPPED_PROVIDERS } from '@csdr/integration/element';
+import { RoutingModule } from './routing.module';
+
+import { FallbackComponent } from './fallback.component';
+import { ModuleComponent } from './module.component';
+
+@NgModule({
+    imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
+        HttpClientModule,
+        StoreRouterConnectingModule.forRoot({ stateKey: 'router', serializer: CustomSerializer }),
+        StoreModule.forRoot(TOKEN, { metaReducers }),
+        EffectsModule.forRoot([]),
+        StoreDevtoolsModule.instrument({ name: appConfig.global.storeName, maxAge: 150, logOnly: environment.production }),
+        TranslateModule.forRoot(translateConfig),
+
+        CoreModule.forRoot(),
+        CsdrCoreModule.forRoot(),
+
+        RootPackageCommonModule,
+        RoutingModule,
+
+        ...EUI_COMPONENTS_MODULES,
+    ],
+    declarations: [
+        FallbackComponent,
+        ModuleComponent,
+    ],
+    entryComponents: [
+        FallbackComponent,
+        ModuleComponent,
+    ],
+    providers: [
+        reducerProvider,
+        {
+            provide: EUI_CONFIG_TOKEN,
+            useValue: { appConfig: { ...appConfig, ...environment }, environment },
+        },
+
+        ...DEFAULT_MAPPED_PROVIDERS,
+    ],
+})
+export class AppModule implements DoBootstrap {
+
+    constructor(private injector: Injector) {
+    }
+
+    ngDoBootstrap(appRef: ApplicationRef): void {
+        const elementSampleEui = createCustomElement(ModuleComponent, { injector: this.injector });
+        try {
+            customElements.define(appConfig.global.elementName, elementSampleEui);
+        } catch (e) {
+            console.log(e);
+        }
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/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/cli/skeletons/package/frontend-remote-eui15/src/app/reducers/index.ts

@@ -0,0 +1,43 @@
+/* eslint-disable */
+import { InjectionToken } from '@angular/core';
+import { ActionReducer, ActionReducerMap, MetaReducer } 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 { 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 const metaReducers: MetaReducer<AppState>[] = !environment.production ? [logger, localStorageSync, storeFreeze] : [localStorageSync];

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/app/routing.module.ts

@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { ELEMENT_ROUTES_TOKEN } from '@csdr/integration/element';
+
+import { routes } from '@module.scope@/@module.name@';
+import { appConfig } from '../config/index';
+import { FallbackComponent } from './fallback.component';
+import { ModuleComponent } from './module.component';
+
+const elementRoutes: Routes = [
+    { path: '', component: ModuleComponent },
+    {
+        path: appConfig.global.baseUrl,
+        children: routes,
+    },
+    { path: '**', component: FallbackComponent },
+];
+
+// @dynamic
+@NgModule({
+    imports: [
+        RouterModule.forRoot(elementRoutes),
+    ],
+    providers: [
+        { provide: ELEMENT_ROUTES_TOKEN, useValue: elementRoutes },
+    ],
+    exports: [
+        RouterModule,
+    ],
+})
+export class RoutingModule {
+}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/config/index.ts

@@ -0,0 +1,10 @@
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+
+import { EuiAppConfig } from '@eui/core';
+import { configMapping } from '@csdr/integration/element';
+
+export const appConfig: EuiAppConfig = configMapping({
+    global: GLOBAL,
+    modules: MODULES,
+});

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/config/modules.ts

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/environments/environment.prod.ts

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/src/environments/environment.ts

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/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/cli/skeletons/package/frontend-remote-eui15/src/main.ts

@@ -0,0 +1,12 @@
+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/cli/skeletons/package/frontend-remote-eui15/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/config/packages.js

@@ -32,8 +32,8 @@ module.exports.getCsdrPackagesFull = (flattenChildren = true) => {
     try {
       outputPackages.push(this.getPackage(p, true));
     } catch (e) {
-      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
-      console.log(e);
+      // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      // console.log(e);
     }
   })
   return outputPackages;
@@ -48,8 +48,8 @@ const getPackages = module.exports.getPackages = () => {
     try {
       outputPackages.push(this.getPackage(p));
     } catch (e) {
-      tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
-      console.log(e);
+      // tools.logInfo(`Package: ${p} is in local config but not found in global... should be cleaned up`);
+      // console.log(e);
     }
   })
   return outputPackages;
@@ -111,8 +111,6 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
 
 
   if (!pkg && !optional) {
-    tools.logInfo(`Package ${pkgName} cannot be found in your local installation, mount it with:`);
-    tools.logInfo(`npm run init -- --pkg ${pkgName} --pkgOnly`);
     throw 'PACKAGE_NOT_FOUND';
   }
 

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui14/tsconfig.app.json

@@ -5,7 +5,7 @@
       "types": [],
       "module": "ESNext",
       "target": "ES2016",
-      "lib": ["es2020", "dom"]
+      "lib": ["es2022", "dom"]
     },
     "angularCompilerOptions": {
         "annotateForClosureCompiler": true,

package/scripts/utils/tools.js

@@ -470,7 +470,7 @@ function removeFilesExtension(rootPath, extension) {
           files.forEach(function (file) {
             const dir = path.dirname(file);
             const filename = path.basename(file);
-            // logInfo('remove extention for file : ' + filename + ' in ' + dir);
+            logInfo('remove extention for file : ' + filename + ' in ' + dir);
             const filenameUpdate = filename.substr(0, filename.indexOf(extension));
             fs.renameSync(file, dir + "/" + filenameUpdate);
             processed++;

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/test.ts.TO_REPLACE

@@ -1,20 +0,0 @@
-// 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/cli/skeletons/package/frontend-remote-eui15/angular.json

@@ -1,84 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "apps",
-  "projects": {
-    "@module.full.name@": {
-      "root": ".",
-      "sourceRoot": "src",
-      "projectType": "application",
-      "prefix": "app",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "ngx-build-plus:build",
-          "options": {
-              "deployUrl": "/mwp/assets/elements/@module.full.name@/bundles/",
-            "outputPath": "dist",
-            "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "scripts": [
-              "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
-            ],
-            "assets": [
-              "src/assets"
-            ],
-              "styles": [
-                  "./node_modules/@eui/styles/dist/styles/eui.css"
-              ]
-          },
-          "configurations": {
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "extractCss": true,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true
-            },
-            "serve-dist": {
-              "outputPath": "serve-dist",
-              "wath": true
-            }
-          }
-        },
-        "serve": {
-          "builder": "./node_modules/@angular-devkit/build-angular:dev-server",
-          "options": {
-              "deployUrl": "/assets/elements/@module.full.name@/bundles/",
-              "browserTarget": "@module.full.name@:build:serve-dist"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "@module.full.name@:build:production"
-            }
-          }
-        },
-        "test": {
-          "builder": "./node_modules/@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "scripts": []
-          }
-        }
-      }
-    }
-  },
-  "cli": {
-    "analytics": false
-  }
-}

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui15/dependencies-composite.json

@@ -1,8 +0,0 @@
-{
-    "@eui/deps-base": "^15.0.0",
-
-    "@csdr/core": "^3.0.0",
-    "@csdr/integration": "^3.0.0",
-
-    "@module.scope@/@module.name@": "^1.0.0"
-}