@eui/tools 6.17.0 → 6.18.0

package/.version.properties

@@ -1 +1 @@
-6.17.0
+6.18.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 6.18.0 (2024-07-24)
+
+##### New Features
+
+* **remotes:**
+  * minor change MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([e7168ead](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e7168ead5b2a841773d570efb1ed7de3e756d921))
+  * enable zoneless for esbuild builds MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([df766769](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/df766769d4498b4d83fbdf259bd185b47e9ac364))
+  * tweak components to make them OnPush MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([50040270](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5004027099447f321dafc74f0a634eafc20cc7f6))
+  * tweak the config in order to see if remotes-build using esbuild are fine. These changes work fine with webpack! [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([15d905d6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/15d905d62d964f26840409775d9f80f26402816d))
+
+* * *
+* * *
+## 6.17.1 (2024-07-19)
+
+##### Chores
+
+* **other:**
+  * avoid common node imports problems MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([d5ff35d3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d5ff35d38ca46a7c912c6165c5ab2a70b99ffc6f))
+
+* * *
+* * *
 ## 6.17.0 (2024-07-18)
 
 ##### New Features

package/package.json

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

package/scripts/csdr/init/remotes/18.x/base/angular.esbuild.json

@@ -3,80 +3,71 @@
     "version": 1,
     "newProjectRoot": "apps",
     "projects": {
-      "@remote.name@": {
-        "root": ".",
-        "sourceRoot": "src",
-        "projectType": "application",
-        "prefix": "app",
-        "schematics": {},
-        "architect": {
-          "build": {
-            "builder": "@angular-devkit/build-angular:application",
-            "options": {
-              "outputPath": "dist",
-              "index": "src/index.html",
-              "browser": "src/main.ts",
-              "polyfills": ["zone.js"],
-              "tsConfig": "tsconfig.app.json",
-              "sourceMap": {
-                "scripts": true,
-                "styles": false,
-                "hidden": true,
-                "vendor": true
-              },
-              "scripts": [
-              ],
-              "assets": [
-                "src/assets",
-                {
-                    "glob": "**/*",
-                    "input": "node_modules/@eui/core/assets/",
-                    "output": "./assets"
-                },
-                {
-                    "glob": "**/*",
-                    "input": "node_modules/@eui/styles/dist/assets/",
-                    "output": "./assets"
+        "@remote.name@": {
+            "root": ".",
+            "sourceRoot": "src",
+            "projectType": "application",
+            "prefix": "app",
+            "schematics": {},
+            "architect": {
+                "build": {
+                    "builder": "@angular-devkit/build-angular:application",
+                    "options": {
+                        "outputPath": "dist",
+                        "index": "src/index.html",
+                        "browser": "src/main.ts",
+                        "polyfills": [
+                        ],
+                        "tsConfig": "tsconfig.app.json",
+                        "scripts": [
+                        ],
+                        "assets": [
+                            "src/assets",
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/@eui/core/assets/",
+                                "output": "./assets"
+                            },
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/@eui/styles/dist/assets/",
+                                "output": "./assets"
+                            }
+                        ],
+                        "styles": [
+                            "node_modules/@eui/styles/dist/styles/eui.css",
+                            "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
+                        ]
+                    },
+                    "configurations": {
+                        "development": {
+                            "optimization": false,
+                            "extractLicenses": false,
+                            "sourceMap": false,
+                            "namedChunks": true
+                        },
+                        "production": {
+                            "fileReplacements": [
+                                {
+                                    "replace": "src/environments/environment.ts",
+                                    "with": "src/environments/environment.prod.ts"
+                                }
+                            ],
+                            "outputHashing": "none",
+                            "sourceMap": false
+                        },
+                        "serve-dist": {
+                            "outputPath": "serve-dist"
+                        }
+                    }
                 }
-              ],
-              "styles": [
-                  "node_modules/@eui/styles/dist/styles/eui.css",
-                  "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
-              ]
-            },
-            "configurations": {
-              "development": {
-                "optimization": false,
-                "extractLicenses": false,
-                "sourceMap": false,
-                "namedChunks": true
-              },
-              "production": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.prod.ts"
-                  }
-                ],
-                "optimization": true,
-                "outputHashing": "all",
-                "sourceMap": false,
-                "namedChunks": false,
-                "aot": true,
-                "extractLicenses": true
-              },
-              "serve-dist": {
-                "outputPath": "serve-dist"
-              }
             }
-          }
         }
-      }
     },
     "cli": {
-      "analytics": false
+        "analytics": false
     }
-  }
+}

package/scripts/csdr/init/remotes/18.x/base/package.json_TO_REPLACE

@@ -6,5 +6,13 @@
     ],
     "dependencies": {},
     "resolutions": {
+    },
+    "browser": {
+        "os": false,
+        "http": false,
+        "https": false,
+        "url": false,
+        "util": false,
+        "node-fetch": false
     }
 }

package/scripts/csdr/init/remotes/18.x/base/tsconfig.app.json

@@ -1,24 +1,37 @@
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/app",
-    "target": "ES2022",
-    "module": "ES2022",
-    "lib": [
-      "ES2022",
-      "dom"
-    ],
-    "types": [
-        "node"
-    ],
-    "paths": {
-        "os": ["./node_modules/empty-module/index.js"],
-        "node-fetch": ["./node_modules/empty-module/index.js"],
-        "zipkin": ["./node_modules/zipkin/dist/zipkin.js"]
-    }
-  },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "outDir": "./out-tsc/app",
+        "target": "ES2022",
+        "module": "ES2022",
+        "skipLibCheck": true,
+        "esModuleInterop": true,
+        "declaration": false,
+        "experimentalDecorators": true,
+        "moduleResolution": "bundler",
+        "importHelpers": true,
+        "sourceMap": true,
+        "lib": [
+            "ES2022",
+            "dom"
+        ],
+        "types": [
+            "node"
+        ],
+        "paths": {
+            "os": [
+                "./node_modules/empty-module/index.js"
+            ],
+            "node-fetch": [
+                "./node_modules/empty-module/index.js"
+            ],
+            "zipkin": [
+                "./node_modules/zipkin/dist/zipkin.js"
+            ]
+        }
+    },
+    "exclude": [
+        "src/test.ts",
+        "**/*.spec.ts"
+    ]
 }

package/scripts/csdr/init/remotes/18.x/full/common/app/fallback.component.ts

@@ -1,6 +1,7 @@
-import { Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <eui-block-content [isBlocked]="true">
             <div style="height: 100%"></div>

package/scripts/csdr/init/remotes/18.x/full/common/app/module.component.ts

@@ -1,26 +1,25 @@
-import { Component, OnInit, ElementRef, OnDestroy, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, inject, OnDestroy, OnInit, signal } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { CONFIG_TOKEN } from '@eui/core';
-import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
+import { ElementLifeCycleService, ElementSetupService } from '@csdr/integration/element';
 
-enum ElementStatus {
-    Loading = 'loading',
-    Loaded = 'loaded',
-    Error = 'error',
-}
+type StatusType = 'Loading' | 'Loaded' | 'Failed';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
-        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
-            <div style="height: 100%"></div>
-        </eui-block-content>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
+        @if (status() === 'Loaded') {
             <router-outlet></router-outlet>
-        </ng-container>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+        }
+        @if (status() === 'Loading') {
+            <eui-block-content [isBlocked]="true">
+                <div style="height: 100%"></div>
+            </eui-block-content>
+        }
+        @if (status() === 'Failed') {
             <div class="error-container">
                 <div>
                     <h1>Translations or user data for this module failed to load.</h1>
@@ -30,8 +29,7 @@ enum ElementStatus {
                     </button>
                 </div>
             </div>
-        </ng-container>
-    `,
+        }`,
     styles: [`
         .error-container {
             width: 50vw;
@@ -48,10 +46,9 @@ enum ElementStatus {
     `],
 })
 export class ModuleComponent implements OnInit, OnDestroy {
-    ElementStatus = ElementStatus;
-    moduleStatus: ElementStatus;
+    status = signal<StatusType | undefined>(undefined);
 
-    private initSubscription: Subscription;
+    private initSubscription: Subscription | undefined = undefined;
 
     private elRef = inject(ElementRef);
     private config = inject(CONFIG_TOKEN);
@@ -69,8 +66,8 @@ export class ModuleComponent implements OnInit, OnDestroy {
         this.elementLifeCycleService.cleanup();
     }
 
-    private loadData() {
-        this.setStatus(ElementStatus.Loading);
+    loadData() {
+        this.status.set('Loading');
         try {
             this.initSubscription?.unsubscribe();
 
@@ -79,19 +76,15 @@ export class ModuleComponent implements OnInit, OnDestroy {
                 .pipe(first())
                 .subscribe((loadStatus: { success: boolean; error?: string }) => {
                     if (!loadStatus.success) {
-                        this.setStatus(ElementStatus.Error);
+                        this.status.set('Failed');
                         console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
                     } else {
-                        this.setStatus(ElementStatus.Loaded);
+                        this.status.set('Loaded');
                     }
                 });
         } catch (e) {
             console.log(e);
-            this.setStatus(ElementStatus.Error);
+            this.status.set('Failed');
         }
     }
-
-    private setStatus(status: ElementStatus) {
-        this.moduleStatus = status;
-    }
 }

package/scripts/csdr/init/remotes/18.x/full/options/participant/app/module.component.ts

@@ -1,37 +1,35 @@
-import { Component, OnInit, Inject, ElementRef, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, inject, OnDestroy, OnInit, signal } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { CONFIG_TOKEN } from '@eui/core';
-import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
+import { ElementLifeCycleService, ElementSetupService } from '@csdr/integration/element';
 
-enum ElementStatus {
-    Loading = 'loading',
-    Loaded = 'loaded',
-    Error = 'error',
-}
+type StatusType = 'Loading' | 'Loaded' | 'Failed';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
-        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
-            <div style="height: 100%"></div>
-        </eui-block-content>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
+        @if (status() === 'Loaded') {
             <!-- BLOCK_CONTAINER_PLACEHOLDER -->
-        </ng-container>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+        }
+        @if (status() === 'Loading') {
+            <eui-block-content [isBlocked]="true">
+                <div style="height: 100%"></div>
+            </eui-block-content>
+        }
+        @if (status() === 'Failed') {
             <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>
+                        <span euiLabel>{{ 'global.RELOAD' | translate }}</span>
                     </button>
                 </div>
             </div>
-        </ng-container>
-    `,
+        }`,
     styles: [`
         .error-container {
             width: 50vw;
@@ -48,18 +46,16 @@ enum ElementStatus {
     `],
 })
 export class ModuleComponent implements OnInit, OnDestroy {
-    ElementStatus = ElementStatus;
-    moduleStatus: ElementStatus;
+    status = signal<StatusType | undefined>(undefined);
 
     block: any;
 
-    private initSubscription: Subscription;
+    private initSubscription: Subscription | undefined = undefined;
 
-    constructor(private elRef: ElementRef,
-                @Inject(CONFIG_TOKEN) public config: any,
-                private elementLifeCycleService: ElementLifeCycleService,
-                private elementSetupService: ElementSetupService) {
-    }
+    private elRef = inject(ElementRef);
+    private config = inject(CONFIG_TOKEN);
+    private elementLifeCycleService = inject(ElementLifeCycleService);
+    private elementSetupService = inject(ElementSetupService);
 
     ngOnInit() {
         this.block = this.elRef.nativeElement.block;
@@ -73,8 +69,8 @@ export class ModuleComponent implements OnInit, OnDestroy {
         this.elementLifeCycleService.cleanup();
     }
 
-    private loadData() {
-        this.setStatus(ElementStatus.Loading);
+    loadData() {
+        this.status.set('Loading');
         try {
             this.initSubscription?.unsubscribe();
 
@@ -83,19 +79,15 @@ export class ModuleComponent implements OnInit, OnDestroy {
                 .pipe(first())
                 .subscribe((loadStatus: { success: boolean, error?: string }) => {
                     if (!loadStatus.success) {
-                        this.setStatus(ElementStatus.Error);
+                        this.status.set('Failed');
                         console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
                     } else {
-                        this.setStatus(ElementStatus.Loaded);
+                        this.status.set('Loaded');
                     }
                 });
         } catch (e) {
             console.log(e);
-            this.setStatus(ElementStatus.Error);
+            this.status.set('Failed');
         }
     }
-
-    private setStatus(status: ElementStatus) {
-        this.moduleStatus = status;
-    }
 }